Add python light win32

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

diff --git a/maven/maven-argeo-qooxdoo-plugin/pom.xml b/maven/maven-argeo-qooxdoo-plugin/pom.xml
index 9e17a2d58e4d5767173b35e6860e89952c374bf5..b456a2d805b8774373c51d0b3dabeb7cbb78e427 100644 (file)
--- a/maven/maven-argeo-qooxdoo-plugin/pom.xml
+++ b/maven/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.4</version>\r
+       <version>0.8.0.3-SNAPSHOT</version>\r
        <packaging>maven-plugin</packaging>\r
        <name>Argeo Qooxdoo Plugin</name>\r
 \r

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..405d6c70e5560083946abf5c372351b898d80c6b 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
@@ -58,7 +58,14 @@ public class GenerateMojo extends AbstractMojo {
                        // 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);

diff --git a/maven/maven-argeo-qooxdoo-plugin/src/main/resources/META-INF/maven/lifecycle.xml b/maven/maven-argeo-qooxdoo-plugin/src/main/resources/META-INF/maven/lifecycle.xml
index 3fb51df2ed6e7625fc47b952ad3d375c9ff0a72e..3d39f72e7af3c206007e3bc670cc92514c1d4654 100644 (file)
--- a/maven/maven-argeo-qooxdoo-plugin/src/main/resources/META-INF/maven/lifecycle.xml
+++ b/maven/maven-argeo-qooxdoo-plugin/src/main/resources/META-INF/maven/lifecycle.xml
@@ -12,6 +12,16 @@
                                                </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
+                                                                       </outputDirectory>
+                                                                       <overWrite>false</overWrite>
+                                                               </artifactItem>
                                                                <artifactItem>
                                                                        <groupId>org.argeo.dep.dist</groupId>
                                                                        <artifactId>qooxdoo-sdk</artifactId>