jvanzyl 00/10/16 22:53:37
Modified: build build-velocity.bat build-velocity.sh
build/xsl xml2pdf.xsl
Log:
- updated build-velocity scripts for oro.
Revision Changes Path
1.8 +80 -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.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- build-velocity.bat 2000/10/15 20:17:12 1.7
+++ build-velocity.bat 2000/10/17 05:53:36 1.8
@@ -1,79 +1,80 @@
-@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 ORO=%LIB%\oro.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%;%ORO%
+
+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.7 +4 -1 jakarta-velocity/build/build-velocity.sh
Index: build-velocity.sh
===================================================================
RCS file: /home/cvs/jakarta-velocity/build/build-velocity.sh,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- build-velocity.sh 2000/10/15 20:17:13 1.6
+++ build-velocity.sh 2000/10/17 05:53:36 1.7
@@ -12,6 +12,7 @@
ANTXML=${LIB}/xml.jar
XERCES=${LIB}/xerces-1.1.3.jar
SERVLET=${LIB}/servlet.jar
+ORO=${LIB}/oro.jar
# Libs needed for runtime.
LOG=${LIB}/log.jar
@@ -45,7 +46,9 @@
CLASSPATH="${CLASSPATH}:${JAVA_HOME}/lib/tools.jar"
fi
-CLASSPATH=${CLASSPATH}:${ANT}:${ANTXML}:${ANTLRALL}:${XERCES}:${XALAN}:${SB}:${LOG}:${FOP}:${LIB}:${W3C}:${JAVACLASS}:${SERVLET}:${JUNIT}
+CLASSPATH=${CLASSPATH}:${ANT}:${ANTXML}:${XERCES}:${XALAN}
+CLASSPATH=${CLASSPATH}:${SB}:${LOG}:${FOP}:${LIB}:${W3C}:${JAVACLASS}:${SERVLET}:${JUNIT}
+CLASSPATH=${CLASSPATH}:${SERVLET}:${JUNIT}:${ORO}
# convert the unix path to windows
if [ "$OSTYPE" = "cygwin32" ] || [ "$OSTYPE" = "cygwin" ] ; then
1.5 +1 -1 jakarta-velocity/build/xsl/xml2pdf.xsl
Index: xml2pdf.xsl
===================================================================
RCS file: /home/cvs/jakarta-velocity/build/xsl/xml2pdf.xsl,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- xml2pdf.xsl 2000/10/13 19:39:37 1.4
+++ xml2pdf.xsl 2000/10/17 05:53:36 1.5
@@ -64,7 +64,7 @@
font-family="serif"
line-height="14pt" >
- FOP documentation - p.
+ Velocity User's Guide - pg
<fo:page-number/>
</fo:block>
