Aren/haiku
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Create packages_build folders per build type.

Browse Source 
* 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.
This commit is contained in:
Oliver Tappe 2014-04-30 23:12:59 +02:00
parent 8c54af563c
commit 3d9c3125ac
11 changed files with 20 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
build/jam/DefaultBuildProfiles
View File

@ -11,11 +11,17 @@ switch $(HAIKU_BUILD_PROFILE) {
case "minimum-*" : { case "minimum-*" : {
HAIKU_BUILD_TYPE = minimum ; HAIKU_BUILD_TYPE = minimum ;
EnableBuildFeatures minimum_image ; EnableBuildFeatures minimum_image ;
HAIKU_DEFINES += HAIKU_MINIMUM_BUILD ;
TARGET_DEFINES += HAIKU_MINIMUM_BUILD ;
} }
case "*" : { case "*" : {
HAIKU_BUILD_TYPE = regular ; HAIKU_BUILD_TYPE = regular ;
EnableBuildFeatures regular_image ; EnableBuildFeatures regular_image ;
HAIKU_DEFINES += HAIKU_REGULAR_BUILD ;
TARGET_DEFINES += HAIKU_REGULAR_BUILD ;
} }
} }
Echo "Starting build of type $(HAIKU_BUILD_TYPE) ..." ; Echo "Starting build of type $(HAIKU_BUILD_TYPE) ..." ;

14
build/jam/PackageRules
View File

