incubator-easyant-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From hi...@apache.org
Subject svn commit: r1154521 - in /incubator/easyant/core/trunk: bin/easyant bin/easyant.bat module.ant
Date Sat, 06 Aug 2011 14:03:37 GMT
Author: hibou
Date: Sat Aug  6 14:03:37 2011
New Revision: 1154521

URL: http://svn.apache.org/viewvc?rev=1154521&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
    incubator/easyant/core/trunk/module.ant

Modified: incubator/easyant/core/trunk/bin/easyant
URL: http://svn.apache.org/viewvc/incubator/easyant/core/trunk/bin/easyant?rev=1154521&r1=1154520&r2=1154521&view=diff
==============================================================================
--- incubator/easyant/core/trunk/bin/easyant (original)
+++ incubator/easyant/core/trunk/bin/easyant Sat Aug  6 14:03:37 2011
@@ -230,7 +230,22 @@ if [ ! -x "$JAVACMD" ] ; then
   exit 1
 fi
 
-EASYANT_BOOTSTRAP_PATH="@unix.dist.path@"
+# 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)
 
 # 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=1154521&r1=1154520&r2=1154521&view=diff
==============================================================================
--- incubator/easyant/core/trunk/bin/easyant.bat (original)
+++ incubator/easyant/core/trunk/bin/easyant.bat Sat Aug  6 14:03:37 2011
@@ -156,7 +156,18 @@ if "%_JAVACMD%" == "" set _JAVACMD=java.
 :checkJikes
 if not "%JIKESPATH%"=="" goto runAntWithJikes
 
-set EASYANT_BOOTSTRAP_PATH="@windows.dist.path@"
+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"
 
 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%

Modified: incubator/easyant/core/trunk/module.ant
URL: http://svn.apache.org/viewvc/incubator/easyant/core/trunk/module.ant?rev=1154521&r1=1154520&r2=1154521&view=diff
==============================================================================
--- incubator/easyant/core/trunk/module.ant (original)
+++ incubator/easyant/core/trunk/module.ant Sat Aug  6 14:03:37 2011
@@ -116,50 +116,13 @@
 
     </target>
 
-    <target name="dist" depends="jar:jar,test-jar:jar, package-extra-modules, prepare-distribution"
-            description="update the dist directory (used for development and packaging)">
+    <target name="stage-dist" depends="prepare-distribution">
 
         <mkdir dir="${target.dist}" />
 
-        <!-- copy easyant data files -->
         <copy todir="${target.dist}">
             <fileset dir="${basedir}">
                 <patternset refid="easyant-files.patternset"/>
-            </fileset>
-        </copy>
-
-        <!-- isolate build cache in case there are multiple easyant workspaces (e.g. on
hudson) -->
-        <property name="wrapper.target.settings" location="${target.dist}/repository/third-party-lib/third-party-ivysettings.xml"/>
-        <property name="wrapper.cache.dir" location="${basedir}/target/tmp/build-cache"/>
-
-        <!-- publish latest easyant artifacts into dist repository -->
-        <ivy:settings id="dist.ivy.settings" file="${basedir}/src/build/etc/cache-wrapper-ivysettings.xml"/>
-        <ivy:cleancache settingsRef="dist.ivy.settings"/>
-
-        <ivy:publish settingsRef="dist.ivy.settings" resolver="third-party-lib" overwrite="true"
-                     srcivypattern="module.ivy" artifactspattern="${target.artifacts}/[artifact].[ext]"/>
-        <!-- compute runtime classpath for easyant distribution -->
-        <ivy:cachepath settingsRef="dist.ivy.settings" pathid="dist.class.path" conf="extra"
inline="true"
-                       organisation="org.apache.easyant" module="easyant-core" revision="latest.integration"
-                       useOrigin="true"/>
-
-        <!-- generate platform-specific path strings for launch scripts -->
-        <property name="dist.prefix" location="${target.dist}"/>
-        <pathconvert refid="dist.class.path" property="unix.dist.path" pathsep=":">
-            <map from="${dist.prefix}" to="$${EASYANT_HOME}"/>
-        </pathconvert>
-
-        <pathconvert refid="dist.class.path" property="windows.dist.path" pathsep=";">
-            <map from="${dist.prefix}" to="%EASYANT_HOME%"/>
-        </pathconvert>
-
-        <!-- copy easyant scripts, including substitution of runtime classpath value -->
-        <copy todir="${target.dist}" filtering="true" overwrite="true">
-            <filterset>
-                <filter token="unix.dist.path" value="${unix.dist.path}"/>
-                <filter token="windows.dist.path" value="${windows.dist.path}"/>
-            </filterset>
-            <fileset dir="${basedir}">
                 <patternset refid="easyant-exec.patternset"/>
             </fileset>
         </copy>
@@ -169,6 +132,15 @@
             <patternset refid="easyant-exec.patternset"/>
         </chmod>
 
+    </target>
+
+	<target name="dist" depends="stage-dist, jar:jar, package-extra-modules" description="update
the dist directory (used for development)">
+
+        <!-- publish latest easyant artifacts into dist repository -->
+        <ivy:settings id="dist.ivy.settings" file="${target.dist}/repository/third-party-lib/third-party-ivysettings.xml"/>
+        <ivy:publish settingsRef="dist.ivy.settings" resolver="third-party-lib" overwrite="true"
+                     srcivypattern="module.ivy" artifactspattern="${target.artifacts}/[artifact].[ext]"/>
+
         <!-- declare distribution fileset for use in packaging targets -->
         <fileset id="easyant-dist.fileset" dir="${target.dist}">
             <patternset refid="easyant-files.patternset"/>



Mime
View raw message