Changeset 21798

Timestamp:

2010-03-16T17:30:00+13:00 (13 years ago)

Author:

oranfry

Message:

made the snapshot task work in windows

Location:

other-projects/nightly-tasks/snapshot/trunk

Files:

• lib.pl (modified) (2 diffs)
• task.pl (modified) (4 diffs)

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

@@ +1 @@
+my $sep = $^O eq "MSWin32" ? "\\" : "/";
+
 sub get_date {
     local ($sec,$min,$hour,$mday,$mon,$year,$wday,$yday,$isdst) = localtime(time);
@@ -93 +95 @@
 
     #copy products to a temporary folder, giving them their new names
-        if ( ! -d "$release_dir/uploads" ) {
-        system( "rm -rf '$release_dir/uploads'" );
+    if ( ! -d "$release_dir${sep}uploads" ) {
+        system( "rm -rf '$release_dir${sep}uploads'" );
     }
-    mkdir "$release_dir/uploads";
+    mkdir "$release_dir${sep}uploads";
 
     my @files;
-    if ( -d "$release_dir/products" ) {
-        @files = <$release_dir/products/*>;
+    if ( -d "$release_dir${sep}products" ) {
+        @files = <$release_dir${sep}products/*>;
+    }
+    push( @files, "$release_dir${sep}$rk.out" );
+
+    for my $file ( @files ) {
+        if ( -e $file ) {
+            my $filename = basename($file);
+            #munge
+            for my $m ( @munges ) {
+                $doit="\$filename =~ $m"; eval "$doit";
+            }
+            #upload
+            print "Will upload '" . basename($file) . "' to '$filename'\n";
+            system("copy \"$file\" \"${release_dir}${sep}uploads${sep}$filename\"");
+        }
+
     }
 
-    push( @files, "$release_dir/$rk.out" );
-    for my $file ( @files ) {
-        my $filename = basename($file);
-        #munge
-        for my $m ( @munges ) {
-            $doit="\$filename =~ $m"; eval "$doit";
-        }
-
-        #upload
-        print "Will upload '" . basename($file) . "' to '$filename'\n";
-        system( "cp '$file' '$release_dir/uploads/$filename'" );
-    }
-    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";
-    print "$command\n";
+    my $command = "cd \"${release_dir}${sep}uploads\" && tar -c * | ";
+    $command .= ($^O eq "MSWin32" ? "plink" : "ssh");
+    $command .= " -T -i \"$ENV{'IDENTITY_FILE'}\" nzdl\@puka.cs.waikato.ac.nz";
+    #print "$command\n";
     system("$command");
 }

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

@@ -1 +1 @@
 use File::Basename;
+my $sep = $^O eq "MSWin32" ? "\\" : "/";
 do "$ENV{'TASK_HOME'}/lib.pl";
 
@@ -26 +27 @@
 #default data dir
 if ( ! exists $ENV{'DATA_DIR'} ) {
-    $ENV{'DATA_DIR'} = "$ENV{'HOME'}/snapshots";
+    $ENV{'DATA_DIR'} = "$ENV{'HOME'}${sep}snapshots";
 }
 
 #default identity dir
 if ( ! exists $ENV{'IDENTITY_DIR'} ) {
-    $ENV{'IDENTITY_DIR'} = "$ENV{'HOME'}/.ssh";
+    $ENV{'IDENTITY_DIR'} = "$ENV{'HOME'}${sep}.ssh";
 }
 
@@ -121 +122 @@
 #use the  correct key for uploading
 $ENV{'IDENTITY_FILE'} =
-    "$ENV{'IDENTITY_DIR'}/upload-" . $ENV{'SNAPSHOT_MODE'} . ($^O eq "MSWin32" ? ".ppk" : "");
+    "$ENV{'IDENTITY_DIR'}${sep}upload-" . $ENV{'SNAPSHOT_MODE'} . ($^O eq "MSWin32" ? ".ppk" : "");
 
 
@@ -137 +138 @@
 
 #set a release directory
-$release_dir = "$ENV{'DATA_DIR'}/$ENV{'TASK_NAME'}/from-" . get_date();
+$release_dir = "$ENV{'DATA_DIR'}${sep}$ENV{'TASK_NAME'}${sep}from-" . get_date();
 
 print "creating a snapshot release\n";