You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cordova.apache.org by ag...@apache.org on 2014/05/06 21:29:41 UTC

[27/34] git commit: Tweak tagging instructions

Tweak tagging instructions


Project: http://git-wip-us.apache.org/repos/asf/cordova-app-harness/repo
Commit: http://git-wip-us.apache.org/repos/asf/cordova-app-harness/commit/66c5109b
Tree: http://git-wip-us.apache.org/repos/asf/cordova-app-harness/tree/66c5109b
Diff: http://git-wip-us.apache.org/repos/asf/cordova-app-harness/diff/66c5109b

Branch: refs/heads/master
Commit: 66c5109bd0a6040c92a4e952d266ffa74c44d315
Parents: 10c8de1
Author: Andrew Grieve <ag...@chromium.org>
Authored: Fri Mar 21 14:00:33 2014 -0700
Committer: Andrew Grieve <ag...@chromium.org>
Committed: Fri Mar 21 14:02:02 2014 -0700

----------------------------------------------------------------------
 README.md       |  5 +++--
 buildharness.sh | 14 +++++++-------
 2 files changed, 10 insertions(+), 9 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cordova-app-harness/blob/66c5109b/README.md
----------------------------------------------------------------------
diff --git a/README.md b/README.md
index 7e11863..a944986 100644
--- a/README.md
+++ b/README.md
@@ -32,10 +32,11 @@ For more info:
   - `vim config.xml`
 - Update versionCode in `platforms/android/AndroidManifest.xml`
   - `vim platforms/android/AndroidManifest.xml`
-- Tag release
-  - `git tag -am "Tagged vX.X.X-alpha"`
 - Build apk
   - `cd CCAHarness && ../buildharness.sh`
+- Tag release
+  - `git tag -am "Tagged vX.X.X-alpha" vX.X.X-alpha`
+  - `git push origin master --tags`
 - Upload apk to GitHub's releases page
   - Attach the apk
   - Write *short* release notes (download link should be visible without scrolling).

http://git-wip-us.apache.org/repos/asf/cordova-app-harness/blob/66c5109b/buildharness.sh
----------------------------------------------------------------------
diff --git a/buildharness.sh b/buildharness.sh
index 4d023ae..a7c1e3f 100755
--- a/buildharness.sh
+++ b/buildharness.sh
@@ -1,7 +1,6 @@
 #!/bin/bash
 
 KEYSTORE_PATH=../CCAHarness-debug.keystore
-APK_PATH=platforms/android/ant-build/*-debug.apk
 AAPT_PATH=$(which aapt)
 
 if [[ -z "$AAPT_PATH" ]]; then
@@ -31,14 +30,15 @@ fi
 cordova build android || exit 1
 
 # Remove previous signing artifacts
-"$AAPT_PATH" remove $APK_PATH META-INF/MANIFEST.MF || exit 1
-"$AAPT_PATH" remove $APK_PATH META-INF/CERT.SF
-"$AAPT_PATH" remove $APK_PATH META-INF/CERT.RSA
+APK_PATH=$(ls platforms/android/ant-build/*-debug.apk)
+"$AAPT_PATH" remove "$APK_PATH" META-INF/MANIFEST.MF || exit 1
+"$AAPT_PATH" remove "$APK_PATH" META-INF/CERT.SF
+"$AAPT_PATH" remove "$APK_PATH" META-INF/CERT.RSA
 
 # Resign.
-jarsigner -verbose -sigalg MD5withRSA -digestalg SHA1 -keystore $KEYSTORE_PATH -storepass android $APK_PATH androiddebugkey || exit 1
+jarsigner -verbose -sigalg MD5withRSA -digestalg SHA1 -keystore $KEYSTORE_PATH -storepass android "$APK_PATH" androiddebugkey || exit 1
 
 # Verify signing
-jarsigner -verify $APK_PATH || exit 1
+jarsigner -verify "$APK_PATH" || exit 1
 
-echo "Build Complete. APK is at: "$APK_PATH
+echo "Build Complete. APK is at: $APK_PATH"