From 740fd54d9ecb6eff348601f0d89152f665d19f23 Mon Sep 17 00:00:00 2001
From: Ryan Pessa <ryan@essential-elements.net>
Date: Thu, 10 Mar 2016 13:40:55 -0600
Subject: [PATCH] add release builds and apk signing

---
 .../bootstraps/pygame/build/build.properties  | 21 ++++++
 .../bootstraps/pygame/build/build.py          |  3 +
 .../pygame/build/templates/build.xml          |  3 +
 .../bootstraps/sdl2/build/build.properties    |  4 ++
 .../bootstraps/sdl2/build/build.py            |  3 +
 .../sdl2/build/templates/build.tmpl.xml       |  2 +
 pythonforandroid/toolchain.py                 | 66 ++++++++++++++-----
 7 files changed, 87 insertions(+), 15 deletions(-)
 create mode 100644 pythonforandroid/bootstraps/pygame/build/build.properties

diff --git a/pythonforandroid/bootstraps/pygame/build/build.properties b/pythonforandroid/bootstraps/pygame/build/build.properties
new file mode 100644
index 0000000000..f12e258691
--- /dev/null
+++ b/pythonforandroid/bootstraps/pygame/build/build.properties
@@ -0,0 +1,21 @@
+# This file is used to override default values used by the Ant build system.
+# 
+# This file must be checked in Version Control Systems, as it is
+# integral to the build system of your project.
+
+# This file is only used by the Ant script.
+
+# You can use this to override default values such as
+#  'source.dir' for the location of your java source folder and
+#  'out.dir' for the location of your output folder.
+
+# You can also use it define how the release builds are signed by declaring
+# the following properties:
+#  '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=${env.P4A_RELEASE_KEYSTORE}
+key.alias=${env.P4A_RELEASE_KEYALIAS}
+key.store.password=${env.P4A_RELEASE_KEYSTORE_PASSWD}
+key.alias.password=${env.P4A_RELEASE_KEYALIAS_PASSWD}
diff --git a/pythonforandroid/bootstraps/pygame/build/build.py b/pythonforandroid/bootstraps/pygame/build/build.py
index e453a54086..3a3fabb3cb 100755
--- a/pythonforandroid/bootstraps/pygame/build/build.py
+++ b/pythonforandroid/bootstraps/pygame/build/build.py
@@ -510,5 +510,8 @@ def parse_args(args=None):
 
     make_package(args)
 
+    return args
+
+
 if __name__ == '__main__':
     parse_args()
diff --git a/pythonforandroid/bootstraps/pygame/build/templates/build.xml b/pythonforandroid/bootstraps/pygame/build/templates/build.xml
index 8dd0bc3f10..8f6b846491 100644
--- a/pythonforandroid/bootstraps/pygame/build/templates/build.xml
+++ b/pythonforandroid/bootstraps/pygame/build/templates/build.xml
@@ -5,6 +5,9 @@
     <property file="ant.properties" />
     <loadproperties srcFile="project.properties" />
 
+    <property environment="env" />
+    <property file="build.properties" />
+
     <fail
             message="sdk.dir is missing. Make sure to generate local.properties using 'android update project'"
             unless="sdk.dir"
diff --git a/pythonforandroid/bootstraps/sdl2/build/build.properties b/pythonforandroid/bootstraps/sdl2/build/build.properties
index edc7f23050..f12e258691 100644
--- a/pythonforandroid/bootstraps/sdl2/build/build.properties
+++ b/pythonforandroid/bootstraps/sdl2/build/build.properties
@@ -15,3 +15,7 @@
 #  '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=${env.P4A_RELEASE_KEYSTORE}
+key.alias=${env.P4A_RELEASE_KEYALIAS}
+key.store.password=${env.P4A_RELEASE_KEYSTORE_PASSWD}
+key.alias.password=${env.P4A_RELEASE_KEYALIAS_PASSWD}
diff --git a/pythonforandroid/bootstraps/sdl2/build/build.py b/pythonforandroid/bootstraps/sdl2/build/build.py
index aa818ed61b..95a81bea70 100755
--- a/pythonforandroid/bootstraps/sdl2/build/build.py
+++ b/pythonforandroid/bootstraps/sdl2/build/build.py
@@ -477,6 +477,9 @@ def parse_args(args=None):
 
     make_package(args)
 
+    return args
+
+
 if __name__ == "__main__":
 
     parse_args()
