From 09568df3148d8dd90643daf65b8c2dfcffe6a7ed Mon Sep 17 00:00:00 2001 From: Mathieu Baudier Date: Sun, 7 Dec 2008 17:10:01 +0000 Subject: [PATCH 1/1] Add python light win32 git-svn-id: https://svn.argeo.org/slc/trunk/maven@1930 4cfe0d0a-d680-48aa-b62c-e0a02a3f76cc --- maven-argeo-qooxdoo-plugin/pom.xml | 2 +- .../argeo/slc/maven/plugins/qooxdoo/GenerateMojo.java | 9 ++++++++- .../src/main/resources/META-INF/maven/lifecycle.xml | 10 ++++++++++ 3 files changed, 19 insertions(+), 2 deletions(-) diff --git a/maven-argeo-qooxdoo-plugin/pom.xml b/maven-argeo-qooxdoo-plugin/pom.xml index 9e17a2d58..b456a2d80 100644 --- a/maven-argeo-qooxdoo-plugin/pom.xml +++ b/maven-argeo-qooxdoo-plugin/pom.xml @@ -3,7 +3,7 @@ org.argeo.slc.maven maven-argeo-qooxdoo-plugin - 0.8.0.4 + 0.8.0.3-SNAPSHOT maven-plugin Argeo Qooxdoo Plugin 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 ec695a56b..405d6c70e 100644 --- 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 @@ -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-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 3fb51df2e..3d39f72e7 100644 --- 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,6 +12,16 @@ + + org.argeo.dep.dist + python-light-win32 + 2.6.1 + dist + zip + ${project.build.directory}/python + + false + org.argeo.dep.dist qooxdoo-sdk -- 2.39.2