Changeset 29299

Show
Ignore:
Timestamp:
17.09.2014 19:05:03 (5 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:
2 modified

Legend:

Unmodified
Added
Removed
  • main/trunk/gli/src/org/greenstone/gatherer/Configuration.java

    r28995 r29299  
    4545import javax.swing.plaf.*; 
    4646import org.greenstone.gatherer.util.StaticStrings; 
     47import org.greenstone.gatherer.util.Utility; 
    4748import org.greenstone.gatherer.util.XMLTools; 
    4849import org.w3c.dom.*; 
     
    698699 
    699700    static public String getGS3BinPath() { 
    700     return gsdl3_src_path + "bin" + File.separator; 
     701    return gsdl3_src_path + "bin" + File.separator + Utility.getOSdirName() + File.separator; 
    701702    } 
    702703 
  • main/trunk/gli/src/org/greenstone/gatherer/util/Utility.java

    r29017 r29299  
    340340    } 
    341341 
     342    /** @return the OSdir foldername: windows, linux or darwin */ 
     343    public static String getOSdirName() { 
     344    if(Utility.isWindows()) { 
     345        return "windows"; 
     346    }    
     347    if(Utility.isMac()) { 
     348        return "darwin"; 
     349    } 
     350    return "linux"; // else assume it's a linux machine, OSdirname = linux 
     351    } 
     352     
    342353 
    343354    /** Method to determine if the host system is MacOS based.