You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@etch.apache.org by gr...@apache.org on 2010/09/17 15:24:17 UTC

svn commit: r998118 - in /incubator/etch/trunk: ./ binding-csharp/runtime/ binding-java/runtime/ build-support/ compiler/ examples/chat/ examples/distmap/ examples/example/ examples/perf/ scripts/ util/

Author: grandyho
Date: Fri Sep 17 13:24:16 2010
New Revision: 998118

URL: http://svn.apache.org/viewvc?rev=998118&view=rev
Log:
build now uses ETCH_EXTERNAL_DEPENDS environment variable to look for dependencies. 
Use "scripts/antsetup.bat" on Win32 to set up your command line before calling "ant Debug"
On Linux, just do export ETCH_EXTERNAL_DEPENDS=/path/to/some/folder

In ETCH_EXTERNAL_DEPENDS, you should have the following:

apache-ant/1.7.0/
apache-ant-dotnet/1.0/
javacc/4.0
junit/4.3.1
nsis/2.23
nunit/2.4.7
velocity/1.5

this resolves https://issues.apache.org/jira/browse/ETCH-90

Modified:
    incubator/etch/trunk/.classpath
    incubator/etch/trunk/README.txt
    incubator/etch/trunk/binding-csharp/runtime/build.xml
    incubator/etch/trunk/binding-java/runtime/build.xml
    incubator/etch/trunk/build-support/dependencies.xml
    incubator/etch/trunk/build-support/etch.common.xml
    incubator/etch/trunk/build.dependencies
    incubator/etch/trunk/build.xml
    incubator/etch/trunk/compiler/build.xml
    incubator/etch/trunk/examples/chat/build.xml
    incubator/etch/trunk/examples/distmap/build.xml
    incubator/etch/trunk/examples/example/build.xml
    incubator/etch/trunk/examples/perf/build.xml
    incubator/etch/trunk/scripts/README.txt
    incubator/etch/trunk/scripts/antsetup.bat
    incubator/etch/trunk/util/build.xml

Modified: incubator/etch/trunk/.classpath
URL: http://svn.apache.org/viewvc/incubator/etch/trunk/.classpath?rev=998118&r1=998117&r2=998118&view=diff
==============================================================================
--- incubator/etch/trunk/.classpath (original)
+++ incubator/etch/trunk/.classpath Fri Sep 17 13:24:16 2010
@@ -39,10 +39,6 @@
 	<classpathentry kind="src" path="binding-c/compiler/src/main/resources"/>
 	<classpathentry excluding="org/apache/etch/bindings/python/compiler/Compiler.java" kind="src" path="binding-python/compiler/src/main/java"/>
 	<classpathentry kind="src" path="binding-python/compiler/src/main/resources"/>
-	<classpathentry kind="src" path="interoptester/src/main/java"/>
-	<classpathentry kind="src" path="interoptester/src/test/java"/>
-	<classpathentry kind="src" path="interoptester/example/src/main/java"/>
-	<classpathentry kind="src" path="interoptester/example/target/generated-sources/main/etch/java"/>
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
 	<classpathentry kind="con" path="org.eclipse.jdt.USER_LIBRARY/ETCH_DEPENDENT_JARS"/>
 	<classpathentry kind="output" path="bin"/>

Modified: incubator/etch/trunk/README.txt
URL: http://svn.apache.org/viewvc/incubator/etch/trunk/README.txt?rev=998118&r1=998117&r2=998118&view=diff
==============================================================================
--- incubator/etch/trunk/README.txt (original)
+++ incubator/etch/trunk/README.txt Fri Sep 17 13:24:16 2010
@@ -123,9 +123,9 @@ etch-java-runtime-1.1.0.jar will be inst
 group "etch.etch", artifact id "etch-java-runtime", and version "1.1.0". You
 may then reference Etch from your maven projects.
 
-= C and Python Bindings =
+= Python and XML Bindings =
 
-The source distribution includes code to support c and python bindings, but
+The source distribution includes code to support XML and python bindings, but
 these bindings are not yet complete, and there is no build products associated
 with those. They are mainly there to 1) capture the code contribution from
 cisco systems, and 2) inspire any fence sitters, ah, helpers to jump in and

