jeremias 2002/11/22 10:06:02
Modified: contrib/servlet build.bat build.sh build.xml
Log:
Updated FOP Servlet build
Revision Changes Path
1.2 +34 -30 xml-fop/contrib/servlet/build.bat
Index: build.bat
===================================================================
RCS file: /home/cvs/xml-fop/contrib/servlet/build.bat,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- build.bat 27 Mar 2002 11:55:52 -0000 1.1
+++ build.bat 22 Nov 2002 18:06:01 -0000 1.2
@@ -1,30 +1,34 @@
-@echo off
-
-echo Fop Build System
-echo ----------------
-
-if "%JAVA_HOME%" == "" goto error
-
-set LIBDIR=../../lib
-set
LOCALCLASSPATH=%JAVA_HOME%\lib\tools.jar;%JAVA_HOME%\lib\classes.zip;%LIBDIR%\ant.jar;%LIBDIR%\ant-1.3-optional.jar;%LIBDIR%\buildtools.jar;%LIBDIR%\xerces-1.4.3.jar;%LIBDIR%\xalan-2.2D11.jar
-
-set ANT_HOME=%LIBDIR%
-
-echo Building with classpath %LOCALCLASSPATH%
-
-echo Starting Ant...
-
-%JAVA_HOME%\bin\java.exe -Dant.home=%ANT_HOME% -classpath "%LOCALCLASSPATH%"
org.apache.tools.ant.Main %1 %2 %3 %4 %5
-
-goto end
-
-:error
-
-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
-
-rem set LOCALCLASSPATH=
-
+@echo off
+
+echo Fop Servlet Build System
+echo --------------------------
+
+if "%JAVA_HOME%" == "" goto error
+
+set LIBDIR=../../lib
+set LOCALCLASSPATH=%JAVA_HOME%\lib\tools.jar;%JAVA_HOME%\lib\classes.zip
+set LOCALCLASSPATH=%LOCALCLASSPATH%;%LIBDIR%\ant.jar
+set LOCALCLASSPATH=%LOCALCLASSPATH%;%LIBDIR%\xml-apis.jar
+set LOCALCLASSPATH=%LOCALCLASSPATH%;%LIBDIR%\xercesImpl-2.2.1.jar
+set LOCALCLASSPATH=%LOCALCLASSPATH%;%LIBDIR%\xalan-2.4.1.jar
+
+set ANT_HOME=%LIBDIR%
+
+echo Building with classpath %LOCALCLASSPATH%
+
+echo Starting Ant...
+
+%JAVA_HOME%\bin\java.exe -Dant.home=%ANT_HOME% -classpath "%LOCALCLASSPATH%"
org.apache.tools.ant.Main %1 %2 %3 %4 %5
+
+goto end
+
+:error
+
+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
+
+rem set LOCALCLASSPATH=
+
1.2 +7 -4 xml-fop/contrib/servlet/build.sh
Index: build.sh
===================================================================
RCS file: /home/cvs/xml-fop/contrib/servlet/build.sh,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- build.sh 27 Mar 2002 11:55:52 -0000 1.1
+++ build.sh 22 Nov 2002 18:06:01 -0000 1.2
@@ -1,8 +1,8 @@
#!/bin/sh
# This file should be executable.
echo
-echo "Fop Build System"
-echo "----------------"
+echo "Fop Servlet Build System"
+echo "--------------------------"
echo
if [ "$JAVA_HOME" = "" ] ; then
@@ -13,8 +13,11 @@
exit 1
fi
LIBDIR=../../lib
-LOCALCLASSPATH=$JAVA_HOME/lib/tools.jar:$JAVA_HOME/lib/classes.zip:$LIBDIR/ant.jar:$LIBDIR/ant-1.3-optional.jar:$LIBDIR/buildtools.jar:$LIBDIR/xerces-1.4.3.jar:$LIBDIR/xalan-2.2D11.jar
-
+LOCALCLASSPATH=$JAVA_HOME/lib/tools.jar:$JAVA_HOME/lib/classes.zip
+LOCALCLASSPATH=$LOCALCLASSPATH:$LIBDIR/ant.jar
+LOCALCLASSPATH=$LOCALCLASSPATH:$LIBDIR/xml-apis.jar
+LOCALCLASSPATH=$LOCALCLASSPATH:$LIBDIR/xercesImpl-2.2.1.jar
+LOCALCLASSPATH=$LOCALCLASSPATH:$LIBDIR/xalan-2.4.1.jar
ANT_HOME=$LIBDIR
echo
1.4 +89 -83 xml-fop/contrib/servlet/build.xml
Index: build.xml
===================================================================
RCS file: /home/cvs/xml-fop/contrib/servlet/build.xml,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- build.xml 7 Aug 2002 12:51:56 -0000 1.3
+++ build.xml 22 Nov 2002 18:06:01 -0000 1.4
@@ -1,86 +1,92 @@
<?xml version="1.0"?>
<project default="package" basedir=".">
- <property name="Name" value="Fop Servlet"/>
- <property name="name" value="fopservlet"/>
- <property name="version" value="0.2cvs"/>
- <!-- compiler switches -->
- <property name="build.compiler" value="classic"/>
- <property name="debug" value="off"/>
- <property name="optimize" value="on"/>
- <property name="deprecation" value="off"/>
- <!-- directories -->
- <property name="src.dir" value="./src"/>
- <property name="conf.dir" value="./conf"/>
- <property name="fop.lib.dir" value="../../lib"/>
- <property name="lib.dir" value="./lib"/>
- <property name="build.dir" value="./build"/>
- <property name="build.src" value="./build/src"/>
- <property name="build.dest" value="./build/classes"/>
- <property name="build.war" value="./build/war"/>
- <!-- stuff -->
- <property name="servlet.jar" value="servlet.jar"/>
- <property name="avalon-framework.jar"
value="avalon-framework-cvs-20020806.jar"/>
- <path id="project.class.path">
- <pathelement location="${lib.dir}/${servlet.jar}"/>
- <pathelement location="${fop.lib.dir}/${avalon-framework.jar}"/>
- <pathelement location="${fop.lib.dir}/../build/fop.jar"/>
- <pathelement location="${fop.lib.dir}/batik.jar"/>
- </path>
- <!-- =================================================================== -->
- <!-- Initialization target -->
- <!-- =================================================================== -->
- <target name="init">
- <tstamp/>
- <filter token="version" value="${version}"/>
- <property name="year" value="1999-2002"/>
- <echo message="------------------- ${Name} ${version} [${year}]
----------------"/>
- <available property="servlet.present"
file="${lib.dir}/${servlet.jar}"/>
- </target>
- <target name="servlet-check" depends="init" unless="servlet.present">
- <echo
message="============================================================================="/>
- <echo message="servlet.jar is missing in the lib directory. Please get
one and put it there."/>
- <echo
message="============================================================================="/>
- </target>
- <!-- =================================================================== -->
- <!-- Prepares the build directory -->
- <!-- =================================================================== -->
- <target name="prepare" depends="init, servlet-check">
- <!-- create directories -->
- <echo message="Preparing the build directories"/>
- <mkdir dir="${build.dir}"/>
- <mkdir dir="${build.dest}"/>
- </target>
- <!-- =================================================================== -->
- <!-- Compiles the source directory -->
- <!-- =================================================================== -->
- <target name="compile" depends="prepare">
- <echo message="Compiling the sources "/>
- <javac srcdir="${src.dir}" destdir="${build.dest}" debug="${debug}"
deprecation="${deprecation}" optimize="${optimize}">
- <classpath refid="project.class.path"/>
- </javac>
- </target>
- <!-- =================================================================== -->
- <!-- Creates the class package -->
- <!-- =================================================================== -->
- <target name="package" depends="compile">
- <echo message="Creating the WAR file"/>
- <war warfile="${build.dir}/fop.war" webxml="${conf.dir}/web.xml">
- <lib dir="${fop.lib.dir}">
- <include name="${avalon-framework.jar}"/>
- <include name="batik.jar"/>
- </lib>
- <lib dir="${fop.lib.dir}/../build">
- <include name="fop.jar"/>
- </lib>
- <classes dir="${build.dest}"/>
- </war>
- </target>
- <target name="all" depends="package"/>
- <!-- "all" target for us Makefile converts ;-) -->
- <!-- =================================================================== -->
- <!-- Clean targets -->
- <!-- =================================================================== -->
- <target name="clean" depends="init">
- <delete dir="${build.dir}"/>
- </target>
+ <property name="Name" value="Fop Servlet"/>
+ <property name="name" value="fopservlet"/>
+ <property name="version" value="0.2cvs"/>
+ <!-- compiler switches -->
+ <property name="build.compiler" value="classic"/>
+ <property name="debug" value="off"/>
+ <property name="optimize" value="on"/>
+ <property name="deprecation" value="off"/>
+ <!-- directories -->
+ <property name="src.dir" value="./src"/>
+ <property name="conf.dir" value="./conf"/>
+ <property name="fop.lib.dir" value="../../lib"/>
+ <property name="lib.dir" value="./lib"/>
+ <property name="build.dir" value="./build"/>
+ <property name="build.src" value="./build/src"/>
+ <property name="build.dest" value="./build/classes"/>
+ <property name="build.war" value="./build/war"/>
+ <!-- stuff -->
+ <property name="servlet.jar" value="servlet.jar"/>
+ <path id="project.class.path">
+ <fileset dir="${lib.dir}">
+ <include name="*.jar"/>
+ </fileset>
+ <fileset dir="${fop.lib.dir}">
+ <include name="avalon-framework*.jar"/>
+ <include name="batik*.jar"/>
+ </fileset>
+ <fileset dir="${fop.lib.dir}/../build">
+ <include name="fop.jar"/>
+ </fileset>
+ </path>
+ <!-- =================================================================== -->
+ <!-- Initialization target -->
+ <!-- =================================================================== -->
+ <target name="init">
+ <tstamp/>
+ <filter token="version" value="${version}"/>
+ <property name="year" value="1999-2002"/>
+ <echo message="------------------- ${Name} ${version} [${year}]
----------------"/>
+ <available property="servlet.present" classname="javax.servlet.Servlet"
classpathref="project.class.path"/>
+ </target>
+ <target name="servlet-check" depends="init" unless="servlet.present">
+ <echo
message="============================================================================="/>
+ <echo message="servlet.jar is missing in the lib directory. Please get one and
put it there."/>
+ <echo
message="============================================================================="/>
+ <fail message="Dependecy check failed."/>
+ </target>
+ <!-- =================================================================== -->
+ <!-- Prepares the build directory -->
+ <!-- =================================================================== -->
+ <target name="prepare" depends="init, servlet-check">
+ <!-- create directories -->
+ <echo message="Preparing the build directories"/>
+ <mkdir dir="${build.dir}"/>
+ <mkdir dir="${build.dest}"/>
+ </target>
+ <!-- =================================================================== -->
+ <!-- Compiles the source directory -->
+ <!-- =================================================================== -->
+ <target name="compile" depends="prepare">
+ <echo message="Compiling the sources "/>
+ <javac srcdir="${src.dir}" destdir="${build.dest}" debug="${debug}"
deprecation="${deprecation}" optimize="${optimize}">
+ <classpath refid="project.class.path"/>
+ </javac>
+ </target>
+ <!-- =================================================================== -->
+ <!-- Creates the class package -->
+ <!-- =================================================================== -->
+ <target name="package" depends="compile">
+ <echo message="Creating the WAR file"/>
+ <war warfile="${build.dir}/fop.war" webxml="${conf.dir}/web.xml">
+ <lib dir="${fop.lib.dir}">
+ <include name="avalon-framework*.jar"/>
+ <include name="batik*.jar"/>
+ </lib>
+ <lib dir="${fop.lib.dir}/../build">
+ <include name="fop.jar"/>
+ </lib>
+ <classes dir="${build.dest}"/>
+ </war>
+ </target>
+ <target name="all" depends="package"/>
+ <!-- "all" target for us Makefile converts ;-) -->
+ <!-- =================================================================== -->
+ <!-- Clean targets -->
+ <!-- =================================================================== -->
+ <target name="clean" depends="init">
+ <delete dir="${build.dir}"/>
+ </target>
</project>
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
