From 0f75e967c86e8d354ad1a06eea57a46afa9a6a4c Mon Sep 17 00:00:00 2001 From: Matt Madia Date: Sun, 25 Jul 2010 20:34:17 +0000 Subject: [PATCH] Introduced a new variable, HAIKU_INCLUDE_TRADEMARKS. It used to include/exclude 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 --- build/jam/BuildSetup | 18 +++++++++++++++--- build/jam/HaikuImage | 12 +++++++----- 2 files changed, 22 insertions(+), 8 deletions(-) diff --git a/build/jam/BuildSetup b/build/jam/BuildSetup index 55ca07c413..84bf8adeb3 100644 --- a/build/jam/BuildSetup +++ b/build/jam/BuildSetup @@ -177,9 +177,21 @@ HAIKU_NO_WERROR ?= 0 ; # distro compatibility level defines HAIKU_DISTRO_COMPATIBILITY ?= "default" ; switch $(HAIKU_DISTRO_COMPATIBILITY) { - case official : HAIKU_DEFINES += HAIKU_DISTRO_COMPATIBILITY_OFFICIAL ; - case compatible : HAIKU_DEFINES += HAIKU_DISTRO_COMPATIBILITY_COMPATIBLE ; - case "default" : HAIKU_DEFINES += HAIKU_DISTRO_COMPATIBILITY_DEFAULT ; + case official : { + HAIKU_DEFINES += HAIKU_DISTRO_COMPATIBILITY_OFFICIAL ; + #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:" $(HAIKU_DISTRO_COMPATIBILITY) ; } diff --git a/build/jam/HaikuImage b/build/jam/HaikuImage index b4d1b26e63..bddd2c3eee 100644 --- a/build/jam/HaikuImage +++ b/build/jam/HaikuImage @@ -74,8 +74,8 @@ SYSTEM_PREFERENCES = Appearance Backgrounds CPUFrequency DataTranslations Mouse Network Notifications OpenGL Printers Screen ScreenSaver Shortcuts Sounds Time Touchpad Tracker VirtualMemory ; -SYSTEM_DEMOS = BSnow Chart Clock Cortex FontDemo - GLTeapot Haiku3d Mandelbrot Pairs Playground Pulse Sudoku +SYSTEM_DEMOS = BSnow Chart Clock Cortex FontDemo GLTeapot + $(HAIKU_INCLUDE_TRADEMARKS)Haiku3d Mandelbrot Pairs Playground Pulse Sudoku ; SYSTEM_LIBS = 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 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_OLD = ; #cmedia sis7018 usb_audio ; SYSTEM_ADD_ONS_DRIVERS_GRAPHICS = $(X86_ONLY)radeon $(X86_ONLY)nvidia @@ -399,8 +400,9 @@ AddFilesToHaikuImage home config boot : $(userBootScripts) ; # Add boot launch directory AddDirectoryToHaikuImage home config boot launch ; -local logoArtwork = "HAIKU logo - white on blue - big.png" - "HAIKU logo - white on blue - normal.png" ; +local logoArtwork = + $(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 ] ; AddFilesToHaikuImage system data artwork : $(logoArtwork) ;