From dcdeed6176ea40e52a44f17be2573b6fed3946ba Mon Sep 17 00:00:00 2001
From: Ingo Weinhold <ingo_weinhold@gmx.de>
Date: Sat, 18 Jun 2011 01:57:35 +0200
Subject: [PATCH] AddDirectoryTo{HaikuImage,...} refactoring

Move common code from AddDirectoryToHaikuImage/AddDirectoryToPackage to
AddDirectoryToContainer. AddDirectoryToPackage was incorrect, using an
incorrect search directory for the attribute files.
---
 build/jam/ImageRules   | 24 +++++++++++-------------
 build/jam/PackageRules | 12 ++----------
 2 files changed, 13 insertions(+), 23 deletions(-)

diff --git a/build/jam/ImageRules b/build/jam/ImageRules
index df2b81a0c9..fd3f30758c 100644
--- a/build/jam/ImageRules
+++ b/build/jam/ImageRules
@@ -97,9 +97,9 @@ actions AddTargetVariableToScript1
 
 #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 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) ;
 }
 
@@ -699,18 +705,10 @@ rule IsUpdateHaikuImageOnly
 
 rule AddDirectoryToHaikuImage directoryTokens : attributeFiles
 {
-	# AddDirectoryToHaikuImage <directoryTokens>
+	# AddDirectoryToHaikuImage <directoryTokens> : <attributeFiles>
 
-	local dir = [ AddDirectoryToContainer $(HAIKU_IMAGE_CONTAINER_NAME)
-		: $(directoryTokens) ] ;
-
-	if $(attributeFiles) {
-		SEARCH on $(attributeFiles)
-			+= [ FDirName $(HAIKU_TOP) data image_directories ] ;
-		ATTRIBUTE_FILES on $(dir) += $(attributeFiles) ;
-	}
-
-	return $(dir) ;
+	return [ AddDirectoryToContainer $(HAIKU_IMAGE_CONTAINER_NAME)
+		: $(directoryTokens) : $(attributeFiles) ] ;
 }
 
 rule AddFilesToHaikuImage directory : targets : destName
diff --git a/build/jam/PackageRules b/build/jam/PackageRules
index 1413209300..241878bbea 100644
--- a/build/jam/PackageRules
+++ b/build/jam/PackageRules
@@ -340,16 +340,8 @@ actions BuildHaikuPackage1
 
 rule AddDirectoryToPackage package : directoryTokens : attributeFiles
 {
-	local dir = [ AddDirectoryToContainer $(package) : $(directoryTokens) ] ;
-	local grist = [ FHaikuPackageGrist $(package) ] ;
-
-	if $(attributeFiles) {
-		SEARCH on $(attributeFiles)
-			+= [ FDirName $(HAIKU_TOP) data package_directories $(grist) ] ;
-		ATTRIBUTE_FILES on $(dir) += $(attributeFiles) ;
-	}
-
-	return $(dir) ;
+	return [ AddDirectoryToContainer $(package)
+		: $(directoryTokens) : $(attributeFiles) ] ;
 }