Changeset 36643 for other-projects/nightly-tasks/diffcol/trunk

Timestamp:

2022-09-20T16:51:23+12:00 (20 months ago)

Author:

anupama

Message:

Some corrections to get diffcol task.pl's setup_greenstone and run_test subcommands to work again when passing in --gs3. I had also manually added checked out GS3's winbin to PATH in setup_greenstone() as unzip was wanting, to test that winbin on PATH helped GS3 finish compiling, but unzip as well as GS3's wget and any other unixtools need to be setup by diffcol's environment.pl, probably not in the task.pl code.

File:

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

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

@@ -516 +516 @@
 
     my $imagickzip = &getImageMagickBins();
+    
+    if($isWin) { # steps from http://wiki.greenstone.org/doku.php?id=en:developer:windows_source_install
+#       my $iconv_dir = filename_concat($greenstone3_home, "gs2build", "common-src", "indexers", "packages", "windows", "iconv");
+#       chdir ("$iconv_dir");       
+#       move("iconv-winVS14-VS2015-plus.zip", "iconv.zip"); #move("iconv.zip", "iconv_preVS14.zip");
+        # https://www.oreilly.com/library/view/perl-cookbook/1565922433/ch09s09.html
+#       rmtree("iconv");
+        
+        # need unzip, and maybe more from winbin    
+        my $winbin_dir = filename_concat($greenstone3_home, "gs2build", "bin", "windows");
+        $ENV{'PATH'} = $winbin_dir . ";" . $ENV{'PATH'};
+    }
     chdir ("$greenstone3_home");
 
@@ -616 +628 @@
 
     # now get the PDFBox extension for PDFBox tutorial  
-    print STDERR "Getting pdfbox from $PDFBOX_TRAC_URL:\n";     
+    print STDERR "Getting pdfbox from $PDFBOX_TRAC_URL:\n";
+    
+    my $linux_ext = ($install_version eq "3") ? "sh" : "bash";
     
     chdir($greenstone_home);
     my $cmd = "";
     if ($isWin) {
-        $cmd = "setup.bat && cd ext && $wget $PDFBOX_TRAC_URL.zip && unzip pdf-box-java.zip";
-        
+        #$cmd = "setup.bat && cd ext && $wget $PDFBOX_TRAC_URL.zip && unzip pdf-box-java.zip";      
+        $cmd = "set GSDL3SRCHOME=&& set GSDLHOME=&& $setup_script.bat && cd ext && $wget $PDFBOX_TRAC_URL.zip && unzip pdf-box-java.zip";       
     } elsif ($isMac) { # need to use curl not wget
         $cmd = "cd ext && curl $PDFBOX_TRAC_URL.tar.gz > pdf-box-java.tar.gz && tar -xzf pdf-box-java.tar.gz";
     }
     else { # linux
-        $cmd = "bash -c \"export GSDLHOME=&& source setup.bash && cd ext && $wget $PDFBOX_TRAC_URL.tar.gz && tar -xzf pdf-box-java.tar.gz\"";
+        $cmd = "bash -c \"export GSDLHOME=&& source $setup_script.$linux_ext && cd ext && $wget $PDFBOX_TRAC_URL.tar.gz && tar -xzf pdf-box-java.tar.gz\"";
     }
     my $status = system $cmd;
@@ -807 +821 @@
     
     for my $collection (@collections) {
+        chdir($collect_parent); # for GS3 too, ensure we're first in the collect folder for each collection
 
     #   next if ($collection ne "Demo-Lucene"); ## TEMPORARY, FOR TESTING THIS SCRIPT
@@ -819 +834 @@
     
     if (! -d "collect$sep$collection") {
+        print STDERR "**** Looked in current dir ".getcwd."\n";
         print STDERR "Collection $collection does not exist\n";
         next;