harmony-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From telli...@apache.org
Subject svn commit: r430078 - /incubator/harmony/enhanced/classlib/trunk/modules/luni/build.xml
Date Wed, 09 Aug 2006 15:50:58 GMT
Author: tellison
Date: Wed Aug  9 08:50:57 2006
New Revision: 430078

URL: http://svn.apache.org/viewvc?rev=430078&view=rev
Log:
Deal with missing .svn dir when setting svn.info property

Modified:
    incubator/harmony/enhanced/classlib/trunk/modules/luni/build.xml

Modified: incubator/harmony/enhanced/classlib/trunk/modules/luni/build.xml
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/luni/build.xml?rev=430078&r1=430077&r2=430078&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/luni/build.xml (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/luni/build.xml Wed Aug  9 08:50:57 2006
@@ -268,9 +268,11 @@
     </target>
 
     <target name="-svn-prop">
-        <exec executable="svn" failifexecutionfails="false">
+        <exec executable="svn"
+              failifexecutionfails="false"
+              resultproperty="svn.rc">
             <arg value="info" />
-            <redirector outputproperty="svn.info">
+            <redirector outputproperty="svn.info.tmp">
                 <outputfilterchain>
                     <linecontainsregexp>
                         <regexp pattern="Repository Root:|Revision:" />
@@ -283,15 +285,15 @@
                 </outputfilterchain>
             </redirector>
         </exec>
-    </target>
-
-    <target name="-nosvn-prop">
+        <condition property="svn.info" value="${svn.info.tmp}" >
+            <equals arg1="${svn.rc}" arg2="0" />
+        </condition>
         <tstamp>
             <format property="svn.info" pattern="'Unknown revision built at' dd-MMM-yyyy
hh:mm aa"/>
         </tstamp>
     </target>
 
-    <target name="build.jar" depends="-svn-prop, -nosvn-prop">
+    <target name="build.jar" depends="-svn-prop">
         <jar destfile="${hy.jdk}/jre/lib/boot/luni.jar"
              manifest="${hy.luni}/META-INF/MANIFEST.MF">
             <fileset refid="classes" />



Mime
View raw message