@ -50,9 +50,6 @@ rule PreprocessPackageInfo source : directory : architecture
; ;
local target = $(source:BSG=package-info)-package-info ; local target = $(source:BSG=package-info)-package-info ;
if $(HAIKU_BUILD_TYPE) = bootstrap {
target = $(target)-bootstrap ;
}
MakeLocate $(target) : $(directory) ; MakeLocate $(target) : $(directory) ;
PreprocessPackageOrRepositoryInfo $(target) : $(source) : $(architecture) PreprocessPackageOrRepositoryInfo $(target) : $(source) : $(architecture)
@ -97,11 +94,9 @@ rule PreprocessPackageOrRepositoryInfo target : source : architecture
# useCPP - Filter the source file through the C preprocessor after the # useCPP - Filter the source file through the C preprocessor after the
# placeholder substitutions have been performed. # 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) ; local sedReplacements = %HAIKU_PACKAGING_ARCH%,$(architecture) ;
if $(HAIKU_BUILD_TYPE) = bootstrap {
defines += HAIKU_BOOTSTRAP_BUILD ;
}
if $(secondaryArchitecture) { if $(secondaryArchitecture) {
defines += HAIKU_SECONDARY_PACKAGING_ARCH=$(secondaryArchitecture) ; defines += HAIKU_SECONDARY_PACKAGING_ARCH=$(secondaryArchitecture) ;
sedReplacements sedReplacements
@ -159,8 +154,9 @@ rule BuildHaikuPackage package : packageInfo
local grist = [ FHaikuPackageGrist $(package) ] ; local grist = [ FHaikuPackageGrist $(package) ] ;
local tempDir local tempDir = [ FDirName
= [ FDirName $(HAIKU_PACKAGES_BUILD_DIR_$(architecture)) $(grist) ] ; $(HAIKU_PACKAGES_BUILD_DIR_$(architecture)) $(HAIKU_BUILD_TYPE) $(grist)
] ;
local scriptDir = [ FDirName $(tempDir) scripts ] ; local scriptDir = [ FDirName $(tempDir) scripts ] ;
# build the package info and locate the package # build the package info and locate the package

2
src/data/package_infos/arm/haiku
View File

@ -181,7 +181,7 @@ requires {
lib:libicutest lib:libicutest
lib:libicutu lib:libicutu
lib:libicuuc lib:libicuuc
#ifndef HAIKU_BOOTSTRAP_BUILD #ifdef HAIKU_REGULAR_BUILD
lib:libjpeg lib:libjpeg
lib:libpng lib:libpng
#endif #endif

2
src/data/package_infos/m68k/haiku
View File

@ -173,7 +173,7 @@ provides {
requires { requires {
lib:libfreetype lib:libfreetype
#ifndef HAIKU_BOOTSTRAP_BUILD #ifdef HAIKU_REGULAR_BUILD
lib:libjpeg lib:libjpeg
lib:libpng lib:libpng
#endif #endif

2
src/data/package_infos/ppc/haiku
View File

@ -181,7 +181,7 @@ requires {
lib:libicutest lib:libicutest
lib:libicutu lib:libicutu
lib:libicuuc lib:libicuuc
#ifndef HAIKU_BOOTSTRAP_BUILD #ifdef HAIKU_REGULAR_BUILD
lib:libjpeg lib:libjpeg
lib:libpng lib:libpng
#endif #endif

2
src/data/package_infos/x86/haiku
View File

@ -182,7 +182,7 @@ requires {
lib:libicutest lib:libicutest
lib:libicutu lib:libicutu
lib:libicuuc lib:libicuuc
#ifndef HAIKU_BOOTSTRAP_BUILD #ifdef HAIKU_REGULAR_BUILD
lib:libjpeg lib:libjpeg
lib:libpng lib:libpng
#endif #endif

2
src/data/package_infos/x86/haiku_secondary
View File

@ -32,7 +32,7 @@ requires {
lib:libicutest_%HAIKU_SECONDARY_PACKAGING_ARCH% lib:libicutest_%HAIKU_SECONDARY_PACKAGING_ARCH%
lib:libicutu_%HAIKU_SECONDARY_PACKAGING_ARCH% lib:libicutu_%HAIKU_SECONDARY_PACKAGING_ARCH%
lib:libicuuc_%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:libjpeg_%HAIKU_SECONDARY_PACKAGING_ARCH%
lib:libpng_%HAIKU_SECONDARY_PACKAGING_ARCH% lib:libpng_%HAIKU_SECONDARY_PACKAGING_ARCH%
#endif #endif

2
src/data/package_infos/x86_64/haiku
View File

@ -181,7 +181,7 @@ requires {
lib:libicutest lib:libicutest
lib:libicutu lib:libicutu
lib:libicuuc lib:libicuuc
#ifndef HAIKU_BOOTSTRAP_BUILD #ifdef HAIKU_REGULAR_BUILD
lib:libjpeg lib:libjpeg
lib:libpng lib:libpng
#endif #endif

2
src/data/package_infos/x86_64/haiku_secondary
View File

@ -30,7 +30,7 @@ requires {
lib:libicutest_%HAIKU_SECONDARY_PACKAGING_ARCH% lib:libicutest_%HAIKU_SECONDARY_PACKAGING_ARCH%
lib:libicutu_%HAIKU_SECONDARY_PACKAGING_ARCH% lib:libicutu_%HAIKU_SECONDARY_PACKAGING_ARCH%
lib:libicuuc_%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:libjpeg_%HAIKU_SECONDARY_PACKAGING_ARCH%
lib:libpng_%HAIKU_SECONDARY_PACKAGING_ARCH% lib:libpng_%HAIKU_SECONDARY_PACKAGING_ARCH%
#endif #endif

2
src/data/package_infos/x86_gcc2/haiku
View File

@ -182,7 +182,7 @@ requires {
lib:libicutest lib:libicutest
lib:libicutu lib:libicutu
lib:libicuuc lib:libicuuc
#ifndef HAIKU_BOOTSTRAP_BUILD #ifdef HAIKU_REGULAR_BUILD
lib:libjpeg lib:libjpeg
lib:libpng lib:libpng
#endif #endif

2
src/data/package_infos/x86_gcc2/haiku_secondary
View File

@ -32,7 +32,7 @@ requires {
lib:libicutest_%HAIKU_SECONDARY_PACKAGING_ARCH% lib:libicutest_%HAIKU_SECONDARY_PACKAGING_ARCH%
lib:libicutu_%HAIKU_SECONDARY_PACKAGING_ARCH% lib:libicutu_%HAIKU_SECONDARY_PACKAGING_ARCH%
lib:libicuuc_%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:libjpeg_%HAIKU_SECONDARY_PACKAGING_ARCH%
lib:libpng_%HAIKU_SECONDARY_PACKAGING_ARCH% lib:libpng_%HAIKU_SECONDARY_PACKAGING_ARCH%
#endif #endif