joerg 2004/03/04 15:51:03
Modified: . build.sh build.bat Added: tools/bin appendcp.bat Log: ported 2.1 changes: XML libs are no longer copied to tools/lib, clean up + unification Revision Changes Path 1.1 cocoon-2.2/tools/bin/appendcp.bat Index: appendcp.bat =================================================================== set CLASSPATH=%CLASSPATH%;%1 1.4 +24 -16 cocoon-2.2/build.sh Index: build.sh =================================================================== RCS file: /home/cvs/cocoon-2.2/build.sh,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- build.sh 30 Apr 2003 14:11:56 -0000 1.3 +++ build.sh 4 Mar 2004 23:51:03 -0000 1.4 @@ -1,26 +1,34 @@ #!/bin/sh -echo -echo "Apache Cocoon Build System" -echo "--------------------------" - -cp ./lib/*/xalan*.jar ./tools/lib -cp ./lib/*/xerces*.jar ./tools/lib -cp ./lib/*/xml-api*.jar ./tools/lib - chmod u+x ./tools/bin/antRun chmod u+x ./tools/bin/ant -unset ANT_HOME +# ----- Verify and Set Required Environment Variables ------------------------- + +if [ "$TERM" = "cygwin" ] ; then + S=';' +else + S=':' +fi -CP=$CLASSPATH -export CP +# ----- Ignore system CLASSPATH variable +OLD_CLASSPATH=$CLASSPATH unset CLASSPATH +CLASSPATH="`echo lib/endorsed/*.jar | tr ' ' $S`" +export CLASSPATH -ANT_OPTS=-Djava.endorsed.dirs=lib/endorsed -export ANT_OPTS +echo Using classpath: \"$CLASSPATH\" -$PWD/tools/bin/ant -logger org.apache.tools.ant.NoBannerLogger -emacs $@ +# ----- 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/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= + +# ----- Restore CLASSPATH +export CLASSPATH=$OLD_CLASSPATH +unset OLD_CLASSPATH= 1.6 +3 -28 cocoon-2.2/build.bat Index: build.bat =================================================================== RCS file: /home/cvs/cocoon-2.2/build.bat,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- build.bat 6 Oct 2003 16:07:22 -0000 1.5 +++ build.bat 4 Mar 2004 23:51:03 -0000 1.6 @@ -5,32 +5,11 @@ rem $Id$ rem ---------------------------------------------------------------------------- -rem ----- Copy Xalan and Xerces for the build system ------------------------ -if not exist "tools\lib\xerces*.jar" copy lib\local\xerces*.jar tools\lib -if not exist "tools\lib\xerces*.jar" copy lib\endorsed\xerces*.jar tools\lib -if not exist "tools\lib\xerces*.jar" copy lib\optional\xerces*.jar tools\lib -if not exist "tools\lib\xerces*.jar" copy lib\core\xerces*.jar tools\lib -if not exist "tools\lib\xalan*.jar" copy lib\local\xalan*.jar tools\lib -if not exist "tools\lib\xalan*.jar" copy lib\endorsed\xalan*.jar tools\lib -if not exist "tools\lib\xalan*.jar" copy lib\optional\xalan*.jar tools\lib -if not exist "tools\lib\xalan*.jar" copy lib\core\xalan*.jar tools\lib -if not exist "tools\lib\xml-api*.jar" copy lib\local\xml-api*.jar tools\lib -if not exist "tools\lib\xml-api*.jar" copy lib\endorsed\xml-api*.jar tools\lib -if not exist "tools\lib\xml-api*.jar" copy lib\optional\xml-api*.jar tools\lib -if not exist "tools\lib\xml-api*.jar" copy lib\core\xml-api*.jar tools\lib - -rem ----- Verify and Set Required Environment Variables ------------------------ - rem ----- Ignore system CLASSPATH variable set OLD_CLASSPATH=%CLASSPATH% set 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 +for %%i in (lib\endorsed\*.jar) do call tools\bin\appendcp.bat %%i +echo Using classpath: "%CLASSPATH%" rem ----- Use Ant shipped with Cocoon. Ignore installed in the system Ant set OLD_ANT_HOME=%ANT_HOME% @@ -41,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%
