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

rule AddFilesToContainer: Support naming files later

Browse Source 
* Add "flags" parameter and only supported flag "computeName". When
  specified the "destName" argument is the name of a shell command
  or function that will be called to determine the destination file
  name when the container is built.
* AddFilesToHaikuImage: Pass flags to AddFilesToContainer.
This commit is contained in:
Ingo Weinhold
2013-10-09 03:48:25 +02:00
parent 066d508682
commit 40c9cb7b47
1 changed files with 34 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
build/jam/ImageRules
+34 -8
View File
@@ -189,10 +189,15 @@ rule PropagateContainerUpdateTargetFlags toTarget : fromTarget
rule AddFilesToContainer container : directoryTokens : targets : destName rule AddFilesToContainer container : directoryTokens : targets : destName
: flags
{ {
# AddFilesToContainer <container> : <directoryTokens> : <targets> # AddFilesToContainer <container> : <directoryTokens> : <targets>
# [ : dest name ] # : [ <destName> ] : [ <flags> ]
# #
# Supported flags:
# computeName - <destName> is the name of a shell command/function that
# computes the destination name.
local containerGrist = [ on $(container) return $(HAIKU_CONTAINER_GRIST) ] ; local containerGrist = [ on $(container) return $(HAIKU_CONTAINER_GRIST) ] ;
local systemDirTokens local systemDirTokens
= [ on $(container) return $(HAIKU_CONTAINER_SYSTEM_DIR_TOKENS) ] ; = [ on $(container) return $(HAIKU_CONTAINER_SYSTEM_DIR_TOKENS) ] ;
@@ -236,15 +241,22 @@ rule AddFilesToContainer container : directoryTokens : targets : destName
local target ; local target ;
for target in $(targets) { for target in $(targets) {
local name ; local name ;
local nameFunction ;
if $(destName) { if $(destName) {
name = $(destName) ; if computeName in $(flags) {
nameFunction = $(destName) ;
name = $(destName)/$(target:BS) ;
} else {
name = $(destName) ;
}
} else { } else {
name = $(target:G=:D=) ; name = $(target:BS) ;
} }
local destTarget = $(name:G=$(containerGrist)__$(directory:G=)) ; local destTarget = $(name:G=$(containerGrist)__$(directory:G=)) ;
TARGET on $(destTarget) = $(target) ; TARGET on $(destTarget) = $(target) ;
INSTALL_DIR on $(destTarget) = $(directory) ; INSTALL_DIR on $(destTarget) = $(directory) ;
NAME_FUNCTION on $(destTarget) = $(nameFunction) ;
$(installTargetsVar) on $(target) += $(destTarget) ; $(installTargetsVar) on $(target) += $(destTarget) ;
TARGETS_TO_INSTALL on $(directory) += $(destTarget) ; TARGETS_TO_INSTALL on $(directory) += $(destTarget) ;
@@ -673,14 +685,22 @@ rule CreateContainerCopyFilesScript container : script
local destTarget ; local destTarget ;
for destTarget in $(destTargets) { for destTarget in $(destTargets) {
local target = [ on $(destTarget) return $(TARGET) ] ; local target = [ on $(destTarget) return $(TARGET) ] ;
local name = $(destTarget:BS) ; local name = $(destTarget:G=) ;
if $(name) != $(target:BS) { if $(name) != $(target:BS) {
# use a unique dummy target for this file, on which we # use a unique dummy target for this file, on which we
# can define the TARGET_DIR variable # can define the TARGET_DIR variable
local dummyTarget = $(script)-dummy-$(dir:G=)-$(target) ; local dummyTarget = $(script)-dummy-$(dir:G=)-$(target) ;
NotFile $(dummyTarget) ; NotFile $(dummyTarget) ;
TARGET_DIR on $(dummyTarget) = $(dir:G=) ; TARGET_DIR on $(dummyTarget) = $(dir:G=) ;
INSTALL_TARGET_NAME on $(dummyTarget) = $(name) ;
local nameFunction
= [ on $(destTarget) return $(NAME_FUNCTION) ] ;
if $(nameFunction) {
INSTALL_TARGET_NAME on $(dummyTarget) = "\\${name}" ;
} else {
INSTALL_TARGET_NAME on $(dummyTarget) = $(name) ;
}
NAME_FUNCTION on $(dummyTarget) = $(nameFunction) ;
Depends $(dummyTarget) : $(initScript) $(target) Depends $(dummyTarget) : $(initScript) $(target)
$(serializationDependency) ; $(serializationDependency) ;
@@ -748,6 +768,11 @@ actions piecemeal AppendToContainerCopyFilesScript bind OUTPUT_SCRIPT
actions AppendToContainerCopyFilesScriptSingleFile actions AppendToContainerCopyFilesScriptSingleFile
{ {
if [ -n "$(NAME_FUNCTION:E)" ]; then
echo "name=\`$(NAME_FUNCTION:E) \"$(2[2])\" 2> /dev/null \` || exit 1" \
>> $(2[1])
fi
echo \$cp "\"\${sPrefix}$(2[2])\"" \ echo \$cp "\"\${sPrefix}$(2[2])\"" \
"\"\${tPrefix}$(TARGET_DIR)/$(INSTALL_TARGET_NAME)\"" >> $(2[1]) "\"\${tPrefix}$(TARGET_DIR)/$(INSTALL_TARGET_NAME)\"" >> $(2[1])
} }
@@ -885,12 +910,13 @@ rule AddDirectoryToHaikuImage directoryTokens : attributeFiles
: $(directoryTokens) : $(attributeFiles) ] ; : $(directoryTokens) : $(attributeFiles) ] ;
} }
rule AddFilesToHaikuImage directory : targets : destName rule AddFilesToHaikuImage directory : targets : destName : flags
{ {
# AddFilesToHaikuImage <directory> : <targets> [ : dest name ] # AddFilesToHaikuImage <directory> : <targets> : [ <destName> ]
# : [ <flags> ]
AddFilesToContainer $(HAIKU_IMAGE_CONTAINER_NAME) : $(directory) AddFilesToContainer $(HAIKU_IMAGE_CONTAINER_NAME) : $(directory)
: $(targets) : $(destName) ; : $(targets) : $(destName) : $(flags) ;
} }
rule FFilesInHaikuImageDirectory directoryTokens rule FFilesInHaikuImageDirectory directoryTokens