Merge pull request #1541 from opacam/python-core-bootstraps

[CORE UPDATE - PART II] Fix bootstraps for webview and service_only

Author: inclement

pythonforandroid/bootstraps/common/build/build.py

@@ -68,8 +68,8 @@ def get_bootstrap_name():
     BLACKLIST_PATTERNS.append('*.py')
 
 WHITELIST_PATTERNS = []
-if get_bootstrap_name() == "sdl2":
-    WHITELIST_PATTERNS.append("pyconfig.h")
+if get_bootstrap_name() in ('sdl2', 'webview', 'service_only'):
+    WHITELIST_PATTERNS.append('pyconfig.h')
 
 python_files = []
 
@@ -263,8 +263,6 @@ def make_package(args):
             sys.exit(1)
 
     assets_dir = "src/main/assets"
-    if get_bootstrap_name() != "sdl2":
-        assets_dir = "assets"
 
     # Delete the old assets.
     try_unlink(join(assets_dir, 'public.mp3'))
@@ -291,15 +289,13 @@ def make_package(args):
 
     # Prepare some variables for templating process
     res_dir = "src/main/res"
-    if get_bootstrap_name() == "webview":
-        res_dir = "res"
     default_icon = 'templates/kivy-icon.png'
     default_presplash = 'templates/kivy-presplash.jpg'
+    shutil.copy(
+        args.icon or default_icon,
+        join(res_dir, 'drawable/icon.png')
+    )
     if get_bootstrap_name() != "service_only":
