Author: rjung
Date: Thu Mar 27 16:31:59 2008
New Revision: 642025
URL: http://svn.apache.org/viewvc?rev=642025&view=rev
Log:
Build procedure update:
- add javadocs
- let build.xml in sub dirs use vars from above
- build release artefacts
- use fixcrlf
- fix file system permissions (chmod task)
Modified:
tomcat/sandbox/tomcat-oacc/trunk/build.properties.default
tomcat/sandbox/tomcat-oacc/trunk/build.xml
tomcat/sandbox/tomcat-oacc/trunk/docs/build.xml
tomcat/sandbox/tomcat-oacc/trunk/test/build.xml
Modified: tomcat/sandbox/tomcat-oacc/trunk/build.properties.default
URL:
http://svn.apache.org/viewvc/tomcat/sandbox/tomcat-oacc/trunk/build.properties.default?rev=642025&r1=642024&r2=642025&view=diff
==============================================================================
--- tomcat/sandbox/tomcat-oacc/trunk/build.properties.default (original)
+++ tomcat/sandbox/tomcat-oacc/trunk/build.properties.default Thu Mar 27
16:31:59 2008
@@ -47,3 +47,10 @@
compile.source=1.5
compile.target=1.5
compile.debug=true
+
+version=6.0.17-dev
+
+oacc.output=output
+oacc.build=output/build
+oacc.dist=output/dist
+oacc.release=output/release
Modified: tomcat/sandbox/tomcat-oacc/trunk/build.xml
URL:
http://svn.apache.org/viewvc/tomcat/sandbox/tomcat-oacc/trunk/build.xml?rev=642025&r1=642024&r2=642025&view=diff
==============================================================================
--- tomcat/sandbox/tomcat-oacc/trunk/build.xml (original)
+++ tomcat/sandbox/tomcat-oacc/trunk/build.xml Thu Mar 27 16:31:59 2008
@@ -24,10 +24,16 @@
<property file="build.properties.default" />
<!-- Build Defaults -->
- <property name="oacc.build" value="build"/>
- <property name="oacc.dist" value="dist"/>
+ <property name="project" value="apache-tomcat-oacc" />
+ <property name="final.name" value="${project}-${version}" />
+ <property name="final-src.name" value="${project}-${version}-src" />
+ <property name="final.dir" value="${oacc.release}/v${version}"/>
+ <property name="fixcrlf.ex"
value="**/*.jar,**/*.class,**/*.gif,**/*.bmp,**/*.jpg,**/*.png,**/*.ico,**/*.war,**/*.exe.**/*.pdf,**/*.bin,**/*.dia"/>
- <!-- Construct Catalina classpath -->
+ <!-- constant to declare a file binary for md5sum -->
+ <property name="md5sum.binary-prefix" value=" *" />
+
+ <!-- Construct Catalina classpath -->
<path id="oacc.classpath">
<pathelement location="${catalina.home}/lib/catalina.jar"/>
<pathelement location="${catalina.home}/lib/tomcat-coyote.jar"/>
@@ -35,7 +41,7 @@
<pathelement location="${catalina.home}/lib/servlet-api.jar"/>
</path>
- <!-- Source path -->
+ <!-- Source path -->
<path id="javadoc.sourcepath">
<pathelement location="src/share"/>
</path>
@@ -78,13 +84,14 @@
<!-- =================== BUILD: Create Directories ====================== -->
<target name="build-prepare">
+ <mkdir dir="${oacc.output}"/>
<mkdir dir="${oacc.build}"/>
<mkdir dir="${oacc.build}/classes"/>
</target>
<!-- =================== BUILD: All ====================== -->
- <target name="build-all" depends="build-oacc,build-docs">
+ <target name="build-all" depends="build-oacc,build-docs,javadoc">
</target>
@@ -131,12 +138,13 @@
<!-- ================ BUILD: Create Catalina Javadocs =================== -->
<target name="javadoc">
- <delete dir="${oacc.build}/javadoc"/>
- <mkdir dir="${oacc.build}/javadoc"/>
+ <delete dir="${oacc.build}/docs/javadoc"/>
+ <mkdir dir="${oacc.build}/docs"/>
+ <mkdir dir="${oacc.build}/docs/javadoc"/>
<javadoc packagenames="org.apache.catalina.*"
classpathref="oacc.classpath"
sourcepathref="javadoc.sourcepath"
- destdir="${oacc.build}/javadoc"
+ destdir="${oacc.build}/docs/javadoc"
author="true"
version="true"
windowtitle="Catalina Cluster Internal API Documentation"
@@ -162,6 +170,8 @@
<!-- ================ DIST: Create Distribution ========================= -->
<target name="dist" depends="build-all,dist-prepare">
+ <copy file="${basedir}/LICENSE" tofile="${oacc.dist}/LICENSE"/>
+ <copy file="${basedir}/NOTICE" tofile="${oacc.dist}/NOTICE"/>
<jar destfile="${oacc.dist}/lib/apache-tomcat-oacc.jar"
basedir="${oacc.build}/classes">
<include name="org/apache/catalina/cluster/**" />
@@ -173,21 +183,145 @@
<exclude name="**/package.html" />
</jar>
<ant target="dist" dir="docs"/>
+ <chmod dir="${oacc.dist}" includes="**" perm="oug+rX" type="both"/>
</target>
<target name="copy" depends="dist" >
<copy file="${oacc.dist}/lib/apache-tomcat-oacc.jar"
todir="${catalina.home}/lib" />
</target>
+ <!-- ====================== DIST: Create Sources ======================== -->
+ <!-- Copy all files for src release; we need a copy because we run fixcrlf
-->
+ <target name="dist-source">
+ <mkdir dir="${oacc.dist}/src"/>
+ <!-- Tomcat source -->
+ <copy todir="${oacc.dist}/src">
+ <fileset dir="${basedir}">
+ <include name="LICENSE"/>
+ <include name="NOTICE"/>
+ <include name="RELEASE-NOTES"/>
+ <include name="BUILDING.txt"/>
+ <include name="PROPOSALS.txt"/>
+ <include name="RELEASE-PLAN.txt"/>
+ <include name="RUNNING.txt"/>
+ <include name="build.properties.default"/>
+ <include name="build.xml"/>
+ <include name="to-do.txt"/>
+ <include name="docs/**"/>
+ <include name="etc/**"/>
+ <include name="src/**"/>
+ <include name="test/**"/>
+ <exclude name=".*/**"/>
+ <exclude name="test/build/**"/>
+ <exclude name="test/logs/**"/>
+ </fileset>
+ </copy>
+ <chmod dir="${oacc.dist}/src" includes="**" perm="oug+rX" type="both"/>
+ </target>
+
+
<!-- ======================= DIST: Clean Directory ====================== -->
<target name="dist-clean">
<delete dir="${oacc.dist}"/>
</target>
- <!-- ====================== Convenient Synonyms ========================= -->
- <target name="clean" depends="build-clean,dist-clean"
- description="Clean build and dist directories"/>
+ <!-- ======================= RELEASE: Create Directories ================ -->
+ <target name="release-prepare">
+ <mkdir dir="${oacc.release}"/>
+ <mkdir dir="${final.dir}"/>
+ <mkdir dir="${final.dir}/bin"/>
+ <mkdir dir="${final.dir}/src"/>
+ </target>
+
+
+ <!-- ==================== RELEASE: Create Release ======================= -->
+ <target name="release"
depends="clean,dist,release-prepare,package-zip,package-tgz,dist-source,package-src-zip,package-src-tgz"
+ description="Create a Tomcat OACC packaged distribution">
+
+ <filter token="VERSION" value="${version}"/>
+ <copy file="RELEASE-NOTES"
+ todir="${final.dir}"
+ filtering="true"/>
+ <chmod dir="${oacc.release}" includes="**" perm="oug+rX" type="both"/>
+
+ </target>
+
+ <!-- Packages the core zip distro -->
+ <target name="package-zip">
+ <fixcrlf srcdir="${oacc.dist}"
includes="*.txt,RELEASE-NOTES,LICENSE,NOTICE" eol="crlf"/>
+ <fixcrlf srcdir="${oacc.dist}/docs" excludes="${fixcrlf.ex}" eol="crlf"/>
+ <zip zipfile="${final.dir}/bin/${final.name}.zip">
+ <zipfileset dir="${oacc.dist}" prefix="${final.name}">
+ <include name="lib/**"/>
+ <include name="docs/**"/>
+ <include name="LICENSE"/>
+ <include name="NOTICE"/>
+ </zipfileset>
+ </zip>
+
+ <checksum file="${final.dir}/bin/${final.name}.zip"
+ forceOverwrite="yes" fileext=".md5" />
+ <echo file="${final.dir}/bin/${final.name}.zip.md5"
+
message="${md5sum.binary-prefix}${final.name}.zip${line.separator}"
append="true" />
+ </target>
+
+ <!-- Packages the core tar.gz distro -->
+ <target name="package-tgz">
+ <fixcrlf srcdir="${oacc.dist}"
includes="*.txt,RELEASE-NOTES,LICENSE,NOTICE" eol="lf"/>
+ <fixcrlf srcdir="${oacc.dist}/docs" excludes="${fixcrlf.ex}" eol="lf"/>
+ <tar longfile="gnu" compression="gzip"
+ tarfile="${final.dir}/bin/${final.name}.tar.gz">
+ <tarfileset dir="${oacc.dist}" prefix="${final.name}">
+ <include name="lib/**" />
+ <include name="docs/**" />
+ <include name="LICENSE"/>
+ <include name="NOTICE"/>
+ </tarfileset>
+ </tar>
+
+ <checksum file="${final.dir}/bin/${final.name}.tar.gz"
+ forceOverwrite="yes" fileext=".md5" />
+ <echo file="${final.dir}/bin/${final.name}.tar.gz.md5"
+
message="${md5sum.binary-prefix}${final.name}.tar.gz${line.separator}"
append="true" />
+ </target>
+
+ <!-- Packages the source code distribution in zip format -->
+ <target name="package-src-zip">
+ <fixcrlf srcdir="${oacc.dist}/src" excludes="${fixcrlf.ex}"
eol="crlf"/>
+ <zip zipfile="${final.dir}/src/${final-src.name}.zip">
+ <zipfileset dir="${oacc.dist}/src" prefix="${final-src.name}" />
+ </zip>
+
+ <checksum file="${final.dir}/src/${final-src.name}.zip"
+ forceOverwrite="yes" fileext=".md5" />
+ <echo file="${final.dir}/src/${final-src.name}.zip.md5"
+
message="${md5sum.binary-prefix}${final-src.name}.zip${line.separator}"
append="true" />
+ </target>
+
+ <!-- Packages the source code distribution in tar.gz format -->
+ <target name="package-src-tgz">
+ <fixcrlf srcdir="${oacc.dist}/src" excludes="${fixcrlf.ex}" eol="lf"/>
+ <tar longfile="gnu" compression="gzip"
+ tarfile="${final.dir}/src/${final-src.name}.tar.gz">
+ <tarfileset dir="${oacc.dist}/src" prefix="${final-src.name}" />
+ </tar>
+ <checksum file="${final.dir}/src/${final-src.name}.tar.gz"
+ forceOverwrite="yes" fileext=".md5" />
+ <echo file="${final.dir}/src/${final-src.name}.tar.gz.md5"
+
message="${md5sum.binary-prefix}${final-src.name}.tar.gz${line.separator}"
append="true" />
+ </target>
+
+ <!-- ======================= RELEASE: Clean Directory =================== -->
+ <target name="release-clean">
+ <delete dir="${oacc.release}"/>
+ </target>
+
+ <!-- ====================== Convenient Synonyms ========================= -->
+ <target name="clean" depends="build-clean,dist-clean,release-clean"
+ description="Clean build and dist directories">
+ <delete dir="${oacc.output}"/>
+ </target>
</project>
Modified: tomcat/sandbox/tomcat-oacc/trunk/docs/build.xml
URL:
http://svn.apache.org/viewvc/tomcat/sandbox/tomcat-oacc/trunk/docs/build.xml?rev=642025&r1=642024&r2=642025&view=diff
==============================================================================
--- tomcat/sandbox/tomcat-oacc/trunk/docs/build.xml (original)
+++ tomcat/sandbox/tomcat-oacc/trunk/docs/build.xml Thu Mar 27 16:31:59 2008
@@ -26,8 +26,8 @@
<property file="../build.properties.default"/>
<property name="build.compiler" value="modern"/>
- <property name="docs.build" value="../build"/>
- <property name="docs.dist" value="../dist"/>
+ <property name="docs.build" value="../${oacc.build}"/>
+ <property name="docs.dist" value="../${oacc.dist}"/>
<property name="docs.dir" value="docs"/>
@@ -42,7 +42,8 @@
<target name="build-static" depends="build-prepare">
<!-- Top Level Static Files -->
- <copy todir="${docs.build}/${docs.dir}">
+ <filter token="VERSION" value="${version}"/>
+ <copy todir="${docs.build}/${docs.dir}" filtering="true">
<fileset dir="..">
<include name="RELEASE-NOTES"/>
<include name="RUNNING.txt"/>
Modified: tomcat/sandbox/tomcat-oacc/trunk/test/build.xml
URL:
http://svn.apache.org/viewvc/tomcat/sandbox/tomcat-oacc/trunk/test/build.xml?rev=642025&r1=642024&r2=642025&view=diff
==============================================================================
--- tomcat/sandbox/tomcat-oacc/trunk/test/build.xml (original)
+++ tomcat/sandbox/tomcat-oacc/trunk/test/build.xml Thu Mar 27 16:31:59 2008
@@ -29,7 +29,7 @@
<property name="compile.encoding" value="UTF-8" />
<property name="build.dir" value="build/test" />
<property name="src.dir" value="src/share" />
- <property name="oacc.dist" value="../dist" />
+ <property name="oacc.lib" value="../${oacc.dist}/lib" />
<!-- Build the classpath -->
<path id="oacc.classpath">
@@ -37,8 +37,8 @@
<pathelement location="${catalina.home}/lib/tomcat-coyote.jar"/>
<pathelement location="${catalina.extras}/tomcat-juli.jar"/>
<pathelement location="${catalina.home}/lib/servlet-api.jar"/>
- <pathelement location="${oacc.dist}/lib/catalina-oacc.jar"/>
- <pathelement location="${oacc.dist}/lib/catalina-sso.jar"/>
+ <pathelement location="${oacc.lib}/apache-tomcat-oacc.jar"/>
+ <pathelement location="${oacc.lib}/apache-tomcat-sso.jar"/>
<pathelement location="${junit.jar}"/>
</path>
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
