Ticket #5507: AddExpanderRules-23.patch

build/jam/ImageRules

@@ -856 +856 @@
     AddEntryToHaikuImageUserGroupFile <haiku-image>group : $(entry) ;
 }
 
+rule AddEntryToHaikuImageExpanderRuleFile file : entry
+{
+    local allEntries 
+        = [ on $(file) return $(HAIKU_IMAGE_EXPANDER_RULES_ENTRIES) ] ;
+
+    if $(allEntries) {
+        allEntries = $(allEntries)|$(entry) ;
+    } else {
+        allEntries = $(entry) ;
+
+        Always $(file) ;
+        MakeLocate $(file) : $(HAIKU_COMMON_PLATFORM_OBJECT_DIR) ;
+        BuildHaikuImageExpanderRules $(file) ;
+        AddFilesToHaikuImage common etc : $(file) ;
+    }
+
+    HAIKU_IMAGE_EXPANDER_RULES_ENTRIES on $(file) = $(allEntries) ;
+}
+
+actions BuildHaikuImageExpanderRules
+{
+    echo "$(HAIKU_IMAGE_EXPANDER_RULES_ENTRIES)" | tr '|' '\n' > $(1)
+}
+
+rule AddExpanerRule mimetype : extension : list : extract
+{
+    #AddExpanerRule <mimetype> : <extension> : <list> : <extract>
+
+    if ! $(mimetype) || ! $(extension) || ! $(list) || ! $(extract) {
+        Exit "Invalid expander rule specification passed to AddExpanerRule." ;
+    }
+
+    local entry = "\"$(mimetype)\"\t$(extension)\t\"$(list)\"\t\"$(extract)\"" ;
+
+    AddEntryToHaikuImageExpanderRuleFile <haiku-image>expander.rules : $(entry) ;
+}
+
 rule AddOptionalPackageDescriptionToHaikuImage file : searchPath
 {
     if $(searchPath) {

build/jam/OptionalPackages

@@ -824 +824 @@
                 :
             ;
         }
-
-        actions BuildHaikuImageExpanderRules
-        {
-            echo -e "\"application/x-7z-compressed\"\t.7z\t\"7za l \0045s\"\t\"7za x -y \0045s\"" > $(1)
-        }
-
-        Always expander.rules ;
-        MakeLocate expander.rules : $(HAIKU_COMMON_PLATFORM_OBJECT_DIR) ;
-        BuildHaikuImageExpanderRules expander.rules ;
-        AddFilesToHaikuImage home config etc : expander.rules ;
+        AddExpanerRule "application/x-7z-compressed" : .7z : "7za l %s" 
+            : "7za x -y %s" ;
     }
 }