Author: thobbs
Date: Mon Jun 20 12:25:22 2011
New Revision: 1137605
URL: http://svn.apache.org/viewvc?rev=1137605&view=rev
Log:
Added script to help roll releases. Removed unneeded DISCLAIMER. Modified ant
script so that it copies txt files into .txt versions in releases.
Added:
river/jtsk/trunk/roll_release.sh (with props)
Removed:
river/jtsk/trunk/DISCLAIMER
Modified:
river/jtsk/trunk/ (props changed)
river/jtsk/trunk/build.xml
Propchange: river/jtsk/trunk/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Mon Jun 20 12:25:22 2011
@@ -10,3 +10,5 @@ lib-dl
lib
dist
doc
+LICENSE.txt
+NOTICE.txt
Modified: river/jtsk/trunk/build.xml
URL:
http://svn.apache.org/viewvc/river/jtsk/trunk/build.xml?rev=1137605&r1=1137604&r2=1137605&view=diff
==============================================================================
--- river/jtsk/trunk/build.xml (original)
+++ river/jtsk/trunk/build.xml Mon Jun 20 12:25:22 2011
@@ -73,9 +73,8 @@
</target>
<fileset id="river.bin.files" dir="${basedir}">
- <include name="DISCLAIMER"/>
- <include name="LICENSE"/>
- <include name="NOTICE"/>
+ <include name="LICENSE*"/>
+ <include name="NOTICE*"/>
<include name="${lib}/**"/>
<include name="${lib-dl}/**"/>
@@ -84,9 +83,8 @@
</fileset>
<fileset id="river.doc.files" dir="${basedir}">
- <include name="DISCLAIMER"/>
- <include name="LICENSE"/>
- <include name="NOTICE"/>
+ <include name="LICENSE*"/>
+ <include name="NOTICE*"/>
<include name="${doc}/**"/>
<exclude name="${doc}/release-notes/new.html"/>
@@ -112,10 +110,10 @@
<include name="${lib-ext}/**"/>
<include name="${doc}/**"/>
<include name="harness/**"/>
- <include name="README.txt"/>
+ <include name="README*"/>
</fileset>-->
- <target name="release-bin" description="Create a binary release"
depends="all.build">
+ <target name="release-bin" description="Create a binary release"
depends="duplicate-text-files, all.build">
<!-- TODO: add depends: javadoc-internals and remove from ci-build -->
<mkdir dir="${dist.dir}"/>
@@ -178,10 +176,15 @@
<include name="${doc}/**"/>
<exclude name="${doc.api}/"/>
<include name="build.xml"/>
- <include name="README*.txt"/>
+ <include name="README*"/>
</fileset>
- <target name="release-doc" description="Create release doc archives"
depends="river-doc">
+ <target name="duplicate-text-files" description="Creates friendly txt
versions of common files">
+ <copy file="LICENSE" toFile="LICENSE.txt"/>
+ <copy file="NOTICE" toFile="NOTICE.txt"/>
+ </target>
+
+ <target name="release-doc" description="Create release doc archives"
depends="duplicate-text-files, river-doc">
<mkdir dir="${dist.dir}"/>
<delete file="${doc.zip.bundle}"/>
@@ -194,7 +197,7 @@
</tar>
</target>
- <target name="release-src" description="Create a source release">
+ <target name="release-src" description="Create a source release"
depends="duplicate-text-files">
<mkdir dir="${dist.dir}"/>
<delete file="${src.zip.bundle}"/>
<zip destfile="${src.zip.bundle}" roundup="yes">
@@ -361,6 +364,7 @@
<package name="net.jini.url.https"/>
</javadoc>
<mkdir dir="${doc.api.dir}/doc-files"/>
+ <copy file="NOTICE" tofile="${doc.api.dir}/doc-files/NOTICE.txt"/>
<copy file="NOTICE" tofile="${doc.api.dir}/doc-files/NOTICE"/>
</target>
@@ -389,6 +393,7 @@
<sourcepath refid="javadoc.sourcepath" />
</javadoc>
<mkdir dir="${doc.internals.dir}/doc-files"/>
+ <copy file="NOTICE"
tofile="${doc.internals.dir}/doc-files/NOTICE.txt"/>
<copy file="NOTICE" tofile="${doc.internals.dir}/doc-files/NOTICE"/>
</target>
@@ -450,6 +455,7 @@
</javadoc>
<mkdir dir="${doc.spec.api.dir}/doc-files"/>
<copy file="NOTICE" tofile="${doc.spec.api.dir}/doc-files/NOTICE"/>
+ <copy file="NOTICE" tofile="${doc.spec.api.dir}/doc-files/NOTICE.txt"/>
</target>
<!-- =========== ... ============ -->
Added: river/jtsk/trunk/roll_release.sh
URL:
http://svn.apache.org/viewvc/river/jtsk/trunk/roll_release.sh?rev=1137605&view=auto
==============================================================================
--- river/jtsk/trunk/roll_release.sh (added)
+++ river/jtsk/trunk/roll_release.sh Mon Jun 20 12:25:22 2011
@@ -0,0 +1,111 @@
+#!/bin/bash
+
+function test_tar_release {
+ TMP_DIR=tar_release_test
+
+ mkdir $TMP_DIR
+ cp dist/apache-river-$VERSION-src.tar.gz $TMP_DIR
+ cd $TMP_DIR
+
+ tar xf apache-river-$VERSION-src.tar.gz
+ cd apache-river-2.2.0
+
+ ant build
+
+ echo
+ echo "Release built from TAR correctly"
+
+ cd ../..
+
+ rm -rf $TMP_DIR
+}
+
+function test_zip_release {
+ TMP_DIR=zip_release_test
+
+ mkdir $TMP_DIR
+ cp dist/apache-river-$VERSION-src.zip $TMP_DIR
+ cd $TMP_DIR
+
+ unzip apache-river-$VERSION-src.zip
+ cd apache-river-$VERSION
+
+ ant build
+
+ echo
+ echo "Release built from ZIP correctly"
+
+ cd ../..
+
+ rm -rf $TMP_DIR
+}
+
+function sign_all {
+ echo
+ echo "Signing release artifacts"
+
+ cd dist
+ for f in $( ls ); do
+ gpg --armor --output $f.asc --detach-sign $f
+ gpg --print-md SHA512 $f > $f.sha
+ done
+ cd ..
+}
+
+function rat_report {
+ echo
+ echo "Running RAT report"
+
+ if [ "${RAT_HOME+x}" = "x" ]; then
+ echo "Using RAT_HOME=${RAT_HOME}"
+ else
+ echo "Please set RAT_HOME before continuing"
+ exit 1
+ fi
+
+ java -jar $RAT_HOME/apache-rat-0.7.jar -d src > RAT_REPORT_src.txt
+ java -jar $RAT_HOME/apache-rat-0.7.jar -d examples -e *.mf >
RAT_REPORT_examples.txt
+ java -jar $RAT_HOME/apache-rat-0.7.jar -d qa/jtreg -e *.mf >
RAT_REPORT_qa_jtreg.txt
+
+ mv RAT_REPORT* dist/
+}
+
+function upload_all {
+ echo
+ echo "Uploading artifacts to $UPLOAD_DEST"
+
+ UPLOAD_DEST=$1
+ cd dist
+ scp * $UPLOAD_DEST
+ cd ..
+}
+
+function confirm_continue {
+ QUIT_MSG=$1
+
+ echo
+ echo "Continue? [Yy]ess [Nn]o"
+ read CONTINUE
+
+ [[ 'n' = $CONTINUE || 'N' = $CONTINUE ]] && echo $QUIT_MSG
+}
+
+VERSION=2.2.0
+
+echo "Rolling River Release $VERSION"
+
+echo
+echo "Checking repo status"
+
+svn st
+
+confirm_continue "Please Update repo state and then re-run this script."
+
+ant release
+
+test_tar_release
+test_zip_release
+
+sign_all
+rat_report
+upload_all [email protected]:~/public_html/river/
Propchange: river/jtsk/trunk/roll_release.sh
------------------------------------------------------------------------------
svn:executable = *
