From a98a9cd8066cea1c57371c6d91f098e7bb69c377 Mon Sep 17 00:00:00 2001
From: Neale Pickett <neale@woozle.org>
Date: Sat, 26 May 2012 20:41:05 -0600
Subject: [PATCH] fix signing issues

---
 AndroidManifest.xml |  4 ++--
 Makefile            | 19 ++++++++++++++++++-
 ant.properties      |  4 ++--
 3 files changed, 22 insertions(+), 5 deletions(-)

diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index d62c016..e17155b 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
       package="org.woozle.penaltytimer"
-      android:versionCode="2"
-      android:versionName="1.0">
+      android:versionCode="4"
+      android:versionName="1.1">
     <uses-sdk android:minSdkVersion="4" android:targetSdkVersion="4" />
     <uses-permission android:name="android.permission.VIBRATE"/>
     <application android:label="@string/app_name" android:description="@string/description" android:icon="@drawable/ic_launcher">
diff --git a/Makefile b/Makefile
index d390715..7063cbc 100644
--- a/Makefile
+++ b/Makefile
@@ -1,13 +1,30 @@
+ALIAS = dartcatcher
+KEYSTORE = /home/neale/.local/android.keystore
+
+SDK = /opt/android-sdk
+
+ZIPALIGN = $(SDK)/tools/zipalign
+
+default: release-install
+
 install: debug-install
 debug-install: bin/PenaltyTimer-debug.apk
 	adb install -r $<
 
 release: bin/PenaltyTimer-release.apk
+release-install: bin/PenaltyTimer-release.apk
+	adb install -r $<
 
 clean:
 	ant clean
+
+bin/PenaltyTimer-release.apk: bin/PenaltyTimer-release-unaligned.apk
+	$(ZIPALIGN) -v 4 $< $@
 	
-bin/PenaltyTimer-release.apk: src/org/woozle/penaltytimer/* res/*/*
+bin/PenaltyTimer-release-unaligned.apk: bin/PenaltyTimer-release-unsigned.apk
+	jarsigner -verbose -sigalg MD5withRSA -digestalg SHA1 -keystore $(KEYSTORE) -signedjar $@ $< $(ALIAS)
+
+bin/PenaltyTimer-release-unsigned.apk: src/org/woozle/penaltytimer/* res/*/*
 	ant release
 
 bin/PenaltyTimer-debug.apk: src/org/woozle/penaltytimer/* res/*/*
diff --git a/ant.properties b/ant.properties
index b3ebe0a..55476c2 100644
--- a/ant.properties
+++ b/ant.properties
@@ -14,5 +14,5 @@
 #  'key.store' for the location of your keystore and
 #  'key.alias' for the name of the key to use.
 # The password will be asked during the build when you use the 'release' target.
-key.store = /home/neale/.local/android.keystore
-key.alias = dartcatcher
+#key.store = /home/neale/.local/android.keystore
+#key.alias = dartcatcher