Changeset 32263 for main/trunk/greenstone2

Timestamp:

2018-07-11T18:54:06+12:00 (6 years ago)

Author:

ak19

Message:

gsConvert.pl's _get_xpdftools_bindir() is now drastically reduced in size as we're now working with our self-compiled xpdf-tools binaries on 32 bit linux, and the pre-compiled windows 32 bit binaries, and won't need to choose between bin32 and bin64 subfolders. Tomorrow will test whether the mac bins work on Mountain Lion and the newer OS, in which case there will be a universal xpdf-tools/bin directory for Mac as well.

File:

• main/trunk/greenstone2/bin/script/gsConvert.pl (modified) (1 diff)

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

@@ -928 +928 @@
 sub _get_xpdftools_bindir {
 
-    # build up the path to the containing bin dir of the xpdf conversion tool we're going to use
-    my $xpdf_tools_bin = &FileUtils::filenameConcatenate($ENV{'GSDLHOME'}, "bin", $ENV{'GSDLOS'}, "xpdf-tools");
-    
-    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_tools_bin = &FileUtils::filenameConcatenate($xpdf_tools_bin, "bin32");
-    } else { # unix (linux|darwin), use the bin32/bin64 folder depending on the BITNESS env var
-        
-        # Don't use $ENV{'GSDLARCH'}, use the new $ENV{'BITNESS'}, since $ENV{'GSDLARCH'}
-        # isn't always set and has side-effects when it is set:
-        # $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_tools_bin = &FileUtils::filenameConcatenate($xpdf_tools_bin, "bin".$ENV{'BITNESS'});
-        } else { # what if $ENV{'BITNESS'} undefined, fallback on bin32? or 64?
-            $xpdf_tools_bin = &FileUtils::filenameConcatenate($xpdf_tools_bin, "bin32");
-        }
-    }
-    
-    return $xpdf_tools_bin;
+    # build up the path to the containing bin dir of the xpdf conversion tool we're going to use
+    my $xpdf_tools_bin = &FileUtils::filenameConcatenate($ENV{'GSDLHOME'}, "bin", $ENV{'GSDLOS'}, "xpdf-tools", "bin"); 
+    return $xpdf_tools_bin;
 }