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

[<pj...@us...>]

Revision: 7280
          http://jython.svn.sourceforge.net/jython/?rev=7280&view=rev
Author:   pjenvey
Date:     2011-04-01 05:22:39 +0000 (Fri, 01 Apr 2011)

Log Message:
-----------
auto-toggle hg/svn version support

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

Modified: trunk/jython/build.xml
===================================================================
--- trunk/jython/build.xml	2011-03-30 15:55:44 UTC (rev 7279)
+++ trunk/jython/build.xml	2011-04-01 05:22:39 UTC (rev 7280)
@@ -393,38 +393,56 @@
         </svn> 
     </target>
 
-    <!-- XXX: could attempt to utilize subwcrev.exe to get the revision on Windows  -->
-    <target name="svnversion" if="os.family.unix">
-        <exec executable="svnversion" failifexecutionfails="false" outputproperty="build.svn.revision"/>
+    <target name="check-hg">
+      <available file=".hg" type="dir" property="hg.present"/>
+      <condition property="hg-run">
+        <and>
+          <isset property="hg.present"/>
+          <!-- XXX: Might this work on Windows? -->
+          <isset property="os.family.unix"/>
+        </and>
+      </condition>
     </target>
+    <target name="hg-id" depends="check-hg, hg-branch, hg-tag, hg-version"/>
 
-    <!-- XXX: Might this work on Windows? -->
-    <target name="hg-branch" if="os.family.unix">
+    <target name="hg-branch" if="hg-run">
         <exec executable="hg" failifexecutionfails="false" outputproperty="build.hg.branch">
           <arg line="id -b"/>
         </exec>
     </target>
-    <target name="hg-tag" if="os.family.unix">
+    <target name="hg-tag" if="hg-run">
         <exec executable="hg" failifexecutionfails="false" outputproperty="build.hg.tag">
           <arg line="id -t"/>
         </exec>
     </target>
-    <target name="hg-version" if="os.family.unix">
+    <target name="hg-version" if="hg-run">
         <exec executable="hg" failifexecutionfails="false" outputproperty="build.hg.version">
           <arg line="id -i"/>
         </exec>
     </target>
-    <target name="hg-id" depends="hg-branch, hg-tag, hg-version"/>
 
+    <target name="svnversion-check" depends="check-hg">
+      <condition property="svnversion-run">
+        <and>
+          <not>
+            <isset property="hg.present"/>
+          </not>
+          <!-- XXX: could attempt to utilize subwcrev.exe to get the revision on Windows  -->
+          <isset property="os.family.unix"/>
+        </and>
+      </condition>
+    </target>
+    <target name="svnversion" depends="svnversion-check" if="svnversion-run">
+        <exec executable="svnversion" failifexecutionfails="false" outputproperty="build.svn.revision"/>
+    </target>
+
     <!-- 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. -->
-    <!-- when hg:
-    <target name="brand-version" depends="init, hg-id" unless="skip-brand">-->
-    <target name="brand-version" depends="init, svnversion" unless="skip-brand">
-        <property name="build.svn.revision" value=""/>
+    <target name="brand-version" depends="init, hg-id, svnversion" unless="skip-brand">
         <property name="build.hg.branch" value=""/>
         <property name="build.hg.tag" value=""/>
         <property name="build.hg.version" value=""/>
+        <property name="build.svn.revision" value=""/>
         <tstamp>
             <format property="build.date" pattern="MMM d yyyy" offset="0"/>
             <format property="build.time" pattern="HH:mm:ss" offset="0"/>

Modified: trunk/jython/src/org/python/Version.java
===================================================================
--- trunk/jython/src/org/python/Version.java	2011-03-30 15:55:44 UTC (rev 7279)
+++ trunk/jython/src/org/python/Version.java	2011-04-01 05:22:39 UTC (rev 7280)
@@ -167,6 +167,9 @@
      * timestamp.
      */
     public static String getBuildInfo() {
+        if (HG_VERSION != null && !"".equals(HG_VERSION)) {
+            return getBuildInfoHG();
+        }
         String revision = getSubversionRevision();
         String sep = "".equals(revision) ? "" : ":";
         String branch = getSubversionShortBranch();


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