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

AddNewDriversToHaikuImage rule: Support alwaysUpdate flag

Browse Source 
* Support alwaysUpdate flag in AddFilesToContainer.
* Add flags arguments to AddNewDriversTo{Container,HaikuImage} and
  support alwaysUpdate flag.
This commit is contained in:
Ingo Weinhold
2013-11-13 01:47:35 +01:00
parent 58114b3476
commit 5328a58455
1 changed files with 14 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
build/jam/ImageRules
+14 -7
View File
@@ -197,6 +197,8 @@ rule AddFilesToContainer container : directoryTokens : targets : destName
# Supported flags: # Supported flags:
# computeName - <destName> is the name of a shell command/function that # computeName - <destName> is the name of a shell command/function that
# computes the destination name. # computes the destination name.
# alwaysUpdate - When only updating the container, always also update the
# given targets.
local containerGrist = [ on $(container) return $(HAIKU_CONTAINER_GRIST) ] ; local containerGrist = [ on $(container) return $(HAIKU_CONTAINER_GRIST) ] ;
local systemDirTokens local systemDirTokens
@@ -207,7 +209,8 @@ rule AddFilesToContainer container : directoryTokens : targets : destName
# If the image shall only be updated, we filter out all targets not marked # If the image shall only be updated, we filter out all targets not marked
# accordingly. # accordingly.
if [ on $(container) return $(HAIKU_CONTAINER_UPDATE_ONLY) ] if [ on $(container) return $(HAIKU_CONTAINER_UPDATE_ONLY) ]
&& ! [ IncludeAllTargetsInContainer $(container) ] { && ! [ IncludeAllTargetsInContainer $(container) ]
&& ! alwaysUpdate in $(flags) {
local filterVar local filterVar
= [ on $(container) return $(HAIKU_INCLUDE_IN_CONTAINER_VAR) ] ; = [ on $(container) return $(HAIKU_INCLUDE_IN_CONTAINER_VAR) ] ;
if $(filterVar) { if $(filterVar) {
@@ -499,10 +502,14 @@ rule AddDriversToContainer container : relativeDirectoryTokens : targets
} }
rule AddNewDriversToContainer container : relativeDirectoryTokens rule AddNewDriversToContainer container : relativeDirectoryTokens
: targets : targets : flags
{ {
# AddNewDriversToContainer <container> : <directory> : <targets> ; # AddNewDriversToContainer <container> : <directory> : <targets> : <flags> ;
# #
# Supported flags:
# alwaysUpdate - When only updating the container, always also update the
# given targets.
local systemDirTokens local systemDirTokens
= [ on $(container) return $(HAIKU_CONTAINER_SYSTEM_DIR_TOKENS) ] ; = [ on $(container) return $(HAIKU_CONTAINER_SYSTEM_DIR_TOKENS) ] ;
local directoryTokens = $(systemDirTokens) add-ons kernel drivers local directoryTokens = $(systemDirTokens) add-ons kernel drivers
@@ -511,7 +518,7 @@ rule AddNewDriversToContainer container : relativeDirectoryTokens
targets = [ FFilterByBuildFeatures $(targets) ] ; targets = [ FFilterByBuildFeatures $(targets) ] ;
AddFilesToContainer $(container) : $(directoryTokens) AddFilesToContainer $(container) : $(directoryTokens)
: $(targets) ; : $(targets) : : $(flags) ;
} }
rule AddBootModuleSymlinksToContainer container : targets rule AddBootModuleSymlinksToContainer container : targets
@@ -1001,12 +1008,12 @@ rule AddDriversToHaikuImage relativeDirectoryTokens : targets
: $(relativeDirectoryTokens) : $(targets) ; : $(relativeDirectoryTokens) : $(targets) ;
} }
rule AddNewDriversToHaikuImage relativeDirectoryTokens : targets rule AddNewDriversToHaikuImage relativeDirectoryTokens : targets : flags
{ {
# AddNewDriversToHaikuImage <relative directory> : <targets> ; # AddNewDriversToHaikuImage <relative directory> : <targets> : <flags> ;
AddNewDriversToContainer $(HAIKU_IMAGE_CONTAINER_NAME) AddNewDriversToContainer $(HAIKU_IMAGE_CONTAINER_NAME)
: $(relativeDirectoryTokens) : $(targets) ; : $(relativeDirectoryTokens) : $(targets) : $(flags) ;
} }
rule AddBootModuleSymlinksToHaikuImage targets rule AddBootModuleSymlinksToHaikuImage targets