Changeset 32209 for main/trunk/greenstone2/bin

Timestamp:

2018-06-25T17:15:40+12:00 (6 years ago)

Author:

ak19

Message:

Commented out the BITNESS env var for Windows introduced in the previous commit and not using it in gsConvert.pl since Win can use XPdf's bin32 version of pdftohtml on 64 bit machines too. The lines determining and setting the BITNESS env var in gs2build\setup.bat are only commented out since setting BITNESS on Win may be useful in the future and we don't want to reinvent the wheel

File:

• main/trunk/greenstone2/bin/script/gsConvert.pl (modified) (2 diffs)

main/trunk/greenstone2/bin/script/gsConvert.pl

@@ -847 +847 @@
     # build up the path to the doc-to-html conversion tool we're going to use
     my $xpdf_pdftohtml = &FileUtils::filenameConcatenate($ENV{'GSDLHOME'}, "bin", $ENV{'GSDLOS'}, "xpdf-tools");
-
-    if ($ENV{'GSDLOS'} =~ m/^darwin$/i) {
-    # TODO
+    
+    if($ENV{'GSDLOS'} =~ m/^windows$/i) { # For Windows, just use the 32 bit xpdf's pdftohtml as it works the same as the 64 bit
+        $xpdf_pdftohtml = &FileUtils::filenameConcatenate($xpdf_pdftohtml, "bin32");
+    } elsif ($ENV{'GSDLOS'} =~ m/^darwin$/i) {
+        # TODO
     } else { # unix or windows, use the appropriate bin folder for the bitness of the system
         # In fact, when testing 3 different PDF docs, it doesn't seem to make a difference on
@@ -855 +857 @@
         # However, maybe we'll use another xpdf-tool too in future where bitness will be relevant.
     
-    # Don't use $ENV{'GSDLARCH'}, use the new $ENV{'BITNESS'}, since
-    # $ENV{'GSDLARCH'} is only (meant to be) set when many other 32-bit or 64-bit
-    # specific subdirectories exist in a greenstone installation.
-    # None of those locations need exist when xpdf-tools is installed with GS.
-    # So don't depend on GSDLARCH as forcing that to be exported has side-effects
-    if($ENV{'BITNESS'}) {
-        $xpdf_pdftohtml = &FileUtils::filenameConcatenate($xpdf_pdftohtml, "bin".$ENV{'BITNESS'});
-    } else { # what if $ENV{'BITNESS'} undefined, fallback on bin32? or 64?
-        $xpdf_pdftohtml = &FileUtils::filenameConcatenate($xpdf_pdftohtml, "bin32");
-    }
-    }
-
-    #print STDERR "@@@@ BITNESS: " . $ENV{'BITNESS'} . "\n";
+        # Don't use $ENV{'GSDLARCH'}, use the new $ENV{'BITNESS'}, since
+        # $ENV{'GSDLARCH'} is only (meant to be) set when many other 32-bit or 64-bit
+        # specific subdirectories exist in a greenstone installation.
+        # None of those locations need exist when xpdf-tools is installed with GS.
+        # So don't depend on GSDLARCH as forcing that to be exported has side-effects
+        if($ENV{'BITNESS'}) {
+            $xpdf_pdftohtml = &FileUtils::filenameConcatenate($xpdf_pdftohtml, "bin".$ENV{'BITNESS'});
+        } else { # what if $ENV{'BITNESS'} undefined, fallback on bin32? or 64?
+            $xpdf_pdftohtml = &FileUtils::filenameConcatenate($xpdf_pdftohtml, "bin32");
+        }
+    }
     
     # We'll create the file by name $output_filestem during post-conversion processing.