bootstrap: make configurable the entrypoint per bootstrap via a bootstrap.properties that is merged with local.properties during the distribution.

tito · tito · commit a8f16bf249e0 · 2014-06-22T00:51:43.000+02:00
diff --git a/bootstrap/common/build.py b/bootstrap/common/build.py
@@ -492,4 +492,19 @@ def make_package(args):
                         and not x.startswith('#')]
         WHITELIST_PATTERNS += patterns
 
+    # read bootstrap.properties and fill the args
+    args.bootstrap = {}
+    with open("local.properties") as fd:
+        for line in fd.readlines():
+            items = line.split("=", 1)
+            if len(items) != 2:
+                continue
+            key, value = items
+            if not key.startswith("bootstrap."):
+                continue
+            key = key[len("bootstrap:"):]
+            args.bootstrap[key] = value.splitlines()[0]
+
+    print args.bootstrap
+
     make_package(args)
diff --git a/bootstrap/common/templates/AndroidManifest.tmpl.xml b/bootstrap/common/templates/AndroidManifest.tmpl.xml
@@ -27,7 +27,7 @@
     <meta-data android:name="wakelock" android:value="{% if args.wakelock %}1{% else %}0{% endif %}"/>
 
 
-    <activity android:name="org.renpy.android.PythonActivity"
+    <activity android:name="{{ args.bootstrap.entrypoint }}"
               android:label="@string/iconName"
 			  android:configChanges="mcc|mnc|locale|touchscreen|keyboard|keyboardHidden|navigation|orientation|screenLayout|fontScale|uiMode{% if android_api >= 13 %}|screenSize{% endif %}"
               android:launchMode="singleTask"
diff --git a/bootstrap/legacy/bootstrap.properties b/bootstrap/legacy/bootstrap.properties
@@ -0,0 +1 @@
+bootstrap.entrypoint=org.renpy.android.PythonActivity
diff --git a/bootstrap/minimal/bootstrap.properties b/bootstrap/minimal/bootstrap.properties
@@ -0,0 +1 @@
+bootstrap.entrypoint=org.renpy.android.PythonActivity
diff --git a/distribute.sh b/distribute.sh
@@ -745,6 +745,7 @@ function run_distribute() {
 	debug "Copy default files"
 	try cp -a $SRC_PATH/default.properties .
 	try cp -a $SRC_PATH/local.properties .
+	try cat $SRC_PATH/bootstrap.properties >> "local.properties"
 	try cp -a $BOOTSTRAP_COMMON_PATH/build.py .
 	try cp -a $BOOTSTRAP_COMMON_PATH/buildlib .
 	try cp -a $BOOTSTRAP_COMMON_PATH/src .

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1 @@`
	`1`	`+bootstrap.entrypoint=org.renpy.android.PythonActivity`