incubator-easyant-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jlboud...@apache.org
Subject svn commit: r1201759 - in /incubator/easyant/core/trunk: bin/easyant bin/easyant.bat module.ant
Date Mon, 14 Nov 2011 15:46:05 GMT
Author: jlboudart
Date: Mon Nov 14 15:46:05 2011
New Revision: 1201759

URL: http://svn.apache.org/viewvc?rev=1201759&view=rev
Log:
refs EASYANT-38 : Refactor easyant's shell script to remove bootstrap classpath

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=1201759&r1=1201758&r2=1201759&view=diff
==============================================================================
--- incubator/easyant/core/trunk/bin/easyant (original)
+++ incubator/easyant/core/trunk/bin/easyant Mon Nov 14 15:46:05 2011
@@ -21,9 +21,6 @@ if [ -z "$EASYANT_HOME" ]; then
     exit 3
 fi
 
-#set default EASYANT_ARGS
-EASYANT_ARGS="-lib $EASYANT_HOME/lib/easyant-core.jar -lib $EASYANT_HOME/lib/easyant-extra-modules.jar
-lib $EASYANT_HOME/lib/ivy.jar -config-file $EASYANT_HOME/easyant-conf.xml -Dbasedir=. -main
org.apache.easyant.core.EasyAntMain -Deasyant.home=$EASYANT_HOME $EASYANT_ARGS"
-
 # This part is fully inspirated by ant's script with some easyant customisation
 ant_exec_args=
 no_config=false
@@ -196,13 +193,6 @@ if [ ! -x "$JAVACMD" ] ; then
   exit 1
 fi
 
-EASYANT_BOOTSTRAP_PATH="@unix.dist.path@"
-
-# prepend custom ant launcher if requested.
-if $use_custom_ant; then
-  EASYANT_BOOTSTRAP_PATH=${ANT_LIB}/ant-launcher.jar:${EASYANT_BOOTSTRAP_PATH}
-fi
-
 # Build local classpath using just the launcher in non-rpm mode or
 # use the Jpackage helper in rpm mode with basic and default jars
 # specified in the ant.conf configuration. Because the launcher is
@@ -382,7 +372,7 @@ else
 fi
 
 #set default EASYANT_ARGS
-EASYANT_ARGS="-configfile \"$EASYANT_HOME/easyant-conf.xml\" -Dbasedir=. -main org.apache.easyant.core.EasyAntMain
-Deasyant.home=\"$EASYANT_HOME\" $EASYANT_ARGS"
+EASYANT_ARGS="-configfile \"$EASYANT_HOME/easyant-conf.xml\" -lib \"$EASYANT_HOME/lib\" -Dbasedir=.
-main org.apache.easyant.core.EasyAntMain -Deasyant.home=\"$EASYANT_HOME\" $EASYANT_ARGS"
 
 ant_exec_command="exec \"$JAVACMD\" $ANT_OPTS $EASYANT_OPTS -classpath \"$LOCALCLASSPATH\"
-Dant.home=\"$ANT_HOME\" -Dant.library.dir=\"$ANT_LIB\" $ant_sys_opts org.apache.tools.ant.launch.Launcher
$ANT_ARGS $EASYANT_ARGS -cp \"$CLASSPATH\""
 if $ant_exec_debug ; then

Modified: incubator/easyant/core/trunk/bin/easyant.bat
URL: http://svn.apache.org/viewvc/incubator/easyant/core/trunk/bin/easyant.bat?rev=1201759&r1=1201758&r2=1201759&view=diff
==============================================================================
--- incubator/easyant/core/trunk/bin/easyant.bat (original)
+++ incubator/easyant/core/trunk/bin/easyant.bat Mon Nov 14 15:46:05 2011
@@ -33,7 +33,7 @@ goto end
 
 :run
 rem set the default parameters for easyant
-set EASYANT_ARGS=-lib "%EASYANT_HOME%\lib\easyant-core.jar" -lib "%EASYANT_HOME%\lib\easyant-extra-modules.jar"
-lib "%EASYANT_HOME%\lib\ivy.jar" -Dbasedir=. -main org.apache.easyant.core.EasyAntMain -config-file
%EASYANT_HOME%/easyant-conf.xml -Deasyant.home=%EASYANT_HOME% %EASYANT_ARGS%
+set EASYANT_ARGS=-lib "%EASYANT_HOME%\lib" -Dbasedir=. -main org.apache.easyant.core.EasyAntMain
-config-file %EASYANT_HOME%/easyant-conf.xml -Deasyant.home=%EASYANT_HOME% %EASYANT_ARGS%
 
 
 rem This part is fully inspirated by ant's script with some easyant customisation
