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

Include DefaultBuildProfiles earlier

Browse Source 
DefaultBuildProfiles is now included earlier (right after BuildSetup).
This allows us to set HAIKU_BOOTSTRAP_BUILD earlier, so it can be used
for the repository selection. The actual build profile definitions,
which cannot be done that early, live in the rule
DefineDefaultBuildProfiles, which is invoked where the file was
previously included.
This commit is contained in:
Ingo Weinhold
2013-07-21 03:20:26 +02:00
parent d1fe5b98d9
commit b9eec5192d
2 changed files with 144 additions and 134 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Jamrules
+2 -1
View File
@@ -54,6 +54,7 @@ include [ FDirName $(HAIKU_BUILD_RULES_DIR) PackageRules ] ;
include [ FDirName $(HAIKU_BUILD_RULES_DIR) RepositoryRules ] ; include [ FDirName $(HAIKU_BUILD_RULES_DIR) RepositoryRules ] ;
include [ FDirName $(HAIKU_BUILD_RULES_DIR) TestsRules ] ; include [ FDirName $(HAIKU_BUILD_RULES_DIR) TestsRules ] ;
include [ FDirName $(HAIKU_BUILD_RULES_DIR) BuildSetup ] ; include [ FDirName $(HAIKU_BUILD_RULES_DIR) BuildSetup ] ;
include [ FDirName $(HAIKU_BUILD_RULES_DIR) DefaultBuildProfiles ] ;
# Include the repositories for this architecture. # Include the repositories for this architecture.
local repositoriesDirectory local repositoriesDirectory
@@ -90,6 +91,6 @@ if ! $(HAIKU_IGNORE_USER_BUILD_CONFIG) {
} }
} }
include [ FDirName $(HAIKU_BUILD_RULES_DIR) DefaultBuildProfiles ] ; DefineDefaultBuildProfiles ;
PrepareConfigVariables ; PrepareConfigVariables ;
build/jam/DefaultBuildProfiles
+36 -27
View File
@@ -1,22 +1,32 @@
# alpha release profiles # set HAIKU_BOOTSTRAP_BUILD early, if building a bootstrap Haiku image
DefineBuildProfile alpha-raw : image : "haiku-alpha.image" ; switch $(HAIKU_BUILD_PROFILE) {
DefineBuildProfile alpha-vmware : vmware-image : "haiku-alpha.vmdk" ; case "bootstrap-*" :
DefineBuildProfile alpha-cd : cd-image : "haiku-alpha.iso" ; HAIKU_BOOTSTRAP_BUILD = 1 ;
DefineBuildProfile alpha-anyboot : anyboot-image }
rule DefineDefaultBuildProfiles
{
# alpha release profiles
DefineBuildProfile alpha-raw : image : "haiku-alpha.image" ;
DefineBuildProfile alpha-vmware : vmware-image : "haiku-alpha.vmdk" ;
DefineBuildProfile alpha-cd : cd-image : "haiku-alpha.iso" ;
DefineBuildProfile alpha-anyboot : anyboot-image
: "haiku-alpha-anyboot.image" ; : "haiku-alpha-anyboot.image" ;
# nightly profiles # nightly profiles
DefineBuildProfile nightly-raw : image : "haiku-nightly.image" ; DefineBuildProfile nightly-raw : image : "haiku-nightly.image" ;
DefineBuildProfile nightly-vmware : vmware-image : "haiku-nightly.vmdk" ; DefineBuildProfile nightly-vmware : vmware-image : "haiku-nightly.vmdk" ;
DefineBuildProfile nightly-cd : cd-image : "haiku-nightly.iso" ; DefineBuildProfile nightly-cd : cd-image : "haiku-nightly.iso" ;
DefineBuildProfile nightly-anyboot : anyboot-image DefineBuildProfile nightly-anyboot : anyboot-image
: "haiku-nightly-anyboot.image" ; : "haiku-nightly-anyboot.image" ;
# bootstrap profiles # bootstrap profiles
DefineBuildProfile bootstrap-raw : image : "haiku-bootstrap.image" ; DefineBuildProfile bootstrap-raw : image : "haiku-bootstrap.image" ;
DefineBuildProfile bootstrap-vmware : vmware-image : "haiku-bootstrap.vmdk" ; DefineBuildProfile bootstrap-vmware : vmware-image
: "haiku-bootstrap.vmdk" ;
switch $(HAIKU_BUILD_PROFILE) { switch $(HAIKU_BUILD_PROFILE) {
case "alpha-*" : { case "alpha-*" : {
Echo Building Haiku R1/alpha ; Echo Building Haiku R1/alpha ;
HAIKU_ROOT_USER_NAME = user ; HAIKU_ROOT_USER_NAME = user ;
@@ -91,7 +101,6 @@ switch $(HAIKU_BUILD_PROFILE) {
case "bootstrap-*" : { case "bootstrap-*" : {
Echo Building Haiku Bootstrap ; Echo Building Haiku Bootstrap ;
HAIKU_BOOTSTRAP_BUILD = 1 ;
HAIKU_IMAGE_HOST_NAME = shredder ; HAIKU_IMAGE_HOST_NAME = shredder ;
HAIKU_IMAGE_SIZE = 1000 ; HAIKU_IMAGE_SIZE = 1000 ;
@@ -109,29 +118,28 @@ switch $(HAIKU_BUILD_PROFILE) {
bison bison
flex flex
gcc gcc
jam # jam
libtool libtool
m4 m4
make make
mkdepend # mkdepend
perl # perl
texinfo # texinfo
yasm
; ;
AddOptionalHaikuImagePackages DevelopmentMin ; AddOptionalHaikuImagePackages DevelopmentMin ;
} }
} }
# Uncomment in official release branch. # Uncomment in official release branch.
#HAIKU_DEFINES += HAIKU_OFFICIAL_RELEASE ; #HAIKU_DEFINES += HAIKU_OFFICIAL_RELEASE ;
#TARGET_DEFINES += HAIKU_OFFICIAL_RELEASE ; #TARGET_DEFINES += HAIKU_OFFICIAL_RELEASE ;
# If a build profile was specified on the command line, now is the time to # If a build profile was specified on the command line, now is the time to
# check whether it is unknown or one of the default profiles. # check whether it is unknown or one of the default profiles.
if $(HAIKU_BUILD_PROFILE) && ! $(HAIKU_BUILD_PROFILE_DEFINED) { if $(HAIKU_BUILD_PROFILE) && ! $(HAIKU_BUILD_PROFILE_DEFINED) {
# define the obvious default profiles # define the obvious default profiles
if $(HAIKU_BUILD_PROFILE) in anyboot-image cd-image image install if $(HAIKU_BUILD_PROFILE) in anyboot-image cd-image image install
vmware-image { vmware-image {
@@ -139,4 +147,5 @@ if $(HAIKU_BUILD_PROFILE) && ! $(HAIKU_BUILD_PROFILE_DEFINED) {
} else { } else {
Exit "Build profile" $(HAIKU_BUILD_PROFILE) "not defined." ; Exit "Build profile" $(HAIKU_BUILD_PROFILE) "not defined." ;
} }
}
} }