Fixed release mode (--release) with sdl2

inclement · inclement · commit 779c1d9d33e6 · 2016-12-04T21:54:12.000Z
diff --git a/pythonforandroid/bootstraps/sdl2/build/build.py b/pythonforandroid/bootstraps/sdl2/build/build.py
@@ -3,7 +3,7 @@
 from __future__ import print_function
 
 from os.path import dirname, join, isfile, realpath, relpath, split, exists
-from os import makedirs
+from os import makedirs, remove
 import os
 import tarfile
 import time
@@ -362,6 +362,12 @@ def make_package(args):
         'custom_rules.xml',
         args=args)
 
+    if args.sign:
+        render('build.properties', 'build.properties')
+    else:
+        if exists('build.properties'):
+            os.remove('build.properties')
+
     with open(join(dirname(__file__), 'res',
                    'values', 'strings.xml')) as fileh:
         lines = fileh.read()
@@ -461,6 +467,9 @@ def parse_args(args=None):
                     help='Include additional source dirs in Java build')
     ap.add_argument('--no-compile-pyo', dest='no_compile_pyo', action='store_true',
                     help='Do not optimise .py files to .pyo.')
+    ap.add_argument('--sign', action='store_true',
+                    help=('Try to sign the APK with your credentials. You must set '
+                          'the appropriate environment variables.'))
 
     if args is None:
         args = sys.argv[1:]
diff --git a/pythonforandroid/bootstraps/sdl2/build/templates/build.properties b/pythonforandroid/bootstraps/sdl2/build/templates/build.properties
diff --git a/pythonforandroid/toolchain.py b/pythonforandroid/toolchain.py
@@ -706,7 +706,10 @@ def apk(self, args):
 
         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(args.build_mode)))
+            suffix = args.build_mode
+            if suffix == 'release':
+                suffix = suffix + '-unsigned'
+            apks = glob.glob(join(dist.dist_dir, 'bin', '*-*-{}.apk'.format(suffix)))
             if len(apks) == 0:
                 raise ValueError('Couldn\'t find the built APK')
             if len(apks) > 1:
