You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@harmony.apache.org by ge...@apache.org on 2006/07/21 21:55:57 UTC
svn commit: r424438 - in /incubator/harmony/enhanced/drlvm/trunk/build/make:
build.xml components/extra.xml components/extra/hello.xml
components/vm/vmcore.xml deploy.xml
Author: geirm
Date: Fri Jul 21 12:55:57 2006
New Revision: 424438
URL: http://svn.apache.org/viewvc?rev=424438&view=rev
Log:
changes :
1) support for svn-stamping the binary for use w/ -version
2) get rid of the Hello program
3) tweaks to build for clean
Removed:
incubator/harmony/enhanced/drlvm/trunk/build/make/components/extra/hello.xml
Modified:
incubator/harmony/enhanced/drlvm/trunk/build/make/build.xml
incubator/harmony/enhanced/drlvm/trunk/build/make/components/extra.xml
incubator/harmony/enhanced/drlvm/trunk/build/make/components/vm/vmcore.xml
incubator/harmony/enhanced/drlvm/trunk/build/make/deploy.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?rev=424438&r1=424437&r2=424438&view=diff
==============================================================================
--- incubator/harmony/enhanced/drlvm/trunk/build/make/build.xml (original)
+++ incubator/harmony/enhanced/drlvm/trunk/build/make/build.xml Fri Jul 21 12:55:57 2006
@@ -54,6 +54,8 @@
<project name="build" default="build">
+ <property name="canonical.deploy.dir" location="../deploy" />
+
<!-- ===============================================================
Define locations of external dependencies
================================================================== -->
@@ -221,8 +223,6 @@
<!-- product binary deploy location -->
<property name="build.deploy.dir" location="../${build.os.short}_${build.arch}_${build.cxx}_${build.cfg}/deploy/jre" />
- <property name="canonical.deploy.dir" location="../deploy" />
-
<!-- product doc deploy location -->
<property name="build.deploy.doc.dir" location="../${build.os.short}_${build.arch}_${build.cxx}_${build.cfg}/docs" />
</target>
@@ -314,10 +314,27 @@
<echo message=" components = ${COMPONENTS}" />
</target>
- <target name="setup" depends="extern_dep,detect.os.arch.cxx.cfg, set.semis.dirs">
+ <target name="setup" depends="svn-prop,extern_dep,detect.os.arch.cxx.cfg, set.semis.dirs">
<ant antfile="setup.xml" target="setup" inheritall="true" />
</target>
+ <target name="svn-prop">
+ <exec executable="svn">
+ <arg value="--non-interactive" />
+ <arg value="info" />
+ <redirector outputproperty="svn.revision">
+ <outputfilterchain>
+ <linecontains>
+ <contains value="Revision: " />
+ </linecontains>
+ <tokenfilter>
+ <replacestring from="Revision: " to=""/>
+ </tokenfilter>
+ </outputfilterchain>
+ </redirector>
+ </exec>
+ </target>
+
<!-- Main target for building components -->
<target name="build" depends="setup, init, set.target.to.build,
process.components, fill.up.deploy,
@@ -406,6 +423,7 @@
<delete dir="../${build.os.short}_${build.arch}_${build.cxx}_${build.cfg}/harmony" failonerror="false" />
<delete dir="../${build.os.short}_${build.arch}_${build.cxx}_${build.cfg}/deploy" failonerror="false" />
<delete dir="../${build.os.short}_${build.arch}_${build.cxx}_${build.cfg}/semis" failonerror="false" />
+ <delete dir="${canonical.deploy.dir}" failonerror="false"/>
</target>
<!-- put the rest of product (everything but components' output) to the deploy directory -->
Modified: incubator/harmony/enhanced/drlvm/trunk/build/make/components/extra.xml
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/drlvm/trunk/build/make/components/extra.xml?rev=424438&r1=424437&r2=424438&view=diff
==============================================================================
--- incubator/harmony/enhanced/drlvm/trunk/build/make/components/extra.xml (original)
+++ incubator/harmony/enhanced/drlvm/trunk/build/make/components/extra.xml Fri Jul 21 12:55:57 2006
@@ -31,7 +31,6 @@
extra.apriconv,
extra.aprutil,
extra.eclipse_script,
- extra.hello,
extra.hyplugin,
extra.java_script,
extra.jre_libraries,
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?rev=424438&r1=424437&r2=424438&view=diff
==============================================================================
--- incubator/harmony/enhanced/drlvm/trunk/build/make/components/vm/vmcore.xml (original)
+++ incubator/harmony/enhanced/drlvm/trunk/build/make/components/vm/vmcore.xml Fri Jul 21 12:55:57 2006
@@ -37,6 +37,14 @@
<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="cpp.compiler" extends="common.cpp.compiler">
<fileset dir="${build.vm.home}/vmcore/src">
<include name="class_support/*.cpp" />
Modified: incubator/harmony/enhanced/drlvm/trunk/build/make/deploy.xml
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/drlvm/trunk/build/make/deploy.xml?rev=424438&r1=424437&r2=424438&view=diff
==============================================================================
--- incubator/harmony/enhanced/drlvm/trunk/build/make/deploy.xml (original)
+++ incubator/harmony/enhanced/drlvm/trunk/build/make/deploy.xml Fri Jul 21 12:55:57 2006
@@ -102,8 +102,5 @@
</select>
</java_script>
- <hello>
- <other>bin:Hello.class</other>
- </hello>
</extra>
</deploy>