You are viewing a plain text version of this content. The canonical link for it is here.
Posted to easyant-commits@incubator.apache.org by hi...@apache.org on 2011/08/06 14:06:34 UTC
svn commit: r1154522 - in /incubator/easyant/core/trunk/bin: easyant
easyant.bat
Author: hibou
Date: Sat Aug 6 14:06:34 2011
New Revision: 1154522
URL: http://svn.apache.org/viewvc?rev=1154522&view=rev
Log:
IP cleanup: revert of easyant svn commit r534
Modified:
incubator/easyant/core/trunk/bin/easyant
incubator/easyant/core/trunk/bin/easyant.bat
Modified: incubator/easyant/core/trunk/bin/easyant
URL: http://svn.apache.org/viewvc/incubator/easyant/core/trunk/bin/easyant?rev=1154522&r1=1154521&r2=1154522&view=diff
==============================================================================
--- incubator/easyant/core/trunk/bin/easyant (original)
+++ incubator/easyant/core/trunk/bin/easyant Sat Aug 6 14:06:34 2011
@@ -230,22 +230,7 @@ if [ ! -x "$JAVACMD" ] ; then
exit 1
fi
-# use Ivy to compute bootstrap classpath
-IVY_VERSION=2.1.0-patched
-IVY_REPOSITORY_PATH=$(normalize_path "${EASYANT_HOME}/repository")
-IVY_JAR=$(normalize_path "${IVY_REPOSITORY_PATH}/third-party-lib/org.apache.ivy/ivy/${IVY_VERSION}/ivy.jar")
-IVY_BOOTSTRAP_CACHE=$(normalize_path "${IVY_REPOSITORY_PATH}/bootstrap-cache")
-
-# default to latest version of easyant in the repository
-EASYANT_VERSION=latest.integration
-
-ivy_exec_command="\"$JAVACMD\" -jar \"${IVY_JAR}\" -dependency org.apache.easyant easyant-core ${EASYANT_VERSION} -confs extra -cachepath \"${IVY_BOOTSTRAP_CACHE}/easyant.path\" -settings \"${IVY_REPOSITORY_PATH}/third-party-lib/third-party-ivysettings.xml\" -cache \"${IVY_BOOTSTRAP_CACHE}\""
-if $ant_exec_debug ; then
- echo $ivy_exec_command
-fi
-eval $ivy_exec_command
-
-EASYANT_BOOTSTRAP_PATH=$(cat ${IVY_BOOTSTRAP_CACHE}/easyant.path)
+EASYANT_BOOTSTRAP_PATH="@unix.dist.path@"
# prepend custom ant launcher if requested.
if $use_custom_ant; then
Modified: incubator/easyant/core/trunk/bin/easyant.bat
URL: http://svn.apache.org/viewvc/incubator/easyant/core/trunk/bin/easyant.bat?rev=1154522&r1=1154521&r2=1154522&view=diff
==============================================================================
--- incubator/easyant/core/trunk/bin/easyant.bat (original)
+++ incubator/easyant/core/trunk/bin/easyant.bat Sat Aug 6 14:06:34 2011
@@ -156,18 +156,7 @@ if "%_JAVACMD%" == "" set _JAVACMD=java.
:checkJikes
if not "%JIKESPATH%"=="" goto runAntWithJikes
-rem use Ivy to compute bootstrap classpath
-set IVY_VERSION=2.1.0-patched
-set IVY_REPOSITORY_PATH=%EASYANT_HOME%\repository
-set IVY_JAR=%IVY_REPOSITORY_PATH%\third-party-lib\org.apache.ivy\ivy\%IVY_VERSION%\ivy.jar
-set IVY_BOOTSTRAP_CACHE=%IVY_REPOSITORY_PATH%\bootstrap-cache
-
-rem default to latest version of easyant in the repository
-set EASYANT_VERSION=latest.integration
-
-"%_JAVACMD%" -jar "%IVY_JAR%" -dependency org.apache.easyant easyant-core %EASYANT_VERSION% -confs extra -cachepath "%IVY_BOOTSTRAP_CACHE%\easyant.path" -settings "%IVY_REPOSITORY_PATH%\third-party-lib\third-party-ivysettings.xml" -cache "%IVY_BOOTSTRAP_CACHE%"
-
-set /P EASYANT_BOOTSTRAP_PATH=<"%IVY_BOOTSTRAP_CACHE%\easyant.path"
+set EASYANT_BOOTSTRAP_PATH="@windows.dist.path@"
rem prepend custom ant launcher if requested.
if "%_USE_CUSTOM_ANT%" == "yes" set EASYANT_BOOTSTRAP_PATH=%ANT_HOME%\lib\ant-launcher.jar;%EASYANT_BOOTSTRAP_PATH%