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/04/15 01:03:11 UTC
cvs commit: incubator-myfaces/build bootstrap.xml build.xml
schof 2005/04/14 16:03:11
Modified: build bootstrap.xml build.xml
Log:
additional changes for release procedure
Revision Changes Path
1.5 +2 -11 incubator-myfaces/build/bootstrap.xml
Index: bootstrap.xml
===================================================================
RCS file: /home/cvs/incubator-myfaces/build/bootstrap.xml,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- bootstrap.xml 14 Apr 2005 22:27:48 -0000 1.4
+++ bootstrap.xml 14 Apr 2005 23:03:11 -0000 1.5
@@ -133,7 +133,7 @@
<!-- publish the nightly bundles -->
<scp todir="${apache.username}:${apache.password}@cvs.apache.org:/www/cvs.apache.org/builds/myfaces/nightly" trust="yes">
- <fileset dir="${release.dir}" excludes=".sh"/>
+ <fileset dir="${release.dir}" excludes="**/*.sh"/>
</scp>
</target>
@@ -154,16 +154,7 @@
<copy todir="${release.dir}">
<fileset dir="${release.dir}"/>
</copy>
-
- <!-- sign files -->
- <exec executable="sign" dir="${release.dir}"
-
- <!-- publish the release bundles -->
- <!--
- <scp todir="${apache.username}:${apache.password}@cvs.apache.org:/www/cvs.apache.org/builds/myfaces/release" trust="yes">
- <fileset dir="${release.dir}"/>
- </scp>
- -->
+
</target>
<target name="check">
1.96 +34 -9 incubator-myfaces/build/build.xml
Index: build.xml
===================================================================
RCS file: /home/cvs/incubator-myfaces/build/build.xml,v
retrieving revision 1.95
retrieving revision 1.96
diff -u -r1.95 -r1.96
--- build.xml 14 Apr 2005 22:27:48 -0000 1.95
+++ build.xml 14 Apr 2005 23:03:11 -0000 1.96
@@ -23,6 +23,7 @@
<property name="wml.src" location="${project.dir}/src/wml"/>
<property name="xdoclet.src" location="${project.dir}/src/xdoclet"/>
<property name="generated.src" location="${project.dir}/src/generated"/>
+ <property file="sign.script" location="${release.dir}/sign.sh"/>
<!-- Properties -->
<property file="build.local.properties"/>
@@ -368,14 +369,25 @@
depends="prepare, myfaces-jsf-api-jar, myfaces-impl-jar, myfaces-extensions-jar, myfaces-jar, myfaces-wap-jar, javadoc, tlddoc, prepare-bin-release"
description="creates the binary release file myfaces-x.x.x.tgz (don't forget to adjust manifest.properties!)">
- <tar destfile="${release.dir}/${bin.release.bundle}.tgz" compression="gzip" >
+ <property name="bin.release.tgz" value="${release.dir}/${bin.release.bundle}.tgz"/>
+ <property name="bin.release.zip" value="${release.dir}/${bin.release.bundle}.zip"/>
+
+ <tar destfile="${bin.release.tgz}" compression="gzip" >
<tarfileset prefix="${bin.release.bundle}" dir="${temp.dir}/${bin.release.bundle}"/>
</tar>
- <zip destfile="${release.dir}/${bin.release.bundle}.zip" compress="true">
+ <zip destfile="${bin.release.zip}" compress="true">
<zipfileset prefix="${bin.release.bundle}" dir="${temp.dir}/${bin.release.bundle}"/>
</zip>
- <checksum file="${release.dir}/${bin.release.bundle}.tgz" forceOverwrite="yes" fileext=".md5"/>
- <checksum file="${release.dir}/${bin.release.bundle}.zip" forceOverwrite="yes" fileext=".md5"/>
+ <checksum file="${bin.release.tgz}" forceOverwrite="yes" fileext=".md5"/>
+ <checksum file="${bin.release.zip}" forceOverwrite="yes" fileext=".md5"/>
+
+ <!-- generate/append script for pgp signing of bundle -->
+ <echo file="${sign.script}" append="true">
+ gpg -o ${bin.release.tgz}.asc --detach-sig ${bin.release.tgz}
+ gpg --verify ${bin.release.tgz}.asc ${bin.release.tgz}
+ gpg -o ${bin.release.zip}.asc --detach-sig ${bin.release.zip}
+ gpg --verify ${bin.release.zip}.asc ${bin.release.zip}
+ </echo>
</target>
@@ -435,14 +447,25 @@
depends="prepare-src-release"
description="creates the source release file myfaces-x.x.x-src.tgz (don't forget to adjust manifest.properties!)">
- <tar destfile="${release.dir}/${src.release.bundle}.tgz" compression="gzip">
+ <property name="src.release.tgz" value="${release.dir}/${src.release.bundle}.tgz"/>
+ <property name="src.release.zip" value="${release.dir}/${src.release.bundle}.zip"/>
+
+ <tar destfile="${src.release.tgz}" compression="gzip">
<tarfileset prefix="${src.release.bundle}" dir="${temp.dir}/${src.release.bundle}"/>
</tar>
- <zip destfile="${release.dir}/${src.release.bundle}.zip" compress="true">
+ <zip destfile="${src.release.zip}" compress="true">
<zipfileset prefix="${src.release.bundle}" dir="${temp.dir}/${src.release.bundle}"/>
</zip>
- <checksum file="${release.dir}/${src.release.bundle}.tgz" forceOverwrite="yes" fileext=".md5"/>
- <checksum file="${release.dir}/${src.release.bundle}.zip" forceOverwrite="yes" fileext=".md5"/>
+ <checksum file="${release.dir}/${src.release.tgz}" forceOverwrite="yes" fileext=".md5"/>
+ <checksum file="${release.dir}/${src.release.zip}" forceOverwrite="yes" fileext=".md5"/>
+
+ <!-- generate/append script for pgp signing of bundle -->
+ <echo file="${sign.script}" append="true">
+ gpg -o ${src.release.tgz}.asc --detach-sig ${src.release.tgz}
+ gpg --verify ${src.release.tgz}.asc ${src.release.tgz}
+ gpg -o ${src.release.zip}.asc --detach-sig ${src.release.zip}
+ gpg --verify ${src.release.zip}.asc ${src.release.zip}
+ </echo>
</target>
@@ -705,6 +728,8 @@
<target name="prepare">
<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}"/>
</target>
<target name="app-dist" depends="myfaces-jar, myfaces-wap-jar">
@@ -778,7 +803,7 @@
<checksum file="${app.release.zip}" forceOverwrite="yes" fileext=".md5"/>
<!-- generate/append script for pgp signing of bundle -->
- <echo file="${release.dir}/sign.sh" append="true">
+ <echo file="${sign.script}" append="true">
gpg -o ${app.release.tgz}.asc --detach-sig ${app.release.tgz}
gpg --verify ${app.release.tgz}.asc ${app.release.tgz}
gpg -o ${app.release.zip}.asc --detach-sig ${app.release.zip}