Changeset 29300

Show
Ignore:
Timestamp:
17.09.2014 19:43:22 (5 years ago)
Author:
ak19
Message:

Fix to recent commit. Now the formatconverter binaries for the 3 OS are in their own new OS subfolders. However, they all share a single tidyconfig.cfg for html-tidy, which is still located in the bin superfolder.

Location:
main/trunk/gli/src/org/greenstone/gatherer
Files:
2 modified

Legend:

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

    r29299 r29300  
    698698    } 
    699699 
     700    /** @return path to GS3/bin */ 
    700701    static public String getGS3BinPath() { 
    701     return gsdl3_src_path + "bin" + File.separator + Utility.getOSdirName() + File.separator; 
     702    return gsdl3_src_path + "bin" + File.separator; 
     703    } 
     704 
     705    /** @return path to GS3/bin/OS, where OS is windows, darwin or linux */ 
     706    static public String getGS3BinOSPath() { 
     707    return getGS3BinPath() + Utility.getOSdirName() + File.separator; 
    702708    } 
    703709 
  • main/trunk/gli/src/org/greenstone/gatherer/gui/FormatConversionDialog.java

    r29044 r29300  
    7373    // Online HTML tidy for learning usage: http://infohound.net/tidy/ 
    7474    private static final String[] xmltidy_cmd_args = {"tidy", "-config", Configuration.getGS3BinPath() + "tidyconfig.cfg", "-utf8", "-wrap", "0", "-raw", "-q"}; // {"tidy", "-xml", "-utf8"}; 
    75     private static final String[] formatconverter_cmd_base_args = {Configuration.getGS3BinPath() + "formatconverter", "--silent"}; 
     75    private static final String[] formatconverter_cmd_base_args = {Configuration.getGS3BinOSPath() + "formatconverter", "--silent"}; 
    7676 
    7777    private static final Dimension SIZE = new Dimension(640,480);