From 78da7fc1df9d1995512b2d08ff0bc11daf7cf220 Mon Sep 17 00:00:00 2001
From: "Rafael H. Schloming" <rhs@apache.org>
Date: Wed, 3 Dec 2008 19:34:40 +0000
Subject: made ant build generate perftest scripts

git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/trunk/qpid@723029 13f79535-47bb-0310-9956-ffa450edef68
---
 java/common/build.xml          |  20 ++++++++------------
 java/common/jython-2.2-rc2.jar | Bin 1203486 -> 0 bytes
 java/common/jython-lib.jar     | Bin 1570006 -> 0 bytes
 3 files changed, 8 insertions(+), 12 deletions(-)
 delete mode 100644 java/common/jython-2.2-rc2.jar
 delete mode 100644 java/common/jython-lib.jar

(limited to 'java/common')

diff --git a/java/common/build.xml b/java/common/build.xml
index 6172a680ec..dfe060cdef 100644
--- a/java/common/build.xml
+++ b/java/common/build.xml
@@ -28,7 +28,6 @@
   <property name="xml.spec.dir" location="${project.root}/../specs" />
   <property name="xml.spec.deps" value="amqp.0-8.xml amqp.0-9.xml" />
   <property name="xml.spec.list" value="${xml.spec.dir}/amqp.0-8.xml ${xml.spec.dir}/amqp.0-9.xml" />
-  <property name="mllib.dir" value="${project.root}/../python" />
   <property name="gentools.timestamp" location="${generated.dir}/gentools.timestamp" />
   <property name="jython.timestamp" location="${generated.dir}/jython.timestamp" />
 
@@ -39,17 +38,14 @@
   </target>
 
   <target name="jython" depends="check_jython_deps" unless="jython.notRequired">
-    <java classname="org.python.util.jython" fork="true" failonerror="true">
-      <arg value="-Dpython.cachedir.skip=true"/>
-      <arg value="-Dpython.path=${basedir}/jython-lib.jar/Lib${path.separator}${mllib.dir}"/>
-      <arg value="${basedir}/codegen"/>
-      <arg value="${module.precompiled}"/>
-      <arg value="${xml.spec.dir}/amqp.0-10-qpid-errata.xml"/>
-      <arg value="${basedir}"/>
-      <classpath>
-        <pathelement location="jython-2.2-rc2.jar"/>
-      </classpath>
-    </java>
+    <jython path="${mllib.dir}">
+      <args>
+        <arg value="${basedir}/codegen"/>
+        <arg value="${module.precompiled}"/>
+        <arg value="${xml.spec.dir}/amqp.0-10-qpid-errata.xml"/>
+        <arg value="${basedir}"/>
+      </args>
+    </jython>
     <touch file="${jython.timestamp}" />
   </target>
 
diff --git a/java/common/jython-2.2-rc2.jar b/java/common/jython-2.2-rc2.jar
deleted file mode 100644
index e25e2cb945..0000000000
Binary files a/java/common/jython-2.2-rc2.jar and /dev/null differ
diff --git a/java/common/jython-lib.jar b/java/common/jython-lib.jar
deleted file mode 100644
index bb3ba82db5..0000000000
Binary files a/java/common/jython-lib.jar and /dev/null differ
-- 
cgit v1.2.1