more fixes to get gradle build working

tito · inclement · commit fba89ce9b238 · 2017-09-29T00:35:55.000+01:00
diff --git a/pythonforandroid/bootstrap.py b/pythonforandroid/bootstrap.py
@@ -6,7 +6,7 @@
 import importlib
 
 from pythonforandroid.logger import (warning, shprint, info, logger,
-                                     debug)
+                                     debug, error)
 from pythonforandroid.util import (current_directory, ensure_dir,
                                    temp_directory, which)
 from pythonforandroid.recipe import Recipe
@@ -277,6 +277,15 @@ def fry_eggs(self, sitepackages):
                     shprint(sh.mv, '-t', sitepackages, *files)
                 shprint(sh.rm, '-rf', d)
 
+    def apk(self, build_mode, env):
+        try:
+            ant = sh.Command('ant')
+        except sh.CommandNotFound:
+            error('Could not find ant binary, please install it and make '
+                  'sure it is in your $PATH.')
+            exit(1)
+        return shprint(ant, build_mode, _tail=20, _critical=True, _env=env)
+
 
 def expand_dependencies(recipes):
     recipe_lists = [[]]
diff --git a/pythonforandroid/bootstraps/sdl2_gradle/__init__.py b/pythonforandroid/bootstraps/sdl2_gradle/__init__.py
@@ -11,14 +11,16 @@
 
 TODO:
 - test with crystax
