Changeset 28572

Timestamp:

2013-10-31T16:52:06+13:00 (10 years ago)

Author:

ak19

Message:

Minor changes related to previous commit

File:

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

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

@@ -40 +40 @@
     $osversion=`uname -r`; # e.g. 12.x.x
     #$osversion =~ s@\..*$@@; # e.g.12
-    $osversion = ($osversion =~ m@^1[1-9](\.)?@i) ? "Lion" : "";
+    $osversion = ($osversion =~ m@^1[1-9](\.)?@i) ? "Lion-" : "";
 }
 
@@ -383 +383 @@
     # osversion will be "Lion" or ""
     # and assuming all darwin is intel, not ppc!!
-    my $gnome_lib_file = $isMac ? "darwin-".$osversion."-intel" : "linux";
+    my $gnome_lib_file = $isMac ? "darwin-".$osversion."intel" : "linux";
 
     $gnome_lib_file .= "-x64" if($bit_arch =~ m/64$/ && !$isMac); # linux only case
@@ -806 +806 @@
     $os_entry =~ s@\[email protected]@ if $isWin;
     if($isMac) {
-        $os_entry = "diffcol-".$osversion."-$os_entry"; # darwin-Lion for Lion/Mountain Lion
+        $os_entry = "diffcol-".$^O."-".$osversion."$os_entry"; # darwin-Lion for Lion/Mountain Lion
     } else {
         $os_entry = "diffcol-".$^O."-$os_entry";