Changeset 27962 for other-projects/nightly-tasks

Timestamp:

2013-08-02T14:48:49+12:00 (11 years ago)

Author:

ak19

Message:

For darwin, need to get the imagemagick binaries that Max had pre-built, rather than compile up the imagemagick src as we do for linux.

File:

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

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

@@ -268 +268 @@
     
     if($isMac) {
-        $imagickzip .= "-10.5.tar.gz";
-#       &File::Path::make_path($ENV{'DATA_DIR'}."$sep$gsdl$sep$os"); # need to ensure gsdl/bin/darwin exists
-# the following mac img bin contains binaries that points to libraries containing fixed paths to /home/max
-#       $cmd = "svn export http://svn.greenstone.org/main/trunk/binaries/mac/intel/imagemagick bin/darwin/imagemagick";
-#       $status = system($cmd);
+#       $imagickzip .= "-10.5.tar.gz";
+        # at present, only the Imagemagick binaries created by Max for darwin work on the Macs
+        &File::Path::make_path($ENV{'DATA_DIR'}."$sep$gsdl$sep$os"); # need to ensure gsdl/bin/darwin exists
+        $cmd = "svn export http://svn.greenstone.org/main/trunk/binaries/mac/intel/imagemagick bin/darwin/imagemagick";
+        $status = system($cmd);
     } else { # linux
         my $extension64 = ($bit_arch =~ m/64$/) ? "-x64" : "";
         $imagickzip .= "$extension64.tar.gz";
-    }
-
-    $cmd = "svn export http://svn.greenstone.org/gs2-extensions/imagemagick/trunk/$imagickzip ext/$imagickzip";
-    $status = system ($cmd);
-    system("cd ext && tar -xvzf $imagickzip");
-    
+    
+        # now these next imagemagick steps (and those near the end of this sub) are just for linux, no longer also for mac
+        $cmd = "svn export http://svn.greenstone.org/gs2-extensions/imagemagick/trunk/$imagickzip ext/$imagickzip";
+        $status = system ($cmd);
+        system("cd ext && tar -xvzf $imagickzip");
+    }
+
     # gnomelib binary
     print STDERR "setting up gnome-lib-minimal for compilation\n";
@@ -347 +348 @@
     $status = system $cmd;
 
-
-    # Moving imagemagick after instead of before compilation, since bin/darwin gets overwritten during compilation
-    move("$ENV{'DATA_DIR'}$sep$gsdl$sep"."ext/imagemagick/$os", "$ENV{'DATA_DIR'}$sep$gsdl$sep"."bin/$os/imagemagick"); # http://www.perlmonks.org/?node_id=586537
-    unlink "$ENV{'DATA_DIR'}/$gsdl"."/ext/$imagickzip" or warn "Could not unlink ext/$imagickzip: $!";
-    &File::Path::remove_tree("$ENV{'DATA_DIR'}$sep$gsdl$sep"."ext/imagemagick"); # the untarred parent folder
+    if(!$isMac) { # Linux
+        # Moving imagemagick after instead of before compilation, since bin/darwin gets overwritten during compilation
+        move("$ENV{'DATA_DIR'}$sep$gsdl$sep"."ext/imagemagick/$os", "$ENV{'DATA_DIR'}$sep$gsdl$sep"."bin/$os/imagemagick"); # http://www.perlmonks.org/?node_id=586537
+        unlink "$ENV{'DATA_DIR'}/$gsdl"."/ext/$imagickzip" or warn "Could not unlink ext/$imagickzip: $!";
+        &File::Path::remove_tree("$ENV{'DATA_DIR'}$sep$gsdl$sep"."ext/imagemagick"); # the untarred parent folder
+    }
 
     }