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

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

Revision: 5912
          http://jython.svn.sourceforge.net/jython/?rev=5912&view=rev
Author:   cgroves
Date:     2009-01-11 00:53:55 +0000 (Sun, 11 Jan 2009)

Log Message:
-----------
* Add xerces' version number to its file name for future explorers.
* Add a skip-brand property to build.xml that allows version branding to be
 skipped, which keeps jython-dev.jar from being built even if no other files
 change and shaves a couple seconds off a dev build.

Modified Paths:
--------------
    trunk/jython/build.xml
    trunk/jython/src/org/python/util/NameUnionAntType.java

Added Paths:
-----------
    trunk/jython/extlibs/xercesImpl-2.9.1.jar

Removed Paths:
-------------
    trunk/jython/extlibs/xercesImpl.jar

Modified: trunk/jython/build.xml
===================================================================
--- trunk/jython/build.xml	2009-01-10 20:50:36 UTC (rev 5911)
+++ trunk/jython/build.xml	2009-01-11 00:53:55 UTC (rev 5912)
@@ -362,7 +362,9 @@
         <exec executable="svnversion" failifexecutionfails="false" outputproperty="build.svn.revision"/>
     </target>
 
-    <target name="brand-version" depends="version-init, svnversion">
+    <!-- skip-brand can be set in ant.properties or as a system property to keep from updating the
+         version.properties file and making the jar on every developer build. -->
+    <target name="brand-version" depends="version-init, svnversion" unless="skip-brand">
         <condition property="build.svn.revision" value="">
             <not>
                 <isset property="build.svn.revision"/>
@@ -520,7 +522,7 @@
             <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"/>
-            <zipfileset src="extlibs/xercesImpl.jar"/>
+            <zipfileset src="extlibs/xercesImpl-2.9.1.jar"/>
             <rule pattern="org.apache.**" result="org.python.apache.@1"/>
             <manifest>
                 <attribute name="Main-Class" value="org.python.util.jython" />

Copied: trunk/jython/extlibs/xercesImpl-2.9.1.jar (from rev 5907, trunk/jython/extlibs/xercesImpl.jar)
===================================================================
(Binary files differ)


Property changes on: trunk/jython/extlibs/xercesImpl-2.9.1.jar
___________________________________________________________________
Added: svn:mime-type
   + application/octet-stream
Added: svn:mergeinfo
   + /branches/newstyle-java-types/extlibs/xercesImpl.jar:5564-5663,5666-5729

Deleted: trunk/jython/extlibs/xercesImpl.jar
===================================================================
(Binary files differ)

Modified: trunk/jython/src/org/python/util/NameUnionAntType.java
===================================================================
--- trunk/jython/src/org/python/util/NameUnionAntType.java	2009-01-10 20:50:36 UTC (rev 5911)
+++ trunk/jython/src/org/python/util/NameUnionAntType.java	2009-01-11 00:53:55 UTC (rev 5912)
@@ -2,7 +2,6 @@
 
 import java.util.ArrayList;
 import java.util.Collection;
-import java.util.HashSet;
 import java.util.Iterator;
 import java.util.List;
 import java.util.Set;


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