jon 00/10/15 13:17:14 Modified: build build-velocity.bat build-velocity.sh Log: added cygwin stuff to the .sh fixed some of the building lines changed the newlines for the .bat file to DOS instead of UNIX. Revision Changes Path 1.7 +79 -79 jakarta-velocity/build/build-velocity.bat Index: build-velocity.bat =================================================================== RCS file: /home/cvs/jakarta-velocity/build/build-velocity.bat,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- build-velocity.bat 2000/10/11 06:25:52 1.6 +++ build-velocity.bat 2000/10/15 20:17:12 1.7 @@ -1,79 +1,79 @@ -@echo off - -REM ----------------------------------------------------------- -REM The targets are the different build scripts. -REM The default "jar" is suggested -REM and does not require any external packages -REM -REM "compile" target builds Turbine core classes -REM "clean" target removes bin directory -REM "jar" target builds "core" + jar file -REM "javadocs" target builds the javadocs -REM ----------------------------------------------------------- -set TARGET=%1% -REM set TARGET=javadocs -REM set TARGET=compile -REM set TARGET=clean -REM set TARGET=jar - -REM ------------------------------------------------------------------- -REM Define the paths to each of the packages. -REM ------------------------------------------------------------------- -set LIB=lib -set ANT=%LIB%\ant.jar -set ANTXML=%LIB%\xml.jar -set XERCES=%LIB%\xerces-1.1.3.jar -set SERVLET=%LIB%\servlet.jar - -set LOG=%LIB%\log.jar -set JAVACLASS=%LIB%\JavaClass.jar - -set JUNIT=%LIB%\junit-3.2.jar - -set XALAN=%LIB%\xalan_1_1_D01.jar -set FOP=%LIB%\fop.jar -set W3C=%LIB%\w3c.jar -set SB=%LIB%\stylebook-1.0-b2.jar - -REM -------------------------------------------- -REM No need to edit anything past here -REM -------------------------------------------- -set BUILDFILE=build-velocity.xml - -if "%TARGET%" == "" goto setdist -goto final - -:setdist -set TARGET=jar -goto final - -:final - -REM set JIKES to be non-null (eg set JIKES=Y) to use the jikes compiler - -REM its a bit faster -REM get it from here... -REM http://oss.software.ibm.com/developerworks/opensource/jikes/project -set JAVAC=classic -if not "%JIKES%" == "" set JAVAC=jikes - -if "%JAVA_HOME%" == "" goto javahomeerror -if exist %JAVA_HOME%\lib\tools.jar set CLASSPATH=%CLASSPATH%;%JAVA_HOME%\lib\tools.jar - -echo Now building %TARGET%... - -set CP=%CLASSPATH%;%TOOLS%;%ANT%;%ANTXML%;%XERCES%;%XALAN%;%SB%;%LOG%;%FOP%;%LIB%;%W3C%;%JAVACLASS%;%SERVLET%;%JUNIT% - -echo Classpath: %CP% -echo JAVA_HOME: %JAVA_HOME% - -%JAVA_HOME%\bin\java.exe -classpath "%CP%" -DJAVAC=%JAVAC% org.apache.tools.ant.Main -buildfile %BUILDFILE% %TARGET% - -goto end - -REM -----------ERROR------------- -:javahomeerror -echo "ERROR: JAVA_HOME not found in your environment." -echo "Please, set the JAVA_HOME variable in your environment to match the" -echo "location of the Java Virtual Machine you want to use." - -:end +@echo off + +REM ----------------------------------------------------------- +REM The targets are the different build scripts. +REM The default "jar" is suggested +REM and does not require any external packages +REM +REM "compile" target builds Turbine core classes +REM "clean" target removes bin directory +REM "jar" target builds "core" + jar file +REM "javadocs" target builds the javadocs +REM ----------------------------------------------------------- +set TARGET=%1% +REM set TARGET=javadocs +REM set TARGET=compile +REM set TARGET=clean +REM set TARGET=jar + +REM ------------------------------------------------------------------- +REM Define the paths to each of the packages. +REM ------------------------------------------------------------------- +set LIB=lib +set ANT=%LIB%\ant.jar +set ANTXML=%LIB%\xml.jar +set XERCES=%LIB%\xerces-1.1.3.jar +set SERVLET=%LIB%\servlet.jar + +set LOG=%LIB%\log.jar +set JAVACLASS=%LIB%\JavaClass.jar + +set JUNIT=%LIB%\junit-3.2.jar + +set XALAN=%LIB%\xalan_1_1_D01.jar +set FOP=%LIB%\fop.jar +set W3C=%LIB%\w3c.jar +set SB=%LIB%\stylebook-1.0-b2.jar + +REM -------------------------------------------- +REM No need to edit anything past here +REM -------------------------------------------- +set BUILDFILE=build-velocity.xml + +if "%TARGET%" == "" goto setdist +goto final + +:setdist +set TARGET=jar +goto final + +:final + +REM set JIKES to be non-null (eg set JIKES=Y) to use the jikes compiler - +REM its a bit faster +REM get it from here... +REM http://oss.software.ibm.com/developerworks/opensource/jikes/project +set JAVAC=classic +if not "%JIKES%" == "" set JAVAC=jikes + +if "%JAVA_HOME%" == "" goto javahomeerror +if exist %JAVA_HOME%\lib\tools.jar set CLASSPATH=%CLASSPATH%;%JAVA_HOME%\lib\tools.jar + +echo Now building %TARGET%... + +set CP=%CLASSPATH%;%TOOLS%;%ANT%;%ANTXML%;%XERCES%;%XALAN%;%SB%;%LOG%;%FOP%;%LIB%;%W3C%;%JAVACLASS%;%SERVLET%;%JUNIT% + +echo Classpath: %CP% +echo JAVA_HOME: %JAVA_HOME% + +%JAVA_HOME%\bin\java.exe -classpath "%CP%" -DJAVAC=%JAVAC% org.apache.tools.ant.Main -buildfile %BUILDFILE% %TARGET% + +goto end + +REM -----------ERROR------------- +:javahomeerror +echo "ERROR: JAVA_HOME not found in your environment." +echo "Please, set the JAVA_HOME variable in your environment to match the" +echo "location of the Java Virtual Machine you want to use." + +:end 1.6 +12 -8 jakarta-velocity/build/build-velocity.sh Index: build-velocity.sh =================================================================== RCS file: /home/cvs/jakarta-velocity/build/build-velocity.sh,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- build-velocity.sh 2000/10/11 06:25:53 1.5 +++ build-velocity.sh 2000/10/15 20:17:13 1.6 @@ -3,8 +3,6 @@ # Script for building Velocity #----------------------------- -TARGET=${1} - #------------------------------------------------------------------- LIB=lib @@ -38,21 +36,27 @@ exit fi +# convert the existing path to unix +if [ "$OSTYPE" = "cygwin32" ] || [ "$OSTYPE" = "cygwin" ] ; then + CLASSPATH=`cygpath --path --unix "$CLASSPATH"` +fi + if test -f ${JAVA_HOME}/lib/tools.jar ; then CLASSPATH="${CLASSPATH}:${JAVA_HOME}/lib/tools.jar" fi -CP=${CLASSPATH}:${ANT}:${ANTXML}:${ANTLRALL}:${XERCES}:${XALAN}:${SB}:${LOG}:${FOP}:${LIB}:${W3C}:${JAVACLASS}:${SERVLET}:${JUNIT} +CLASSPATH=${CLASSPATH}:${ANT}:${ANTXML}:${ANTLRALL}:${XERCES}:${XALAN}:${SB}:${LOG}:${FOP}:${LIB}:${W3C}:${JAVACLASS}:${SERVLET}:${JUNIT} -echo "Now building ${TARGET}..." - -echo "Classpath: ${CP}" +# convert the unix path to windows +if [ "$OSTYPE" = "cygwin32" ] || [ "$OSTYPE" = "cygwin" ] ; then + CLASSPATH=`cygpath --path --windows "$CLASSPATH"` +fi BUILDFILE=build-velocity.xml -${JAVA_HOME}/bin/java -classpath ${CP} \ +${JAVA_HOME}/bin/java -classpath ${CLASSPATH} \ org.apache.tools.ant.Main \ - -buildfile ${BUILDFILE} ${TARGET} + -buildfile ${BUILDFILE} "$@"
