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

[<cg...@us...>]

Revision: 6547
          http://jython.svn.sourceforge.net/jython/?rev=6547&view=rev
Author:   cgroves
Date:     2009-07-19 06:49:49 +0000 (Sun, 19 Jul 2009)

Log Message:
-----------
Move version-init into init as it wasn't used separately, and add a fileset to the jarring to shut up ant's spurious warning about no files being included

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

Modified: trunk/jython/build.xml
===================================================================
--- trunk/jython/build.xml	2009-07-19 06:23:03 UTC (rev 6546)
+++ trunk/jython/build.xml	2009-07-19 06:49:49 UTC (rev 6547)
@@ -113,7 +113,38 @@
         </uptodate>
     </target>
 
-    <target name="init" depends="version-init">
+    <target name="init">
+        <property file="${user.home}/ant.properties" />
+        <property file="${basedir}/ant.properties" />
+
+        <property name="PY_RELEASE_LEVEL_ALPHA" value="10"/> <!-- 0xA -->
+        <property name="PY_RELEASE_LEVEL_BETA" value="11"/> <!-- 0xB -->
+        <property name="PY_RELEASE_LEVEL_GAMMA" value="12"/> <!-- 0xC -->
+        <property name="PY_RELEASE_LEVEL_FINAL" value="15"/> <!-- 0xF -->
+        <property name="PY_RELEASE_LEVEL_SNAPSHOT" value="170"/> <!-- 0xAA -->
+
+        <!-- The current version info -->
+        <property name="jython.version" value="2.5.0+"/>
+        <property name="jython.version.noplus" value="2.5.0"/>
+        <property name="jython.major_version" value="2"/>
+        <property name="jython.minor_version" value="5"/>
+        <property name="jython.micro_version" value="0"/>
+        <property name="jython.release_level" value="${PY_RELEASE_LEVEL_FINAL}"/>
+        <property name="jython.release_serial" value="0"/>
+
+        <condition property="do.snapshot.build">
+            <isset property="snapshot.revision" />
+        </condition>
+        <!-- Switch to a snapshot release_level when appropriate -->
+        <condition property="jython.real_release_level" value="${PY_RELEASE_LEVEL_SNAPSHOT}" else="${jython.release_level}">
+            <isset property="do.snapshot.build" />
+        </condition>
+        <condition property="os.family.unix">
+            <os family="unix"/>
+        </condition>
+        <condition property="os.family.windows">
+            <os family="windows"/>
+        </condition>
         <property name="build.compiler" value="modern" />
         <property name="jdk.target.version" value="1.5" />
         <property name="jdk.source.version" value="1.5" />
@@ -177,40 +208,6 @@
         <property name="jython.deploy.jar" value="jython.jar" />
     </target>
 
-    <target name="version-init">
-        <property file="${user.home}/ant.properties" />
-        <property file="${basedir}/ant.properties" />
-
-        <property name="PY_RELEASE_LEVEL_ALPHA" value="10"/> <!-- 0xA -->
-        <property name="PY_RELEASE_LEVEL_BETA" value="11"/> <!-- 0xB -->
-        <property name="PY_RELEASE_LEVEL_GAMMA" value="12"/> <!-- 0xC -->
-        <property name="PY_RELEASE_LEVEL_FINAL" value="15"/> <!-- 0xF -->
-        <property name="PY_RELEASE_LEVEL_SNAPSHOT" value="170"/> <!-- 0xAA -->
-
-        <!-- The current version info -->
-        <property name="jython.version" value="2.5.0+"/>
-        <property name="jython.version.noplus" value="2.5.0"/>
-        <property name="jython.major_version" value="2"/>
-        <property name="jython.minor_version" value="5"/>
-        <property name="jython.micro_version" value="0"/>
-        <property name="jython.release_level" value="${PY_RELEASE_LEVEL_FINAL}"/>
-        <property name="jython.release_serial" value="0"/>
-
-        <condition property="do.snapshot.build">
-            <isset property="snapshot.revision" />
-        </condition>
-        <!-- Switch to a snapshot release_level when appropriate -->
-        <condition property="jython.real_release_level" value="${PY_RELEASE_LEVEL_SNAPSHOT}" else="${jython.release_level}">
-            <isset property="do.snapshot.build" />
-        </condition>
-        <condition property="os.family.unix">
-            <os family="unix"/>
-        </condition>
-        <condition property="os.family.windows">
-            <os family="windows"/>
-        </condition>
-    </target>
-
     <target name="full-preinit">
         <property file="${user.home}/ant.properties" />
         <property file="${basedir}/ant.properties" />
@@ -593,9 +590,13 @@
            <fileset dir="${compile.dir}" includes="org/python/tests/Callbacker*"/>
        </jar>
        <jar destfile="${dist.dir}/${jython.dev.jar}" duplicate="fail">
+          <!-- If only nameunion is used, ant issues a spurious warning about no files being
+               included.  Use a fileset for version.properties just to shut that up. -->
+          <fileset dir="${compile.dir}" includes="org/python/version.properties"/>
           <nameunion>
              <fileset dir="${exposed.dir}"/>
-             <fileset dir="${compile.dir}" excludes="org/python/expose/generate/**"/>   
+             <fileset dir="${compile.dir}"
+                 excludes="org/python/expose/generate/**,org/python/version.properties"/>   
           </nameunion>
           <manifest>
               <attribute name="Main-Class" value="org.python.util.jython" />


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