Changeset 28605

Timestamp:

2013-11-05T19:15:21+13:00 (10 years ago)

Author:

ak19

Message:

Getting IsisGdl for 64 bit linux machines, so that the new CDS-ISIS model tutorial collection (to be committed) can be built.

File:

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

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

@@ -452 +452 @@
         exit -1;
     }
+
+    &getIsisGdl("$ENV{'DATA_DIR'}/$gsdl/bin/linux");
     
     # set the path to the greenstone_home variable                             
@@ -483 +485 @@
         exit -1; # or proceed to testing other tutorials?
     }
+}
+
+sub getIsisGdl {
+    my $bin_lin_folder = shift(@_);
+    
+    if(!$isWin && !$isMac) {
+    my $bit_arch=`uname -m`;
+    if ($bit_arch =~ m/64$/) {
+        my $cmd = "cd $bin_lin_folder && wget http://www.greenstone.org/caveat-emptor/IsisGdl.bin32 && mv IsisGdl.bin32 IsisGdl && chmod u+x IsisGdl";
+        my $isis_status = system $cmd;
+        if($isis_status != 0) {
+        print STDERR "Unable to get IsisGdl.bin32 from caveat page\n";
+        }
+    }
+    }
 }
 
@@ -504 +521 @@
         &getPDFBox();
     }
+
+    &getIsisGdl("$greenstone_home/bin/linux");
 
     open (my $xml_fh, '>'.$xmlout) || die "Could not open xml file $xmlout for appending: $!\n";