BridJ: updated release script

ochafik · ochafik · commit 3ab3a791f7eb · 2013-03-16T15:10:14.000Z
diff --git a/libraries/RELEASE.txt b/libraries/RELEASE.txt
@@ -2,19 +2,12 @@
 - Move Velocity, Utils, BridJ, JNAerator, JavaCL, Parent to release versions
 - Remove ~/.m2/repository/com/nativelibs4java and make sure the following command succeeds (runs the tests):
   mvn clean install -o
-- Upload artifacts with uploadGoogleCodeDownloads, after editing it to match versions:
-  scripts/uploadGoogleCodeDownloads
+- Deploy to staged repo, create release tags and upload artifacts to Google Code
+  scripts/tagAndUpload_BridJ_JNAerator_JavaCL
 - Prepare release notes:
   - Run this
     scripts/prepareReleaseNotes
   - Paste first section of CHANGELOG.html files into a new post at http://ochafik.com/wp-admin
-- Tag new versions in git
-  git -a bridj-$BRIDJ_VERSION "BridJ version $BRIDJ_VERSION"
-  git -a jnaerator-$JNAERATOR_VERSION "JNAerator version $JNAERATOR_VERSION"
-  git -a javacl-$JAVACL_VERSION "JavaCL version $JAVACL_VERSION"
-  git push --tags
-- Deploy to staged repo:
-  mvn clean javadoc:jar deploy -DskipTests -Pgpg,coordinated-release
 - Close staged repo on http://oss.sonatype.org
 - Test staged repo with a dummy sbt project
 - Release stage repo
diff --git a/libraries/scripts/tagAndUpload_BridJ_JNAerator_JavaCL b/libraries/scripts/tagAndUpload_BridJ_JNAerator_JavaCL
@@ -17,20 +17,41 @@ function getVersion {
     cat "$POM" | grep "<version>" | head -n 1 | sed 's/[^>]*>//' | sed 's/<.*//'
 }
 
+function listPOMs {
+    find $1 -name pom.xml
+}
+
 cd `dirname $0`
 cd ..
 
 BRIDJ_VERSION=`getVersion BridJ/pom.xml`
 JNAERATOR_VERSION=`getVersion jnaerator/pom.xml`
 JAVACL_VERSION=`getVersion OpenCL/pom.xml`
+ROOT_VERSION=`getVersion pom.xml`
 
-[[ $BRIDJ_VERSION =~ .*-SNAPSHOT || $JNAERATOR_VERSION =~ .*-SNAPSHOT || $JAVACL_VERSION =~ .*-SNAPSHOT ]] && fail "Found snapshot versions: BRIDJ_VERSION = $BRIDJ_VERSION, JNAERATOR_VERSION = $JNAERATOR_VERSION, JAVACL_VERSION = $JAVACL_VERSION"
+HAS_SNAPSHOT_VERSION=0
+for POM in pom.xml `listPOMs BridJ` `listPOMs jnaerator` `listPOMs OpenCL`; do
+    VERSION=`getVersion "$POM"`
+    if [[ $VERSION =~ .*-SNAPSHOT ]]; then
+        HAS_SNAPSHOT_VERSION=1
+        echo "Found SNAPSHOT version in '$POM': $VERSION"
+    fi
+done
+
+[[ $HAS_SNAPSHOT_VERSION -eq 0 ]] || fail "Please update versions to release versions and try again"
 
 USER=$1
 PASSWORD=$2
 
 [[ -n "$USER" && -n "$PASSWORD" ]]�|| fail "Please provide a username and a password for Google Code"
 
+mvn clean javadoc:jar deploy -DskipTests -Pgpg,coordinated-release || fail "Deployment failed"
+
+git -a bridj-$BRIDJ_VERSION "BridJ version $BRIDJ_VERSION" || fail "Failed to create git tag for BridJ"
+git -a jnaerator-$JNAERATOR_VERSION "JNAerator version $JNAERATOR_VERSION" || fail "Failed to create git tag for JNAerator"
+git -a javacl-$JAVACL_VERSION "JavaCL version $JAVACL_VERSION" || fail "Failed to create git tag for JavaCL"
+git push --tags || fail "Failed to push newly-created git tags"
+
 # Modified script to add full description:
 # wget http://support.googlecode.com/svn/trunk/scripts/googlecode_upload.py
 
