Changeset 7754


Ignore:
Timestamp:
09/15/11 09:11:28 (8 years ago)
Author:
hinerm
Message:

Adjusted correction of jar paths

The previous fix to correct '\' to '/' in jar paths seemed not to work
in a Windows environment.
The fix was moved to upstream in the execution process in hopes of ensuring proper paths.

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/projects/jar2lib/src/main/java/loci/jar2lib/Jar2Lib.java

    r7752 r7754  
    198198      } 
    199199      else if (arg.startsWith("-")) die("Unknown flag: " + arg); 
    200       else libraryJars.add(arg); 
     200      else libraryJars.add(arg.replace('\\', '/')); 
    201201    } 
    202202    if (projectId == null || projectName == null || libraryJars.size() == 0) { 
     
    215215    generateSkeleton(); 
    216216    copySourceFiles(); 
    217     correctJarPaths(); 
    218217    generateHeaders(); 
    219218    generateProxies(); 
     
    224223 
    225224    log("--> Done"); 
    226   } 
    227  
    228   /** 
    229    * Replaces instances of '\' in the jar paths with '/' 
    230    */ 
    231   public void correctJarPaths() { 
    232  
    233     ArrayList<String> tmpLibJars = new ArrayList<String>(); 
    234  
    235     for (String jarPath : libraryJars) { 
    236       tmpLibJars.add(jarPath.replace('\\', '/')); 
    237     } 
    238     setLibraryJars(tmpLibJars);  
    239225  } 
    240226 
Note: See TracChangeset for help on using the changeset viewer.