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

* Moved jam argument processing to new build/jam/CommandLineArguments.

Browse Source 
* Check the first argument for "help" as well. If given print a somewhat
  helpful text. Consider this my excuse to close ticket #1883. :-)
* Track available and added optional packages and fail, if an optional package
  is requested that doesn't exist. Closes ticket #3332.
* Check for duplicate build profile definitions and fail if encountered.
  Closes ticket #3333.


git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@29298 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Ingo Weinhold
2009-02-23 22:33:09 +00:00
parent 24a7f4c285
commit 37aefc9c6f
6 changed files with 136 additions and 54 deletions
Download Patch File Download Diff File Expand all files Collapse all files
build/jam/BuildSetup
+2 -52
View File
@@ -64,58 +64,8 @@ HAIKU_DEFAULT_CD_NAME = haiku-cd.iso ;
HAIKU_DEFAULT_CD_DIR = $(HAIKU_OUTPUT_DIR) ;
HAIKU_DEFAULT_CD_LABEL = Haiku ;
# analyze an optionally replace jam's target parameters
HAIKU_ORIGINAL_JAM_TARGETS = $(JAM_TARGETS) ;
HAIKU_BUILD_PROFILE = ;
if $(JAM_TARGETS) {
switch $(JAM_TARGETS[1]) {
# If the target to be built is "all" (i.e. the default) and we're in
# the output directory, the root directory of the build system, or
# in "src/", we change the target to be built to "haiku-image".
case all : {
if ! $(INVOCATION_SUBDIR) || $(INVOCATION_SUBDIR) = src {
JAM_TARGETS = haiku-image ;
}
}
# The "run" target allows for running arbitrary command lines containing
# build system targets, which are built and replaced accordingly.
case run : {
if $(JAM_TARGETS[2]) {
JAM_TARGETS = [ RunCommandLine $(JAM_TARGETS[2-]) ] ;
} else {
Exit "\"jam run\" requires parameters!" ;
}
}
# A target starting with "@" is a build profile.
case @* : {
HAIKU_BUILD_PROFILE = [ Match "@(.*)" : $(JAM_TARGETS[1]) ] ;
HAIKU_BUILD_PROFILE_ACTION = $(JAM_TARGETS[2]:E=build) ;
HAIKU_BUILD_PROFILE_PARAMETERS = $(JAM_TARGETS[3-]) ;
HAIKU_BUILD_PROFILE_DEFINED = ;
}
case * : {
# "update-image", "update-vmware-image", and "update-install"
# targets allow for updating only specific targets in the
# image/installation dir.
if $(JAM_TARGETS[1]) in update-image update-vmware-image
update-install {
SetUpdateHaikuImageOnly 1 ;
HAIKU_INCLUDE_IN_IMAGE on $(JAM_TARGETS[2-]) = 1 ;
if $(JAM_TARGETS[1]) = update-image {
JAM_TARGETS = haiku-image ;
} else if $(JAM_TARGETS[1]) = update-vmware-image {
JAM_TARGETS = haiku-vmware-image ;
} else {
JAM_TARGETS = install-haiku ;
}
}
}
}
}
# analyze and optionally replace jam's target parameters
ProcessCommandLineArguments ;
# include Timezones/libgccObjects