Modified: incubator/etch/trunk/binding-csharp/runtime/build.xml
URL: http://svn.apache.org/viewvc/incubator/etch/trunk/binding-csharp/runtime/build.xml?rev=998118&r1=998117&r2=998118&view=diff
==============================================================================
--- incubator/etch/trunk/binding-csharp/runtime/build.xml (original)
+++ incubator/etch/trunk/binding-csharp/runtime/build.xml Fri Sep 17 13:24:16 2010
@@ -99,20 +99,20 @@
     </target>
 
     <!-- TEST TARGET -->
-    <target name="build-test-with-mono" if="USE.mono" >
+    <target name="build-test-with-mono" if="USE.mono" unless="build.skip.tests">
         <echo message="TODO: build w/ mono" />
         <mdtool dir="${src}/test/csharp" project="EtchTestProj.csproj" />
     </target>
 
-    <target name="build-test-with-dotnet" if="USE.dotnet" >
+    <target name="build-test-with-dotnet" if="USE.dotnet" unless="build.skip.tests">
         <msbuild buildfile="${src}/test/csharp/EtchTestProj.csproj" >
             <property name="Configuration" value="${Etch.build.target}" />
         </msbuild>
     </target>
 
-    <target name="build-test-csharp" depends="build-test-with-mono,build-test-with-dotnet" />
+    <target name="build-test-csharp" depends="build-test-with-mono,build-test-with-dotnet" unless="build.skip.tests"/>
 
-    <target name="do-test" depends="build-test-csharp" if="USE.dotnet" >
+    <target name="do-test" depends="build-test-csharp" if="USE.dotnet" unless="build.skip.tests">
         <mkdir dir="${rawNUnitResults}" />
 
         <nunit xmlout="${rawNUnitResults}/NUnitResults.xml">

Modified: incubator/etch/trunk/binding-java/runtime/build.xml
URL: http://svn.apache.org/viewvc/incubator/etch/trunk/binding-java/runtime/build.xml?rev=998118&r1=998117&r2=998118&view=diff
==============================================================================
--- incubator/etch/trunk/binding-java/runtime/build.xml (original)
+++ incubator/etch/trunk/binding-java/runtime/build.xml Fri Sep 17 13:24:16 2010
@@ -226,8 +226,7 @@
     <target name="do-build" depends="generate-sources,compile-for-dist,compile-for-clover" />
 
     <!-- TEST TARGET -->
-    <target name="do-test">
-
+    <target name="do-test" unless="build.skip.tests">
         <!-- Run Unit Tests -->
         <junit printsummary="yes" haltonfailure="no" dir="${classesDirectory}"
             errorProperty="build.tests.fail" failureProperty="build.tests.fail">

Modified: incubator/etch/trunk/build-support/dependencies.xml
URL: http://svn.apache.org/viewvc/incubator/etch/trunk/build-support/dependencies.xml?rev=998118&r1=998117&r2=998118&view=diff
==============================================================================
--- incubator/etch/trunk/build-support/dependencies.xml (original)
+++ incubator/etch/trunk/build-support/dependencies.xml Fri Sep 17 13:24:16 2010
@@ -71,11 +71,36 @@
             </condition>
         </fail>        
     </target>
-    
-    <target name="check-dotnet" >
-        <echo message="ANT-DOTNET" />
+
+    <target name="check-dotnet" depends="check-dotnet-check" if="dotnet-missing-components">
+         <echo>       
+              *
+              *
+              *
+              ************************************************************************
+              WARNING: ant-dotnet-1.0.jar and/or msbuild.exe and/or nunit.exe is missing, 
+                       dotnet support will be disabled on your windows system.
+                       (please check scripts/antSetup.bat for correct paths)
+              ************************************************************************
+              *
+              *
+              *
+         </echo>
+    </target>
+
+    <target name="check-dotnet-check">
+            <condition property="dotnet-missing-components" value="true">
+             <and>
+             <os family="windows" />
+             <or>
+                <not><available file="${build.ant-dotnet.lib}/ant-dotnet-1.0.jar" /></not>
+                <not><available file="${env.DOTNET_HOME}/msbuild.exe" /></not>
+                <not><available file="${env.NUNIT_HOME}/bin/nunit.exe" /></not>
+             </or>
+             </and>
+            </condition>      
     </target>
     
-    <target name="check-all" depends="check-javacc,check-junit,check-velocity,check-dotnet" />
+    <target name="check-all" depends="check-javacc,check-junit,check-velocity, check-dotnet" />
 
 </project>

