Changeset 29299 for main/trunk

Timestamp:

2014-09-17T19:05:03+12:00 (10 years ago)

Author:

ak19

Message:

Moved the formatconverter binaries from GS3/bin to the new GS3/bin/OS folders, since Macs need a Mac-generated formatconverter binary because the linux-generated formatconverter binary does not work on Mac (when I tested on Mountain Lion and Maverick).

Location:

main/trunk/gli/src/org/greenstone/gatherer

Files:

• Configuration.java (modified) (2 diffs)
• util/Utility.java (modified) (1 diff)

main/trunk/gli/src/org/greenstone/gatherer/Configuration.java

@@ -45 +45 @@
 import javax.swing.plaf.*;
 import org.greenstone.gatherer.util.StaticStrings;
+import org.greenstone.gatherer.util.Utility;
 import org.greenstone.gatherer.util.XMLTools;
 import org.w3c.dom.*;
@@ -698 +699 @@
 
     static public String getGS3BinPath() {
-    return gsdl3_src_path + "bin" + File.separator;
+    return gsdl3_src_path + "bin" + File.separator + Utility.getOSdirName() + File.separator;
     }
 

main/trunk/gli/src/org/greenstone/gatherer/util/Utility.java

@@ -340 +340 @@
     }
 
+    /** @return the OSdir foldername: windows, linux or darwin */
+    public static String getOSdirName() {
+    if(Utility.isWindows()) {
+        return "windows";
+    }   
+    if(Utility.isMac()) {
+        return "darwin";
+    }
+    return "linux"; // else assume it's a linux machine, OSdirname = linux
+    }
+    
 
     /** Method to determine if the host system is MacOS based.