remm 01/06/17 16:07:39
Modified: . build.xml
Log:
- Reorganize the build so that the builds generated by the nightly builds and
the full-dist target now look like the release builds.
- Remove the need for a separate release directory.
- The zips and tgzs now contain files which will extract to a
jakarta-slide-1.0dev directory, which is similar to what most of the other
projects do.
Revision Changes Path
1.96 +130 -122 jakarta-slide/build.xml
Index: build.xml
===================================================================
RCS file: /home/cvs/jakarta-slide/build.xml,v
retrieving revision 1.95
retrieving revision 1.96
diff -u -r1.95 -r1.96
--- build.xml 2001/06/14 22:46:46 1.95
+++ build.xml 2001/06/17 23:07:39 1.96
@@ -12,17 +12,16 @@
<!-- Compiler Options -->
<!-- =================================================================== -->
<!-- Should Java compilations set the 'debug' compiler option? -->
- <property name="compile.debug" value="true"/>
-
+ <property name="compile.debug" value="true"/>
<!-- Should Java compilations set the 'deprecation' compiler option? -->
- <property name="compile.deprecation" value="true"/>
-
+ <property name="compile.deprecation" value="true"/>
<!-- Should Java compilations set the 'optimize' compiler option? -->
- <property name="compile.optimize" value="true"/>
+ <property name="compile.optimize" value="true"/>
+ <property name="build.compiler" value="classic" />
<!-- =================================================================== -->
- <!-- Properties -->
+ <!-- Project Properties -->
<!-- =================================================================== -->
<property name="name" value="Jakarta-Slide" />
<property name="year" value="2000" />
@@ -30,13 +29,18 @@
<property name="project" value="jakarta-slide" />
<property name="final.name" value="${project}-${version}" />
<property name="final-src.name" value="${project}-src-${version}" />
- <property name="ant.home" value="../jakarta-ant" />
- <property name="build.compiler" value="classic" />
+
+
+ <!-- =================================================================== -->
+ <!-- Dependencies Properties -->
+ <!-- =================================================================== -->
<property name="catalina.build"
value="../jakarta-tomcat-4.0/catalina/build" />
<property name="catalina.dist" value="../jakarta-tomcat-4.0/dist" />
+ <property name="servletapi.home"
+ value="../jakarta-servletapi/" />
<property name="servlet.jar"
- value="../jakarta-servletapi/lib/servlet.jar" />
+ value="${servletapi.home}/lib/servlet.jar" />
<property name="jdom.home" value="./lib"/>
<property name="jdom.jar" value="${jdom.home}/jdom.jar"/>
<property name="jaxp.home" value="../jaxp"/>
@@ -51,24 +55,30 @@
<property name="jndi.jar" value="./lib/jndi.jar"/>
<property name="jta.jar" value="./lib/jta.jar"/>
<property name="log4j.jar" value="./lib/log4j.jar"/>
- <property name="naming.jar"
value="${catalina.dist}/common/lib/naming.jar"/>
- <property name="resources.jar"
value="${catalina.dist}/common/lib/resources.jar"/>
- <property name="catalina.jar"
value="${catalina.dist}/server/lib/catalina.jar"/>
+ <property name="naming.jar"
+ value="${catalina.dist}/common/lib/naming.jar"/>
+ <property name="resources.jar"
+ value="${catalina.dist}/common/lib/resources.jar"/>
+ <property name="catalina.jar"
+ value="${catalina.dist}/server/lib/catalina.jar"/>
<property name="struts.home" value="."/>
- <property name="struts.jar" value="${struts.home}/lib/struts.jar"/>
+ <property name="struts.jar"
+ value="${struts.home}/lib/struts.jar"/>
<property name="commons-httpclient.jar"
- value="../jakarta-commons/httpclient/dist/commons-httpclient.jar"/>
+ value="../jakarta-commons/httpclient/dist/commons-httpclient.jar"/>
<property name="tomcat.build" value="../jakarta-tomcat-4.0/build" />
- <property name="avalon.dist" value="../dist/avalon" />
+
+
+ <!-- =================================================================== -->
+ <!-- Build Properties -->
+ <!-- =================================================================== -->
<property name="slide.build" value="./build" />
<property name="slide.dist" value="./dist" />
- <property name="dav.dist" value="../dist/dav" />
- <property name="webapp.dist" value="${slide.dist}/webapp" />
- <property name="slide.release" value="./release" />
- <property name="slide.archive" value="./${final.name}" />
- <property name="slide-src.archive" value="./${final-src.name}" />
<property name="webdavclient.build" value="${slide.build}/client" />
<property name="webdavclient.dist" value="${slide.dist}/client" />
+ <property name="webapp.dist" value="${slide.dist}/slide/webapp" />
+ <property name="slide.archive" value="./${final.name}" />
+ <property name="slide-src.archive" value="./${final-src.name}" />
<!-- =================================================================== -->
@@ -210,11 +220,9 @@
<echo message="Packaging" />
<echo message="---------" />
<echo message="" />
- <echo message="release : Builds a milestone distribution" />
- <echo message="release-clean : Cleans the milestone distribution directory" />
<echo message="package-zip : Builds a zipped package of the milestone
distribution" />
<echo message="package-tgz : Builds a tgzed package of the milestone
distribution" />
- <echo message="package-all : Builds both zip and tgz packages" />
+ <echo message="release : Builds both zip and tgz packages" />
<echo message="" />
<echo message="DAV client targets" />
<echo message="------------------" />
@@ -660,7 +668,6 @@
<target name="clean">
<delete dir="${slide.build}"/>
<delete dir="${slide.dist}"/>
- <delete dir="${dav.dist}"/>
</target>
@@ -685,12 +692,12 @@
<mkdir dir="${slide.dist}" />
<mkdir dir="${slide.dist}/client" />
<mkdir dir="${slide.dist}/server" />
- <mkdir dir="${slide.dist}/webapp" />
- <mkdir dir="${slide.dist}/lib" />
- <mkdir dir="${slide.dist}/examples" />
- <mkdir dir="${slide.dist}/tests" />
+ <mkdir dir="${slide.dist}/slide/webapp" />
+ <mkdir dir="${slide.dist}/slide/lib" />
+ <mkdir dir="${slide.dist}/slide/examples" />
+ <mkdir dir="${slide.dist}/slide/tests" />
<mkdir dir="${slide.dist}/doc" />
- <mkdir dir="${slide.dist}/wrappers" />
+ <mkdir dir="${slide.dist}/slide/wrappers" />
</target>
@@ -713,26 +720,26 @@
</copy>
<echo message="Building Slide main JAR file" />
- <jar jarfile="${slide.dist}/lib/slide.jar"
+ <jar jarfile="${slide.dist}/slide/lib/slide.jar"
basedir="${slide.build}/classes"
manifest="${slide.build}/classes/MANIFEST.MF"
includes="LICENSE,README,CHANGELOG,org/apache/slide/**,org/apache/util/**"
excludes="org/apache/slide/webdav/**,org/apache/slide/manager/**" />
<echo message="Building Slide Standard Stores JAR file" />
- <jar jarfile="${slide.dist}/lib/slidestores.jar"
+ <jar jarfile="${slide.dist}/slide/lib/slidestores.jar"
basedir="${slide.build}/classes"
manifest="${slide.build}/classes/MANIFEST.MF"
includes="LICENSE,README,CHANGELOG,slidestore/**" />
<echo message="Building Default Roles JAR file" />
- <jar jarfile="${slide.dist}/lib/roles.jar"
+ <jar jarfile="${slide.dist}/slide/lib/roles.jar"
basedir="${slide.build}/classes"
manifest="${slide.build}/classes/MANIFEST.MF"
includes="LICENSE,README,CHANGELOG,slideroles/**" />
<echo message="Building WebDAV Servlet JAR" />
- <jar jarfile="${slide.dist}/lib/webdav.jar"
+ <jar jarfile="${slide.dist}/slide/lib/webdav.jar"
basedir="${slide.build}/classes"
manifest="${slide.build}/classes/MANIFEST.MF"
includes="LICENSE,README,CHANGELOG,org/apache/slide/webdav/**" />
@@ -745,33 +752,30 @@
<fileset dir=".">
<include name="LICENSE" />
<include name="README" />
- <include name="CHANGELOG" />
<include name="RELEASE-INFO" />
- <include name="RELEASE-PLAN" />
- <include name="STATUS.html" />
</fileset>
</copy>
<echo message="Copying examples" />
- <copy todir="${slide.dist}/examples">
+ <copy todir="${slide.dist}/slide/examples">
<fileset dir="${slide.build}/examples" />
</copy>
<echo message="Copying tests" />
- <copy todir="${slide.dist}/tests">
+ <copy todir="${slide.dist}/slide/tests">
<fileset dir="${slide.build}/tests" />
</copy>
<echo message="Copying libraries" />
- <copy todir="${slide.dist}/lib">
+ <copy todir="${slide.dist}/slide/lib">
<fileset dir="${slide.build}/lib" />
</copy>
- <copy todir="${slide.dist}/lib" file="${jta.jar}" />
- <copy todir="${slide.dist}/lib" file="${junit.jar}" />
- <copy todir="${slide.dist}/lib" file="${jaxp.jar}" />
- <copy todir="${slide.dist}/lib" file="${xmlapi.jar}" />
- <copy todir="${slide.dist}/lib" file="${xmlparser.jar}" />
- <copy todir="${slide.dist}/lib" file="${jdom.jar}" />
+ <copy todir="${slide.dist}/slide/lib" file="${jta.jar}" />
+ <copy todir="${slide.dist}/slide/lib" file="${junit.jar}" />
+ <copy todir="${slide.dist}/slide/lib" file="${jaxp.jar}" />
+ <copy todir="${slide.dist}/slide/lib" file="${xmlapi.jar}" />
+ <copy todir="${slide.dist}/slide/lib" file="${xmlparser.jar}" />
+ <copy todir="${slide.dist}/slide/lib" file="${jdom.jar}" />
</target>
@@ -782,18 +786,18 @@
<target name="webapp-dist" depends="dist">
<filter token="AUTH" value="${authenticate}"/>
- <copy todir="${slide.dist}/conf" filtering="true" overwrite="yes" >
+ <copy todir="${slide.dist}/slide/conf" filtering="true" overwrite="yes" >
<fileset dir="src/conf/webapp">
<include name="web.xml"/>
</fileset>
</copy>
<war warfile="${webapp.dist}/slide.war"
- webxml="${slide.dist}/conf/web.xml">
+ webxml="${slide.dist}/slide/conf/web.xml">
<fileset dir="src/conf/webapp">
<include name="**/Domain.xml" />
</fileset>
- <lib dir="${slide.dist}/lib" />
+ <lib dir="${slide.dist}/slide/lib" />
</war>
<war warfile="${webapp.dist}/slidedoc.war"
@@ -832,7 +836,7 @@
<!-- =================================================================== -->
<target name="jndi-wrapper" depends="wrappers" if="jndi.present">
- <jar jarfile="${slide.dist}/wrappers/slidejndi.jar"
+ <jar jarfile="${slide.dist}/slide/wrappers/jndiwrapper.jar"
basedir="${slide.build}/classes"
manifest="${slide.build}/classes/MANIFEST.MF"
includes="LICENSE,README,CHANGELOG,**/wrappers/jndi/**" />
@@ -857,7 +861,7 @@
</fileset>
</copy>
- <jar jarfile="${slide.dist}/wrappers/catalinautil.jar"
+ <jar jarfile="${slide.dist}/slide/wrappers/catalinawrapper.jar"
basedir="${slide.build}/classes"
manifest="${slide.build}/classes/MANIFEST.MF"
includes="LICENSE,README,CHANGELOG,**/wrappers/catalina/**" />
@@ -883,7 +887,7 @@
</fileset>
</copy>
- <jar jarfile="${slide.dist}/wrappers/log4jwrapper.jar"
+ <jar jarfile="${slide.dist}/slide/wrappers/log4jwrapper.jar"
basedir="${slide.build}/classes"
manifest="${slide.build}/classes/MANIFEST.MF"
includes="LICENSE,README,CHANGELOG,**/log4j/**" />
@@ -912,19 +916,20 @@
<exclude name="**/webapps/**" />
<exclude name="**/src/**" />
<exclude name="**/logs/**" />
+ <exclude name="**/work/**" />
<exclude name="*.txt" />
</fileset>
</copy>
<copy todir="${slide.dist}/server/common/lib">
- <fileset dir="${slide.dist}/lib">
+ <fileset dir="${slide.dist}/slide/lib">
</fileset>
</copy>
- <copy file="${slide.dist}/wrappers/catalinautil.jar"
- tofile="${slide.dist}/server/server/lib/catalinautil.jar" />
- <copy file="${slide.dist}/wrappers/slidejndi.jar"
- tofile="${slide.dist}/server/server/lib/slidejndi.jar" />
+ <copy file="${slide.dist}/slide/wrappers/catalinawrapper.jar"
+ tofile="${slide.dist}/server/server/lib/catalinawrapper.jar" />
+ <copy file="${slide.dist}/slide/wrappers/jndiwrapper.jar"
+ tofile="${slide.dist}/server/server/lib/jndiwrapper.jar" />
<copy file="src/wrappers/catalina/server.xml"
tofile="${slide.dist}/server/conf/server.xml"
@@ -935,6 +940,7 @@
<mkdir dir="${slide.dist}/server/webapps" />
<mkdir dir="${slide.dist}/server/logs" />
+ <mkdir dir="${slide.dist}/server/work" />
<mkdir dir="${slide.dist}/server/blank" />
<!-- Sepcial handling for JAXP to avoid sealing violations with Jasper -->
@@ -977,83 +983,69 @@
jmx-wrapper" />
- <!-- =================================================================== -->
- <!-- Release Clean -->
- <!-- =================================================================== -->
- <target name="release-clean">
- <delete dir="${slide.release}" />
- </target>
-
-
<!-- =================================================================== -->
- <!-- Release Prepare -->
+ <!-- Packages the distribution with ZIP -->
<!-- =================================================================== -->
- <target name="release-prepare">
- <mkdir dir="${slide.release}" />
- <mkdir dir="${slide.release}/slide" />
- <mkdir dir="${slide.release}/client" />
- <mkdir dir="${slide.release}/webapp" />
+ <target name="package-zip" depends="full-dist">
+ <zip zipfile="${slide.dist}/${slide.archive}.zip">
+ <zipfileset dir="${slide.dist}" prefix="${final.name}"
+ includes="slide/**" />
+ <zipfileset dir="${slide.dist}" prefix="${final.name}"
+ includes="client/**" />
+ <zipfileset dir="${slide.dist}" prefix="${final.name}"
+ includes="server/**" />
+ <zipfileset dir="${slide.dist}" prefix="${final.name}"
+ includes="doc/**" />
+ <zipfileset dir="${slide.dist}" prefix="${final.name}"
+ includes="LICENSE" />
+ <zipfileset dir="${slide.dist}" prefix="${final.name}"
+ includes="README" />
+ <zipfileset dir="${slide.dist}" prefix="${final.name}"
+ includes="RELEASE-INFO" />
+ </zip>
</target>
<!-- =================================================================== -->
- <!-- Release -->
+ <!-- Packages the distribution with TAR-GZIP -->
<!-- =================================================================== -->
- <target name="release" depends="full-dist, release-prepare">
- <!--copydir src="${avalon.dist}"
- dest="${slide.release}/avalon" /-->
- <copy todir="${slide.release}/client">
- <fileset dir="${webdavclient.dist}" />
- </copy>
- <copy todir="${slide.release}/slide">
+ <target name="package-tgz" depends="full-dist">
+ <mkdir dir="${slide.dist}/${final.name}" />
+ <copy todir="${slide.dist}/${final.name}">
<fileset dir="${slide.dist}">
- <exclude name="client/**" />
- <exclude name="webapp/**" />
- </fileset>
- </copy>
- <copy file="${webapp.dist}/slide.war"
- tofile="${slide.release}/webapp/slide.war" />
- <copy file="${webapp.dist}/slidedoc.war"
- tofile="${slide.release}/webapp/slidedoc.war" />
- <copy todir="${slide.release}">
- <fileset dir=".">
+ <include name="slide/**" />
+ <include name="client/**" />
+ <include name="server/**" />
+ <include name="doc/**" />
<include name="LICENSE" />
<include name="README" />
- <include name="CHANGELOG" />
<include name="RELEASE-INFO" />
- <include name="RELEASE-PLAN" />
- <include name="STATUS.html" />
</fileset>
</copy>
+ <tar tarfile="${slide.dist}/${slide.archive}.tar">
+ <tarfileset dir="${slide.dist}" mode="755">
+ <include name="${final.name}/server/bin/catalina.sh" />
+ <include name="${final.name}/server/bin/startup.sh" />
+ <include name="${final.name}/server/bin/shutdown.sh" />
+ </tarfileset>
+ <tarfileset dir="${slide.dist}">
+ <include name="${final.name}/**" />
+ <exclude name="${final.name}/server/bin/catalina.sh" />
+ <exclude name="${final.name}/server/bin/startup.sh" />
+ <exclude name="${final.name}/server/bin/shutdown.sh" />
+ </tarfileset>
+ </tar>
+ <delete dir="${slide.dist}/${final.name}" />
+ <gzip zipfile="${slide.dist}/${slide.archive}.tar.gz"
+ src="${slide.dist}/${slide.archive}.tar"/>
+ <delete file="${slide.dist}/${slide.archive}.tar" />
</target>
<!-- =================================================================== -->
- <!-- Packages the distribution with ZIP -->
- <!-- =================================================================== -->
- <target name="package-zip" depends="release">
- <zip zipfile="${slide.archive}.zip"
- basedir="${slide.release}"
- includes="**"/>
- </target>
-
-
- <!-- =================================================================== -->
- <!-- Packages the distribution with TAR-GZIP -->
- <!-- =================================================================== -->
- <target name="package-tgz" depends="release">
- <tar tarfile="${slide.archive}.tar"
- basedir="${slide.release}"
- includes="**"/>
- <gzip zipfile="${slide.archive}.tar.gz"
- src="${slide.archive}.tar"/>
- </target>
-
-
- <!-- =================================================================== -->
<!-- Packages the distribution with ZIP and TAG-GZIP -->
<!-- =================================================================== -->
- <target name="package-all" depends="package-zip, package-tgz, package-src-all">
+ <target name="release" depends="package-zip, package-tgz, package-src-all">
</target>
@@ -1061,9 +1053,12 @@
<!-- Packages the source code with ZIP -->
<!-- =================================================================== -->
<target name="package-src-zip">
- <zip zipfile="${slide-src.archive}.zip"
- basedir="."
- includes="src/**"/>
+ <zip zipfile="${slide.dist}/${slide-src.archive}.zip">
+ <zipfileset dir="." prefix="${final.name}" includes="src/**" />
+ <zipfileset dir="." prefix="${final.name}" includes="LICENSE" />
+ <zipfileset dir="." prefix="${final.name}" includes="README" />
+ <zipfileset dir="." prefix="${final.name}" includes="RELEASE-INFO" />
+ </zip>
</target>
@@ -1071,11 +1066,24 @@
<!-- Packages the source code with TAR-GZIP -->
<!-- =================================================================== -->
<target name="package-src-tgz">
- <tar tarfile="${slide-src.archive}.tar"
- basedir="."
- includes="src/**"/>
- <gzip zipfile="${slide-src.archive}.tar.gz"
- src="${slide-src.archive}.tar"/>
+ <mkdir dir="${slide.dist}/${final.name}" />
+ <copy todir="${slide.dist}/${final.name}">
+ <fileset dir=".">
+ <include name="src/**" />
+ <include name="LICENSE" />
+ <include name="README" />
+ <include name="RELEASE-INFO" />
+ </fileset>
+ </copy>
+ <tar tarfile="${slide.dist}/${slide-src.archive}.tar">
+ <tarfileset dir="${slide.dist}">
+ <include name="${final.name}/**" />
+ </tarfileset>
+ </tar>
+ <delete dir="${slide.dist}/${final.name}" />
+ <gzip zipfile="${slide.dist}/${slide-src.archive}.tar.gz"
+ src="${slide.dist}/${slide-src.archive}.tar"/>
+ <delete file="${slide.dist}/${slide-src.archive}.tar" />
</target>