Modified: incubator/etch/trunk/build-support/etch.common.xml
URL: http://svn.apache.org/viewvc/incubator/etch/trunk/build-support/etch.common.xml?rev=998118&r1=998117&r2=998118&view=diff
==============================================================================
--- incubator/etch/trunk/build-support/etch.common.xml (original)
+++ incubator/etch/trunk/build-support/etch.common.xml Fri Sep 17 13:24:16 2010
@@ -23,6 +23,10 @@
     <property name="Etch.copyrightNotice"
 		value="Copyright © Apache Software Foundation 2009" />
 
+    <condition property="build.skip.tests">
+            <isset property="skip.tests" />
+    </condition>
+
     <!-- Load Environment -->
     <property environment="env" />
     <property file="${Etch.basedir}/build.dependencies" prefix="file" />
@@ -39,10 +43,13 @@
     <condition property="build.velocity.lib" value="${velocity.lib}" >
         <isset property="velocity.lib" />
     </condition>
+
+    <condition property="build.nsis.home" value="${nsis.home}" >
+        <isset property="nsis.home" />
+    </condition>
     
     <property file="${Etch.basedir}/build.dependencies" prefix="build" />
-    
-    
+
     <!-- Validate properties -->
     
     <!-- Compute top of tree -->
@@ -53,7 +60,6 @@
 
     <!-- load runtime properties -->
     <property prefix="Etch.property."      file="${Etch.basedir}/etch.properties" />
-    <property prefix="Etch.runtime."       file="${Etch.basedir}/bamboo.properties" />
     
     <!-- Compute version numbers -->
     <condition property="Etch.property.majorVersion" value="0">
@@ -157,7 +163,9 @@
     <condition property="USE.dotnet">
         <and>
             <os family="windows" />
-            <available file="${build.dotnet.home}/msbuild.exe" />
+            <available file="${env.DOTNET_HOME}/msbuild.exe" />
+            <available file="${build.ant-dotnet.lib}/ant-dotnet-1.0.jar" />
+            <available file="${env.NUNIT_HOME}/bin/nunit.exe" />
         </and>
     </condition>
     <condition property="USE.mono">

Modified: incubator/etch/trunk/build.dependencies
URL: http://svn.apache.org/viewvc/incubator/etch/trunk/build.dependencies?rev=998118&r1=998117&r2=998118&view=diff
==============================================================================
--- incubator/etch/trunk/build.dependencies (original)
+++ incubator/etch/trunk/build.dependencies Fri Sep 17 13:24:16 2010
@@ -19,27 +19,20 @@
 ## Core Dependencies .. these must be set
 ##
 
-javacc.home=${env.TOOLS_DIR}/javacc/4.0
-junit.lib=${env.TOOLS_DIR}/junit/4.3.1
-velocity.lib=${env.TOOLS_DIR}/velocity/1.5
+javacc.home=${env.ETCH_EXTERNAL_DEPENDS}/javacc/4.0
+junit.lib=${env.ETCH_EXTERNAL_DEPENDS}/junit/4.3.1
+velocity.lib=${env.ETCH_EXTERNAL_DEPENDS}/velocity/1.5
 
 ##
 ## Optional Dependencies
 ##
 
 ## NSIS
-nsis.home=${env.NSIS_HOME}
+nsis.home=${env.ETCH_EXTERNAL_DEPENDS}/nsis/2.23
 
 ## Clover
-clover.home=${env.CLOVER_HOME}
+clover.home=${env.ETCH_EXTERNAL_DEPENDS}/clover-ant/2.3.2
 
 ## Csharp support
-ant-dotnet.lib=${env.TOOLS_DIR}/apache-ant-dotnet/1.0
-nunit.home=${env.NUNIT_HOME}
-
-# Set to the .NET 2.0 framework install
-dotnet.home=${env.windir}/Microsoft.NET/Framework/v2.0.50727
-
-# MONO support still a bit flakey
-mono.home=${env.MONO_HOME}
+ant-dotnet.lib=${env.ETCH_EXTERNAL_DEPENDS}/apache-ant-dotnet/1.0
 

Modified: incubator/etch/trunk/build.xml
URL: http://svn.apache.org/viewvc/incubator/etch/trunk/build.xml?rev=998118&r1=998117&r2=998118&view=diff
==============================================================================
--- incubator/etch/trunk/build.xml (original)
+++ incubator/etch/trunk/build.xml Fri Sep 17 13:24:16 2010
@@ -140,29 +140,38 @@
     </target>    
 
     <!-- Component targets; Add to this set -->
+    <target name="component-all" depends="component-core, component-plugins, component-bindings, component-examples, component-tests, component-bundles" />
 
