[Jython-checkins] SF.net SVN: jython:[5864] trunk/jython/build.xml

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

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

Log Message:
-----------
1) exlude jython.jar from the installation
   this makes the installer autotests pass again
2) do not include the /Lib files into jython-complete.jar
   once issue #1214 is fixed, 'java -jar jython-complete.jar' will run for all installation types
   (for now, set the -Dpython.home variable if not in standalone mode)

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

Modified: trunk/jython/build.xml
===================================================================
--- trunk/jython/build.xml	2009-01-07 07:35:05 UTC (rev 5863)
+++ trunk/jython/build.xml	2009-01-07 08:08:00 UTC (rev 5864)
@@ -518,7 +518,6 @@
             <rule pattern="org.jruby.ext.posix.**" result="org.python.posix.@1"/>
             <zipfileset src="extlibs/constantine-0.4.jar"/>
             <rule pattern="com.kenai.constantine.**" result="org.python.constantine.@1"/>
-            <fileset dir="${dist.dir}" includes="Lib/**/*" />
             <manifest>
                 <attribute name="Main-Class" value="org.python.util.jython" />
                 <attribute name="Built-By" value="${user.name}" />
@@ -713,7 +712,11 @@
             </fileset>
         </copy>
         <echo>building installer .jar file</echo>
-        <jar destfile="${work.dir}/jython_installer-${jython.version.noplus}.jar" basedir="${dist.dir}" update="true">
+        <jar destfile="${work.dir}/jython_installer-${jython.version.noplus}.jar" update="true">
+            <fileset dir="${dist.dir}">
+                <exclude name="jython.jar"/>
+                <exclude name="callbacker_test.jar"/>
+            </fileset>
             <manifest>
                 <attribute name="Main-Class" value="org.python.util.install.Installation" />
                 <attribute name="Built-By" value="${user.name}" />


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