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

rule CopyDirectoryToContainer: Add flags isTarget 

The flags indicates that the passed sourceDirectory is a target, not a
path.
This commit is contained in:
Ingo Weinhold 2013-05-07 03:13:37 +02:00
parent fa5dff5529
commit d6a6e2c811
1 changed files with 13 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
build/jam/ImageRules
View File

@ -318,7 +318,8 @@ rule CopyDirectoryToContainer container : directoryTokens : sourceDirectory
# : <sourceDirectory> : <targetDirectoryName> : <excludePatterns> # : <sourceDirectory> : <targetDirectoryName> : <excludePatterns>
# [ : <flags> ] ; # [ : <flags> ] ;
# #
# Supported flags: alwaysUpdate # Supported flags: alwaysUpdate, isTarget
# isTarget: <sourceDirectory> is a target, not a path
# If the image shall only be updated, we don't copy any directories # If the image shall only be updated, we don't copy any directories
if [ on $(container) return $(HAIKU_CONTAINER_UPDATE_ONLY) ] if [ on $(container) return $(HAIKU_CONTAINER_UPDATE_ONLY) ]
@ -328,14 +329,22 @@ rule CopyDirectoryToContainer container : directoryTokens : sourceDirectory
} }
if ! $(targetDirectoryName) { if ! $(targetDirectoryName) {
local path = [ FReverse [ FSplitPath $(sourceDirectory) ] ] ; targetDirectoryName = $(sourceDirectory[1]:BS) ;
targetDirectoryName = $(path[1]) ; }
# If sourceDirectory is a path, not a target, make it a target, so we can
# tree them the same way.
if ! isTarget in $(flags) {
sourceDirectory = $(sourceDirectory:G=copy-directory-to-container) ;
SEARCH on $(sourceDirectory) = ;
TARGET on $(sourceDirectory) = ;
} }
local directory = [ AddDirectoryToContainer $(container) local directory = [ AddDirectoryToContainer $(container)
: $(directoryTokens) $(targetDirectoryName) ] ; : $(directoryTokens) $(targetDirectoryName) ] ;
local targetDir = $(directory)/-/$(sourceDirectory) ; local targetDir = $(directory)/-/$(sourceDirectory) ;
Depends $(targetDir) : $(sourceDirectory) ;
EXCLUDE_PATTERNS on $(targetDir) = $(excludePatterns) ; EXCLUDE_PATTERNS on $(targetDir) = $(excludePatterns) ;
SOURCE_DIRECTORY on $(targetDir) = $(sourceDirectory) ; SOURCE_DIRECTORY on $(targetDir) = $(sourceDirectory) ;
TARGET_DIRECTORY on $(targetDir) = $(directory) ; TARGET_DIRECTORY on $(targetDir) = $(directory) ;
@ -719,7 +728,7 @@ actions AddSymlinkToContainerCopyFilesScript
} }
actions AddDirectoryToContainerCopyFilesScript actions AddDirectoryToContainerCopyFilesScript bind SOURCE_DIRECTORY
{ {
echo \$cp -r $(EXCLUDE_PATTERNS) "\"\${sPrefix}$(SOURCE_DIRECTORY)/.\"" \ echo \$cp -r $(EXCLUDE_PATTERNS) "\"\${sPrefix}$(SOURCE_DIRECTORY)/.\"" \
"\"\${tPrefix}$(TARGET_DIRECTORY:G=)\"" >> $(2[1]) "\"\${tPrefix}$(TARGET_DIRECTORY:G=)\"" >> $(2[1])