Changeset 28571 for other-projects/nightly-tasks/diffcol/trunk

Timestamp:

2013-10-31T16:07:56+13:00 (10 years ago)

Author:

ak19

Message:

Committing local changes made for Mac Lion, which get the correct gnome-lib-minimal for Lion from svn and upload the diffcol report for Lion.

File:

• other-projects/nightly-tasks/diffcol/trunk/task.pl (modified) (3 diffs)

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

@@ -33 +33 @@
 my $isWin = ($^O =~ m/mswin/i) ? 1 : 0;
 my $isMac = ($^O =~ m/macos|darwin/i) ? 1 : 0;
+
+my $osversion="";
+# Need to get the correct gnome-lib-minimal for the OS
+# darwin11* Lion, darwin12* Mountain Lion, darwin9* and darwin10* are Leopard and Snow Leopard
+if ($^O eq "darwin") {
+    $osversion=`uname -r`; # e.g. 12.x.x
+    #$osversion =~ s@\..*$@@; # e.g.12
+    $osversion = ($osversion =~ m@^1[1-9](\.)?@i) ? "Lion" : "";
+}
+
+
 my $sep = $isWin ? "\\" : "/";
 my $pathsep = $isWin ? ";" : ":";
@@ -370 +381 @@
     # But since we know we're on a Linux/Darwin machine at this point, wecan just run `uname -m` and other linux cmds
 
-    my $gnome_lib_file = $isMac ? "darwin-intel" : "linux"; # assuming all darwin is intel, not ppc!!
-
-    $gnome_lib_file .= "-x64" if($bit_arch =~ m/64$/);
+    # osversion will be "Lion" or ""
+    # and assuming all darwin is intel, not ppc!!
+    my $gnome_lib_file = $isMac ? "darwin-".$osversion."-intel" : "linux";
+
+    $gnome_lib_file .= "-x64" if($bit_arch =~ m/64$/ && !$isMac); # linux only case
 
     #svn checkout gnome-lib for this linux/darwin
@@ -792 +805 @@
     my $os_entry = $entry; 
     $os_entry =~ s@\[email protected]@ if $isWin;
-    $os_entry = "diffcol-".$^O."-$os_entry";
+    if($isMac) {
+        $os_entry = "diffcol-".$osversion."-$os_entry"; # darwin-Lion for Lion/Mountain Lion
+    } else {
+        $os_entry = "diffcol-".$^O."-$os_entry";
+    }
     
     # get the absolute path to the original files before copying them over