joerg 2004/03/04 15:49:09
Modified: . build.bat build.sh
Log:
clean up + unification
Revision Changes Path
1.8 +2 -15 cocoon-2.1/build.bat
Index: build.bat
===================================================================
RCS file: /home/cvs/cocoon-2.1/build.bat,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- build.bat 4 Mar 2004 22:40:07 -0000 1.7
+++ build.bat 4 Mar 2004 23:49:09 -0000 1.8
@@ -5,21 +5,12 @@
rem $Id$
rem
----------------------------------------------------------------------------
-rem ----- Verify and Set Required Environment Variables
------------------------
-
rem ----- Ignore system CLASSPATH variable
set OLD_CLASSPATH=%CLASSPATH%
set CLASSPATH=
-for %%i in (.\lib\endorsed\*.jar) do call .\tools\bin\appendcp.bat %%i
+for %%i in (lib\endorsed\*.jar) do call tools\bin\appendcp.bat %%i
echo Using classpath: "%CLASSPATH%"
-rem ----- Use Java in JAVA_HOME if JAVA_HOME is set.
-set OLD_PATH=%PATH%
-if "%JAVA_HOME%" == "" goto noJavaHome
-echo Using Java from %JAVA_HOME%
-set PATH=%JAVA_HOME%\bin
-:noJavaHome
-
rem ----- Use Ant shipped with Cocoon. Ignore installed in the system Ant
set OLD_ANT_HOME=%ANT_HOME%
set ANT_HOME=tools
@@ -29,10 +20,6 @@
rem ----- Restore ANT_HOME
set ANT_HOME=%OLD_ANT_HOME%
set OLD_ANT_HOME=
-
-rem ----- Restore PATH
-set PATH=%OLD_PATH%
-set OLD_PATH=
rem ----- Restore CLASSPATH
set CLASSPATH=%OLD_CLASSPATH%
1.6 +14 -18 cocoon-2.1/build.sh
Index: build.sh
===================================================================
RCS file: /home/cvs/cocoon-2.1/build.sh,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- build.sh 4 Mar 2004 07:38:54 -0000 1.5
+++ build.sh 4 Mar 2004 23:49:09 -0000 1.6
@@ -11,28 +11,24 @@
S=':'
fi
-# ----- Set Up The Runtime Classpath
------------------------------------------
-
-OLD_ANT_HOME="$ANT_HOME"
-unset ANT_HOME
-
-CP=$CLASSPATH
-export CP
+# ----- Ignore system CLASSPATH variable
+OLD_CLASSPATH=$CLASSPATH
unset CLASSPATH
-
-CLASSPATH="`echo ./lib/endorsed/*.jar | tr ' ' $S`"
+CLASSPATH="`echo lib/endorsed/*.jar | tr ' ' $S`"
export CLASSPATH
echo Using classpath: \"$CLASSPATH\"
-"$PWD/tools/bin/ant" -logger org.apache.tools.ant.NoBannerLogger -emacs $@
-unset CLASSPATH
+# ----- Use Ant shipped with Cocoon. Ignore installed in the system Ant
+OLD_ANT_HOME="$ANT_HOME"
+export ANT_HOME=tools
-CLASSPATH=$CP
-export CLASSPATH
-ANT_HOME=OLD_ANT_HOME
-export ANT_HOME
+"$ANT_HOME/bin/ant" -Djava.endorsed.dirs=lib/endorsed -logger
org.apache.tools.ant.NoBannerLogger -emacs $@
+
+# ----- Restore ANT_HOME
+export ANT_HOME=$OLD_ANT_HOME
+unset OLD_ANT_HOME=
-# ----- Clean the environment ------------------------------------------
-unset OLD_ANT_HOME
-unset CP
+# ----- Restore CLASSPATH
+export CLASSPATH=$OLD_CLASSPATH
+unset OLD_CLASSPATH=
