[Jython-checkins] SF.net SVN: jython:[5863] trunk/jython

[<otm...@us...>]

Revision: 5863
          http://jython.svn.sourceforge.net/jython/?rev=5863&view=rev
Author:   otmarhumbel
Date:     2009-01-07 07:35:05 +0000 (Wed, 07 Jan 2009)

Log Message:
-----------
- added asm and constantine .jar files to the eclipse build path
- jarjar directory is not needed any more

Modified Paths:
--------------
    trunk/jython/.classpath
    trunk/jython/build.xml

Modified: trunk/jython/.classpath
===================================================================
--- trunk/jython/.classpath	2009-01-07 04:02:38 UTC (rev 5862)
+++ trunk/jython/.classpath	2009-01-07 07:35:05 UTC (rev 5863)
@@ -12,8 +12,10 @@
 	<classpathentry kind="lib" path="extlibs/mysql-connector-java-5.1.6.jar"/>
 	<classpathentry kind="lib" path="extlibs/postgresql-8.3-603.jdbc4.jar"/>
 	<classpathentry kind="lib" path="extlibs/servlet-api-2.5.jar"/>
-	<classpathentry kind="lib" path="build/jarjar"/>
 	<classpathentry kind="var" path="ANT_HOME/lib/ant.jar"/>
 	<classpathentry kind="lib" path="extlibs/antlr-3.1.1-runtime.jar"/>
+	<classpathentry kind="lib" path="extlibs/asm-3.1.jar"/>
+	<classpathentry kind="lib" path="extlibs/asm-commons-3.1.jar"/>
+	<classpathentry kind="lib" path="extlibs/constantine-0.4.jar"/>
 	<classpathentry kind="output" path="bugtests/classes"/>
 </classpath>

Modified: trunk/jython/build.xml
===================================================================
--- trunk/jython/build.xml	2009-01-07 04:02:38 UTC (rev 5862)
+++ trunk/jython/build.xml	2009-01-07 07:35:05 UTC (rev 5863)
@@ -135,7 +135,6 @@
         <property name="extlibs.dir" value="${jython.base.dir}/extlibs" />
         <property name="output.dir" value="${work.dir}/build" />
         <property name="compile.dir" value="${output.dir}/classes" />
-        <property name="jarjar.dir" value="${output.dir}/jarjar" />
         <property name="exposed.dir" value="${output.dir}/exposed" />
         <property name="gensrc.dir" value="${output.dir}/gensrc" />
         <property name="dist.dir" value="${work.dir}/dist" />
@@ -144,7 +143,6 @@
 
         <!-- classpaths -->
         <path id="main.classpath">
-            <pathelement path="${jarjar.dir}" />
             <pathelement path="${extlibs.dir}/libreadline-java-0.8.jar" />
             <pathelement path="${extlibs.dir}/jline-0.9.94.jar" />
             <pathelement path="${extlibs.dir}/servlet-api-2.5.jar" />
@@ -325,7 +323,6 @@
     <!-- create output directories -->
     <target name ="prepare-output" depends="init,needed-check,clean-if-antlr-needed">
         <mkdir dir="${compile.dir}" />
-        <mkdir dir="${jarjar.dir}" />
         <mkdir dir="${gensrc.dir}/org/python/antlr" />
         <mkdir dir="${exposed.dir}" />
         <mkdir dir="${dist.dir}" />


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.