i2p/haiku-beta6
1
0
Fork 0
Code Issues Pull Requests Actions 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-05-01 13:00:46 +02:00
parent 8c54af563c
commit 3d9c3125ac
11 changed files with 20 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files
build/jam/PackageRules
+5 -9
View File
@@ -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