i2p/haiku-beta6
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Introduced a new variable, HAIKU_INCLUDE_TRADEMARKS. It used to include/exclude

Browse Source 
files from HaikuImage and is set when HAIKU_DISTRO_COMPATIBILITY is 'official'
or 'compatible'


git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@37742 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Matt Madia
2010-07-25 20:34:17 +00:00
parent 2873f50a40
commit 0f75e967c8
2 changed files with 22 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
build/jam/BuildSetup
+15 -3
View File
@@ -177,9 +177,21 @@ HAIKU_NO_WERROR ?= 0 ;
# distro compatibility level defines # distro compatibility level defines
HAIKU_DISTRO_COMPATIBILITY ?= "default" ; HAIKU_DISTRO_COMPATIBILITY ?= "default" ;
switch $(HAIKU_DISTRO_COMPATIBILITY) { switch $(HAIKU_DISTRO_COMPATIBILITY) {
case official : HAIKU_DEFINES += HAIKU_DISTRO_COMPATIBILITY_OFFICIAL ; case official : {
case compatible : HAIKU_DEFINES += HAIKU_DISTRO_COMPATIBILITY_COMPATIBLE ; HAIKU_DEFINES += HAIKU_DISTRO_COMPATIBILITY_OFFICIAL ;
case "default" : HAIKU_DEFINES += HAIKU_DISTRO_COMPATIBILITY_DEFAULT ; #TARGET_DEFINES += HAIKU_DISTRO_COMPATIBILITY_OFFICIAL ;
HAIKU_INCLUDE_TRADEMARKS = "" ;
}
case compatible : {
HAIKU_DEFINES += HAIKU_DISTRO_COMPATIBILITY_COMPATIBLE ;
#TARGET_DEFINES += HAIKU_DISTRO_COMPATIBILITY_COMPATIBLE ;
HAIKU_INCLUDE_TRADEMARKS = "" ;
}
case "default" : {
HAIKU_DEFINES += HAIKU_DISTRO_COMPATIBILITY_DEFAULT ;
#TARGET_DEFINES += HAIKU_DISTRO_COMPATIBILITY_DEFAULT ;
HAIKU_INCLUDE_TRADEMARKS = ;
}
case * : Exit "Invalid value for HAIKU_DISTRO_COMPATIBILITY:" case * : Exit "Invalid value for HAIKU_DISTRO_COMPATIBILITY:"
$(HAIKU_DISTRO_COMPATIBILITY) ; $(HAIKU_DISTRO_COMPATIBILITY) ;
} }
build/jam/HaikuImage
+7 -5
View File
@@ -74,8 +74,8 @@ SYSTEM_PREFERENCES = Appearance Backgrounds CPUFrequency DataTranslations
Mouse Network Notifications OpenGL Printers Screen ScreenSaver Shortcuts Sounds Time Mouse Network Notifications OpenGL Printers Screen ScreenSaver Shortcuts Sounds Time
Touchpad <preference>Tracker VirtualMemory Touchpad <preference>Tracker VirtualMemory
; ;
SYSTEM_DEMOS = BSnow Chart Clock Cortex FontDemo SYSTEM_DEMOS = BSnow Chart Clock Cortex FontDemo GLTeapot
GLTeapot Haiku3d Mandelbrot Pairs Playground Pulse Sudoku $(HAIKU_INCLUDE_TRADEMARKS)Haiku3d Mandelbrot Pairs Playground Pulse Sudoku
; ;
SYSTEM_LIBS = SYSTEM_LIBS =
libbe.so libbsd.so libbnetapi.so libbe.so libbsd.so libbnetapi.so
@@ -155,7 +155,8 @@ SYSTEM_ADD_ONS_PRINT = Canon\ LIPS3\ Compatible Canon\ LIPS4\ Compatible
SYSTEM_ADD_ONS_PRINT_TRANSPORT = HP\ JetDirect IPP LPR Parallel\ Port SYSTEM_ADD_ONS_PRINT_TRANSPORT = HP\ JetDirect IPP LPR Parallel\ Port
Print\ To\ File Serial\ Port USB\ Port Print\ To\ File Serial\ Port USB\ Port
; ;
SYSTEM_ADD_ONS_SCREENSAVERS = DebugNow Flurry Haiku Icons IFS Spider Message ; SYSTEM_ADD_ONS_SCREENSAVERS = DebugNow Flurry
$(HAIKU_INCLUDE_TRADEMARKS)Haiku Icons IFS Spider Message ;
SYSTEM_ADD_ONS_DRIVERS_AUDIO = auich auvia echo3g emuxki hda ; SYSTEM_ADD_ONS_DRIVERS_AUDIO = auich auvia echo3g emuxki hda ;
SYSTEM_ADD_ONS_DRIVERS_AUDIO_OLD = ; #cmedia sis7018 usb_audio ; SYSTEM_ADD_ONS_DRIVERS_AUDIO_OLD = ; #cmedia sis7018 usb_audio ;
SYSTEM_ADD_ONS_DRIVERS_GRAPHICS = $(X86_ONLY)radeon $(X86_ONLY)nvidia SYSTEM_ADD_ONS_DRIVERS_GRAPHICS = $(X86_ONLY)radeon $(X86_ONLY)nvidia
@@ -399,8 +400,9 @@ AddFilesToHaikuImage home config boot : $(userBootScripts) ;
# Add boot launch directory # Add boot launch directory
AddDirectoryToHaikuImage home config boot launch ; AddDirectoryToHaikuImage home config boot launch ;
local logoArtwork = "HAIKU logo - white on blue - big.png" local logoArtwork =
"HAIKU logo - white on blue - normal.png" ; $(HAIKU_INCLUDE_TRADEMARKS)"HAIKU logo - white on blue - big.png"
$(HAIKU_INCLUDE_TRADEMARKS)"HAIKU logo - white on blue - normal.png" ;
SEARCH on $(logoArtwork) = [ FDirName $(HAIKU_TOP) data artwork ] ; SEARCH on $(logoArtwork) = [ FDirName $(HAIKU_TOP) data artwork ] ;
AddFilesToHaikuImage system data artwork : $(logoArtwork) ; AddFilesToHaikuImage system data artwork : $(logoArtwork) ;