Ticket #8838: win32-packager-depfixes.diff

win32-packager.pl

@@ -254 +254 @@
 #  stop the run, useful for script debugging                         [stop]
 #  pause the run, await a enter                                      [pause]
 #  always execute the action  (try to minimise the use of this!)     [always]
+#  execute a shell command and perform an action based on the result [shell]
 
 #build actions (events) are:
 #  fetch a file from the web (to a location)                         [fetch]
@@ -373 +374 @@
 [ file    => $mingw.'/bin/reimp.exe',
   extract => [$sources.'mingw-utils-0.3.tar', $mingw],
   comment => 'Now we can finish all the mingw and msys addons:' ],
-[ file    => $mingw.'/share/info/binutils.info',
+[ shell   => 'ld --version | grep -qw "2.20"',
   extract => [$sources.'binutils-2.20-1-mingw32-bin.tar', $mingw] ],
 [ grep    => ['__MINGW32_VERSION           3.17', $mingw.'include/_mingw.h'],
   extract => [$sources.'mingwrt-3.17-mingw32-dev.tar', $mingw] ],
@@ -381 +382 @@
   extract => [$sources.'mingwrt-3.17-mingw32-dll.tar', $mingw] ],
 [ dir     => $sources.'coreutils-5.97',
   extract => [$sources.'coreutils-5.97-MSYS-1.0.11-snapshot.tar'] ],
-[ file    => $msys.'bin/pr.exe',
+[ shell   => 'pr --version | grep -qw "5.97"',
   shell   => ["cd ".$unixsources."coreutils-5.97","cp -r * / "] ],
-[ file    => $msys.'bin/mktemp.exe',
+[ shell   => 'mktemp -V | grep -qw "1.5"',
   extract => [$sources.'mktemp-1.5-MSYS.tar', $msys] ],
-[ always  => ['No unique file to check'],
+[ shell   => 'patch --version | grep -qw "2.5.9"',
   extract => [$sources.'patch-2.5.9-1-msys-1.0.11-bin.tar', $msys] ],
-[ always  => ['Make sure we overwrite old msys-z lib files'],
+[ grep    => ['version 1.2.3,', $msys.'include/zlib.h'],
   extract => [$sources.'libz-1.2.3-1-mingw32-dev.tar', $msys] ],
-[ file    => $msys.'bin/libz-1.dll',
+[ grep    => ['1.2.3', $msys.'bin/libz-1.dll'],
   extract => [$sources.'libz-1.2.3-1-mingw32-dll-1.tar', $msys] ],
 
 [ dir     => $msys."lib" ,  mkdirs => $msys.'lib' ],
@@ -1841 +1842 @@
     } elsif ( $causetype eq 'pause' ){
         comment("PAUSED! : ".$cause);
         my $temp = getc() unless $continuous;
-    } else {
+    } elsif ( $causetype eq 'shell' ) {
+        print "Executing '$cause[0]'...\n" if $NOISY >0;
+        if ( system_shell($cause[0] ) ) {
+            effect($effecttype,@nocheckeffectparams);
+        } else
+                {
+                    print "shell command: $cause[0] succeeded, no action required\n" ;
+                }
+        } else {
         die " unknown causetype $causetype \n";
     }
 }
@@ -2089 +2098 @@
 }
 
 #------------------------------------------------------------------------------
+# like shell() above, this function executes a sequence of commands in a
+# bash shell. It uses the system()
+# function to run the command so that we can accurately capture
+# exit status
+sub system_shell {
+    my @cmds = @_;
+    my $cmd = $dosmsys.'bin\bash.exe -c "( export PATH=/bin:/mingw/bin:$PATH;'.
+              join(';',@cmds).') 2>&1 "';
+    print "system_shell:$cmd\n";
+    return(system($cmd)) ;
+}
+
+#------------------------------------------------------------------------------
 # recursively make folders, requires perl-compatible folder separators
 # (ie forward slashes)
 #