You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tomcat.apache.org by cr...@locus.apache.org on 2000/08/25 04:58:57 UTC
cvs commit: jakarta-tomcat-4.0/webapps/examples build.xml
craigmcc 00/08/24 19:58:57
Modified: catalina build.xml
catalina/src/share/org/apache/catalina Globals.java
jasper build.xml
webapps build.xml
webapps/ROOT build.xml
webapps/examples build.xml
Log:
Provide consistent build.xml targets for all three top-level directories,
where xxxxx is the name of the particular subproject (catalina, jasper,
or webapps):
* build-main - Compile/copy files to ../../build/xxxxx for use
in further steps. This target runs the fastest, and is typically used
when you want to make sure the changes you just made compile cleanly.
This is the default target
* deploy - Copy from ../../build/xxxxx to ../../build/tomcat-4.0, which
is the directory from which you can execute Tomcat. It does not matter
what order you do the deploys of the subprojects from, but you will need
all three in order to match the behavior of Tomcat 3.x.
* dist - Build stand-alone distributions in ../../dist/xxxxx for the
various subprojects.
A top level set of scripts will be created soon to build complete
distributions (both binary and source) from scratch, so that early access
releases of Tomcat 4.0 can be made available to non-CVS users.
Revision Changes Path
1.7 +89 -9 jakarta-tomcat-4.0/catalina/build.xml
Index: build.xml
===================================================================
RCS file: /home/cvs/jakarta-tomcat-4.0/catalina/build.xml,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- build.xml 2000/08/21 21:08:34 1.6
+++ build.xml 2000/08/25 02:58:53 1.7
@@ -5,12 +5,14 @@
<property name="ant.home" value="../../jakarta-ant"/>
<property name="build.compiler" value="classic"/>
<property name="catalina.build" value="../../build/catalina"/>
+ <property name="catalina.deploy" value="../../build/tomcat-4.0"/>
<property name="catalina.dist" value="../../dist/catalina"/>
<property name="jaxp.home" value="../../jaxp"/>
<property name="jsse.home" value="../../jsse"/>
<property name="regexp.home" value="../../jakarta-regexp"/>
<property name="servletapi.home" value="../../jakarta-servletapi"/>
+
<!-- ================== Derived Property Values ========================= -->
<property name="jaxp.jar" value="${jaxp.home}/jaxp.jar"/>
<property name="jnet.jar" value="${jsse.home}/lib/jnet.jar"/>
@@ -27,9 +29,7 @@
<mkdir dir="${catalina.build}/classes"/>
<mkdir dir="${catalina.build}/conf"/>
<mkdir dir="${catalina.build}/lib"/>
- <mkdir dir="${catalina.build}/logs"/>
<mkdir dir="${catalina.build}/server"/>
- <mkdir dir="${catalina.build}/webapps"/>
</target>
@@ -50,9 +50,6 @@
<!-- Shared Extensions -->
<!-- All applications need the servlet API classes -->
<copyfile src="${servlet.jar}" dest="${catalina.build}/lib/servlet.jar"/>
- <!-- Jasper needs a JAXP-compatible XML parser -->
- <copyfile src="${jaxp.jar}" dest="${catalina.build}/lib/jaxp.jar"/>
- <copyfile src="${parser.jar}" dest="${catalina.build}/lib/parser.jar"/>
<!-- Server Components -->
<!-- Catalina needs a JAXP-compatible XML parser -->
@@ -90,12 +87,12 @@
<!-- ================ BUILD: Create Catalina Javadocs =================== -->
<target name="javadoc" depends="build-main">
- <deltree dir="${catalina.build}/webapps/ROOT/catalina-javadoc"/>
- <mkdir dir="${catalina.build}/webapps/ROOT/catalina-javadoc"/>
+ <deltree dir="${catalina.build}/javadoc"/>
+ <mkdir dir="${catalina.build}/javadoc"/>
<javadoc packagenames="org.apache.catalina.*"
classpath="${regexp.jar}:${servlet.jar}:${catalina.build}/classes"
sourcepath="src/share"
- destdir="${catalina.build}/webapps/ROOT/catalina-javadoc"
+ destdir="${catalina.build}/javadoc"
author="true"
version="true"
windowtitle="Catalina Internal API Documentation"
@@ -114,8 +111,91 @@
<!-- ==================== BUILD: Rebuild Everything ===================== -->
<target name="all" depends="build-clean,build-main"/>
+
+ <!-- ====================== DEPLOY: Create Directories ================== -->
+ <target name="deploy-prepare">
+ <mkdir dir="${catalina.deploy}"/>
+ <mkdir dir="${catalina.deploy}/bin"/>
+ <mkdir dir="${catalina.deploy}/conf"/>
+ <mkdir dir="${catalina.deploy}/lib"/>
+ <mkdir dir="${catalina.deploy}/logs"/>
+ <mkdir dir="${catalina.deploy}/server"/>
+ <mkdir dir="${catalina.deploy}/work"/>
+ </target>
+
+
+ <!-- ====================== DEPLOY: Copy Static Files =================== -->
+ <target name="deploy-static" depends="build-main,deploy-prepare">
+
+ <!-- Executable Commands -->
+ <copydir src="${catalina.build}/bin" dest="${catalina.deploy}/bin"/>
+ <fixcrlf srcdir="${catalina.deploy}/bin" includes="*.sh" cr="remove"/>
+ <fixcrlf srcdir="${catalina.deploy}/bin" includes="*.bat" cr="add"/>
+ <chmod perm="+x" file="${catalina.deploy}/bin/catalina.sh"/>
+ <chmod perm="+x" file="${catalina.deploy}/bin/startup.sh"/>
+ <chmod perm="+x" file="${catalina.deploy}/bin/shutdown.sh"/>
+
+ <!-- Configuration Files -->
+ <copydir src="${catalina.build}/conf" dest="${catalina.deploy}/conf"/>
+
+ <!-- Shared Extensions -->
+ <copydir src="${catalina.build}/lib" dest="${catalina.deploy}/lib"/>
+
+ <!-- Server Components -->
+ <copydir src="${catalina.build}/server" dest="${catalina.deploy}/server"/>
+
+ </target>
+
+
+ <!-- ====================== DEPLOY: Create Catalina JAR ================= -->
+ <target name="deploy-main" depends="deploy-static">
+ <jar jarfile="${catalina.deploy}/server/catalina.jar"
+ basedir="${catalina.build}/classes"/>
+ </target>
+
+
+ <!-- ====================== DEPLOY: Deploy Catalina Build =============== -->
+ <target name="deploy" depends="deploy-main"/>
+
+
+ <!-- ====================== DEPLOY: Clean Directories =================== -->
+ <target name="deploy-clean">
+ <deltree dir="${catalina.deploy}"/>
+ </target>
+
+
+ <!-- ================ DIST: Create Distribution ========================= -->
+ <target name="dist" depends="build-main">
+
+ <mkdir dir="${catalina.dist}/bin"/>
+ <copydir src="${catalina.build}/bin" dest="${catalina.dist}/bin"/>
+ <fixcrlf srcdir="${catalina.dist}/bin" includes="*.sh" cr="remove"/>
+ <fixcrlf srcdir="${catalina.dist}/bin" includes="*.bat" cr="add"/>
+ <chmod perm="+x" file="${catalina.dist}/bin/catalina.sh"/>
+ <chmod perm="+x" file="${catalina.dist}/bin/jspc.sh"/>
+
+ <mkdir dir="${catalina.dist}/conf"/>
+ <copydir src="${catalina.build}/conf" dest="${catalina.dist}/conf"/>
+
+ <mkdir dir="${catalina.dist}/lib"/>
+ <copydir src="${catalina.build}/lib" dest="${catalina.dist}/lib"/>
+
+ <mkdir dir="${catalina.dist}/server"/>
+ <copydir src="${catalina.build}/server" dest="${catalina.dist}/server"/>
+ <jar jarfile="${catalina.dist}/server/catalina.jar"
+ basedir="${catalina.build}/classes"/>
+
+ </target>
+
+
+ <!-- ======================== DIST: Clean Directory ===================== -->
+ <target name="dist-clean">
+ <deltree dir="${catalina.dist}"/>
+ </target>
+
+
<!-- ====================== Convenient Synonyms ========================= -->
- <target name="clean" depends="build-clean"/>
+ <target name="clean" depends="build-clean, dist-clean"/>
</project>
1.2 +4 -4 jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/Globals.java
Index: Globals.java
===================================================================
RCS file: /home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/Globals.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- Globals.java 2000/08/24 23:56:55 1.1
+++ Globals.java 2000/08/25 02:58:53 1.2
@@ -1,7 +1,7 @@
/*
- * $Header: /home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/Globals.java,v 1.1 2000/08/24 23:56:55 craigmcc Exp $
- * $Revision: 1.1 $
- * $Date: 2000/08/24 23:56:55 $
+ * $Header: /home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/Globals.java,v 1.2 2000/08/25 02:58:53 craigmcc Exp $
+ * $Revision: 1.2 $
+ * $Date: 2000/08/25 02:58:53 $
*
* ====================================================================
*
@@ -69,7 +69,7 @@
* Global constants that are applicable to multiple packages within Catalina.
*
* @author Craig R. McClanahan
- * @version $Revision: 1.1 $ $Date: 2000/08/24 23:56:55 $
+ * @version $Revision: 1.2 $ $Date: 2000/08/25 02:58:53 $
*/
public final class Globals {
@@ -89,7 +89,7 @@
* delimited with the appropriate path delimiter for this platform.
*/
public static final String CLASS_PATH_ATTR =
- "org.apache.catalina.jsp.classpath";
+ "org.apache.catalina.jsp_classpath";
/**
1.4 +53 -34 jakarta-tomcat-4.0/jasper/build.xml
Index: build.xml
===================================================================
RCS file: /home/cvs/jakarta-tomcat-4.0/jasper/build.xml,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- build.xml 2000/08/21 21:07:23 1.3
+++ build.xml 2000/08/25 02:58:53 1.4
@@ -5,11 +5,12 @@
<property name="ant.home" value="../../jakarta-ant"/>
<property name="build.compiler" value="classic"/>
<property name="jasper.build" value="../../build/jasper"/>
+ <property name="jasper.deploy" value="../../build/tomcat-4.0"/>
<property name="jasper.dist" value="../../dist/jasper"/>
<property name="jaxp.home" value="../../jaxp"/>
<property name="servletapi.home" value="../../jakarta-servletapi"/>
- <property name="catalina.build" value="../../build/catalina"/>
+
<!-- ================== Derived Property Values ========================= -->
<property name="jaxp.jar" value="${jaxp.home}/jaxp.jar"/>
<property name="parser.jar" value="${jaxp.home}/parser.jar"/>
@@ -21,9 +22,7 @@
<mkdir dir="${jasper.build}"/>
<mkdir dir="${jasper.build}/bin"/>
<mkdir dir="${jasper.build}/classes"/>
- <mkdir dir="${jasper.build}/conf"/>
<mkdir dir="${jasper.build}/lib"/>
- <mkdir dir="${jasper.build}/logs"/>
</target>
@@ -37,11 +36,8 @@
<chmod perm="+x" file="${jasper.build}/bin/jasper.sh"/>
<chmod perm="+x" file="${jasper.build}/bin/jspc.sh"/>
- <!-- Configuration Files -->
- <!-- <copydir src="src/conf" dest="${jasper.build}/conf"/> -->
-
<!-- Shared Extensions -->
- <!-- All applications need the servlet API classes -->
+ <!-- Japser needs the servlet API classes -->
<copyfile src="${servlet.jar}" dest="${jasper.build}/lib/servlet.jar"/>
<!-- Jasper needs a JAXP-compatible XML parser -->
<copyfile src="${jaxp.jar}" dest="${jasper.build}/lib/jaxp.jar"/>
@@ -66,14 +62,15 @@
</target>
+
<!-- ================ BUILD: Create Jasper Javadocs ===================== -->
<target name="javadoc" depends="build-main">
- <deltree dir="${catalina.build}/webapps/ROOT/jasper-javadoc"/>
- <mkdir dir="${catalina.build}/webapps/ROOT/jasper-javadoc"/>
+ <deltree dir="${jasper.build}/javadoc"/>
+ <mkdir dir="${jasper.build}/javadoc"/>
<javadoc packagenames="org.apache.jasper.*"
classpath="${servlet.jar}:${jasper.build}/classes"
sourcepath="src/share"
- destdir="${catalina.build}/webapps/ROOT/jasper-javadoc"
+ destdir="${jasper.build}/javadoc"
author="true"
version="true"
windowtitle="Jasper Internal API Documentation"
@@ -93,46 +90,68 @@
<target name="all" depends="build-clean,build-main"/>
- <!-- ================ DIST: Create Directories ========================== -->
- <target name="dist-prepare">
- <mkdir dir="${jasper.dist}/bin"/>
- <mkdir dir="${jasper.dist}/lib"/>
+ <!-- ====================== DEPLOY: Create Directories ================== -->
+ <target name="deploy-prepare">
+ <mkdir dir="${jasper.deploy}"/>
+ <mkdir dir="${jasper.deploy}/bin"/>
+ <mkdir dir="${jasper.deploy}/lib"/>
+ </target>
+
+
+ <!-- ====================== DEPLOY: Copy Static Files =================== -->
+ <target name="deploy-static" depends="build-main,deploy-prepare">
+
+ <!-- Executable Commands -->
+ <copydir src="${jasper.build}/bin" dest="${jasper.deploy}/bin"/>
+ <fixcrlf srcdir="${jasper.deploy}/bin" includes="*.sh" cr="remove"/>
+ <fixcrlf srcdir="${jasper.deploy}/bin" includes="*.bat" cr="add"/>
+ <chmod perm="+x" file="${jasper.deploy}/bin/jasper.sh"/>
+ <chmod perm="+x" file="${jasper.deploy}/bin/jspc.sh"/>
+
+ <!-- Shared Extensions -->
+ <copydir src="${jasper.build}/lib" dest="${jasper.deploy}/lib"/>
+
+ </target>
+
+
+ <!-- ====================== DEPLOY: Create Jasper JAR =================== -->
+ <target name="deploy-main" depends="deploy-static">
+ <jar jarfile="${jasper.deploy}/lib/jasper.jar"
+ basedir="${jasper.build}/classes"/>
</target>
- <!-- ================ DIST: Copy Static Files =========================== -->
- <target name="dist-static" depends="dist-prepare, build-static">
+ <!-- ====================== DEPLOY: Deploy Jasper Build ================= -->
+ <target name="deploy" depends="deploy-main"/>
+
+
+ <!-- ====================== DEPLOY: Clean Directories =================== -->
+ <target name="deploy-clean">
+ <deltree dir="${jasper.deploy}"/>
+ </target>
+
+
+ <!-- ================ DIST: Create Distribution ========================= -->
+ <target name="dist" depends="build-main">
+
+ <mkdir dir="${jasper.dist}/bin"/>
<copydir src="${jasper.build}/bin" dest="${jasper.dist}/bin"/>
<fixcrlf srcdir="${jasper.dist}/bin" includes="*.sh" cr="remove"/>
<fixcrlf srcdir="${jasper.dist}/bin" includes="*.bat" cr="add"/>
<chmod perm="+x" file="${jasper.dist}/bin/jasper.sh"/>
<chmod perm="+x" file="${jasper.dist}/bin/jspc.sh"/>
- </target>
+ <mkdir dir="${jasper.dist}/lib"/>
+ <copydir src="${jasper.build}/lib" dest="${jasper.dist}/lib"/>
+ <jar jarfile="${jasper.dist}/lib/jasper.jar"
+ basedir="${jasper.build}/classes"/>
- <!-- ================ DIST: Create Distribution ========================= -->
- <target name="dist" depends="dist-static, build-main">
- <jar jarfile="${jasper.dist}/lib/jasper.jar"
- basedir="${jasper.build}/classes" >
- <include name="org/apache/jasper/**" />
- </jar>
</target>
<!-- ======================== DIST: Clean Directory ===================== -->
<target name="dist-clean">
<deltree dir="${jasper.dist}"/>
- </target>
-
-
- <!-- ================ DIST: Deploy for Catalina ========================= -->
- <target name="deploy" depends="dist">
- <copydir src="${jasper.dist}/bin" dest="${catalina.build}/bin">
- <include name="j*"/>
- </copydir>
- <chmod perm="+x" file="${catalina.build}/bin/jasper.sh"/>
- <chmod perm="+x" file="${catalina.build}/bin/jspc.sh"/>
- <copyfile src="${jasper.dist}/lib/jasper.jar" dest="${catalina.build}/lib/jasper.jar"/>
</target>
1.3 +27 -27 jakarta-tomcat-4.0/webapps/build.xml
Index: build.xml
===================================================================
RCS file: /home/cvs/jakarta-tomcat-4.0/webapps/build.xml,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- build.xml 2000/08/23 18:32:11 1.2
+++ build.xml 2000/08/25 02:58:54 1.3
@@ -4,10 +4,12 @@
<!-- ===================== Initialize Property Values =================== -->
<property name="ant.home" value="../../jakarta-ant"/>
<property name="build.compiler" value="classic"/>
+ <property name="servletapi.home" value="../../jakarta-servletapi"/>
<property name="webapps.build" value="../../build/webapps"/>
+ <property name="webapps.deploy" value="../../build/tomcat-4.0"/>
<property name="webapps.dist" value="../../dist/webapps"/>
- <property name="servletapi.home" value="../../jakarta-servletapi"/>
+
<!-- ================== Derived Property Values ========================= -->
<property name="servlet.jar" value="${servletapi.home}/lib/servlet.jar"/>
@@ -15,7 +17,7 @@
<!-- =================== BUILD: Create Directories ====================== -->
<target name="build-prepare">
<mkdir dir="${webapps.build}"/>
- <mkdir dir="${webapps.build}/"/>
+ <mkdir dir="${webapps.dist}"/>
</target>
@@ -26,48 +28,46 @@
<ant dir="./ROOT" target="dist"/>
</target>
- <target name="ROOT-deploy">
- <ant dir="./ROOT" target="deploy"/>
- </target>
-
- <target name="ROOT-deploydist">
- <ant dir="./ROOT" target="deploy-dist"/>
- </target>
-
<target name="examples">
<ant dir="./examples" target="dist"/>
</target>
- <target name="examples-deploy">
- <ant dir="./examples" target="deploy"/>
- </target>
-
- <target name="examples-deploydist">
- <ant dir="./examples" target="deploy-dist"/>
- </target>
<!-- ================= BUILD: Compile Server Components ================= -->
+ <!-- Update the depends list for each subproject -->
<target name="build" depends="build-prepare,ROOT,examples"/>
- <!-- ================= BUILD: Create Distribution Files ================= -->
- <target name="dist" depends="build-prepare,ROOT,examples"/>
- <!-- ================= BUILD: Deploy Webapps Projects =================== -->
- <target name="deploy" depends="ROOT-deploy,examples-deploy"/>
-
- <!-- ================= BUILD: Deploy Webapps Distribution Files ========= -->
- <target name="deploy-dist" depends="ROOT-deploydist,examples-deploydist"/>
-
<!-- ======================= BUILD: Clean Directory ===================== -->
<target name="build-clean">
<deltree dir="${webapps.build}"/>
- <deltree dir="${webapps.dist}"/>
</target>
+
<!-- ==================== BUILD: Rebuild Everything ===================== -->
<target name="all" depends="build-clean,dist"/>
+
+ <!-- ================= DEPLOY: Deploy Webapps Projects ================== -->
+ <target name="deploy" depends="dist">
+ <deltree dir="${webapps.deploy}/webapps"/>
+ <mkdir dir="${webapps.deploy}/webapps"/>
+ <copydir src="${webapps.dist}" dest="${webapps.deploy}/webapps"/>
+ </target>
+
+
+ <!-- ================= DIST: Create Distribution Files ================== -->
+ <target name="dist" depends="build"/>
+
+
+ <!-- ======================= DIST: Clean Directory ====================== -->
+ <target name="dist-clean">
+ <deltree dir="${webapps.dist}"/>
+ </target>
+
+
<!-- ====================== Convenient Synonyms ========================= -->
- <target name="clean" depends="build-clean"/>
+ <target name="clean" depends="build-clean,dist-clean"/>
+
</project>
1.2 +14 -53 jakarta-tomcat-4.0/webapps/ROOT/build.xml
Index: build.xml
===================================================================
RCS file: /home/cvs/jakarta-tomcat-4.0/webapps/ROOT/build.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- build.xml 2000/08/23 18:29:48 1.1
+++ build.xml 2000/08/25 02:58:55 1.2
@@ -4,16 +4,12 @@
<!-- ===================== Initialize Property Values =================== -->
<property name="ant.home" value="../../../jakarta-ant"/>
<property name="build.compiler" value="classic"/>
- <property name="build.catalina" value="../../../build/catalina"/>
<property name="build.dir" value="../../../build/webapps"/>
<property name="dist.dir" value="../../../dist/webapps"/>
- <property name="dist.servletapi" value="../../../dist/servletapi"/>
- <property name="deploy.dir" value="../../../build/catalina/webapps"/>
- <property name="deploy-dist.dir" value="../../../dist/catalina/webapps"/>
<property name="servletapi.home" value="../../../jakarta-servletapi"/>
- <property name="webapps.name" value="ROOT"/>
- <property name="webapps.src" value="WEB-INF"/>
+ <property name="webapp.name" value="ROOT"/>
+
<!-- ================== Derived Property Values ========================= -->
<property name="servlet.jar" value="${servletapi.home}/lib/servlet.jar"/>
@@ -21,86 +17,51 @@
<!-- =================== BUILD: Create Directories ====================== -->
<target name="build-prepare">
<mkdir dir="${build.dir}"/>
- <mkdir dir="${build.dir}/${webapps.name}"/>
+ <mkdir dir="${build.dir}/${webapp.name}"/>
</target>
<!-- ================ BUILD: Copy Static Files ========================== -->
<target name="build-static" depends="build-prepare">
- <copydir src="." dest="${build.dir}/${webapps.name}"
+ <copydir src="." dest="${build.dir}/${webapp.name}"
excludes="build.*"/>
<copydir src="../../catalina/docs"
- dest="${build.dir}/${webapps.name}/docs"/>
- </target>
-
-
- <!-- ================ BUILD: Copy Javadoc Files ========================= -->
- <target name="build-javadoc" depends="build-static">
- <copydir src="${build.catalina}/webapps/ROOT/catalina-javadoc"
- dest="${build.dir}/${webapps.name}/catalina-javadoc"/>
- <copydir src="${build.catalina}/webapps/ROOT/jasper-javadoc"
- dest="${build.dir}/${webapps.name}/jasper-javadoc"/>
- <copydir src="${dist.servletapi}/docs/api"
- dest="${build.dir}/${webapps.name}/servletapi-javadoc"/>
+ dest="${build.dir}/${webapp.name}/docs"/>
+ <!-- FIXME: JavaDocs????? -->
</target>
<!-- ================= BUILD: Compile Server Components ================= -->
- <target name="build-main" depends="build-static">
- <!--
- <javac srcdir="WEB-INF/classes"
- destdir="${build.dir}/${webapps.name}/WEB-INF/classes"
- classpath="${servlet.jar}"
- deprecation="off" debug="on" optimize="off"
- excludes="**/CVS/**"/>
- -->
- </target>
+ <target name="build-main" depends="build-static"/>
- <!-- ======================= BUILD: Deploy Build Files ================== -->
- <target name="deploy" depends="build-main,build-javadoc">
- <copydir src="${build.dir}/${webapps.name}"
- dest="${deploy.dir}/${webapps.name}">
- </copydir>
- </target>
+ <!-- ==================== BUILD: Rebuild Everything ===================== -->
+ <target name="all" depends="build-clean,build-main"/>
<!-- ======================= BUILD: Clean Directory ===================== -->
<target name="build-clean">
- <deltree dir="${build.dir}/${webapps.name}"/>
+ <deltree dir="${build.dir}/${webapp.name}"/>
</target>
<!-- ======================= DIST: Create Directories =================== -->
<target name="dist-prepare">
<mkdir dir="${dist.dir}"/>
- <mkdir dir="${dist.dir}/${webapps.name}"/>
</target>
<!-- ======================= DIST: Create Distribution Files ============ -->
- <target name="dist" depends="build-main,build-javadoc,dist-prepare">
- <jar jarfile="${dist.dir}/${webapps.name}/${webapps.name}.war"
- basedir="${build.dir}/${webapps.name}" includes="**"/>
+ <target name="dist" depends="build-main,dist-prepare">
+ <jar jarfile="${dist.dir}/${webapp.name}.war"
+ basedir="${build.dir}/${webapp.name}" includes="**"/>
</target>
- <!-- ======================= DIST: Deploy Distribution Files ============ -->
- <target name="deploy-dist" depends="dist">
- <copydir src="${dist.dir}/${webapps.name}"
- dest="${deploy-dist.dir}">
- </copydir>
- </target>
-
-
<!-- ======================= DIST: Clean Directory ====================== -->
<target name="dist-clean">
- <deltree dir="${dist.dir}/${webapps.name}"/>
+ <deltree dir="${dist.dir}/${webapp.name}"/>
</target>
-
-
- <!-- ==================== BUILD: Rebuild Everything ===================== -->
- <target name="all" depends="build-clean,build-main"/>
<!-- ====================== Convenient Synonyms ========================= -->
1.2 +35 -47 jakarta-tomcat-4.0/webapps/examples/build.xml
Index: build.xml
===================================================================
RCS file: /home/cvs/jakarta-tomcat-4.0/webapps/examples/build.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- build.xml 2000/08/21 18:30:26 1.1
+++ build.xml 2000/08/25 02:58:56 1.2
@@ -4,17 +4,11 @@
<!-- ===================== Initialize Property Values =================== -->
<property name="ant.home" value="../../../jakarta-ant"/>
<property name="build.compiler" value="classic"/>
- <property name="servletapi.home" value="../../../jakarta-servletapi"/>
<property name="build.dir" value="../../../build/webapps"/>
<property name="dist.dir" value="../../../dist/webapps"/>
- <property name="deploy.dir" value="../../../build/catalina/webapps"/>
- <property name="deploy-dist.dir" value="../../../dist/catalina/webapps"/>
+ <property name="servletapi.home" value="../../../jakarta-servletapi"/>
+ <property name="webapp.name" value="examples"/>
- <property name="webapps.name" value="examples"/>
- <property name="webapps.src" value="WEB-INF"/>
- <property name="jsp.src" value="jsp"/>
- <property name="servlets.src" value="servlets"/>
- <property name="images.src" value="images"/>
<!-- ================== Derived Property Values ========================= -->
<property name="servlet.jar" value="${servletapi.home}/lib/servlet.jar"/>
@@ -22,73 +16,67 @@
<!-- =================== BUILD: Create Directories ====================== -->
<target name="build-prepare">
- <!-- Set up build directories -->
- <mkdir dir="${build.dir}/${webapps.name}"/>
+ <mkdir dir="${build.dir}"/>
+ <mkdir dir="${build.dir}/${webapp.name}"/>
+ </target>
- <!-- Set up distribution directories -->
- <mkdir dir="${dist.dir}/${webapps.name}"/>
+
+ <!-- ================ BUILD: Copy Static Files ========================== -->
+ <target name="build-static" depends="build-prepare">
+ <copydir src="." dest="${build.dir}/${webapp.name}"
+ excludes="build.*"/>
</target>
<!-- ================= BUILD: Compile Server Components ================= -->
- <target name="build-main" depends="build-prepare">
-
- <copydir src="${webapps.src}"
- dest="${build.dir}/${webapps.name}/${webapps.src}"/>
- <copydir src="${jsp.src}"
- dest="${build.dir}/${webapps.name}/${jsp.src}"/>
- <copydir src="${servlets.src}"
- dest="${build.dir}/${webapps.name}/${servlets.src}"/>
- <copydir src="${images.src}"
- dest="${build.dir}/${webapps.name}/${images.src}"/>
+ <target name="build-main" depends="build-static">
- <!-- Compile internal server components -->
<javac srcdir="WEB-INF/classes"
- destdir="${build.dir}/${webapps.name}/WEB-INF/classes"
+ destdir="${build.dir}/${webapp.name}/WEB-INF/classes"
classpath="${servlet.jar}"
deprecation="off" debug="on" optimize="off"
excludes="**/CVS/**"/>
+
<javac srcdir="jsp/plugin/applet"
- destdir="${build.dir}/${webapps.name}/jsp/plugin/applet"
+ destdir="${build.dir}/${webapp.name}/jsp/plugin/applet"
classpath="${servlet.jar}"
deprecation="off" debug="on" optimize="off"
excludes="**/CVS/**"/>
</target>
- <!-- ======================= DIST: Create Distribution Files ============ -->
- <target name="dist" depends="build-main">
- <!-- Create webapp WARS -->
- <jar jarfile="${dist.dir}/${webapps.name}/${webapps.name}.war"
- basedir="${build.dir}/${webapps.name}" includes="**"/>
+
+ <!-- ==================== BUILD: Rebuild Everything ===================== -->
+ <target name="all" depends="build-clean,build-main"/>
+
+
+ <!-- ======================= BUILD: Clean Directory ===================== -->
+ <target name="build-clean">
+ <deltree dir="${build.dir}/${webapp.name}"/>
</target>
- <!-- ======================= BUILD: Deploy Build ======================== -->
- <target name="deploy" depends="build-main">
- <copydir src="${build.dir}/${webapps.name}"
- dest="${deploy.dir}/${webapps.name}">
- </copydir>
+ <!-- ======================= DIST: Create Directories =================== -->
+ <target name="dist-prepare">
+ <mkdir dir="${dist.dir}"/>
</target>
- <!-- ======================= BUILD: Deploy Distribution Files =========== -->
- <target name="deploy-dist" depends="dist">
- <copydir src="${dist.dir}/${webapps.name}"
- dest="${deploy-dist.dir}">
- </copydir>
+
+ <!-- ======================= DIST: Create Distribution Files ============ -->
+ <target name="dist" depends="build-main,dist-prepare">
+ <jar jarfile="${dist.dir}/${webapp.name}.war"
+ basedir="${build.dir}/${webapp.name}" includes="**"/>
</target>
- <!-- ======================= BUILD: Clean Directory ===================== -->
- <target name="build-clean">
- <deltree dir="${build.dir}/${webapps.name}"/>
- <deltree dir="${dist.dir}/${webapps.name}"/>
+
+ <!-- ======================= DIST: Clean Directory ====================== -->
+ <target name="dist-clean">
+ <deltree dir="${dist.dir}/${webapp.name}"/>
</target>
- <!-- ==================== BUILD: Rebuild Everything ===================== -->
- <target name="all" depends="build-clean,build-main"/>
<!-- ====================== Convenient Synonyms ========================= -->
- <target name="clean" depends="build-clean"/>
+ <target name="clean" depends="build-clean,dist-clean"/>
</project>