Changeset 28299 for other-projects/nightly-tasks/snapshot/trunk

Timestamp:

2013-09-19T21:07:36+12:00 (11 years ago)

Author:

ak19

Message:

The changes needed to have the nightly snapshot task uploading successfully to the caveat from the Mountain Lion mac

Location:

other-projects/nightly-tasks/snapshot/trunk

Files:

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

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

@@ -115 +115 @@
             #upload
             print "Will upload '" . basename($file) . "' to '$filename'\n";
-            system("copy \"$file\" \"${release_dir}${sep}uploads${sep}$filename\"");
+            if( $^O =~ "linux|darwin" ) {
+                system("cp \"$file\" \"${release_dir}${sep}uploads${sep}$filename\"");
+            }
+            else {
+                system("copy \"$file\" \"${release_dir}${sep}uploads${sep}$filename\"");
+            }
         }
 

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

@@ -16 +16 @@
 our $branch_path = "";
 our $major_version = 0;
+
+# for Darwin, specify if this binary is for (Mountain)Lions in the filename, otherwise it's for Leopards
+# http://en.wikipedia.org/wiki/Darwin_(operating_system)
+# darwin11* Lion, darwin12* Mountain Lion, darwin9* and darwin10* are Leopard and Snow Leopard
+my $osversion = "";
+if($^O eq "darwin") {
+    #$osversion=`uname -r | sed 's/\..*$//'`;
+    $osversion=`uname -r`; #$osversion =~ s@\..*$@@; 
+    $osversion = ($osversion =~ m@^1[1-9]@i) ? "-Lion" : "";
+}
 
 # if the first arg is a digit, it's the new envi verbosity param. Take it off the array
@@ -83 +93 @@
     #change the filenames to have the date in them
     my $id2 = $ENV{'snapshot_id2'};
-    (my $id2re = $id2) =~ s@\.@\\.@g; #copy id2 and then change idre, see http://www.perlmonks.org/?node_id=366431
+    (my $id2re = $id2) =~ s@\.@\\.@g; #copy id2 and then change id2re, see http://www.perlmonks.org/?node_id=366431
 
     my $id3 = $ENV{'snapshot_id3'};
     (my $id3re = $id3) =~ s@\.@\\.@g;
 
-    $ENV{'munges'} = "s/-$id2re/-$id2-candidate-" . get_date() . "/g " if ($id2 =~ m/\S/);
-    $ENV{'munges'} .= "s/-$id3re/-$id3-candidate-" . get_date() . "/g" if ($id3 =~ m/\S/);
+    $ENV{'munges'} = "s/-$id2re/-$id2$osversion-candidate-" . get_date() . "/g " if ($id2 =~ m/\S/);
+    $ENV{'munges'} .= "s/-$id3re/-$id3$osversion-candidate-" . get_date() . "/g" if ($id3 =~ m/\S/);
 
     # the above generates a list of regex. Have a \D (non-digit) prefixed to the value to be substituted, else
@@ -138 +148 @@
 
 #always rename the log not to clash with other files on puka
-$ENV{'munges'} = $ENV{'munges'} . " s/\\.out\$/-" . get_date() . "-" . $^O . "-log.txt/";
+$ENV{'munges'} = $ENV{'munges'} . " s/\\.out\$/-" . get_date() . "-" . $^O . $osversion . "-log.txt/";
 
 #choose a snapshot ID