sdl2/bootstrap: add --add-jar and --intent-filters support

tito · tito · commit 28dd8c0bf78c · 2016-01-10T19:48:36.000+01:00
Same behavior as the old toolchain
diff --git a/pythonforandroid/bootstraps/sdl2/build/build.py b/pythonforandroid/bootstraps/sdl2/build/build.py
@@ -198,11 +198,6 @@ def compile_dir(dfn):
 
 
 def make_package(args):
-    url_scheme = 'kivy'
-
-    # Figure out versions of the private and public data.
-    private_version = str(time.time())
-
     # # Update the project to a recent version.
     # try:
     #     subprocess.call([ANDROID, 'update', 'project', '-p', '.', '-t',
@@ -253,6 +248,14 @@ def make_package(args):
     shutil.copy(args.presplash or default_presplash,
                 'res/drawable/presplash.jpg')
 
+    # If extra Java jars were requested, copy them into the libs directory
+    if args.add_jar:
+        for jarname in args.add_jar:
+            if not os.path.exists(jarname):
+                print('Requested jar does not exist: {}'.format(jarname))
+                sys.exit(-1)
+            shutil.copy(jarname, 'libs')
+
     versioned_name = (args.name.replace(' ', '').replace('\'', '') +
                       '-' + args.version)
 
@@ -263,6 +266,10 @@ def make_package(args):
             version_code += int(i)
         args.numeric_version = str(version_code)
 
+    if args.intent_filters:
+        with open(args.intent_filters) as fd:
+            args.intent_filters = fd.read()
+
     render(
         'AndroidManifest.tmpl.xml',
         'AndroidManifest.xml',
@@ -345,6 +352,16 @@ def parse_args(args=None):
                     default=join(curdir, 'whitelist.txt'),
                     help=('Use a whitelist file to prevent blacklisting of '
                           'file in the final APK'))
+    ap.add_argument('--add-jar', dest='add_jar', action='append',
+                    help=('Add a Java .jar to the libs, so you can access its '
+                          'classes with pyjnius. You can specify this '
+                          'argument more than once to include multiple jars'))
+    ap.add_argument('--intent-filters', dest='intent_filters',
+                    help=('Add intent-filters xml rules to the '
+                          'AndroidManifest.xml file. The argument is a '
+                          'filename containing xml. The filename should be '
+                          'located relative to the python-for-android '
+                          'directory'))
 
     if args is None:
         args = sys.argv[1:]
diff --git a/pythonforandroid/bootstraps/sdl2/build/templates/AndroidManifest.tmpl.xml b/pythonforandroid/bootstraps/sdl2/build/templates/AndroidManifest.tmpl.xml
@@ -52,7 +52,10 @@
                 <action android:name="android.intent.action.MAIN" />
                 <category android:name="android.intent.category.LAUNCHER" />
             </intent-filter>
+            {%- if args.intent_filters -%}
+            {{- args.intent_filters -}}
+            {%- endif -%}
         </activity>
     </application>
 
-</manifest> 
+</manifest>
