Fix bootstrap build for launcher

KeyWeeUsr · KeyWeeUsr · commit 6ebd2ff3d46c · 2016-12-12T11:29:00.000+01:00
diff --git a/pythonforandroid/bootstraps/sdl2/build/build.py b/pythonforandroid/bootstraps/sdl2/build/build.py
@@ -222,13 +222,15 @@ def make_package(args):
     #     print('Your PATH must include android tools.')
     #     sys.exit(-1)
 
-    if not (exists(join(realpath(args.private), 'main.py')) or
-            exists(join(realpath(args.private), 'main.pyo'))):
-        print('''BUILD FAILURE: No main.py(o) found in your app directory. This
+    # Ignore warning if the launcher is in args
+    if not args.launcher:
+        if not (exists(join(realpath(args.private), 'main.py')) or
+                exists(join(realpath(args.private), 'main.pyo'))):
+            print('''BUILD FAILURE: No main.py(o) found in your app directory. This
 file must exist to act as the entry point for you app. If your app is
 started by a file with a different name, rename it to main.py or add a
 main.py that loads it.''')
-        exit(1)
+            exit(1)
 
     # Delete the old assets.
     if exists('assets/public.mp3'):
@@ -248,8 +250,13 @@ def make_package(args):
         tar_dirs.append('private')
     if exists('crystax_python'):
         tar_dirs.append('crystax_python')
+
     if args.private:
         make_tar('assets/private.mp3', tar_dirs, args.ignore_path)
+    elif args.launcher:
+        # clean 'None's as a result of main.py path absence
+        tar_dirs = [tdir for tdir in tar_dirs if tdir]
+        make_tar('assets/private.mp3', tar_dirs, args.ignore_path)
     # else:
     #     make_tar('assets/private.mp3', ['private'])
 
@@ -267,12 +274,18 @@ def make_package(args):
     #     sys.exit(-1)
 
 
-    # Prepare some variables for templating process
+    # folder name for launcher
+    url_scheme = 'kivy'
 
-    default_icon = 'templates/kivy-icon.png'
+    # Prepare some variables for templating process
+    if args.launcher:
+        default_icon = 'templates/launcher-icon.png'
+        default_presplash = 'templates/launcher-presplash.jpg'
+    else:
+        default_icon = 'templates/kivy-icon.png'
+        default_presplash = 'templates/kivy-presplash.jpg'
     shutil.copy(args.icon or default_icon, 'res/drawable/icon.png')
 
-    default_presplash = 'templates/kivy-presplash.jpg'
     shutil.copy(args.presplash or default_presplash,
                 'res/drawable/presplash.jpg')
 
@@ -312,9 +325,10 @@ def make_package(args):
         args.extra_source_dirs = []
 
     service = False
-    service_main = join(realpath(args.private), 'service', 'main.py')
-    if exists(service_main) or exists(service_main + 'o'):
-        service = True
+    if args.private:
+        service_main = join(realpath(args.private), 'service', 'main.py')
+        if exists(service_main) or exists(service_main + 'o'):
+            service = True
 
     service_names = []
     for sid, spec in enumerate(args.services):
@@ -344,6 +358,7 @@ def make_package(args):
         args=args,
         service=service,
         service_names=service_names,
+        url_scheme=url_scheme,
         )
 
     render(
@@ -355,7 +370,9 @@ def make_package(args):
     render(
         'strings.tmpl.xml',
         'res/values/strings.xml',
-        args=args)
+        args=args,
+        url_scheme=url_scheme,
+        )
 
     render(
         'custom_rules.tmpl.xml',
@@ -391,8 +408,9 @@ def parse_args(args=None):
 ''')
 
     ap.add_argument('--private', dest='private',
-                    help='the dir of user files',
-                    required=True)
+                    help='the dir of user files')
+                    # , required=True) for launcher, crashes in make_package
+                    # if not mentioned (and the check is there anyway)
     ap.add_argument('--package', dest='package',
                     help=('The name of the java package the project will be'
                           ' packaged under.'),
@@ -414,6 +432,9 @@ def parse_args(args=None):
                     help=('The orientation that the game will display in. '
                           'Usually one of "landscape", "portrait" or '
                           '"sensor"'))
+    ap.add_argument('--launcher', dest='launcher', action='store_true',
+                    help=('Provide this argument to build a multi-app '
+                          'launcher, rather than a single app.'))
     ap.add_argument('--icon', dest='icon',
                     help='A png file to use as the icon for the application.')
     ap.add_argument('--permission', dest='permissions', action='append',
@@ -499,6 +520,9 @@ def parse_args(args=None):
         PYTHON = None
         BLACKLIST_PATTERNS.remove('*.py')
 
+    if args.launcher:
+        WHITELIST_PATTERNS += ['pyconfig.h']
+
     if args.blacklist:
         with open(args.blacklist) as fd:
             patterns = [x.strip() for x in fd.read().splitlines()
