Changeset 268

Timestamp:

2008-05-30 08:12:24 (5 years ago)

Author:

bruno

Message:

runtime scripts: build classpath the same way for dev and release mode, don't know if there's a good reason not to.

File:

• trunk/tools/kauri-genscript-plugin/src/main/groovy/GenerateScriptMojo.groovy (modified) (3 diffs)

trunk/tools/kauri-genscript-plugin/src/main/groovy/GenerateScriptMojo.groovy

@@ -75 +75 @@
 
         def classpath = ""
-        if (isRelease) {
-            artifacts.eachWithIndex(
-                    { entry, i ->
-                        classpath += "\$M2_REPO" + "/" + new File(localRepository.pathOf(entry)).getPath()
-                        if (i < artifacts.size() - 1)
-                            classpath += ":\\\n"
-                    }
-            );
-        } else {
-            artifacts.eachWithIndex(
-                    { entry, i ->
-                        classpath += entry.getFile().getPath();
-                        if (i < artifacts.size() - 1)
-                            classpath += ":\\\n"
-                    }
-            );
-        }
+        artifacts.eachWithIndex(
+                { entry, i ->
+                    classpath += "\$M2_REPO" + "/" + new File(localRepository.pathOf(entry)).getPath()
+                    if (i < artifacts.size() - 1)
+                        classpath += ":\\\n"
+                }
+        );
+
+        def allCliArgs = '"\$@"'; // defining this here because IDEA gives error when embedding this in a GString (yes, lame)
 
         def script = """\
@@ -113 +105 @@
 KAURI_LOG_OPTS="-Dorg.apache.commons.logging.Log=org.apache.commons.logging.impl.SimpleLog -Dorg.apache.commons.logging.simplelog.defaultlog=error"
 
-"\$JAVA_HOME/bin/java" \$KAURI_JAVA_OPTIONS \$KAURI_LOG_OPTS ${mainClass} "\$@"
+"\$JAVA_HOME/bin/java" \$KAURI_JAVA_OPTIONS \$KAURI_LOG_OPTS ${mainClass} ${allCliArgs}
 """
 
@@ -130 +122 @@
 
         def classpath = ""
-        if (isRelease) {
-            for (entry in artifacts) {
-                classpath += "%M2_REPO%" + "\\" + new File(localRepository.pathOf(entry)).getPath() + ";"
-            }
-        } else {
-            for (entry in artifacts) {
-                classpath += entry.getFile().getPath() + ";"
-            }
+        for (entry in artifacts) {
+            classpath += "%M2_REPO%" + "\\" + new File(localRepository.pathOf(entry)).getPath() + ";"
         }