You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@myfaces.apache.org by sc...@apache.org on 2005/06/29 00:39:06 UTC
svn commit: r202293 - in /myfaces/build/trunk: build.xml manifest.properties
Author: schof
Date: Tue Jun 28 15:39:05 2005
New Revision: 202293
URL: http://svn.apache.org/viewcvs?rev=202293&view=rev
Log:
improvements to build (first cut of release target; fixes to build for tomahawk.jar)
Added:
myfaces/build/trunk/manifest.properties
Modified:
myfaces/build/trunk/build.xml
Modified: myfaces/build/trunk/build.xml
URL: http://svn.apache.org/viewcvs/myfaces/build/trunk/build.xml?rev=202293&r1=202292&r2=202293&view=diff
==============================================================================
--- myfaces/build/trunk/build.xml (original)
+++ myfaces/build/trunk/build.xml Tue Jun 28 15:39:05 2005
@@ -127,7 +127,7 @@
<property name="share.src.dir" location="${basedir}/../../share/src/java"/>
<property file="../build.properties"/>
- <property file="../manfiest.properties"/>
+ <property file="manifest.properties"/>
<!-- Load local and user build preferences -->
<property file="build.local.properties"/>
@@ -174,13 +174,21 @@
<property name="project.dir" location="${basedir}/.."/>
<property name="build.dir" location="${project.dir}/build"/>
+ <property name="release.dir" location="${build.dir}/release"/>
<property name="temp.dir" location="${build.dir}/temp"/>
<property name="classes.dir" location="${temp.dir}/classes"/>
<property name="dist.dir" location="${build.dir}/dist"/>
<property name="javadoc.dir" location="${temp.dir}/javadoc"/>
+ <property name="tlddoc.dir" location="${temp.dir}/tlddoc"/>
<property name="tlddoc.dtd.dir" location="${build.dir}/tld-doc"/>
<property name="tlddoc.xslt.dir" location="${build.dir}/tlddoc-xslt"/>
<property name="tlddoc.dtd" location="${tlddoc.dtd.dir}/web-jsptaglibrary_1_2.dtd"/>
+ <property name="sign.script" location="${release.dir}/sign.sh"/>
+ <property name="release.version" value="${manifest.impl.version}"/>
+ <property name="src.release.bundle" value="myfaces-${release.version}-src"/>
+ <property name="bin.release.bundle" value="myfaces-${release.version}"/>
+ <property name="examples.release.bundle" value="myfaces-${release.version}-examples"/>
+ <property name="tomahawk.release.bundle" value="tomahawk-${release.version}"/>
<!-- This is only used if you execute "ant download-dependencies" -->
<property name="lib.dir" value="${project.dir}/lib" />
@@ -388,7 +396,6 @@
<property name="tomahawk.jar" location="${basedir}/../tomahawk/build/dist/tomahawk.jar"/>
<property name="share.src.dir" location="${basedir}/../share/src/java"/>
<property file="${basedir}/../${subproject}/build.properties"/>
- <property file="${basedir}/../${subproject}/manifest.properties"/>
</ant>
</target>
@@ -443,15 +450,6 @@
<ant target="project">
<property name="target" value="clean"/>
</ant>
- <!--
- Examples subproject needs to be handled specially
- -->
- <!--
- <ant target="subproject">
- <property name="subproject" value="examples"/>
- <property name="target" value="clean"/>
- </ant>
- -->
</target>
<!--
@@ -460,6 +458,7 @@
<target name="clean">
<delete dir="${temp.dir}"/>
<delete dir="${dist.dir}"/>
+ <delete dir="${release.dir}"/>
</target>
<!--
@@ -572,10 +571,6 @@
Create javadoc for the TLD of the current subproject
-->
<target name="tlddoc" depends="resolve-tld-entities" if="tlds.dir">
-
- <!-- set the property for tlddoc dir (if it hasn't been set already) -->
- <property name="tlddoc.dir" value="${doc.dir}/tlddoc"/>
-
<mkdir dir="${tlddoc.dir}"/>
<java fork="true" jar="${tlddoc.jar}" failonerror="true">
<arg line="-doctitle 'Tag library for Apache MyFaces'" />
@@ -589,11 +584,10 @@
Create distribution files for all subprojects
-->
<target name="dist-all">
- <!-- ******************* TEMPROARILY COMMENTED OUT: RESTORE WHEN DONE TESTING *******************
+ <!-- ******************* TEMPROARILY COMMENTED OUT: RESTORE WHEN DONE TESTING *******************-->
<ant target="project">
<property name="target" value="dist"/>
</ant>
- -->
<!-- create the myfaces-all.jar which contains everything -->
<mkdir dir="${dist.dir}"/>
@@ -650,12 +644,8 @@
<copy file="${commons-logging.jar}" todir="${examples.lib.dir}"/>
<copy file="${commons-validator.jar}" todir="${examples.lib.dir}"/>
<copy file="${jakarta-oro.jar}" todir="${examples.lib.dir}"/>
- <copy file="${jsp.jar}" todir="${examples.lib.dir}"/>
- <copy file="${jstl.jar}" todir="${examples.lib.dir}"/>
<copy file="${portlet-api.jar}" todir="${examples.lib.dir}"/>
- <copy file="${servlet-api.jar}" todir="${examples.lib.dir}"/>
<copy file="${struts.jar}" todir="${examples.lib.dir}"/>
- <copy file="${tlddoc.jar}" todir="${examples.lib.dir}"/>
<!-- these jars are built/provided locally -->
<copy file="${jsf-api.jar}" todir="${examples.lib.dir}"/>
@@ -724,6 +714,131 @@
<!--
Create distribution files for current project
-->
- <target name="dist" depends="jar, javadoc, webapp"/>
+ <target name="dist" depends="jar, javadoc, tlddoc, webapp"/>
+
+ <!--
+ Builds release distribution files. Can only be run from current/build.
+ -->
+ <target name="release" depends="dist-all">
+
+ <mkdir dir="${release.dir}"/>
+ <!-- remove sign script in case clean target is not run so we don't accidentally append to the old one -->
+ <delete file="${sign.script}"/>
+
+ <!-- source -->
+ <property name="src.bundle.tgz" value="${release.dir}/${src.release.bundle}.tar.gz"/>
+ <property name="src.bundle.zip" value="${release.dir}/${src.release.bundle}.zip"/>
+ <tar destfile="${src.bundle.tgz}" compression="gzip" >
+ <tarfileset prefix="${src.release.bundle}" dir="." includes="*.txt"/>
+ <tarfileset prefix="${src.release.bundle}/src/api" dir="../api/src/java"/>
+ <tarfileset prefix="${src.release.bundle}/src/impl" dir="../impl/src/java"/>
+ <tarfileset prefix="${src.release.bundle}/src/share" dir="../share/src/java"/>
+ <tarfileset prefix="${src.release.bundle}/src/tomahawk" dir="../tomahawk/src/java"/>
+ <tarfileset prefix="${src.release.bundle}/javadoc/api" dir="../api/build/temp/javadoc"/>
+ <tarfileset prefix="${src.release.bundle}/javadoc/impl" dir="../impl/build/temp/javadoc"/>
+ <tarfileset prefix="${src.release.bundle}/javadoc/tomahawk" dir="../tomahawk/build/temp/javadoc"/>
+ <tarfileset prefix="${src.release.bundle}/tlddoc/core" dir="../impl/build/temp/tlddoc"/>
+ <tarfileset prefix="${src.release.bundle}/tlddoc/tomahawk" dir="../tomahawk/build/temp/tlddoc"/>
+ </tar>
+ <zip destfile="${src.bundle.zip}" compress="true">
+ <zipfileset prefix="${src.release.bundle}" dir="." includes="*.txt"/>
+ <zipfileset prefix="${src.release.bundle}/src/api" dir="../api/src/java"/>
+ <zipfileset prefix="${src.release.bundle}/src/impl" dir="../impl/src/java"/>
+ <zipfileset prefix="${src.release.bundle}/src/share" dir="../share/src/java"/>
+ <zipfileset prefix="${src.release.bundle}/src/tomahawk" dir="../tomahawk/src/java"/>
+ <zipfileset prefix="${src.release.bundle}/javadoc/api" dir="../api/build/temp/javadoc"/>
+ <zipfileset prefix="${src.release.bundle}/javadoc/impl" dir="../impl/build/temp/javadoc"/>
+ <zipfileset prefix="${src.release.bundle}/javadoc/tomahawk" dir="../tomahawk/build/temp/javadoc"/>
+ <zipfileset prefix="${src.release.bundle}/tlddoc/core" dir="../impl/build/temp/tlddoc"/>
+ <zipfileset prefix="${src.release.bundle}/tlddoc/tomahawk" dir="../tomahawk/build/temp/tlddoc"/>
+ </zip>
+ <ant target="sign">
+ <property name="release.bundle.tgz" value="${src.bundle.tgz}"/>
+ <property name="release.bundle.zip" value="${src.bundle.zip}"/>
+ </ant>
+
+ <!-- binary -->
+ <property name="bin.bundle.tgz" value="${release.dir}/${bin.release.bundle}.tar.gz"/>
+ <property name="bin.bundle.zip" value="${release.dir}/${bin.release.bundle}.zip"/>
+ <tar destfile="${bin.bundle.tgz}" compression="gzip" >
+ <tarfileset prefix="${bin.release.bundle}" dir="." includes="*.txt"/>
+ <tarfileset prefix="${bin.release.bundle}" dir="../api/build/dist"/>
+ <tarfileset prefix="${bin.release.bundle}" dir="../impl/build/dist"/>
+ <tarfileset prefix="${bin.release.bundle}" dir="../tomahawk/build/dist"/>
+ <tarfileset prefix="${bin.release.bundle}/javadoc/api" dir="../api/build/temp/javadoc"/>
+ <tarfileset prefix="${bin.release.bundle}/javadoc/impl" dir="../impl/build/temp/javadoc"/>
+ <tarfileset prefix="${bin.release.bundle}/javadoc/tomahawk" dir="../tomahawk/build/temp/javadoc"/>
+ <tarfileset prefix="${bin.release.bundle}/tlddoc/core" dir="../impl/build/temp/tlddoc"/>
+ <tarfileset prefix="${bin.release.bundle}/tlddoc/tomahawk" dir="../tomahawk/build/temp/tlddoc"/>
+ </tar>
+ <zip destfile="${bin.bundle.zip}" compress="true">
+ <zipfileset prefix="${bin.release.bundle}" dir="." includes="*.txt"/>
+ <zipfileset prefix="${bin.release.bundle}" dir="../api/build/dist"/>
+ <zipfileset prefix="${bin.release.bundle}" dir="../impl/build/dist"/>
+ <zipfileset prefix="${bin.release.bundle}" dir="../tomahawk/build/dist"/>
+ <zipfileset prefix="${bin.release.bundle}/javadoc/api" dir="../api/build/temp/javadoc"/>
+ <zipfileset prefix="${bin.release.bundle}/javadoc/impl" dir="../impl/build/temp/javadoc"/>
+ <zipfileset prefix="${bin.release.bundle}/javadoc/tomahawk" dir="../tomahawk/build/temp/javadoc"/>
+ <zipfileset prefix="${bin.release.bundle}/tlddoc/core" dir="../impl/build/temp/tlddoc"/>
+ <zipfileset prefix="${bin.release.bundle}/tlddoc/tomahawk" dir="../tomahawk/build/temp/tlddoc"/>
+ </zip>
+ <ant target="sign">
+ <property name="release.bundle.tgz" value="${bin.bundle.tgz}"/>
+ <property name="release.bundle.zip" value="${bin.bundle.zip}"/>
+ </ant>
+
+ <!-- tomahawk -->
+ <property name="tomahawk.bundle.tgz" value="${release.dir}/${tomahawk.release.bundle}.tar.gz"/>
+ <property name="tomahawk.bundle.zip" value="${release.dir}/${tomahawk.release.bundle}.zip"/>
+ <tar destfile="${tomahawk.bundle.tgz}" compression="gzip" >
+ <tarfileset prefix="${tomahawk.release.bundle}" dir="." includes="*.txt"/>
+ <tarfileset prefix="${tomahawk.release.bundle}" dir="../tomahawk/build/dist"/>
+ <tarfileset prefix="${tomahawk.release.bundle}/javadoc" dir="../tomahawk/build/temp/javadoc"/>
+ <tarfileset prefix="${tomahawk.release.bundle}/tlddoc/tomahawk" dir="../tomahawk/build/temp/tlddoc"/>
+ </tar>
+ <zip destfile="${tomahawk.bundle.zip}" compress="true">
+ <zipfileset prefix="${tomahawk.release.bundle}" dir="." includes="*.txt"/>
+ <zipfileset prefix="${tomahawk.release.bundle}" dir="../tomahawk/build/dist"/>
+ <zipfileset prefix="${tomahawk.release.bundle}/javadoc" dir="../tomahawk/build/temp/javadoc"/>
+ <zipfileset prefix="${tomahawk.release.bundle}/tlddoc/tomahawk" dir="../tomahawk/build/temp/tlddoc"/>
+ </zip>
+ <ant target="sign">
+ <property name="release.bundle.tgz" value="${tomahawk.bundle.tgz}"/>
+ <property name="release.bundle.zip" value="${tomahawk.bundle.zip}"/>
+ </ant>
+
+ <!-- examples -->
+ <property name="examples.bundle.tgz" value="${release.dir}/${examples.release.bundle}.tar.gz"/>
+ <property name="examples.bundle.zip" value="${release.dir}/${examples.release.bundle}.zip"/>
+ <tar destfile="${examples.bundle.tgz}" compression="gzip" >
+ <tarfileset prefix="${examples.release.bundle}" dir="." includes="*.txt"/>
+ <tarfileset prefix="${examples.release.bundle}" dir="../examples/build/dist"/>
+ </tar>
+ <zip destfile="${examples.bundle.zip}" compress="true">
+ <zipfileset prefix="${examples.release.bundle}" dir="." includes="*.txt"/>
+ <zipfileset prefix="${examples.release.bundle}" dir="../examples/build/dist"/>
+ </zip>
+ <ant target="sign">
+ <property name="release.bundle.tgz" value="${examples.bundle.tgz}"/>
+ <property name="release.bundle.zip" value="${examples.bundle.zip}"/>
+ </ant>
+
+ </target>
+
+ <target name="sign">
+
+ <checksum file="${release.bundle.tgz}" forceOverwrite="yes" fileext=".md5"/>
+ <checksum file="${release.bundle.zip}" forceOverwrite="yes" fileext=".md5"/>
+
+ <!-- generate/append script for pgp signing of bundle -->
+
+ <echo file="${sign.script}" append="true">
+ gpg -o ${release.bundle.tgz}.asc --detach-sig ${release.bundle.tgz}
+ gpg --verify ${release.bundle.tgz}.asc ${release.bundle.tgz}
+ gpg -o ${release.bundle.zip}.asc --detach-sig ${release.bundle.zip}
+ gpg --verify ${release.bundle.zip}.asc ${release.bundle.zip}
+ </echo>
+
+ </target>
</project>
Added: myfaces/build/trunk/manifest.properties
URL: http://svn.apache.org/viewcvs/myfaces/build/trunk/manifest.properties?rev=202293&view=auto
==============================================================================
--- myfaces/build/trunk/manifest.properties (added)
+++ myfaces/build/trunk/manifest.properties Tue Jun 28 15:39:05 2005
@@ -0,0 +1,5 @@
+manifest.impl.title=MyFaces
+manifest.impl.vendor=MyFaces Project Team (http://myfaces.apache.org)
+
+# don't forget to update version in examples/web/inc/page_header.jsp !
+manifest.impl.version=1.0.10
\ No newline at end of file