You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@etch.apache.org by di...@apache.org on 2009/02/05 19:57:19 UTC
svn commit: r741243 - in /incubator/etch/trunk/examples: build.xml
chat/build.xml chat/dist-build.xml distmap/build.xml distmap/dist-build.xml
example/build.xml example/dist-build.xml perf/build.xml perf/dist-build.xml
Author: dixson
Date: Thu Feb 5 18:57:18 2009
New Revision: 741243
URL: http://svn.apache.org/viewvc?rev=741243&view=rev
Log:
ETCH-51 -- make examples more tolerant of verison changes
Modified:
incubator/etch/trunk/examples/build.xml
incubator/etch/trunk/examples/chat/build.xml
incubator/etch/trunk/examples/chat/dist-build.xml
incubator/etch/trunk/examples/distmap/build.xml
incubator/etch/trunk/examples/distmap/dist-build.xml
incubator/etch/trunk/examples/example/build.xml
incubator/etch/trunk/examples/example/dist-build.xml
incubator/etch/trunk/examples/perf/build.xml
incubator/etch/trunk/examples/perf/dist-build.xml
Modified: incubator/etch/trunk/examples/build.xml
URL: http://svn.apache.org/viewvc/incubator/etch/trunk/examples/build.xml?rev=741243&r1=741242&r2=741243&view=diff
==============================================================================
--- incubator/etch/trunk/examples/build.xml (original)
+++ incubator/etch/trunk/examples/build.xml Thu Feb 5 18:57:18 2009
@@ -7,6 +7,7 @@
<property name="target" location="${basedir}/target" />
<target name="do-clean">
+ <delete dir="${target}" failonerror="false" quiet="true" />
</target>
<target name="do-init">
Modified: incubator/etch/trunk/examples/chat/build.xml
URL: http://svn.apache.org/viewvc/incubator/etch/trunk/examples/chat/build.xml?rev=741243&r1=741242&r2=741243&view=diff
==============================================================================
--- incubator/etch/trunk/examples/chat/build.xml (original)
+++ incubator/etch/trunk/examples/chat/build.xml Thu Feb 5 18:57:18 2009
@@ -22,7 +22,7 @@
<property name="Etch.buildSupportDirectory" location="../../build-support" />
<!-- compute etch.version -->
- <condition property="etch.version" value="1.1.0" >
+ <condition property="etch.version" value="${Etch.version}" >
<not><isset property="etch.version" /></not>
</condition>
@@ -213,7 +213,7 @@
</target>
<target name="test-csharp" depends="build-csharp" if="BUILD.csharp" >
- <nunit xmlout="${nunit-results}/NUnitResults.xml">
+ <nunit xmlout="${nunit-results}/NUnitResults.xml" >
<testassembly name="${src}/test/csharp/ChatTestProj/bin/${build.target}/ChatTestProj.dll" />
</nunit>
@@ -262,7 +262,9 @@
</target>
<target name="dist-src" >
- <copy file="dist-build.xml" tofile="${dist-src}/build.xml" overwrite="true" />
+ <copy file="dist-build.xml" tofile="${dist-src}/build.xml" overwrite="true" >
+ <filterset refid="Etch.buildTokens" />
+ </copy>
<copy file="dist-README.txt" tofile="${dist-src}/README.txt" overwrite="true" />
<copy todir="${dist-src}/src/main/etch" overwrite="true" >
Modified: incubator/etch/trunk/examples/chat/dist-build.xml
URL: http://svn.apache.org/viewvc/incubator/etch/trunk/examples/chat/dist-build.xml?rev=741243&r1=741242&r2=741243&view=diff
==============================================================================
--- incubator/etch/trunk/examples/chat/dist-build.xml (original)
+++ incubator/etch/trunk/examples/chat/dist-build.xml Thu Feb 5 18:57:18 2009
@@ -3,7 +3,7 @@
<description>Chat Example</description>
<property name="etch.home" location="${basedir}/../.."/>
- <property name="etch.version" value="1.1.0"/>
+ <property name="etch.version" value="@EtchVersion@"/>
<property name="etch-java-runtime-name" value="etch-java-runtime-${etch.version}.jar"/>
<property name="etch-ant-plugin.jar" location="${etch.home}/lib/etch-ant-plugin-${etch.version}.jar"/>
@@ -26,7 +26,7 @@
</condition>
<taskdef
- resource="org/apache/etch/tools/ant/etch.xml"
+ resource="org/apache/etch/tools/ant/etch.xml"
classpath="${etch-ant-plugin.jar}"/>
<target name="build" depends="build-java, build-csharp, done"/>
Modified: incubator/etch/trunk/examples/distmap/build.xml
URL: http://svn.apache.org/viewvc/incubator/etch/trunk/examples/distmap/build.xml?rev=741243&r1=741242&r2=741243&view=diff
==============================================================================
--- incubator/etch/trunk/examples/distmap/build.xml (original)
+++ incubator/etch/trunk/examples/distmap/build.xml Thu Feb 5 18:57:18 2009
@@ -22,7 +22,7 @@
<property name="Etch.buildSupportDirectory" location="../../build-support" />
<!-- compute etch.version -->
- <condition property="etch.version" value="1.1.0" >
+ <condition property="etch.version" value="${Etch.version}" >
<not><isset property="etch.version" /></not>
</condition>
@@ -256,8 +256,10 @@
<property name="build.target" value="Release" />
</target>
- <target name="dist-src" >
- <copy file="dist-build.xml" tofile="${dist-src}/build.xml" overwrite="true" />
+ <target name="dist-src" >
+ <copy file="dist-build.xml" tofile="${dist-src}/build.xml" overwrite="true" >
+ <filterset refid="Etch.buildTokens" />
+ </copy>
<copy file="dist-README.txt" tofile="${dist-src}/README.txt" overwrite="true" />
<copy todir="${dist-src}/src/main/etch" overwrite="true" >
Modified: incubator/etch/trunk/examples/distmap/dist-build.xml
URL: http://svn.apache.org/viewvc/incubator/etch/trunk/examples/distmap/dist-build.xml?rev=741243&r1=741242&r2=741243&view=diff
==============================================================================
--- incubator/etch/trunk/examples/distmap/dist-build.xml (original)
+++ incubator/etch/trunk/examples/distmap/dist-build.xml Thu Feb 5 18:57:18 2009
@@ -3,7 +3,7 @@
<description>Distributed Map Example</description>
<property name="etch.home" location="${basedir}/../.."/>
- <property name="etch.version" value="1.1.0"/>
+ <property name="etch.version" value="@EtchVersion@"/>
<property name="etch-java-runtime-name" value="etch-java-runtime-${etch.version}.jar"/>
<property name="etch-ant-plugin.jar" location="${etch.home}/lib/etch-ant-plugin-${etch.version}.jar"/>
Modified: incubator/etch/trunk/examples/example/build.xml
URL: http://svn.apache.org/viewvc/incubator/etch/trunk/examples/example/build.xml?rev=741243&r1=741242&r2=741243&view=diff
==============================================================================
--- incubator/etch/trunk/examples/example/build.xml (original)
+++ incubator/etch/trunk/examples/example/build.xml Thu Feb 5 18:57:18 2009
@@ -22,7 +22,7 @@
<property name="Etch.buildSupportDirectory" location="../../build-support" />
<!-- compute etch.version -->
- <condition property="etch.version" value="1.1.0" >
+ <condition property="etch.version" value="${Etch.version}" >
<not><isset property="etch.version" /></not>
</condition>
@@ -229,7 +229,7 @@
Build Complete!
-To run java example, open a cmd window and run these
+To run java example example, open a cmd window and run these
commands:
> cd target\bin
@@ -257,9 +257,11 @@
<target name="init-release" >
<property name="build.target" value="Release" />
</target>
-
+
<target name="dist-src" >
- <copy file="dist-build.xml" tofile="${dist-src}/build.xml" overwrite="true" />
+ <copy file="dist-build.xml" tofile="${dist-src}/build.xml" overwrite="true" >
+ <filterset refid="Etch.buildTokens" />
+ </copy>
<copy file="dist-README.txt" tofile="${dist-src}/README.txt" overwrite="true" />
<copy todir="${dist-src}/src/main/etch" overwrite="true" >
Modified: incubator/etch/trunk/examples/example/dist-build.xml
URL: http://svn.apache.org/viewvc/incubator/etch/trunk/examples/example/dist-build.xml?rev=741243&r1=741242&r2=741243&view=diff
==============================================================================
--- incubator/etch/trunk/examples/example/dist-build.xml (original)
+++ incubator/etch/trunk/examples/example/dist-build.xml Thu Feb 5 18:57:18 2009
@@ -3,7 +3,7 @@
<description>Example Example</description>
<property name="etch.home" location="${basedir}/../.."/>
- <property name="etch.version" value="1.1.0"/>
+ <property name="etch.version" value="@EtchVersion@"/>
<property name="etch-java-runtime-name" value="etch-java-runtime-${etch.version}.jar"/>
<property name="etch-ant-plugin.jar" location="${etch.home}/lib/etch-ant-plugin-${etch.version}.jar"/>
Modified: incubator/etch/trunk/examples/perf/build.xml
URL: http://svn.apache.org/viewvc/incubator/etch/trunk/examples/perf/build.xml?rev=741243&r1=741242&r2=741243&view=diff
==============================================================================
--- incubator/etch/trunk/examples/perf/build.xml (original)
+++ incubator/etch/trunk/examples/perf/build.xml Thu Feb 5 18:57:18 2009
@@ -22,7 +22,7 @@
<property name="Etch.buildSupportDirectory" location="../../build-support" />
<!-- compute etch.version -->
- <condition property="etch.version" value="1.1.0" >
+ <condition property="etch.version" value="${Etch.version}" >
<not><isset property="etch.version" /></not>
</condition>
@@ -256,8 +256,10 @@
<property name="build.target" value="Release" />
</target>
- <target name="dist-src" >
- <copy file="dist-build.xml" tofile="${dist-src}/build.xml" overwrite="true" />
+ <target name="dist-src" >
+ <copy file="dist-build.xml" tofile="${dist-src}/build.xml" overwrite="true" >
+ <filterset refid="Etch.buildTokens" />
+ </copy>
<copy file="dist-README.txt" tofile="${dist-src}/README.txt" overwrite="true" />
<copy todir="${dist-src}/src/main/etch" overwrite="true" >
Modified: incubator/etch/trunk/examples/perf/dist-build.xml
URL: http://svn.apache.org/viewvc/incubator/etch/trunk/examples/perf/dist-build.xml?rev=741243&r1=741242&r2=741243&view=diff
==============================================================================
--- incubator/etch/trunk/examples/perf/dist-build.xml (original)
+++ incubator/etch/trunk/examples/perf/dist-build.xml Thu Feb 5 18:57:18 2009
@@ -3,7 +3,7 @@
<description>Perf Perf</description>
<property name="etch.home" location="${basedir}/../.."/>
- <property name="etch.version" value="1.1.0"/>
+ <property name="etch.version" value="@EtchVersion@"/>
<property name="etch-java-runtime-name" value="etch-java-runtime-${etch.version}.jar"/>
<property name="etch-ant-plugin.jar" location="${etch.home}/lib/etch-ant-plugin-${etch.version}.jar"/>