Changeset 28572 for other-projects
- Timestamp:
- 2013-10-31T16:52:06+13:00 (10 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
other-projects/nightly-tasks/diffcol/trunk/task.pl
r28571 r28572 40 40 $osversion=`uname -r`; # e.g. 12.x.x 41 41 #$osversion =~ s@\..*$@@; # e.g.12 42 $osversion = ($osversion =~ m@^1[1-9](\.)?@i) ? "Lion " : "";42 $osversion = ($osversion =~ m@^1[1-9](\.)?@i) ? "Lion-" : ""; 43 43 } 44 44 … … 383 383 # osversion will be "Lion" or "" 384 384 # and assuming all darwin is intel, not ppc!! 385 my $gnome_lib_file = $isMac ? "darwin-".$osversion." -intel" : "linux";385 my $gnome_lib_file = $isMac ? "darwin-".$osversion."intel" : "linux"; 386 386 387 387 $gnome_lib_file .= "-x64" if($bit_arch =~ m/64$/ && !$isMac); # linux only case … … 806 806 $os_entry =~ s@\[email protected]@ if $isWin; 807 807 if($isMac) { 808 $os_entry = "diffcol-".$ osversion."-$os_entry"; # darwin-Lion for Lion/Mountain Lion808 $os_entry = "diffcol-".$^O."-".$osversion."$os_entry"; # darwin-Lion for Lion/Mountain Lion 809 809 } else { 810 810 $os_entry = "diffcol-".$^O."-$os_entry";
Note:
See TracChangeset
for help on using the changeset viewer.