Ticket #7425: FileRules.patch

build/jam/FileRules

@@ -221 +221 @@
     }
 
     LOCATE on $(targets) = $(directory) ;
-    Depends $(targets) : $(directory) ;
+    Depends $(targets) : $(directory) $(archiveFile) ;
     NoUpdate $(targets) ;
 
     # one-time initialization for the main target (the directory)
@@ -235 +235 @@
         Depends $(directory) : $(archiveFile) ;
         switch $(archiveFile:S)
         {
-            case .zip   : ExtractZipArchive1 $(directory) : $(archiveFile) ;
-            case .tgz   : ExtractTarArchive1 $(directory) : $(archiveFile) ;
+            case .zip   : ExtractZipArchive1 $(targets) : $(directory)
+                            $(archiveFile) ;
+            case .tgz   : ExtractTarArchive1 $(targets) : $(directory)
+                            $(archiveFile) ;
             case *      : Exit "ExtractArchive: Unhandled archive extension:
                             $(archiveFile:S)" ;
         }
@@ -252 +254 @@
 
 actions ExtractZipArchive1
 {
-    mkdir -p $(1[1])
-    unzip -q -u -o -d $(1[1]) $(2)
+    mkdir -p $(2[1])
+    unzip -q -u -o -d $(2[1]) $(2[2])
 }
 
 actions ExtractTarArchive1
 {
-    mkdir -p $(1[1])
-    tar -C $(1[1]) -xf $(2)
+    mkdir -p $(2[1])
+    tar -C $(2[1]) -xf $(2[2])
 }
 
 actions ExtractArchiveDummy