From b21634835a8db02403c02bbae6f6c65218ae8754 Mon Sep 17 00:00:00 2001
From: Sam Ruby <rubys@apache.org>
Date: Fri, 30 Jun 2000 22:39:45 +0000
Subject: [PATCH] Add lib/* to CLASSPATH

git-svn-id: https://svn.apache.org/repos/asf/ant/core/trunk@267720 13f79535-47bb-0310-9956-ffa450edef68
---
 build.bat | 22 ++++++++++++++++++----
 build.sh  | 19 ++++++++++++-------
 lcp.bat   |  2 ++
 3 files changed, 32 insertions(+), 11 deletions(-)
 create mode 100755 lcp.bat

diff --git a/build.bat b/build.bat
index 965b3c768..4b04de917 100755
--- a/build.bat
+++ b/build.bat
@@ -1,5 +1,19 @@
 @echo off
-REM convience bat file to build with
-set TOOLSJAR=
-if exist %JAVA_HOME%\lib\tools.jar set TOOLSJAR=%JAVA_HOME%\lib\tools.jar
-java -classpath "%CLASSPATH%;%TOOLSJAR%;lib\ant.jar" org.apache.tools.ant.Main %1 %2 %3 %4 %5
+
+set _ANTHOME=%ANT_HOME%
+if "%ANT_HOME%" == "" set ANT_HOME=.
+
+set LOCALCLASSPATH=%CLASSPATH%
+for %%i in (%ANT_HOME%\lib\*.jar) do call lcp.bat %%i
+if exist %JAVA_HOME%\lib\tools.jar call lcp.bat %JAVA_HOME%\lib\tools.jar
+
+echo.
+echo Building with classpath: %LOCALCLASSPATH%
+echo.
+
+java -Dant.home="%ANT_HOME%" -classpath "%LOCALCLASSPATH%" %ANT_OPTS% org.apache.tools.ant.Main %1 %2 %3 %4 %5 %6 %7 %8 %9
+
+rem clean up
+set LOCALCLASSPATH=
+set ANT_HOME=%_ANTHOME%
+set _ANTHOME=
diff --git a/build.sh b/build.sh
index 9978ad1d7..462c2b5de 100755
--- a/build.sh
+++ b/build.sh
@@ -5,15 +5,20 @@ if [ "$ANT_HOME" = "" ] ; then
 fi
 export ANT_HOME
 
-ADDL_CLASSPATH=$ANT_HOME/lib/ant.jar
+LOCALCLASSPATH=`echo $ANT_HOME/lib/*.jar | tr ' ' ':'`
 
 if [ "$CLASSPATH" != "" ] ; then
-  CLASSPATH=$CLASSPATH:$ADDL_CLASSPATH
-else
- CLASSPATH=$ADDL_CLASSPATH
+  LOCALCLASSPATH=$CLASSPATH:$LOCALCLASSPATH
 fi
-export CLASSPATH
 
-echo Building with classpath $CLASSPATH
+if test -f $JAVA_HOME/lib/tools.jar ; then
+  LOCALCLASSPATH=$LOCALCLASSPATH:$JAVA_HOME/lib/tools.jar
+fi
+
+echo
+echo Building with classpath: $LOCALCLASSPATH
+echo
+
+chmod 0755 $ANT_HOME/bin/antRun
 
-java org.apache.tools.ant.Main -Dant.home=$ANT_HOME $*
+java -Dant.home=$ANT_HOME -classpath $LOCALCLASSPATH $ANT_OPTS org.apache.tools.ant.Main $*
diff --git a/lcp.bat b/lcp.bat
new file mode 100755
index 000000000..8feb0d0fe
--- /dev/null
+++ b/lcp.bat
@@ -0,0 +1,2 @@
+set LOCALCLASSPATH=%LOCALCLASSPATH%;%1
+