[TWiki-Dev] [SVN] CrawfordCurrie r11913 - twiki/branches/MAIN/twikiplugins/BuildContrib/lib/TWiki/Contrib

[<de...@de...>]

Author: CrawfordCurrie
Date: 2006-11-06 06:56:16 -0600 (Mon, 06 Nov 2006)
New Revision: 11913

Modified:
   twiki/branches/MAIN/twikiplugins/BuildContrib/lib/TWiki/Contrib/Build.pm
Log:
Item3109: stopped it including the zip in the tgz (or was it vice versa)

Modified: twiki/branches/MAIN/twikiplugins/BuildContrib/lib/TWiki/Contrib/Build.pm
===================================================================
--- twiki/branches/MAIN/twikiplugins/BuildContrib/lib/TWiki/Contrib/Build.pm	2006-11-06 04:27:15 UTC (rev 11912)
+++ twiki/branches/MAIN/twikiplugins/BuildContrib/lib/TWiki/Contrib/Build.pm	2006-11-06 12:56:16 UTC (rev 11913)
@@ -907,21 +907,24 @@
     $this->apply_perms($this->{files}, $this->{tmpDir} );
 
     $this->sys_action('zip -r -q ' . $project . '.zip *');
+    $this->perl_action('File::Copy::move("'.$project.'.zip", "'.
+                         $this->{basedir}.'/'.$project.'.zip");');
+
     $this->sys_action('tar czpf '  . $project . '.tgz *');
-    $this->sys_action('md5sum '    . $project . '.tgz '
-                                   . $project . '_installer '
-                                   . $project . '.zip '
-    .'> ' . $this->{basedir} . '/' . $project . '.md5');
-
     $this->perl_action('File::Copy::move("'.$project.'.tgz", "'.
                          $this->{basedir}.'/'.$project.'.tgz")');
-    $this->perl_action('File::Copy::move("'.$project.'.zip", "'.
-                         $this->{basedir}.'/'.$project.'.zip");');
 
-    $this->cp($this->{tmpDir}.'/'.$project.'_installer',
-              $this->{basedir}.'/'.$project.'_installer');
+    $this->perl_action('File::Copy::move("'.
+                         $this->{tmpDir}.'/'.$project.'_installer","'.
+                         $this->{basedir}.'/'.$project.'_installer")');
 
+    $this->pushd($this->{basedir});
+    $this->sys_action('md5sum ' . $project . '.tgz '
+                        . $project . '_installer '
+                          . $project . '.zip '
+                            .'> ' . $project . '.md5');
     $this->popd();
+    $this->popd();
 
     print 'Release ZIP is '.$this->{basedir}.'/'.$project.'.zip',$NL;
     print 'Release TGZ is '.$this->{basedir}.'/'.$project.'.tgz',$NL;
@@ -1368,6 +1371,7 @@
 sub build {
     my $this = shift;
     my $target = shift;
+
     if ($this->{-v}) {
         print 'Building ',$target,$NL;
     }