cordova-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From an-s...@apache.org
Subject cordova-windows git commit: CB-10303 Fixes build arguments parsing
Date Wed, 06 Jan 2016 14:48:29 GMT
Repository: cordova-windows
Updated Branches:
  refs/heads/master 74303fcf8 -> e6016147a


CB-10303 Fixes build arguments parsing


Project: http://git-wip-us.apache.org/repos/asf/cordova-windows/repo
Commit: http://git-wip-us.apache.org/repos/asf/cordova-windows/commit/e6016147
Tree: http://git-wip-us.apache.org/repos/asf/cordova-windows/tree/e6016147
Diff: http://git-wip-us.apache.org/repos/asf/cordova-windows/diff/e6016147

Branch: refs/heads/master
Commit: e6016147a450b35537f08b94b5605a61078c33ec
Parents: 74303fc
Author: Vladimir Kotikov <kotikov.vladimir@gmail.com>
Authored: Wed Jan 6 13:57:19 2016 +0300
Committer: Vladimir Kotikov <kotikov.vladimir@gmail.com>
Committed: Wed Jan 6 14:27:09 2016 +0300

----------------------------------------------------------------------
 template/cordova/lib/build.js | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cordova-windows/blob/e6016147/template/cordova/lib/build.js
----------------------------------------------------------------------
diff --git a/template/cordova/lib/build.js b/template/cordova/lib/build.js
index b90c205..1a268f5 100644
--- a/template/cordova/lib/build.js
+++ b/template/cordova/lib/build.js
@@ -179,7 +179,10 @@ function parseAndValidateArgs(options) {
 
     // get build options/defaults
     config.buildType = options.release ? 'release' : 'debug';
-    config.buildArchs = args.archs ? args.archs.split(' ') : ['anycpu'];
+
+    var archs = options.archs || args.archs;
+    config.buildArchs = archs ? archs.split(' ') : ['anycpu'];
+
     config.phone = args.phone ? true : false;
     config.win = args.win ? true : false;
     config.projVerOverride = args.appx;
@@ -195,7 +198,7 @@ function parseAndValidateArgs(options) {
     }
 
     // if build.json is provided, parse it
-    var buildConfigPath = args.buildConfig;
+    var buildConfigPath = options.buildConfig;
     if (buildConfigPath) {
         buildConfig = parseBuildConfig(buildConfigPath, config.buildType);
         for (var prop in buildConfig) { config[prop] = buildConfig[prop]; }
@@ -273,10 +276,9 @@ function updateManifestWithPublisher(allMsBuildVersions, config) {
         return projFilesToManifests[proj];
     });
     manifestFiles.forEach(function(file) {
-        var manifestPath = path.join(ROOT, file);
-        AppxManifest.get(manifestPath)
-            .getIdentity().setPublisher(config.publisherId)
-            .write();
+        var manifest = AppxManifest.get(path.join(ROOT, file));
+        manifest.getIdentity().setPublisher(config.publisherId);
+        manifest.write();
     });
 }
 


---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@cordova.apache.org
For additional commands, e-mail: commits-help@cordova.apache.org


Mime
View raw message