-    <target name="component-all" >
+    <target name="component-core" >
         <!-- Core -->
         <build_component dir="util" />
         <build_component dir="compiler" />
-        
+    </target>
+
+    <target name="component-plugins" >
         <!-- IDE/tool plugins -->
         <build_component dir="plugins/ant" />
-        
+    </target>
+
+    <target name="component-bindings">
         <!-- Bindings -->
         <build_component dir="binding-xml" />
         <build_component dir="binding-java" />
         <build_component dir="binding-csharp" />
         <build_component dir="binding-c" />
-        
+    </target>
+
+    <target name="component-examples">
         <!-- Examples -->
         <build_component dir="examples" />
-        
-        <!-- Functional Tests -->
-        <build_component dir="tests" />
-        
+    </target>
+
+    <target name="component-tests" unless="build.skip.tests">
+          <build_component dir="tests" />
+    </target>
+
+    <target name="component-bundles">
         <!-- Installer/zip Bundles -->
         <build_component dir="installers" />
     </target>
-
 </project>

Modified: incubator/etch/trunk/compiler/build.xml
URL: http://svn.apache.org/viewvc/incubator/etch/trunk/compiler/build.xml?rev=998118&r1=998117&r2=998118&view=diff
==============================================================================
--- incubator/etch/trunk/compiler/build.xml (original)
+++ incubator/etch/trunk/compiler/build.xml Fri Sep 17 13:24:16 2010
@@ -271,7 +271,7 @@
     <target name="do-build" depends="generate-sources,compile-for-dist,compile-for-clover" />
 
     <!-- TEST TARGET -->
-    <target name="do-test">
+    <target name="do-test" unless="build.skip.tests">
 
         <!-- Run Unit Tests -->
         <junit printsummary="yes" haltonfailure="no" dir="${classesDirectory}"

Modified: incubator/etch/trunk/examples/chat/build.xml
URL: http://svn.apache.org/viewvc/incubator/etch/trunk/examples/chat/build.xml?rev=998118&r1=998117&r2=998118&view=diff
==============================================================================
--- incubator/etch/trunk/examples/chat/build.xml (original)
+++ incubator/etch/trunk/examples/chat/build.xml Fri Sep 17 13:24:16 2010
@@ -52,7 +52,9 @@
     <condition property="USE.dotnet" >
         <and>
             <os family="windows" />
-            <available file="${env.windir}/Microsoft.NET/Framework/v2.0.50727/msbuild.exe" />
+            <available file="${env.DOTNET_HOME}/msbuild.exe" />
+            <available file="${build.ant-dotnet.lib}/ant-dotnet-1.0.jar" />
+            <available file="${env.NUNIT_HOME}/bin/nunit.exe" /> 
         </and>
     </condition>
     <condition property="USE.mono" >
@@ -216,7 +218,7 @@
 
     <!-- run unit tests -->
 
-    <target name="test-java" depends="build-java" >
+    <target name="test-java" depends="build-java" unless="build.skip.tests">
         <!-- Run Unit Tests -->
         <junit printsummary="yes" haltonfailure="no" dir="${classes-test}"
             errorProperty="build.tests.fail" failureProperty="build.tests.fail" >
@@ -234,7 +236,7 @@
         </junit>
     </target>
 
-    <target name="test-csharp" depends="build-csharp" if="BUILD.csharp" >
+    <target name="test-csharp" depends="build-csharp" if="BUILD.csharp" unless="build.skip.tests">
          <nunit xmlout="${nunit-results}/NUnitResults.xml" >
              <testassembly name="${src}/test/csharp/ChatTestProj/bin/${build.target}/ChatTestProj.dll" />
          </nunit>

Modified: incubator/etch/trunk/examples/distmap/build.xml
URL: http://svn.apache.org/viewvc/incubator/etch/trunk/examples/distmap/build.xml?rev=998118&r1=998117&r2=998118&view=diff
==============================================================================
--- incubator/etch/trunk/examples/distmap/build.xml (original)
+++ incubator/etch/trunk/examples/distmap/build.xml Fri Sep 17 13:24:16 2010
@@ -52,7 +52,9 @@
     <condition property="USE.dotnet" >
         <and>
             <os family="windows" />
-            <available file="${env.windir}/Microsoft.NET/Framework/v2.0.50727/msbuild.exe" />
+            <available file="${env.DOTNET_HOME}/msbuild.exe" />
+            <available file="${build.ant-dotnet.lib}/ant-dotnet-1.0.jar" />
+            <available file="${env.NUNIT_HOME}/bin/nunit.exe" />
         </and>
     </condition>
     <condition property="USE.mono" >
