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

AddDirectoryTo{HaikuImage,...} refactoring

Browse Source 
Move common code from AddDirectoryToHaikuImage/AddDirectoryToPackage to
AddDirectoryToContainer. AddDirectoryToPackage was incorrect, using an
incorrect search directory for the attribute files.
This commit is contained in:
Ingo Weinhold
2011-07-17 16:54:12 +02:00
parent d1f40ef636
commit dcdeed6176
2 changed files with 13 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files
build/jam/ImageRules
+11 -13
View File
@@ -97,9 +97,9 @@ actions AddTargetVariableToScript1
#pragma mark - #pragma mark -
rule AddDirectoryToContainer container : directoryTokens rule AddDirectoryToContainer container : directoryTokens : attributeFiles
{ {
# AddDirectoryToContainer <container> : <directoryTokens> # AddDirectoryToContainer <container> : <directoryTokens> : <attributeFiles>
local containerGrist = [ on $(container) return $(HAIKU_CONTAINER_GRIST) ] ; local containerGrist = [ on $(container) return $(HAIKU_CONTAINER_GRIST) ] ;
local directory = [ FDirName $(directoryTokens) ] ; local directory = [ FDirName $(directoryTokens) ] ;
@@ -121,6 +121,12 @@ rule AddDirectoryToContainer container : directoryTokens
} }
} }
if $(attributeFiles) {
SEARCH on $(attributeFiles)
+= [ FDirName $(HAIKU_TOP) data image_directories ] ;
ATTRIBUTE_FILES on $(dir) += $(attributeFiles) ;
}
return $(directory) ; return $(directory) ;
} }
@@ -699,18 +705,10 @@ rule IsUpdateHaikuImageOnly
rule AddDirectoryToHaikuImage directoryTokens : attributeFiles rule AddDirectoryToHaikuImage directoryTokens : attributeFiles
{ {
# AddDirectoryToHaikuImage <directoryTokens> # AddDirectoryToHaikuImage <directoryTokens> : <attributeFiles>
local dir = [ AddDirectoryToContainer $(HAIKU_IMAGE_CONTAINER_NAME) return [ AddDirectoryToContainer $(HAIKU_IMAGE_CONTAINER_NAME)
: $(directoryTokens) ] ; : $(directoryTokens) : $(attributeFiles) ] ;
if $(attributeFiles) {
SEARCH on $(attributeFiles)
+= [ FDirName $(HAIKU_TOP) data image_directories ] ;
ATTRIBUTE_FILES on $(dir) += $(attributeFiles) ;
}
return $(dir) ;
} }
rule AddFilesToHaikuImage directory : targets : destName rule AddFilesToHaikuImage directory : targets : destName
build/jam/PackageRules
+2 -10
View File
@@ -340,16 +340,8 @@ actions BuildHaikuPackage1
rule AddDirectoryToPackage package : directoryTokens : attributeFiles rule AddDirectoryToPackage package : directoryTokens : attributeFiles
{ {
local dir = [ AddDirectoryToContainer $(package) : $(directoryTokens) ] ; return [ AddDirectoryToContainer $(package)
local grist = [ FHaikuPackageGrist $(package) ] ; : $(directoryTokens) : $(attributeFiles) ] ;
if $(attributeFiles) {
SEARCH on $(attributeFiles)
+= [ FDirName $(HAIKU_TOP) data package_directories $(grist) ] ;
ATTRIBUTE_FILES on $(dir) += $(attributeFiles) ;
}
return $(dir) ;
} }