Changeset 28572 for other-projects

Show
Ignore:
Timestamp:
31.10.2013 16:52:06 (6 years ago)
Author:
ak19
Message:

Minor changes related to previous commit

Files:
1 modified

Legend:

Unmodified
Added
Removed
  • other-projects/nightly-tasks/diffcol/trunk/task.pl

    r28571 r28572  
    4040    $osversion=`uname -r`; # e.g. 12.x.x 
    4141    #$osversion =~ s@\..*$@@; # e.g.12 
    42     $osversion = ($osversion =~ m@^1[1-9](\.)?@i) ? "Lion" : ""; 
     42    $osversion = ($osversion =~ m@^1[1-9](\.)?@i) ? "Lion-" : ""; 
    4343} 
    4444 
     
    383383    # osversion will be "Lion" or "" 
    384384    # 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"; 
    386386 
    387387    $gnome_lib_file .= "-x64" if($bit_arch =~ m/64$/ && !$isMac); # linux only case 
     
    806806    $os_entry =~ s@\.html$@.htm@ if $isWin; 
    807807    if($isMac) { 
    808         $os_entry = "diffcol-".$osversion."-$os_entry"; # darwin-Lion for Lion/Mountain Lion 
     808        $os_entry = "diffcol-".$^O."-".$osversion."$os_entry"; # darwin-Lion for Lion/Mountain Lion 
    809809    } else { 
    810810        $os_entry = "diffcol-".$^O."-$os_entry";