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

Timestamp:

2013-06-26T22:11:32+12:00 (11 years ago)

Author:

ak19

Message:

Now checking out imagemagick binary (tested on linux) to work with image model collections like backdrop. However, the imagemagick binary does not work as it's looking for the libjpeg.so.62 library file, but only libjpeg.so.8.0.2 and its symlinks and an .la file exist.

File:

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

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

@@ -222 +222 @@
     # use existing compiled-up greenstone installation, if a GSDLHOME set
     if(defined $ENV{'GSDL3SRCHOME'} || defined $ENV{'GSDLHOME'}) {
-    print STDERR "Found existing Greenstone home, will use that instead";
+    print STDERR "Found existing Greenstone home, will use that instead\n";
     return;
     }
@@ -256 +256 @@
         $status = system $cmd;
         
-    } else { # if we're on linux/darwin, need gnome-lib for the correct architecture.
-    
+    } else { # if we're on linux/darwin, need gnome-lib for the correct architecture. And need imagemagick to build imgs in collections
+       
+    my $isMac = ($^O =~ m/macos|darwin/i) ? 1 : 0;
+    my $bit_arch=`uname -m`;
+
+    # imagmagick binary
+    print STDERR "Getting imagemagick binary\n";
+    
+    if($isMac) {
+        $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
+    }
+    
+    # gnomelib binary
     print STDERR "setting up gnome-lib-minimal for compilation\n";
 
@@ -266 +288 @@
     # But since we know we're on a Linux/Darwin machine at this point, wecan just run `uname -m` and other linux cmds
 
-    my $gnome_lib_file = ($^O =~ m/macos|darwin/i) ? "darwin-intel" : "linux"; # assuming all darwin is intel, not ppc!!
-
-    my $bit_arch=`uname -m`;
+    my $gnome_lib_file = $isMac ? "darwin-intel" : "linux"; # assuming all darwin is intel, not ppc!!
+
     $gnome_lib_file .= "-x64" if($bit_arch =~ m/64$/);