harmony-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From hinde...@apache.org
Subject svn commit: r462856 - in /incubator/harmony/enhanced/drlvm/trunk/build/make: build.xml components/vm/vmcore.xml
Date Wed, 11 Oct 2006 17:00:45 GMT
Author: hindessm
Date: Wed Oct 11 10:00:44 2006
New Revision: 462856

URL: http://svn.apache.org/viewvc?view=rev&rev=462856
Log:
Applied patch from "[#HARMONY-1083] [drlvm][build] Avoid touching
svn_version_tag.h if svn information is not available".

Modified:
    incubator/harmony/enhanced/drlvm/trunk/build/make/build.xml
    incubator/harmony/enhanced/drlvm/trunk/build/make/components/vm/vmcore.xml

Modified: incubator/harmony/enhanced/drlvm/trunk/build/make/build.xml
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/drlvm/trunk/build/make/build.xml?view=diff&rev=462856&r1=462855&r2=462856
==============================================================================
--- incubator/harmony/enhanced/drlvm/trunk/build/make/build.xml (original)
+++ incubator/harmony/enhanced/drlvm/trunk/build/make/build.xml Wed Oct 11 10:00:44 2006
@@ -323,7 +323,11 @@
         <ant antfile="setup.xml" target="setup" inheritall="true" />
     </target>
 
-    <target name="svn-prop">
+    <target name="svn-detect">
+      <available file=".svn" type="dir" property="svn.available"/>
+    </target>
+
+    <target name="svn-prop" depends="svn-detect" if="svn.available">
         <exec executable="svn">
             <arg value="info" />
             <redirector outputproperty="svn.revision">

Modified: incubator/harmony/enhanced/drlvm/trunk/build/make/components/vm/vmcore.xml
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/drlvm/trunk/build/make/components/vm/vmcore.xml?view=diff&rev=462856&r1=462855&r2=462856
==============================================================================
--- incubator/harmony/enhanced/drlvm/trunk/build/make/components/vm/vmcore.xml (original)
+++ incubator/harmony/enhanced/drlvm/trunk/build/make/components/vm/vmcore.xml Wed Oct 11
10:00:44 2006
@@ -26,7 +26,17 @@
   -->
 
 <project name="vm.vmcore">
-    <target name="init" depends="common_vm">
+
+    <target name="stamp_version" depends="common_vm" if="svn.revision">
+        <copy file="${build.vm.home}/vmcore/include/version_svn_tag_orig.h"
+              tofile="${build.vm.home}/vmcore/include/version_svn_tag.h" overwrite="true">
+            <filterset>
+                <filter token="svn.revision" value="${svn.revision}"/>
+            </filterset>
+        </copy>
+    </target>
+
+    <target name="init" depends="common_vm, stamp_version">
         <property name="build.depends" value="extra.apr,
                                               extra.aprutil,
                                               extra.log4cxx,
@@ -37,13 +47,6 @@
         <property name="libname" value="harmonyvm" />
         <property name="outtype" value="shared" />
         <property name="src" location="${build.vm.home}" />
-
-        <copy file="${build.vm.home}/vmcore/include/version_svn_tag_orig.h"
-              tofile="${build.vm.home}/vmcore/include/version_svn_tag.h" overwrite="true">
-            <filterset>
-                <filter token="svn.revision" value="${svn.revision}"/>
-            </filterset>
-        </copy>
 
         <compiler id="c.compiler" extends="common.c.compiler">
             <includepath>



Mime
View raw message