_bootstrap.py can bootstrap other than "main"

alanjds · alanjds · commit 4f343c7b0e81 · 2014-09-15T14:43:29.000-03:00
diff --git a/bootstrap/minimal/assets/_bootstrap.py b/bootstrap/minimal/assets/_bootstrap.py
@@ -120,5 +120,8 @@ def load_module(self, fullname):
 # Step 4: bootstrap the application !
 #
 
+main_module = sys.argv[1]
+print 'Bootstrapping module: "%s"' % main_module
+
 import runpy
-runpy._run_module_as_main("main", False)
+runpy._run_module_as_main(main_module, False)
diff --git a/bootstrap/minimal/jni/main.c b/bootstrap/minimal/jni/main.c
@@ -66,6 +66,15 @@ void android_main(struct android_app* state) {
         return;
     }
 
+    // pass a module name as argument: _bootstrap.py use it as the main module
+    int argc;
+    char * argv[2];
+    argc = 2;
+    argv[0] = "_bootstrap.py";
+    argv[1] = "main";
+
+    PySys_SetArgv(argc, argv);
+
     // run the python bootstrap
     LOGI("Run _bootstrap.py >>>");
     FILE *fhd = fopen(bootstrap_fn, "rb");

Original file line number	Diff line number	Diff line change
`@@ -120,5 +120,8 @@ def load_module(self, fullname):`
`120`	`120`	`# Step 4: bootstrap the application !`
`121`	`121`	`#`
`122`	`122`
	`123`	`+main_module = sys.argv[1]`
	`124`	`+print 'Bootstrapping module: "%s"' % main_module`
	`125`	`+`
`123`	`126`	`import runpy`
`124`		`-runpy._run_module_as_main("main", False)`
	`127`	`+runpy._run_module_as_main(main_module, False)`