@@ -216,7 +218,7 @@
 
     <!-- run unit tests -->
 
-    <target name="test-java" depends="build-java" >
+    <target name="test-java" depends="build-java" unless="build.skip.tests">
         <!-- Run Unit Tests -->
         <junit printsummary="yes" haltonfailure="no" dir="${classes-test}"
             errorProperty="build.tests.fail" failureProperty="build.tests.fail" >
@@ -234,7 +236,7 @@
         </junit>
     </target>
 
-    <target name="test-csharp" depends="build-csharp" if="BUILD.csharp" >
+    <target name="test-csharp" depends="build-csharp" if="BUILD.csharp" unless="build.skip.tests">
          <nunit xmlout="${nunit-results}/NUnitResults.xml">
              <testassembly name="${src}/test/csharp/DistMapTestProj/bin/${build.target}/DistMapTestProj.dll" />
          </nunit>

Modified: incubator/etch/trunk/examples/example/build.xml
URL: http://svn.apache.org/viewvc/incubator/etch/trunk/examples/example/build.xml?rev=998118&r1=998117&r2=998118&view=diff
==============================================================================
--- incubator/etch/trunk/examples/example/build.xml (original)
+++ incubator/etch/trunk/examples/example/build.xml Fri Sep 17 13:24:16 2010
@@ -52,7 +52,9 @@
     <condition property="USE.dotnet" >
         <and>
             <os family="windows" />
-            <available file="${env.windir}/Microsoft.NET/Framework/v2.0.50727/msbuild.exe" />
+            <available file="${env.DOTNET_HOME}/msbuild.exe" />
+            <available file="${build.ant-dotnet.lib}/ant-dotnet-1.0.jar" />
+            <available file="${env.NUNIT_HOME}/bin/nunit.exe" />
         </and>
     </condition>
     <condition property="USE.mono" >
@@ -216,7 +218,7 @@
 
     <!-- run unit tests -->
 
-    <target name="test-java" depends="build-java" >
+    <target name="test-java" depends="build-java" unless="build.skip.tests">
         <!-- Run Unit Tests -->
         <junit printsummary="yes" haltonfailure="no" dir="${classes-test}"
             errorProperty="build.tests.fail" failureProperty="build.tests.fail" >
@@ -234,7 +236,7 @@
         </junit>
     </target>
 
-    <target name="test-csharp" depends="build-csharp" if="BUILD.csharp" >
+    <target name="test-csharp" depends="build-csharp" if="BUILD.csharp" unless="build.skip.tests">
          <nunit xmlout="${nunit-results}/NUnitResults.xml">
              <testassembly name="${src}/test/csharp/ExampleTestProj/bin/${build.target}/ExampleTestProj.dll" />
          </nunit>

Modified: incubator/etch/trunk/examples/perf/build.xml
URL: http://svn.apache.org/viewvc/incubator/etch/trunk/examples/perf/build.xml?rev=998118&r1=998117&r2=998118&view=diff
==============================================================================
--- incubator/etch/trunk/examples/perf/build.xml (original)
+++ incubator/etch/trunk/examples/perf/build.xml Fri Sep 17 13:24:16 2010
@@ -52,7 +52,9 @@
     <condition property="USE.dotnet" >
         <and>
             <os family="windows" />
-            <available file="${env.windir}/Microsoft.NET/Framework/v2.0.50727/msbuild.exe" />
+            <available file="${env.DOTNET_HOME}/msbuild.exe" />
+            <available file="${build.ant-dotnet.lib}/ant-dotnet-1.0.jar" />
+            <available file="${env.NUNIT_HOME}/bin/nunit.exe" />
         </and>
     </condition>
     <condition property="USE.mono" >
@@ -216,7 +218,7 @@
 
     <!-- run unit tests -->
 
-    <target name="test-java" depends="build-java" >
+    <target name="test-java" depends="build-java" unless="build.skip.tests">
         <!-- Run Unit Tests -->
         <junit printsummary="yes" haltonfailure="no" dir="${classes-test}"
             errorProperty="build.tests.fail" failureProperty="build.tests.fail" >

