Changeset 29238

Show
Ignore:
Timestamp:
26.08.2014 15:58:38 (5 years ago)
Author:
ak19
Message:

Correcting detection of pdfbox extension for GS3. For GS3, it's not supposed to be in GS3/ext but in gs2build/ext. For GS2 it's also in GS2/ext.

Files:
1 modified

Legend:

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

    r29222 r29238  
    505505                DebugStream.println("Not checking for PDFBox."); 
    506506            } 
    507             else { 
    508                 String gs_dir = GS3 ? gsdl3_src_path : gsdl_path; 
     507            else {               
     508                String gs_dir = gsdl_path; // for GS3, pdf-box is in gs2build/ext (not in GS3/ext), for GS2 it's also in GS2/ext 
    509509                File pdfboxExtensionFolder = new File(gs_dir+File.separator+"ext"+File.separator+"pdf-box"); 
    510510                if (!(pdfboxExtensionFolder.exists() && pdfboxExtensionFolder.isDirectory())) {