From easyant-commits-return-308-apmail-incubator-easyant-commits-archive=incubator.apache.org@incubator.apache.org Sat Aug 6 14:06:55 2011 Return-Path: X-Original-To: apmail-incubator-easyant-commits-archive@minotaur.apache.org Delivered-To: apmail-incubator-easyant-commits-archive@minotaur.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id D64B964AF for ; Sat, 6 Aug 2011 14:06:55 +0000 (UTC) Received: (qmail 99029 invoked by uid 500); 6 Aug 2011 14:06:55 -0000 Delivered-To: apmail-incubator-easyant-commits-archive@incubator.apache.org Received: (qmail 99010 invoked by uid 500); 6 Aug 2011 14:06:55 -0000 Mailing-List: contact easyant-commits-help@incubator.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: easyant-dev@incubator.apache.org Delivered-To: mailing list easyant-commits@incubator.apache.org Received: (qmail 99003 invoked by uid 99); 6 Aug 2011 14:06:55 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Sat, 06 Aug 2011 14:06:55 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Sat, 06 Aug 2011 14:06:54 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id A229623888CC; Sat, 6 Aug 2011 14:06:34 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1154522 - in /incubator/easyant/core/trunk/bin: easyant easyant.bat Date: Sat, 06 Aug 2011 14:06:34 -0000 To: easyant-commits@incubator.apache.org From: hibou@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20110806140634.A229623888CC@eris.apache.org> 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%