Modified: incubator/etch/trunk/scripts/README.txt
URL: http://svn.apache.org/viewvc/incubator/etch/trunk/scripts/README.txt?rev=998118&r1=998117&r2=998118&view=diff
==============================================================================
--- incubator/etch/trunk/scripts/README.txt (original)
+++ incubator/etch/trunk/scripts/README.txt Fri Sep 17 13:24:16 2010
@@ -1,15 +1,5 @@
-These scripts and launch configurations are used in conjunction with eclipse.
+antSetup.bat should be used to prepare your command line environment for a ant build
+of the whole system.
 
-NOTE: These are windows versions. If you are using unix, you'll have to come up
-with your own versions of these.
-
-In order for these scripts to work properly, you also need to add a variable to
-your environment before starting eclipse:
-
-ETCH_DEPENDENT_JARS=C:\workspace-etch\tools\velocity\1.5\velocity-dep-1.5.jar
-
-If you're using clover, you'll need to add clover to that:
-
-ETCH_DEPENDENT_JARS=C:\workspace-etch\tools\velocity\1.5\velocity-dep-1.5.jar;C:\workspace-etch\tools\clover-ant\2.3.2\lib\clover.jar
-
-In the above, please edit the path as appropriate for your local environment.
+The other scripts and launch configurations are used in conjunction with eclipse.
+see ..\BUILD.txt for more detailed instructions on how to build using eclipse.

Modified: incubator/etch/trunk/scripts/antsetup.bat
URL: http://svn.apache.org/viewvc/incubator/etch/trunk/scripts/antsetup.bat?rev=998118&r1=998117&r2=998118&view=diff
==============================================================================
--- incubator/etch/trunk/scripts/antsetup.bat (original)
+++ incubator/etch/trunk/scripts/antsetup.bat Fri Sep 17 13:24:16 2010
@@ -15,36 +15,13 @@
 @rem  specific language governing permissions and limitations      *
 @rem  under the License.                                           *
 
-rem -- java builds --
 
-set TOOLS_DIR=C:\wks\tools
-set ANT_HOME=%TOOLS_DIR%\apache-ant\1.7.0
-rem set JAVA_HOME=C:\Program Files\Java\jdk1.6.0_06
-rem optional
-rem set CLOVER_HOME=%TOOLS_DIR%\clover-ant\2.3.2
-rem /optional
-PATH %ANT_HOME%\bin;%JAVA_HOME%\bin;%PATH%
+IF "%ETCH_EXTERNAL_DEPENDS%" == "" set ETCH_EXTERNAL_DEPENDS=C:\etch-external-depends\
+set ANT_HOME=%ETCH_EXTERNAL_DEPENDS%\apache-ant\1.7.0
+set JAVA_HOME=c:\Program Files (x86)\Java\jdk1.6.0_18\
+set NUNIT_HOME=%ETCH_EXTERNAL_DEPENDS%\NUnit\2.4.7
 
-rem -- dotnet builds --
-
-rem optional
+rem uncomment this line / unset this variable if you don't want to build csharp
 set DOTNET_HOME=C:\WINDOWS\Microsoft.NET\Framework\v2.0.50727
-set NUNIT_HOME=%TOOLS_DIR%\NUnit\2.4.7
-PATH %DOTNET_HOME%;%NUNIT_HOME%\bin;%PATH%
-rem /optional
-
-rem -- mono builds --
-
-rem optional
-rem set MONO_HOME=...
-rem /optional
-
-rem -- installer builds --
-
-rem optional
-set NSIS_HOME=%TOOLS_DIR%\nsis\2.23
-rem /optional
-
-rem -- standalone example builds --
 
-rem set ETCH_HOME=...
+set PATH=%ANT_HOME%\bin;%JAVA_HOME%\bin;%DOTNET_HOME%;%NUNIT_HOME%\bin;%PATH%

Modified: incubator/etch/trunk/util/build.xml
URL: http://svn.apache.org/viewvc/incubator/etch/trunk/util/build.xml?rev=998118&r1=998117&r2=998118&view=diff
==============================================================================
--- incubator/etch/trunk/util/build.xml (original)
+++ incubator/etch/trunk/util/build.xml Fri Sep 17 13:24:16 2010
@@ -242,8 +242,7 @@
     <target name="do-build" depends="generate-sources,compile-for-dist,compile-for-clover" />
 
     <!-- TEST TARGET -->
-    <target name="do-test">
-        
+    <target name="do-test" unless="build.skip.tests">
         <!-- Run Unit Tests -->
         <junit printsummary="yes" haltonfailure="no" dir="${classesDirectory}"
             errorProperty="build.tests.fail" failureProperty="build.tests.fail">