Use generator directly

[gpl/argeo-slc.git] / maven / maven-argeo-qooxdoo-plugin / src / main / java / org / argeo / slc / maven / plugins / qooxdoo / GenerateMojo.java

diff --git a/maven/maven-argeo-qooxdoo-plugin/src/main/java/org/argeo/slc/maven/plugins/qooxdoo/GenerateMojo.java b/maven/maven-argeo-qooxdoo-plugin/src/main/java/org/argeo/slc/maven/plugins/qooxdoo/GenerateMojo.java
index ec695a56b21301ccf08b877f71f98882a0d33fe6..66f00c2a17d848cd9f1e8f80ea90b705903404b1 100644 (file)
--- a/maven/maven-argeo-qooxdoo-plugin/src/main/java/org/argeo/slc/maven/plugins/qooxdoo/GenerateMojo.java
+++ b/maven/maven-argeo-qooxdoo-plugin/src/main/java/org/argeo/slc/maven/plugins/qooxdoo/GenerateMojo.java
@@ -26,6 +26,14 @@ public class GenerateMojo extends AbstractMojo {
         */
        private String job;
 
+       /**
+        * Location of the qooxdoo sdk.
+        * 
+        * @parameter expression="${qooxdooSdk}"
+        */
+       private String qooxdooSdk = "src" + File.separator + "main"
+                       + File.separator + "webapp" + File.separator + "qooxdoo-0.8-sdk";
+
        /**
         * The build directory.
         * 
@@ -48,17 +56,26 @@ public class GenerateMojo extends AbstractMojo {
                        // jythonBase.mkdirs();
                        // System.setProperty("python.home", jythonBase.getCanonicalPath());
 
-                       File generateScript = new File(baseDir, "generate.py");
+                       File generateScript = new File(baseDir.getPath() + File.separator
+                                       + qooxdooSdk + File.separator + "tool" + File.separator
+                                       + "bin", "generator.py");
                        // String[] jobArray = jobs.split(" ");
                        // String[] args = new String[jobArray.length + 1];
                        // args[0] = generateScript.getCanonicalPath();
                        // System.arraycopy(jobArray, 0, args, 1, jobArray.length);
-                       String[] args = { "generate.py", job };
+                       // String[] args = { "generate.py", job };
                        getLog().info("Running Qooxdoo job: " + job + " ...");
                        // jython.main(args);
 
                        Commandline cl = new Commandline();
-                       cl.setExecutable("python");
+
+                       if (File.separatorChar == '\\') {// win
+                               File pythonBase = new File(buildDirectory, "python-win32")
+                                               .getCanonicalFile();
+                               cl.setExecutable(pythonBase.getPath() + File.separator
+                                               + "python");
+                       } else
+                               cl.setExecutable("python");
                        cl.setWorkingDirectory(baseDir.getCanonicalPath());
                        cl.createArgument().setValue(generateScript.getCanonicalPath());
                        cl.createArgument().setValue(job);