@@ -156,22 +156,17 @@ if "%_JAVACMD%" == "" set _JAVACMD=java.
 :checkJikes
 if not "%JIKESPATH%"=="" goto runAntWithJikes
 
-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%
-
 :runAnt
 if "%_USE_CLASSPATH%"=="no" goto runAntNoClasspath
 :runAntWithClasspath
-"%_JAVACMD%" %ANT_OPTS% %EASYANT_OPTS% -classpath "%EASYANT_BOOTSTRAP_PATH%" "-Dant.home=%ANT_HOME%"
org.apache.tools.ant.launch.Launcher %ANT_ARGS% %EASYANT_ARGS% -cp "%CLASSPATH%" %ANT_CMD_LINE_ARGS%
+"%_JAVACMD%" %ANT_OPTS% %EASYANT_OPTS% -classpath "%ANT_HOME%\lib\ant-launcher.jar" "-Dant.home=%ANT_HOME%"
org.apache.tools.ant.launch.Launcher %ANT_ARGS% %EASYANT_ARGS% -cp "%CLASSPATH%" %ANT_CMD_LINE_ARGS%
 rem Check the error code of the Ant build
 if not "%OS%"=="Windows_NT" goto onError
 set ANT_ERROR=%ERRORLEVEL%
 goto end
 
 :runAntNoClasspath
-"%_JAVACMD%" %ANT_OPTS% %EASYANT_OPTS% -classpath "%EASYANT_BOOTSTRAP_PATH%" "-Dant.home=%ANT_HOME%"
org.apache.tools.ant.launch.Launcher %ANT_ARGS% %EASYANT_ARGS% %ANT_CMD_LINE_ARGS%
+"%_JAVACMD%" %ANT_OPTS% %EASYANT_OPTS% -classpath "%ANT_HOME%\lib\ant-launcher.jar" "-Dant.home=%ANT_HOME%"
org.apache.tools.ant.launch.Launcher %ANT_ARGS% %EASYANT_ARGS% %ANT_CMD_LINE_ARGS%
 rem Check the error code of the Ant build
 if not "%OS%"=="Windows_NT" goto onError
 set ANT_ERROR=%ERRORLEVEL%

Modified: incubator/easyant/core/trunk/module.ant
URL: http://svn.apache.org/viewvc/incubator/easyant/core/trunk/module.ant?rev=1201759&r1=1201758&r2=1201759&view=diff
==============================================================================
--- incubator/easyant/core/trunk/module.ant (original)
+++ incubator/easyant/core/trunk/module.ant Mon Nov 14 15:46:05 2011
@@ -91,7 +91,7 @@
 
         <patternset id="easyant-files.patternset">
             <exclude name="target/**"/>
-            <exclude name="lib/**"/>
+            <include name="lib/*.jar"/>
 
             <include name="repository/**" />
             <exclude name="repository/extra-modules/**" />
@@ -115,7 +115,7 @@
 
     </target>
 
-    <target name="stage-dist" depends="prepare-distribution">
+    <target name="stage-dist" depends="prepare-distribution, provision">
 
         <mkdir dir="${target.dist}" />
 
@@ -126,6 +126,12 @@
             </fileset>
         </copy>
 
+	<mkdir dir="${target.dist}/lib/"/>
+	<copy todir="${target.dist}/lib">
+		<fileset dir="${basedir}/lib/main"/>
+	</copy>
+	<copy file="${target.main.artifact}" todir="${target.dist}/lib"/>
+
         <!-- makes easyant scripts executable -->
         <chmod perm="744" dir="${target.dist}">
             <patternset refid="easyant-exec.patternset"/>
@@ -133,7 +139,7 @@
 
     </target>
 
-	<target name="dist" depends="stage-dist, jar:jar, package-extra-modules" description="update
the dist directory (used for development)">
+	<target name="dist" depends="jar:jar, stage-dist, 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"/>



Mime
View raw message