Changeset 7773 for trunk/projects/jar2lib

Timestamp:

09/16/11 12:14:28 (8 years ago)

Author:

hinerm

Message:

Removed File usage from automation of CMakeLists.txt

The use of a File object in VelocityAutogen was forcing
all file separators to become platform specific.
Instead, an array of Strings is now passed in, and
the substring command is used on the velocity side
to parse out the file name.

Location:

trunk/projects/jar2lib/src/main

Files:

• java/loci/jar2lib/VelocityAutogen.java (modified) (2 diffs)
• resources/CMakeLists.vm (modified) (1 diff)

trunk/projects/jar2lib/src/main/java/loci/jar2lib/VelocityAutogen.java

@@ -134 +134 @@
     VelocityEngine ve = VelocityTools.createEngine();
     VelocityContext context = VelocityTools.createContext();
-    
-    File[] libJars = new File[libraryJars.size()];
-    
-    for (int i = 0; i < libraryJars.size(); i++)
-    {
-        libJars[i] = new File(libraryJars.get(i));
-    }
 
     context.put("headerBlock", scriptHeader);
@@ -146 +139 @@
     context.put("projectName", projectName);
     context.put("sourceFiles", sourceFiles);
-    context.put("sourceJars", libJars);
+    context.put("sourceJars", libraryJars.toArray(new String[libraryJars.size()]));
     context.put("q", this);
 

trunk/projects/jar2lib/src/main/resources/CMakeLists.vm

@@ -292 +292 @@
 
 #foreach ($jarFile in $sourceJars)
-#set ($jarName = $jarFile.getName())
+#set( $offset = $jarfile.lastIndexOf('/') + 1 )
+#set ($jarName = $jarFile.substring($offset) )
 # copy ${jarName}
 add_custom_command(