Changeset 21797 for other-projects

Timestamp:

2010-03-16T17:23:20+13:00 (14 years ago)

Author:

oranfry

Message:

imrpoved cross-platform compatibility, stopped using compression for upload, upload logs even if products dont exist and fixed log names to include OS

Location:

other-projects/nightly-tasks/snapshot/trunk

Files:

• lib.pl (modified) (3 diffs)
• task.pl (modified) (3 diffs)

other-projects/nightly-tasks/snapshot/trunk/lib.pl

@@ -92 +92 @@
     }
 
-    if ( ! -d "$release_dir/products" ) {
-        die "error: products directory doesn't exist, exiting. (Well, not that exciting, a bit of a downer really...)";
-    }
-
     #copy products to a temporary folder, giving them their new names
         if ( ! -d "$release_dir/uploads" ) {
@@ -102 +98 @@
     mkdir "$release_dir/uploads";
 
-    @files = <$release_dir/products/*>;
+    my @files;
+    if ( -d "$release_dir/products" ) {
+        @files = <$release_dir/products/*>;
+    }
+
     push( @files, "$release_dir/$rk.out" );
     for my $file ( @files ) {
@@ -115 +115 @@
         system( "cp '$file' '$release_dir/uploads/$filename'" );
     }
-    my $command = "cd $release_dir/uploads && tar -cz * | ";
+    my $command = "cd $release_dir/uploads && tar -c * | ";
     $command .= ($^O eq "MSWin32" ? "putty" : "ssh");
     $command .= " -i '$ENV{'IDENTITY_FILE'}' nzdl\@puka.cs.waikato.ac.nz";
-    #system("$command");
     print "$command\n";
+    system("$command");
 }

other-projects/nightly-tasks/snapshot/trunk/task.pl

@@ -62 +62 @@
 }
 
+#keep wget/curl base command in a variable
+my $httpRetrieve = $^O eq "darwin" ? "curl" : "wget -O -";
+
 #setup based on mode
 if ( $ENV{'TASK_NAME'} =~ "caveat\$" ) {
@@ -67 +70 @@
 
     if ( $major_version == 2 ) {
-        $ENV{'snapshot_id2'} = `wget -O - http://www.greenstone.org/next-release.txt`;
+        $ENV{'snapshot_id2'} = `$httpRetrieve http://www.greenstone.org/next-release.txt`;
         chomp($ENV{'snapshot_id2'});
     } else {
-        $ENV{'snapshot_id3'} = `wget -O - http://www.greenstone.org/next-release-greenstone3.txt`;
+        $ENV{'snapshot_id3'} = `$httpRetrieve http://www.greenstone.org/next-release-greenstone3.txt`;
         chomp($ENV{'snapshot_id3'});
     }
@@ -122 +125 @@
 
 #always rename the log not to clash with other files on puka
-$ENV{'munges'} = $ENV{'munges'} . " s/\.out/-" . get_date() . "-log.txt/";
+$ENV{'munges'} = $ENV{'munges'} . " s/\.out/-" . get_date() . "-" . $^O . "-log.txt/";
 
 #choose a snapshot ID