Changeset 28571 for other-projects

Show
Ignore:
Timestamp:
31.10.2013 16:07:56 (6 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.

Files:
1 modified

Legend:

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

    r28172 r28571  
    3333my $isWin = ($^O =~ m/mswin/i) ? 1 : 0; 
    3434my $isMac = ($^O =~ m/macos|darwin/i) ? 1 : 0; 
     35 
     36my $osversion=""; 
     37# Need to get the correct gnome-lib-minimal for the OS 
     38# darwin11* Lion, darwin12* Mountain Lion, darwin9* and darwin10* are Leopard and Snow Leopard 
     39if ($^O eq "darwin") { 
     40    $osversion=`uname -r`; # e.g. 12.x.x 
     41    #$osversion =~ s@\..*$@@; # e.g.12 
     42    $osversion = ($osversion =~ m@^1[1-9](\.)?@i) ? "Lion" : ""; 
     43} 
     44 
     45 
    3546my $sep = $isWin ? "\\" : "/"; 
    3647my $pathsep = $isWin ? ";" : ":"; 
     
    370381    # But since we know we're on a Linux/Darwin machine at this point, wecan just run `uname -m` and other linux cmds 
    371382 
    372     my $gnome_lib_file = $isMac ? "darwin-intel" : "linux"; # assuming all darwin is intel, not ppc!! 
    373  
    374     $gnome_lib_file .= "-x64" if($bit_arch =~ m/64$/); 
     383    # osversion will be "Lion" or "" 
     384    # and assuming all darwin is intel, not ppc!! 
     385    my $gnome_lib_file = $isMac ? "darwin-".$osversion."-intel" : "linux"; 
     386 
     387    $gnome_lib_file .= "-x64" if($bit_arch =~ m/64$/ && !$isMac); # linux only case 
    375388 
    376389    #svn checkout gnome-lib for this linux/darwin 
     
    792805    my $os_entry = $entry;  
    793806    $os_entry =~ s@\.html$@.htm@ if $isWin; 
    794     $os_entry = "diffcol-".$^O."-$os_entry"; 
     807    if($isMac) { 
     808        $os_entry = "diffcol-".$osversion."-$os_entry"; # darwin-Lion for Lion/Mountain Lion 
     809    } else { 
     810        $os_entry = "diffcol-".$^O."-$os_entry"; 
     811    } 
    795812     
    796813    # get the absolute path to the original files before copying them over