From 3d9c3125ac6ac5f643a89eea32dd4667a4bb5ce4 Mon Sep 17 00:00:00 2001 From: Oliver Tappe Date: Wed, 30 Apr 2014 23:12:59 +0200 Subject: [PATCH] Create packages_build folders per build type. * The content of the preprocessed package-info files and the package contents depend on the build type, so we use a different folder for each build type. --- build/jam/DefaultBuildProfiles | 6 ++++++ build/jam/PackageRules | 14 +++++--------- src/data/package_infos/arm/haiku | 2 +- src/data/package_infos/m68k/haiku | 2 +- src/data/package_infos/ppc/haiku | 2 +- src/data/package_infos/x86/haiku | 2 +- src/data/package_infos/x86/haiku_secondary | 2 +- src/data/package_infos/x86_64/haiku | 2 +- src/data/package_infos/x86_64/haiku_secondary | 2 +- src/data/package_infos/x86_gcc2/haiku | 2 +- src/data/package_infos/x86_gcc2/haiku_secondary | 2 +- 11 files changed, 20 insertions(+), 18 deletions(-) diff --git a/build/jam/DefaultBuildProfiles b/build/jam/DefaultBuildProfiles index 34414c8761..13525bfbea 100644 --- a/build/jam/DefaultBuildProfiles +++ b/build/jam/DefaultBuildProfiles @@ -11,11 +11,17 @@ switch $(HAIKU_BUILD_PROFILE) { case "minimum-*" : { HAIKU_BUILD_TYPE = minimum ; EnableBuildFeatures minimum_image ; + + HAIKU_DEFINES += HAIKU_MINIMUM_BUILD ; + TARGET_DEFINES += HAIKU_MINIMUM_BUILD ; } case "*" : { HAIKU_BUILD_TYPE = regular ; EnableBuildFeatures regular_image ; + + HAIKU_DEFINES += HAIKU_REGULAR_BUILD ; + TARGET_DEFINES += HAIKU_REGULAR_BUILD ; } } Echo "Starting build of type $(HAIKU_BUILD_TYPE) ..." ; diff --git a/build/jam/PackageRules b/build/jam/PackageRules index 731c08918f..11cf632a75 100644 --- a/build/jam/PackageRules +++ b/build/jam/PackageRules @@ -50,9 +50,6 @@ rule PreprocessPackageInfo source : directory : architecture ; local target = $(source:BSG=package-info)-package-info ; - if $(HAIKU_BUILD_TYPE) = bootstrap { - target = $(target)-bootstrap ; - } MakeLocate $(target) : $(directory) ; PreprocessPackageOrRepositoryInfo $(target) : $(source) : $(architecture) @@ -97,11 +94,9 @@ rule PreprocessPackageOrRepositoryInfo target : source : architecture # useCPP - Filter the source file through the C preprocessor after the # placeholder substitutions have been performed. - local defines = HAIKU_PACKAGING_ARCH=$(architecture) ; + local defines = HAIKU_PACKAGING_ARCH=$(architecture) + HAIKU_$(HAIKU_BUILD_TYPE:U)_BUILD ; local sedReplacements = %HAIKU_PACKAGING_ARCH%,$(architecture) ; - if $(HAIKU_BUILD_TYPE) = bootstrap { - defines += HAIKU_BOOTSTRAP_BUILD ; - } if $(secondaryArchitecture) { defines += HAIKU_SECONDARY_PACKAGING_ARCH=$(secondaryArchitecture) ; sedReplacements @@ -159,8 +154,9 @@ rule BuildHaikuPackage package : packageInfo local grist = [ FHaikuPackageGrist $(package) ] ; - local tempDir - = [ FDirName $(HAIKU_PACKAGES_BUILD_DIR_$(architecture)) $(grist) ] ; + local tempDir = [ FDirName + $(HAIKU_PACKAGES_BUILD_DIR_$(architecture)) $(HAIKU_BUILD_TYPE) $(grist) + ] ; local scriptDir = [ FDirName $(tempDir) scripts ] ; # build the package info and locate the package diff --git a/src/data/package_infos/arm/haiku b/src/data/package_infos/arm/haiku index ea1e676803..b056b92f24 100644 --- a/src/data/package_infos/arm/haiku +++ b/src/data/package_infos/arm/haiku @@ -181,7 +181,7 @@ requires { lib:libicutest lib:libicutu lib:libicuuc -#ifndef HAIKU_BOOTSTRAP_BUILD +#ifdef HAIKU_REGULAR_BUILD lib:libjpeg lib:libpng #endif diff --git a/src/data/package_infos/m68k/haiku b/src/data/package_infos/m68k/haiku index bb19df2295..f80e701126 100644 --- a/src/data/package_infos/m68k/haiku +++ b/src/data/package_infos/m68k/haiku @@ -173,7 +173,7 @@ provides { requires { lib:libfreetype -#ifndef HAIKU_BOOTSTRAP_BUILD +#ifdef HAIKU_REGULAR_BUILD lib:libjpeg lib:libpng #endif diff --git a/src/data/package_infos/ppc/haiku b/src/data/package_infos/ppc/haiku index 10bd6643f6..f93d0c38b7 100644 --- a/src/data/package_infos/ppc/haiku +++ b/src/data/package_infos/ppc/haiku @@ -181,7 +181,7 @@ requires { lib:libicutest lib:libicutu lib:libicuuc -#ifndef HAIKU_BOOTSTRAP_BUILD +#ifdef HAIKU_REGULAR_BUILD lib:libjpeg lib:libpng #endif diff --git a/src/data/package_infos/x86/haiku b/src/data/package_infos/x86/haiku index 57c6f2fbc9..f1439dd1e1 100644 --- a/src/data/package_infos/x86/haiku +++ b/src/data/package_infos/x86/haiku @@ -182,7 +182,7 @@ requires { lib:libicutest lib:libicutu lib:libicuuc -#ifndef HAIKU_BOOTSTRAP_BUILD +#ifdef HAIKU_REGULAR_BUILD lib:libjpeg lib:libpng #endif diff --git a/src/data/package_infos/x86/haiku_secondary b/src/data/package_infos/x86/haiku_secondary index 9b36abbde8..02feef5ff1 100644 --- a/src/data/package_infos/x86/haiku_secondary +++ b/src/data/package_infos/x86/haiku_secondary @@ -32,7 +32,7 @@ requires { lib:libicutest_%HAIKU_SECONDARY_PACKAGING_ARCH% lib:libicutu_%HAIKU_SECONDARY_PACKAGING_ARCH% lib:libicuuc_%HAIKU_SECONDARY_PACKAGING_ARCH% -#ifndef HAIKU_BOOTSTRAP_BUILD +#ifdef HAIKU_REGULAR_BUILD lib:libjpeg_%HAIKU_SECONDARY_PACKAGING_ARCH% lib:libpng_%HAIKU_SECONDARY_PACKAGING_ARCH% #endif diff --git a/src/data/package_infos/x86_64/haiku b/src/data/package_infos/x86_64/haiku index 7eda63d5f4..ec6fe846e9 100644 --- a/src/data/package_infos/x86_64/haiku +++ b/src/data/package_infos/x86_64/haiku @@ -181,7 +181,7 @@ requires { lib:libicutest lib:libicutu lib:libicuuc -#ifndef HAIKU_BOOTSTRAP_BUILD +#ifdef HAIKU_REGULAR_BUILD lib:libjpeg lib:libpng #endif diff --git a/src/data/package_infos/x86_64/haiku_secondary b/src/data/package_infos/x86_64/haiku_secondary index b0a2576df0..225f9dfdc1 100644 --- a/src/data/package_infos/x86_64/haiku_secondary +++ b/src/data/package_infos/x86_64/haiku_secondary @@ -30,7 +30,7 @@ requires { lib:libicutest_%HAIKU_SECONDARY_PACKAGING_ARCH% lib:libicutu_%HAIKU_SECONDARY_PACKAGING_ARCH% lib:libicuuc_%HAIKU_SECONDARY_PACKAGING_ARCH% -#ifndef HAIKU_BOOTSTRAP_BUILD +#ifdef HAIKU_REGULAR_BUILD lib:libjpeg_%HAIKU_SECONDARY_PACKAGING_ARCH% lib:libpng_%HAIKU_SECONDARY_PACKAGING_ARCH% #endif diff --git a/src/data/package_infos/x86_gcc2/haiku b/src/data/package_infos/x86_gcc2/haiku index 2fb96d275d..2ad01a066c 100644 --- a/src/data/package_infos/x86_gcc2/haiku +++ b/src/data/package_infos/x86_gcc2/haiku @@ -182,7 +182,7 @@ requires { lib:libicutest lib:libicutu lib:libicuuc -#ifndef HAIKU_BOOTSTRAP_BUILD +#ifdef HAIKU_REGULAR_BUILD lib:libjpeg lib:libpng #endif diff --git a/src/data/package_infos/x86_gcc2/haiku_secondary b/src/data/package_infos/x86_gcc2/haiku_secondary index 16404870ca..029249c18f 100644 --- a/src/data/package_infos/x86_gcc2/haiku_secondary +++ b/src/data/package_infos/x86_gcc2/haiku_secondary @@ -32,7 +32,7 @@ requires { lib:libicutest_%HAIKU_SECONDARY_PACKAGING_ARCH% lib:libicutu_%HAIKU_SECONDARY_PACKAGING_ARCH% lib:libicuuc_%HAIKU_SECONDARY_PACKAGING_ARCH% -#ifndef HAIKU_BOOTSTRAP_BUILD +#ifdef HAIKU_REGULAR_BUILD lib:libjpeg_%HAIKU_SECONDARY_PACKAGING_ARCH% lib:libpng_%HAIKU_SECONDARY_PACKAGING_ARCH% #endif