diff --git a/pythonforandroid/bootstraps/sdl2/build/templates/build.tmpl.xml b/pythonforandroid/bootstraps/sdl2/build/templates/build.tmpl.xml
index 9564aae306..9ab301ad94 100644
--- a/pythonforandroid/bootstraps/sdl2/build/templates/build.tmpl.xml
+++ b/pythonforandroid/bootstraps/sdl2/build/templates/build.tmpl.xml
@@ -38,6 +38,8 @@
         <isset property="env.ANDROID_HOME" />
     </condition>
 
+    <property file="build.properties" />
+
     <!-- The project.properties file is created and updated by the 'android'
          tool, as well as ADT.
 
diff --git a/pythonforandroid/toolchain.py b/pythonforandroid/toolchain.py
index 25232ade2b..c6ebe28eed 100755
--- a/pythonforandroid/toolchain.py
+++ b/pythonforandroid/toolchain.py
@@ -527,10 +527,21 @@ def _dist(self):
     def apk(self, args):
         '''Create an APK using the given distribution.'''
 
-        # AND: Need to add a parser here for any extra options
-        # parser = argparse.ArgumentParser(
-        #     description='Build an APK')
-        # args = parser.parse_args(args)
+        ap = argparse.ArgumentParser(
+            description='Build an APK')
+        ap.add_argument('--release', dest='build_mode', action='store_const',
+                        const='release', default='debug',
+                        help='Build the APK in Release mode')
+        ap.add_argument('--keystore', dest='keystore', action='store', default=None,
+                        help=('Keystore for JAR signing key, will use jarsigner '
+                              'default if not specified (release build only)'))
+        ap.add_argument('--signkey', dest='signkey', action='store', default=None,
+                        help='Key alias to sign APK with (release build only)')
+        ap.add_argument('--keystorepw', dest='keystorepw', action='store', default=None,
+                        help='Password for keystore')
+        ap.add_argument('--signkeypw', dest='signkeypw', action='store', default=None,
+                        help='Password for key alias')
+        apk_args, args = ap.parse_known_args(args)
 
         ctx = self.ctx
         dist = self._dist
@@ -550,21 +561,46 @@ def apk(self, args):
                 else:
                     args[i+1] = realpath(expanduser(args[i+1]))
 
+        env = os.environ.copy()
+        if apk_args.build_mode == 'release':
+            if apk_args.keystore:
+                env['P4A_RELEASE_KEYSTORE'] = realpath(expanduser(apk_args.keystore))
+            if apk_args.signkey:
+                env['P4A_RELEASE_KEYALIAS'] = apk_args.signkey
+            if apk_args.keystorepw:
+                env['P4A_RELEASE_KEYSTORE_PASSWD'] = apk_args.keystorepw
+            if apk_args.signkeypw:
+                env['P4A_RELEASE_KEYALIAS_PASSWD'] = apk_args.signkeypw
+            elif apk_args.keystorepw and 'P4A_RELEASE_KEYALIAS_PASSWD' not in env:
+                env['P4A_RELEASE_KEYALIAS_PASSWD'] = apk_args.keystorepw
+
         build = imp.load_source('build', join(dist.dist_dir, 'build.py'))
         with current_directory(dist.dist_dir):
-            build.parse_args(args)
-            shprint(sh.ant, 'debug', _tail=20, _critical=True)
+            build_args = build.parse_args(args)
+            output = shprint(sh.ant, apk_args.build_mode, _tail=20, _critical=True, _env=env)
 
-        # AND: This is very crude, needs improving. Also only works
-        # for debug for now.
         info_main('# Copying APK to current directory')
-        apks = glob.glob(join(dist.dist_dir, 'bin', '*-*-debug.apk'))
-        if len(apks) == 0:
-            raise ValueError('Couldn\'t find the built APK')
-        if len(apks) > 1:
-            info('More than one built APK found...guessing you '
-                 'just built {}'.format(apks[-1]))
-        shprint(sh.cp, apks[-1], './')
+
+        apk_re = re.compile(r'.*Package: (.*\.apk)$')
+        apk_file = None
+        for line in reversed(output.splitlines()):
+            m = apk_re.match(line)
+            if m:
+                apk_file = m.groups()[0]
+                break
+
+        if not apk_file:
+            info_main('# APK filename not found in build output, trying to guess')
+            apks = glob.glob(join(dist.dist_dir, 'bin', '*-*-{}.apk'.format(apk_args.build_mode)))
+            if len(apks) == 0:
+                raise ValueError('Couldn\'t find the built APK')
+            if len(apks) > 1:
+                info('More than one built APK found...guessing you '
+                     'just built {}'.format(apks[-1]))
+            apk_file = apks[-1]
+
+        info_main('# Found APK file: {}'.format(apk_file))
+        shprint(sh.cp, apk_file, './')
 
     @require_prebuilt_dist
     def create(self, args):