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

ImageRules: Allow build feature annotated params in Add* rules 

More precisely in the rules that take multiple targets. It doesn't make
that much sense e.g. for AddSymlinkTo*.
This commit is contained in:
Ingo Weinhold 2012-12-09 03:50:31 +01:00
parent ffa0014b8e
commit 33c254876c
1 changed files with 10 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
build/jam/ImageRules
View File

@ -160,6 +160,8 @@ rule AddFilesToContainer container : directoryTokens : targets : destName
: $(directoryTokens) ] ; : $(directoryTokens) ] ;
local containerGrist = [ on $(container) return $(HAIKU_CONTAINER_GRIST) ] ; local containerGrist = [ on $(container) return $(HAIKU_CONTAINER_GRIST) ] ;
targets = [ FFilterByBuildFeatures $(targets) ] ;
# 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) ]
@ -303,6 +305,8 @@ rule AddDriversToContainer container : relativeDirectoryTokens : targets
local directoryTokens = system add-ons kernel drivers dev local directoryTokens = system add-ons kernel drivers dev
$(relativeDirectoryTokens) ; $(relativeDirectoryTokens) ;
targets = [ FFilterByBuildFeatures $(targets) ] ;
AddFilesToContainer $(container) : system add-ons kernel drivers bin AddFilesToContainer $(container) : system add-ons kernel drivers bin
: $(targets) ; : $(targets) ;
@ -335,6 +339,8 @@ rule AddNewDriversToContainer container : relativeDirectoryTokens
local directoryTokens = system add-ons kernel drivers local directoryTokens = system add-ons kernel drivers
$(relativeDirectoryTokens) ; $(relativeDirectoryTokens) ;
targets = [ FFilterByBuildFeatures $(targets) ] ;
AddFilesToContainer $(container) : $(directoryTokens) AddFilesToContainer $(container) : $(directoryTokens)
: $(targets) ; : $(targets) ;
} }
@ -350,6 +356,8 @@ rule AddBootModuleSymlinksToContainer container : targets
return ; return ;
} }
targets = [ FFilterByBuildFeatures $(targets) ] ;
# add the symlinks # add the symlinks
local installTargetsVar local installTargetsVar
= [ on $(container) return $(HAIKU_INSTALL_TARGETS_VAR) ] ; = [ on $(container) return $(HAIKU_INSTALL_TARGETS_VAR) ] ;
@ -1272,6 +1280,8 @@ rule AddLibrariesToHaikuHybridImage directory : libs
# Installs libraries with the appropriate links onto the image. # Installs libraries with the appropriate links onto the image.
# #
libs = [ FFilterByBuildFeatures $(libs) ] ;
local lib ; local lib ;
for lib in $(libs) { for lib in $(libs) {
local abiVersion = [ on $(lib) return $(HAIKU_LIB_ABI_VERSION) ] ; local abiVersion = [ on $(lib) return $(HAIKU_LIB_ABI_VERSION) ] ;