Changeset 27724 for other-projects/nightly-tasks/diffcol

Timestamp:

2013-06-27T21:29:18+12:00 (11 years ago)

Author:

ak19

Message:

Mac now gets its imagemagick binary from where linux gets it at svn, since a new mac binary .tar.gz file has been added to gs2-extensions/imagemagick. In task.pl, the move operation that shifts the unzipped imagick binary happens after compilation, since bin/darwin is overwritten during compilation, so moving imagemagick into there has to happen at the end.

File:

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

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

@@ -263 +263 @@
     # imagmagick binary
     print STDERR "Getting imagemagick binary\n";
+
+    my $os = $isMac ? "darwin" : "linux";
+    my $imagickzip = "imagemagick-$os";
     
     if($isMac) {
-        $cmd = "svn export http://svn.greenstone.org/main/trunk/binaries/mac/intel/imagemagick bin/darwin/imagemagick";
-        $status = system($cmd);
+        $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);
     } else { # linux
         my $extension64 = ($bit_arch =~ m/64$/) ? "-x64" : "";
-        my $imagickzip = "imagemagick-linux$extension64.tar.gz";
-        $cmd = "svn export http://svn.greenstone.org/gs2-extensions/imagemagick/trunk/imagemagick-linux$extension64.tar.gz ext/$imagickzip";
-        $status = system ($cmd);
-        system("cd ext && tar -xvzf $imagickzip");
-
-        move("$ENV{'DATA_DIR'}$sep$gsdl$sep"."ext/imagemagick/linux", "$ENV{'DATA_DIR'}$sep$gsdl$sep"."bin/linux/imagemagick"); # http://www.perlmonks.org/?node_id=586537
-        unlink "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
-    }
+        $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");
     
     # gnomelib binary
@@ -343 +346 @@
     $cmd .= "\""; # close off cmd to bash and run it
     $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
+
     }
     
@@ -349 +359 @@
         exit -1;
     }
-    
+
     # set the path to the greenstone_home variable                             
     $greenstone_home="$ENV{'DATA_DIR'}$sep$gsdl";
@@ -363 +373 @@
     print $xml_fh "<test time=\"$dateid\" id=\"$dateid\">\n";
     
-    # make sure that diffcol/model-collect is up to date before copying it over to greenstone-home                                                                            
+    # make sure that diffcol/model-collect is up to date before copying it over to greenstone-home
+
     print $xml_fh "Updating $ENV{'TASK_HOME'}/model-collect:\n";
     my $cmd = "svn up $ENV{'TASK_HOME'}/model-collect"; #chdir("$ENV{'TASK_HOME'}/model-collect");