[Jython-checkins] SF.net SVN: jython: [4870] branches/asm/build.xml

[<fwi...@us...>]

Revision: 4870
          http://jython.svn.sourceforge.net/jython/?rev=4870&view=rev
Author:   fwierzbicki
Date:     2008-07-08 01:59:37 -0700 (Tue, 08 Jul 2008)

Log Message:
-----------
some tweaks to help the install task.

Modified Paths:
--------------
    branches/asm/build.xml

Modified: branches/asm/build.xml
===================================================================
--- branches/asm/build.xml	2008-07-08 07:27:03 UTC (rev 4869)
+++ branches/asm/build.xml	2008-07-08 08:59:37 UTC (rev 4870)
@@ -202,7 +202,7 @@
         <property name="PY_RELEASE_LEVEL_SNAPSHOT" value="170"/> <!-- 0xAA -->
 
         <!-- The current version info -->
-        <property name="jython.version" value="2.5a0+" />
+        <property name="jython.version" value="2.5a0" />
         <property name="jython.major_version" value="2"/>
         <property name="jython.minor_version" value="5"/>
         <property name="jython.micro_version" value="0"/>
@@ -515,7 +515,7 @@
             destdir="${exposed.dir}" 
             includesfile="${jython.base.dir}/CoreExposed.includes"/>
     </target>
-    <target name="jarjar" depends="init" unless="jarjar.notneeded">
+    <target name="jarjar" depends="init" >
         <taskdef name="jarjar" classname="com.tonicsystems.jarjar.JarJarTask" classpath="extlibs/jarjar-0.7.jar"/>
         <jarjar destfile="${output.dir}/jarjar.jar">
             <zipfileset src="extlibs/antlr-runtime-3.1b1.jar"/>
@@ -535,7 +535,7 @@
         </unjar>
     </target>
 
-    <target name="jar-complete" depends="compile,expose,jarjar">
+    <target name="jar-complete" depends="jarjar,compile,expose">
        <jar destfile="${dist.dir}/jython-complete.jar">
           <fileset dir="${compile.dir}"/>   
           <fileset dir="${exposed.dir}"/>
@@ -697,8 +697,8 @@
     </target>
 
     <!-- wrap the build into the installer -->
-    <target name="install" depends="brand-readme-version, doc, jar, javadoc, copy-full">
-        <property name="install.src.dir" value="${jython.base.dir}/../installer/src/java" />
+    <target name="install" depends="brand-readme-version, doc, jar-complete, javadoc, copy-full">
+        <property name="install.src.dir" value="${jython.base.dir}/../installer25/src/java" />
         <echo>compiling installer from ${install.src.dir}</echo>
         <javac srcdir="${install.src.dir}"
                includes="org/**"


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