From 4793c8bae1f908cc02080ed2b7528405288bd93b Mon Sep 17 00:00:00 2001
From: Mathieu Baudier <mbaudier@argeo.org>
Date: Tue, 13 Jan 2009 15:43:37 +0000
Subject: [PATCH] Don't use python win32 package

git-svn-id: https://svn.argeo.org/slc/trunk@2092 4cfe0d0a-d680-48aa-b62c-e0a02a3f76cc
---
 maven/maven-argeo-qooxdoo-plugin/pom.xml       |  2 +-
 .../maven/plugins/qooxdoo/GenerateMojo.java    | 18 +-----------------
 .../resources/META-INF/maven/lifecycle.xml     | 10 ----------
 3 files changed, 2 insertions(+), 28 deletions(-)

diff --git a/maven/maven-argeo-qooxdoo-plugin/pom.xml b/maven/maven-argeo-qooxdoo-plugin/pom.xml
index b48d4cf0e..bea1f792c 100644
--- 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>
 	<artifactId>maven-argeo-qooxdoo-plugin
 	</artifactId>
-	<version>0.8.0.8</version>
+	<version>0.8.0.9</version>
 	<packaging>maven-plugin</packaging>
 	<name>Argeo Qooxdoo Plugin</name>
 
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 1529b808e..27f9f6dd9 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
@@ -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/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 cc2e57288..a6400aaac 100644
--- 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,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>
-- 
2.39.2