X-Git-Url: http://git.argeo.org/?a=blobdiff_plain;f=maven%2Fmaven-argeo-qooxdoo-plugin%2Fsrc%2Fmain%2Fjava%2Forg%2Fargeo%2Fslc%2Fmaven%2Fplugins%2Fqooxdoo%2FGenerateMojo.java;h=3138fbc4eea11a40582d2efb631b09e472cf98d6;hb=2c20b8060f8682ca9267ce158c002d79b1367a29;hp=405d6c70e5560083946abf5c372351b898d80c6b;hpb=a2535c135a12f741e66f37602802711b2992ea03;p=gpl%2Fargeo-slc.git

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 405d6c70e..3138fbc4e 100644
--- 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
@@ -15,7 +15,6 @@ import org.codehaus.plexus.util.cli.StreamConsumer;
  * Calls Qooxdoo python tool chain
  * 
  * @goal generate
- * @execute goal="env"
  */
 public class GenerateMojo extends AbstractMojo {
 	/**
@@ -26,6 +25,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-sdk";
+
 	/**
 	 * The build directory.
 	 * 
@@ -44,28 +51,14 @@ public class GenerateMojo extends AbstractMojo {
 
 	public void execute() throws MojoExecutionException, MojoFailureException {
 		try {
-			// File jythonBase = new File(buildDirectory, "jython");
-			// jythonBase.mkdirs();
-			// System.setProperty("python.home", jythonBase.getCanonicalPath());
-
-			File generateScript = new File(baseDir, "generate.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 };
+			File generateScript = new File(baseDir.getPath() + File.separator
+					+ qooxdooSdk + File.separator + "tool" + File.separator
+					+ "bin", "generator.py");
 			getLog().info("Running Qooxdoo job: " + job + " ...");
-			// jython.main(args);
 
 			Commandline cl = new Commandline();
 
-			if (File.separatorChar == '\\') {// win
-				File pythonBase = new File(buildDirectory, "python-win32")
-						.getCanonicalFile();
-				cl.setExecutable(pythonBase.getPath() + File.separator
-						+ "python");
-			} else
-				cl.setExecutable("python");
+			cl.setExecutable("python");// python needs to be installed
 			cl.setWorkingDirectory(baseDir.getCanonicalPath());
 			cl.createArgument().setValue(generateScript.getCanonicalPath());
 			cl.createArgument().setValue(job);