-        shutil.copy(
-            args.icon or default_icon,
-            join(res_dir, 'drawable/icon.png')
-        )
         shutil.copy(
             args.presplash or default_presplash,
             join(res_dir, 'drawable/presplash.jpg')
@@ -340,9 +336,9 @@ def make_package(args):
         with open(args.intent_filters) as fd:
             args.intent_filters = fd.read()
 
-    if get_bootstrap_name() == "sdl2":
-        args.add_activity = args.add_activity or []
-        args.activity_launch_mode = args.activity_launch_mode or ''
+    # if get_bootstrap_name() == "sdl2":
+    args.add_activity = args.add_activity or []
+    args.activity_launch_mode = args.activity_launch_mode or ''
 
     if args.extra_source_dirs:
         esd = []
@@ -374,17 +370,11 @@ def make_package(args):
         sticky = 'sticky' in options
 
         service_names.append(name)
-        service_target_path = ""
-        if get_bootstrap_name() != "sdl2":
-            service_target_path =\
-                'src/{}/Service{}.java'.format(args.package.replace(".", "/"),
-                                               name.capitalize())
-        else:
-            service_target_path =\
-                'src/main/java/{}/Service{}.java'.format(
-                    args.package.replace(".", "/"),
-                    name.capitalize()
-                )
+        service_target_path =\
+            'src/main/java/{}/Service{}.java'.format(
+                args.package.replace(".", "/"),
+                name.capitalize()
+            )
         render(
             'Service.tmpl.java',
             service_target_path,
@@ -424,8 +414,6 @@ def make_package(args):
 
     # Render out android manifest:
     manifest_path = "src/main/AndroidManifest.xml"
-    if get_bootstrap_name() != "sdl2":
-        manifest_path = "AndroidManifest.xml"
     render_args = {
         "args": args,
         "service": service,
@@ -441,45 +429,39 @@ def make_package(args):
 
     # Copy the AndroidManifest.xml to the dist root dir so that ant
     # can also use it
-    if get_bootstrap_name() == "sdl2":
-        if exists('AndroidManifest.xml'):
-            remove('AndroidManifest.xml')
-        shutil.copy(manifest_path, 'AndroidManifest.xml')
+    if exists('AndroidManifest.xml'):
+        remove('AndroidManifest.xml')
+    shutil.copy(manifest_path, 'AndroidManifest.xml')
 
     # gradle build templates
-    if get_bootstrap_name() != "webview":
-        # HISTORICALLY NOT SUPPORTED FOR WEBVIEW. Needs review? -JonasT
-        render(
-            'build.tmpl.gradle',
-            'build.gradle',
-            args=args,
-            aars=aars,
-            jars=jars,
-            android_api=android_api,
-            build_tools_version=build_tools_version)
+    render(
+        'build.tmpl.gradle',
+        'build.gradle',
+        args=args,
+        aars=aars,
+        jars=jars,
+        android_api=android_api,
+        build_tools_version=build_tools_version
+        )
 
     # ant build templates
-    if get_bootstrap_name() != "service_only":
-        # Historically, service_only doesn't support ant anymore.
-        # Maybe we should also drop this for the others? -JonasT
-        render(
-            'build.tmpl.xml',
-            'build.xml',
-            args=args,
-            versioned_name=versioned_name)
+    render(
+        'build.tmpl.xml',
+        'build.xml',
+        args=args,
+        versioned_name=versioned_name)
 
     # String resources:
-    if get_bootstrap_name() != "service_only":
-        render_args = {
-            "args": args,
-            "private_version": str(time.time())
-        }
-        if get_bootstrap_name() == "sdl2":
-            render_args["url_scheme"] = url_scheme
-        render(
-            'strings.tmpl.xml',
-            join(res_dir, 'values/strings.xml'),
-            **render_args)
+    render_args = {
+        "args": args,
+        "private_version": str(time.time())
+    }
+    if get_bootstrap_name() == "sdl2":
+        render_args["url_scheme"] = url_scheme
+    render(
+        'strings.tmpl.xml',
+        join(res_dir, 'values/strings.xml'),
+        **render_args)
 
     if exists(join("templates", "custom_rules.tmpl.xml")):
         render(
@@ -489,7 +471,7 @@ def make_package(args):
 
     if get_bootstrap_name() == "webview":
         render('WebViewLoader.tmpl.java',
-               'src/org/kivy/android/WebViewLoader.java',
+               'src/main/java/org/kivy/android/WebViewLoader.java',
                args=args)
 
     if args.sign:
@@ -551,6 +533,9 @@ def parse_args(args=None):
                     help='The permissions to give this app.', nargs='+')
     ap.add_argument('--meta-data', dest='meta_data', action='append',
                     help='Custom key=value to add in application metadata')
+    ap.add_argument('--icon', dest='icon',
+                    help=('A png file to use as the icon for '
+                          'the application.'))
     if get_bootstrap_name() != "service_only":
         ap.add_argument('--presplash', dest='presplash',
                         help=('A jpeg file to use as a screen while the '
@@ -566,9 +551,6 @@ def parse_args(args=None):
         ap.add_argument('--window', dest='window', action='store_true',
                         default=False,
                         help='Indicate if the application will be windowed')
-        ap.add_argument('--icon', dest='icon',
-                        help=('A png file to use as the icon for '
-                              'the application.'))
         ap.add_argument('--orientation', dest='orientation',
                         default='portrait',
                         help=('The orientation that the game will '
@@ -626,9 +608,6 @@ def parse_args(args=None):
                           '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]')
     ap.add_argument('--add-source', dest='extra_source_dirs', action='append',
                     help='Include additional source dirs in Java build')
     if get_bootstrap_name() == "webview":
@@ -708,7 +687,7 @@ def _read_configuration():
     if args.meta_data is None:
         args.meta_data = []
 
-    if args.services is None:
+    if (not hasattr(args, 'services')) or args.services is None:
         args.services = []
 
     if args.try_system_python_compile:
@@ -739,10 +718,8 @@ def _read_configuration():
                         if x.strip() and not x.strip().startswith('#')]
         WHITELIST_PATTERNS += patterns
 
-    if args.private is None and (
-            get_bootstrap_name() != "sdl2" or
-            args.launcher is None
-            ):
+    if args.private is None and \
+            get_bootstrap_name() == 'sdl2' and args.launcher is None:
         print('Need --private directory or ' +
               '--launcher (SDL2 bootstrap only)' +
               'to have something to launch inside the .apk!')

…/build/gradle/wrapper/gradle-wrapper.jar …/build/gradle/wrapper/gradle-wrapper.jarpythonforandroid/bootstraps/sdl2/build/gradle/wrapper/gradle-wrapper.jar renamed to pythonforandroid/bootstraps/common/build/gradle/wrapper/gradle-wrapper.jar pythonforandroid/bootstraps/sdl2/build/gradle/wrapper/gradle-wrapper.jar renamed to pythonforandroid/bootstraps/common/build/gradle/wrapper/gradle-wrapper.jar

@@ -1,90 +1,90 @@
-@if "%DEBUG%" == "" @echo off
-@rem ##########################################################################
-@rem
-@rem  Gradle startup script for Windows
-@rem
-@rem ##########################################################################
-
-@rem Set local scope for the variables with windows NT shell
-if "%OS%"=="Windows_NT" setlocal
-
-@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
-set DEFAULT_JVM_OPTS=
-
-set DIRNAME=%~dp0
-if "%DIRNAME%" == "" set DIRNAME=.
-set APP_BASE_NAME=%~n0
-set APP_HOME=%DIRNAME%
-
-@rem Find java.exe
-if defined JAVA_HOME goto findJavaFromJavaHome
-
-set JAVA_EXE=java.exe
-%JAVA_EXE% -version >NUL 2>&1
-if "%ERRORLEVEL%" == "0" goto init
-
-echo.
-echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
-echo.
-echo Please set the JAVA_HOME variable in your environment to match the
-echo location of your Java installation.
-
-goto fail
-
-:findJavaFromJavaHome
-set JAVA_HOME=%JAVA_HOME:"=%
-set JAVA_EXE=%JAVA_HOME%/bin/java.exe
-
-if exist "%JAVA_EXE%" goto init
-
-echo.
-echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
-echo.
-echo Please set the JAVA_HOME variable in your environment to match the
-echo location of your Java installation.
-
-goto fail
-
-:init
-@rem Get command-line arguments, handling Windowz variants
-
-if not "%OS%" == "Windows_NT" goto win9xME_args
-if "%@eval[2+2]" == "4" goto 4NT_args
-
-:win9xME_args
-@rem Slurp the command line arguments.
-set CMD_LINE_ARGS=
-set _SKIP=2
-
-:win9xME_args_slurp
-if "x%~1" == "x" goto execute
-
-set CMD_LINE_ARGS=%*
-goto execute
-
-:4NT_args
-@rem Get arguments from the 4NT Shell from JP Software
-set CMD_LINE_ARGS=%$
-
-:execute
-@rem Setup the command line
-
-set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
-
-@rem Execute Gradle
-"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %CMD_LINE_ARGS%
-
-:end
-@rem End local scope for the variables with windows NT shell
-if "%ERRORLEVEL%"=="0" goto mainEnd
-
-:fail
-rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of
-rem the _cmd.exe /c_ return code!
-if  not "" == "%GRADLE_EXIT_CONSOLE%" exit 1
-exit /b 1
-
-:mainEnd
-if "%OS%"=="Windows_NT" endlocal
-
-:omega
+@if "%DEBUG%" == "" @echo off
+@rem ##########################################################################
+@rem
+@rem  Gradle startup script for Windows
+@rem
+@rem ##########################################################################
+
+@rem Set local scope for the variables with windows NT shell
+if "%OS%"=="Windows_NT" setlocal
+
+@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
+set DEFAULT_JVM_OPTS=
+
+set DIRNAME=%~dp0
+if "%DIRNAME%" == "" set DIRNAME=.
+set APP_BASE_NAME=%~n0
+set APP_HOME=%DIRNAME%
+
+@rem Find java.exe
+if defined JAVA_HOME goto findJavaFromJavaHome
+
+set JAVA_EXE=java.exe
+%JAVA_EXE% -version >NUL 2>&1
+if "%ERRORLEVEL%" == "0" goto init
+
+echo.
+echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
+echo.
+echo Please set the JAVA_HOME variable in your environment to match the
+echo location of your Java installation.
+
+goto fail
+
+:findJavaFromJavaHome
+set JAVA_HOME=%JAVA_HOME:"=%
+set JAVA_EXE=%JAVA_HOME%/bin/java.exe
+
+if exist "%JAVA_EXE%" goto init
+
+echo.
+echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
+echo.
+echo Please set the JAVA_HOME variable in your environment to match the
+echo location of your Java installation.
+
+goto fail
+
+:init
+@rem Get command-line arguments, handling Windowz variants
+
+if not "%OS%" == "Windows_NT" goto win9xME_args
+if "%@eval[2+2]" == "4" goto 4NT_args
+
+:win9xME_args
+@rem Slurp the command line arguments.
+set CMD_LINE_ARGS=
+set _SKIP=2
+
+:win9xME_args_slurp
+if "x%~1" == "x" goto execute
+
+set CMD_LINE_ARGS=%*
+goto execute
+
+:4NT_args
+@rem Get arguments from the 4NT Shell from JP Software
+set CMD_LINE_ARGS=%$
+
+:execute
+@rem Setup the command line
+
+set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
+
+@rem Execute Gradle
+"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %CMD_LINE_ARGS%
+
+:end
+@rem End local scope for the variables with windows NT shell
+if "%ERRORLEVEL%"=="0" goto mainEnd
+
+:fail
+rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of
+rem the _cmd.exe /c_ return code!
+if  not "" == "%GRADLE_EXIT_CONSOLE%" exit 1
+exit /b 1
+
+:mainEnd
+if "%OS%"=="Windows_NT" endlocal
+
+:omega