You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@etch.apache.org by fi...@apache.org on 2010/11/15 17:03:36 UTC
svn commit: r1035328 - /incubator/etch/trunk/scripts/antsetup.bat
Author: fitzner
Date: Mon Nov 15 16:03:36 2010
New Revision: 1035328
URL: http://svn.apache.org/viewvc?rev=1035328&view=rev
Log:
[ETCH-116] Change \scripts\antsetup.bat so external ENV variables are also handled
Modified:
incubator/etch/trunk/scripts/antsetup.bat
Modified: incubator/etch/trunk/scripts/antsetup.bat
URL: http://svn.apache.org/viewvc/incubator/etch/trunk/scripts/antsetup.bat?rev=1035328&r1=1035327&r2=1035328&view=diff
==============================================================================
--- incubator/etch/trunk/scripts/antsetup.bat (original)
+++ incubator/etch/trunk/scripts/antsetup.bat Mon Nov 15 16:03:36 2010
@@ -16,15 +16,31 @@
@rem under the License. *
@echo off
+@rem ETCH_EXTERNAL_DEPENDS settings
IF "%ETCH_EXTERNAL_DEPENDS%" == "" (
set ETCH_EXTERNAL_DEPENDS=C:\etch\external
)
-
set ANT_HOME=%ETCH_EXTERNAL_DEPENDS%\apache-ant\1.7.0
-set JAVA_HOME=c:\Program Files (x86)\Java\jdk1.6.0_18\
+
+@rem JAVA_HOME settings
+IF "%JAVA_HOME%" == "" (
+set JAVA_HOME="c:\Program Files (x86)\Java\jdk1.6.0_18\"
+)
+
+@rem NUNIT_HOME settings
+IF "%NUNIT_HOME%" == "" (
set NUNIT_HOME=%ETCH_EXTERNAL_DEPENDS%\NUnit\2.4.7
+)
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 PATH=%ANT_HOME%\bin;%JAVA_HOME%\bin;%DOTNET_HOME%;%NUNIT_HOME%\bin;%PATH%
+
+@echo ==================================================
+@echo Etch Configuration
+@echo ==================================================
+@echo ETCH_EXTERNAL_DEPENDS: %ETCH_EXTERNAL_DEPENDS%
+@echo ANT_HOME: %ANT_HOME%
+@echo JAVA_HOME: %JAVA_HOME%
+@echo ==================================================