+- hardcoded -lpython2.7 in build/jni/src/Android.mk
+- Android.mk require both -I, otherwise it fail in different points
 
 """
 
 from pythonforandroid.toolchain import (
-    Bootstrap, shprint, current_directory, info, warning, ArchARM, info_main)
-from pythonforandroid.utils import ensure_dir
+    Bootstrap, shprint, current_directory, info, info_main)
+from pythonforandroid.util import ensure_dir
 from os.path import join, exists, curdir, abspath
-from os import walk, makedirs
+from os import walk
 import glob
 import sh
 
diff --git a/pythonforandroid/bootstraps/sdl2_gradle/build/build.py b/pythonforandroid/bootstraps/sdl2_gradle/build/build.py
@@ -12,19 +12,11 @@
 import shutil
 from zipfile import ZipFile
 import sys
-import re
 
 from fnmatch import fnmatch
 
 import jinja2
 
-if os.name == 'nt':
-    ANDROID = 'android.bat'
-    ANT = 'ant.bat'
-else:
-    ANDROID = 'android'
-    ANT = 'ant'
-
 curdir = dirname(__file__)
 
 # Try to find a host version of Python that matches our ARM version.
@@ -265,9 +257,9 @@ def make_package(args):
     # Prepare some variables for templating process
     default_icon = 'templates/kivy-icon.png'
     default_presplash = 'templates/kivy-presplash.jpg'
-    shutil.copy(args.icon or default_icon, 'res/drawable/icon.png')
+    shutil.copy(args.icon or default_icon, 'src/main/res/drawable/icon.png')
     shutil.copy(args.presplash or default_presplash,
-                'res/drawable/presplash.jpg')
+                'src/main/res/drawable/presplash.jpg')
 
     # If extra Java jars were requested, copy them into the libs directory
     if args.add_jar:
@@ -334,53 +326,34 @@ def make_package(args):
         service_names.append(name)
         render(
             'Service.tmpl.java',
-            'src/{}/Service{}.java'.format(args.package.replace(".", "/"), name.capitalize()),
+            'src/main/java/{}/Service{}.java'.format(args.package.replace(".", "/"), name.capitalize()),
             name=name,
             entrypoint=entrypoint,
             args=args,
             foreground=foreground,
             sticky=sticky,
-            service_id=sid + 1,
-        )
+            service_id=sid + 1)
 
     render(
         'AndroidManifest.tmpl.xml',
-        'AndroidManifest.xml',
+        'src/main/AndroidManifest.xml',
         args=args,
         service=service,
         service_names=service_names,
-        url_scheme=url_scheme,
-        )
+        url_scheme=url_scheme)
 
     render(
         'build.tmpl.gradle',
         'build.gradle',
         args=args,
-        aars=aars,
-        versioned_name=versioned_name)
+        aars=aars)
 
     render(
         'strings.tmpl.xml',
         'src/main/res/values/strings.xml',
         args=args,
         url_scheme=url_scheme,
-        )
-
-    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()
-
-    with open(join(dirname(__file__), 'res',
-                   'values', 'strings.xml'), 'w') as fileh:
-        fileh.write(re.sub(r'"private_version">[0-9\.]*<',
-                           '"private_version">{}<'.format(
-                               str(time.time())), lines))
+        private_version=str(time.time()))
 
 
 def parse_args(args=None):
@@ -476,8 +449,6 @@ def parse_args(args=None):
                           'filename containing xml. The filename should be '
                           'located relative to the python-for-android '
                           'directory'))
-    ap.add_argument('--with-billing', dest='billing_pubkey',
-                    help='If set, the billing service will be added (not implemented)')
     ap.add_argument('--service', dest='services', action='append',
                     help='Declare a new service entrypoint: '
                          'NAME:PATH_TO_PY[:foreground]')
@@ -497,10 +468,6 @@ def parse_args(args=None):
     if args.name and args.name[0] == '"' and args.name[-1] == '"':
         args.name = args.name[1:-1]
 
-    if args.billing_pubkey:
-        print('Billing not yet supported in sdl2 bootstrap!')
-        exit(1)
-
     if args.sdk_version == -1:
         args.sdk_version = args.min_sdk_version
 
@@ -538,5 +505,4 @@ def parse_args(args=None):
 
 
 if __name__ == "__main__":
-
     parse_args()
diff --git a/pythonforandroid/bootstraps/sdl2_gradle/build/jni/src/Android.mk b/pythonforandroid/bootstraps/sdl2_gradle/build/jni/src/Android.mk
@@ -12,12 +12,14 @@ LOCAL_C_INCLUDES := $(LOCAL_PATH)/$(SDL_PATH)/include
 LOCAL_SRC_FILES := $(SDL_PATH)/src/main/android/SDL_android_main.c \
 	start.c
 
+LOCAL_CFLAGS += -I$(LOCAL_PATH)/../../../../other_builds/$(PYTHON2_NAME)/$(ARCH)/python2/python-install/include/python2.7 $(EXTRA_CFLAGS)
 LOCAL_CFLAGS += -I$(LOCAL_PATH)/../../python-install/include/python2.7 $(EXTRA_CFLAGS)
 
 LOCAL_SHARED_LIBRARIES := SDL2
 
 LOCAL_LDLIBS := -lGLESv1_CM -lGLESv2 -llog -lpython2.7 $(EXTRA_LDLIBS)
 
+LOCAL_LDFLAGS += -L$(LOCAL_PATH)/../../../../other_builds/$(PYTHON2_NAME)/$(ARCH)/python2/python-install/lib $(APPLICATION_ADDITIONAL_LDFLAGS)
 LOCAL_LDFLAGS += -L$(LOCAL_PATH)/../../python-install/lib $(APPLICATION_ADDITIONAL_LDFLAGS)
 
 include $(BUILD_SHARED_LIBRARY)
diff --git a/pythonforandroid/bootstraps/sdl2_gradle/build/templates/build.tmpl.gradle b/pythonforandroid/bootstraps/sdl2_gradle/build/templates/build.tmpl.gradle
@@ -26,7 +26,7 @@ android {
 		minSdkVersion {{ args.min_sdk_version }}
 		targetSdkVersion {{ args.sdk_version }}
 		versionCode {{ args.numeric_version }}
-		versionName {{ args.version }}
+		versionName '{{ args.version }}'
 		ndk {
 			abiFilters 'armeabi-v7a'
 		}
@@ -60,7 +60,9 @@ dependencies {
 	{%- for aar in aars %}
 	compile(name: '{{ aar }}', ext: 'aar')
 	{%- endfor -%}
+	{%- if args.depends -%}
 	{%- for depend in args.depends %}
 	compile '{{ depend }}'
 	{%- endfor %}
+	{%- endif %}
 }
diff --git a/pythonforandroid/toolchain.py b/pythonforandroid/toolchain.py
@@ -65,7 +65,7 @@ def check_python_dependencies():
 
 import sys
 from sys import platform
-from os.path import (join, dirname, realpath, exists, expanduser)
+from os.path import (join, dirname, realpath, exists, expanduser, basename)
 import os
 import glob
 import shutil
@@ -605,7 +605,7 @@ def clean(self, args):
                     'Asked to clean "{}" but this argument is not '
                     'recognised'.format(component)))
             component_clean_methods[component](args)
-            
+
 
     def clean_all(self, args):
         '''Delete all build components; the package cache, package builds,
@@ -755,18 +755,48 @@ def apk(self, args):
         build = imp.load_source('build', join(dist.dist_dir, 'build.py'))
         with current_directory(dist.dist_dir):
             self.hook("before_apk_build")
+            os.environ["ANDROID_API"] = str(self.ctx.android_api)
             build_args = build.parse_args(args.unknown_args)
             self.hook("after_apk_build")
             self.hook("before_apk_assemble")
 
-            try:
-                ant = sh.Command('ant')
-            except sh.CommandNotFound:
-                error('Could not find ant binary, please install it and make '
-                      'sure it is in your $PATH.')
-                exit(1)
+            if exists(join(dist.dist_dir, "templates", "build.tmpl.gradle")):
+                # gradle-based build
+                env["ANDROID_NDK_HOME"] = self.ctx.ndk_dir
+                env["ANDROID_HOME"] = self.ctx.sdk_dir
+
+                gradlew = sh.Command('./gradlew')
+                if args.build_mode == "debug":
+                    gradle_task = "assembleDebug"
+                elif args.build_mode == "release":
+                    gradle_task = "assembleRelease"
+                else:
+                    error("Unknown build mode {} for apk()".format(
+                        args.build_mode))
+                    exit(1)
+                output = shprint(gradlew, gradle_task, _tail=20,
+                                 _critical=True, _env=env)
+
+                # gradle output apks somewhere else
+                # and don't have version in file
+                apk_dir = join(dist.dist_dir, "build", "outputs", "apk")
+                apk_glob = "*-{}.apk"
+                apk_add_version = True
+
+            else:
+                # ant-based build
+                try:
+                    ant = sh.Command('ant')
+                except sh.CommandNotFound:
+                    error('Could not find ant binary, please install it '
+                          'and make sure it is in your $PATH.')
+                    exit(1)
+                output = shprint(ant, args.build_mode, _tail=20,
+                                 _critical=True, _env=env)
+                apk_dir = join(dist.dist_dir, "bin")
+                apk_glob = "*-*-{}.apk"
+                apk_add_version = False
 
-            output = shprint(ant, args.build_mode, _tail=20, _critical=True, _env=env)
             self.hook("after_apk_assemble")
 
         info_main('# Copying APK to current directory')
@@ -784,16 +814,24 @@ def apk(self, args):
             suffix = args.build_mode
             if suffix == 'release' and not args.keystore:
                 suffix = suffix + '-unsigned'
-            apks = glob.glob(join(dist.dist_dir, 'bin', '*-*-{}.apk'.format(suffix)))
+            apks = glob.glob(join(apk_dir, apk_glob.format(suffix)))
             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 '
+                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, './')
+        if apk_add_version:
+            info('# Add version number to APK')
+            apk_name, apk_suffix = basename(apk_file).split("-", 1)
+            apk_file_dest = "{}-{}-{}".format(
+                apk_name, build_args.version, apk_suffix)
+            info('# APK renamed to {}'.format(apk_file_dest))
+            shprint(sh.cp, apk_file, apk_file_dest)
+        else:
+            shprint(sh.cp, apk_file, './')
 
     @require_prebuilt_dist
     def create(self, args):
