Don't use python win32 package

git-svn-id: https://svn.argeo.org/slc/trunk/maven@2092 4cfe0d0a-d680-48aa-b62c-e0a02a3f76cc

diff --git a/maven-argeo-qooxdoo-plugin/pom.xml b/maven-argeo-qooxdoo-plugin/pom.xml
index b48d4cf0ed7663c9c3dd31f3854f30d79339874c..bea1f792c4180c6d310998d6ea24cb7b81b234d6 100644 (file)
--- a/maven-argeo-qooxdoo-plugin/pom.xml
+++ b/maven-argeo-qooxdoo-plugin/pom.xml
@@ -3,7 +3,7 @@
        <groupId>org.argeo.slc.maven</groupId>\r
        <artifactId>maven-argeo-qooxdoo-plugin\r
        </artifactId>\r
-       <version>0.8.0.8</version>\r
+       <version>0.8.0.9</version>\r
        <packaging>maven-plugin</packaging>\r
        <name>Argeo Qooxdoo Plugin</name>\r
 \r

diff --git a/maven-argeo-qooxdoo-plugin/src/main/java/org/argeo/slc/maven/plugins/qooxdoo/GenerateMojo.java b/maven-argeo-qooxdoo-plugin/src/main/java/org/argeo/slc/maven/plugins/qooxdoo/GenerateMojo.java
index 1529b808e7e9c093024f6632a034cff68412dedb..27f9f6dd99b62455a68be1ad0425a8632b4f42cc 100644 (file)
--- a/maven-argeo-qooxdoo-plugin/src/main/java/org/argeo/slc/maven/plugins/qooxdoo/GenerateMojo.java
+++ b/maven-argeo-qooxdoo-plugin/src/main/java/org/argeo/slc/maven/plugins/qooxdoo/GenerateMojo.java
@@ -51,30 +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.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 };
                        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);

diff --git a/maven-argeo-qooxdoo-plugin/src/main/resources/META-INF/maven/lifecycle.xml b/maven-argeo-qooxdoo-plugin/src/main/resources/META-INF/maven/lifecycle.xml
index cc2e5728851a61a75168aadcb67232ca5ff1c11a..a6400aaac75b29827767b3b277082b61d6d8cb53 100644 (file)
--- a/maven-argeo-qooxdoo-plugin/src/main/resources/META-INF/maven/lifecycle.xml
+++ b/maven-argeo-qooxdoo-plugin/src/main/resources/META-INF/maven/lifecycle.xml
@@ -12,16 +12,6 @@
                                                </goals>
                                                <configuration>
                                                        <artifactItems>
-                                                               <artifactItem>
-                                                                       <groupId>org.argeo.dep.dist</groupId>
-                                                                       <artifactId>python-light-win32</artifactId>
-                                                                       <version>2.6.1</version>
-                                                                       <classifier>dist</classifier>
-                                                                       <type>zip</type>
-                                                                       <outputDirectory>${project.build.directory}/python-win32
-                                                                       </outputDirectory>
-                                                                       <overWrite>false</overWrite>
-                                                               </artifactItem>
                                                                <artifactItem>
                                                                        <groupId>org.argeo.dep.dist</groupId>
                                                                        <artifactId>qooxdoo-sdk</artifactId>