Merge pull request #163 from fujunwei/xwalk-url

Add the option of "--xwalk-apk-url" when creating Cordova project

Author: huningxin

bin/create

@@ -30,12 +30,17 @@ if (args['--help'] || args._.length === 0) {
     console.log('    <template_path>: Path to a custom application template to use');
     console.log('    --shared will use the CordovaLib project directly instead of making a copy.');
     console.log('    --xwalk-shared-library will use Crosswalk shared mode to package the project that without xwalk so library.');
+    console.log('    --xwalk-apk-url configure the download URL of the Crosswalk runtime library.');
     process.exit(1);
 }
-if (args['--shared'] && args['--xwalk-shared-library']) {
-    console.log('    --xwalk-shared-library do not support --shared.');
-    process.exit(1);
+if (args['--xwalk-shared-library'] || args['--xwalk-apk-url']) {
+    if (args['--shared']) {
+        console.log('    --shared do not support --xwalk-shared-library and --xwalk-apk-url.');
+        process.exit(1);
+    } else if (!(args['--xwalk-shared-library'] && args['--xwalk-apk-url'])) {
+        console.log('    --xwalk-shared-library and --xwalk-apk-url must be used at the same time.');
+        process.exit(1);
+    }
 }
 
-create.createProject(args._[0], args._[1], args._[2], args._[3], args['--shared'], args['--cli'], args['--xwalk-shared-library']).done();
-
+create.createProject(args._[0], args._[1], args._[2], args._[3], args['--shared'], args['--cli'], args['--xwalk-shared-library'], args['--xwalk-apk-url']).done();

bin/lib/create.js

@@ -209,7 +209,8 @@ function validateProjectName(project_name) {
  * Returns a promise.
  */
 
-exports.createProject = function(project_path, package_name, project_name, project_template_dir, use_shared_project, use_cli_template, xwalk_shared_library) {
+exports.createProject = function(project_path, package_name, project_name, project_template_dir,
+        use_shared_project, use_cli_template, xwalk_shared_library, xwalk_apk_url) {
     var VERSION = fs.readFileSync(path.join(ROOT, 'VERSION'), 'utf-8').trim();
 
     // Set default values for path, package and name
@@ -220,6 +221,7 @@ exports.createProject = function(project_path, package_name, project_name, proje
     project_template_dir = typeof project_template_dir !== 'undefined' ? 
                            project_template_dir : 
                            path.join(ROOT, 'bin', 'templates', 'project');
+    xwalk_apk_url = typeof xwalk_apk_url !== 'undefined' ? xwalk_apk_url : "";
 
     var safe_activity_name = project_name.replace(/\W/g, '');
     var package_as_path = package_name.replace(/\./g, path.sep);
@@ -302,6 +304,7 @@ exports.createProject = function(project_path, package_name, project_name, proje
             shell.sed('-i', /__ACTIVITY__/, safe_activity_name, manifest_path);
             shell.sed('-i', /__PACKAGE__/, package_name, manifest_path);
             shell.sed('-i', /__APILEVEL__/, target_api.split('-')[1], manifest_path);
+            shell.sed('-i', /__XWALKAPKURL__/, xwalk_apk_url, manifest_path);
             copyScripts(project_path);
             copyBuildRules(project_path);
         });

bin/lib/simpleargs.js

@@ -22,7 +22,12 @@ exports.getArgs = function(argv) {
     var posArgs = [];
     for (var i = 2, arg; arg = argv[i] || i < argv.length; ++i) {
         if (/^--/.exec(arg)) {
-            ret[arg] = true;
+            if (arg.indexOf("=") != -1) {
+                var arr = arg.split("=");
+                ret[arr[0]] = arr[1];
+            } else {
+                ret[arg] = true;
+            }
         } else {
             posArgs.push(arg);
         }

bin/templates/project/AndroidManifest.xml

@@ -36,6 +36,7 @@
     <application android:name="org.apache.cordova.CordovaApplication"
         android:icon="@drawable/icon" android:label="@string/app_name"
         android:hardwareAccelerated="true">
+        <meta-data android:name="xwalk_apk_url" android:value="__XWALKAPKURL__" />
         <activity android:name="__ACTIVITY__"
                 android:label="@string/activity_name"
                 android:launchMode="singleTop"