cordova-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From sgreb...@apache.org
Subject git commit: CB-6976 fixes deploy when target type is not specified
Date Tue, 24 Jun 2014 19:45:54 GMT
Repository: cordova-windows
Updated Branches:
  refs/heads/master 0b029c021 -> 7419a0983


CB-6976 fixes deploy when target type is not specified

We currently support --phone, --store and --store80, for example 'cordova emulate windows
-- --phone'


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

Branch: refs/heads/master
Commit: 7419a098388b1c8be02d56ffc238c6db50d9a3bb
Parents: 0b029c0
Author: an-selm <an-selm@ya.ru>
Authored: Tue Jun 24 22:50:39 2014 +0400
Committer: sgrebnov <v-segreb@microsoft.com>
Committed: Tue Jun 24 23:45:21 2014 +0400

----------------------------------------------------------------------
 windows/template/cordova/lib/deploy.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cordova-windows/blob/7419a098/windows/template/cordova/lib/deploy.js
----------------------------------------------------------------------
diff --git a/windows/template/cordova/lib/deploy.js b/windows/template/cordova/lib/deploy.js
index 5dce05c..92188c7 100644
--- a/windows/template/cordova/lib/deploy.js
+++ b/windows/template/cordova/lib/deploy.js
@@ -129,7 +129,7 @@ function getPackage (path, projecttype, buildtype, buildarchs) {
 
         // set default values
         // because "store81" and "store" are synonims, replace "store81" with "store" due
to appx naming.
-        projecttype = projecttype != "store81" ? projecttype : "store";
+        projecttype = projecttype && projecttype != "store81" ? projecttype : "store";
         buildtype = buildtype ? buildtype : "debug";
         buildarchs = buildarchs ? buildarchs : ["anycpu"];
         // if "Any CPU" is arch to deploy, remove space because folder name will contain
@@ -151,7 +151,7 @@ function getPackage (path, projecttype, buildtype, buildarchs) {
                 var appx_buildtype = appx_props[4] ? appx_props[4].toLowerCase() : "release";
                 // compare chip architecture and build type of package found with
                 // chip architecture and build type specified in script arguments
-                if (appx_buildarch == buildarch && appx_buildtype == buildType &&
appx_projecttype == projecttype) {
+                if (appx_buildarch == buildarch && appx_buildtype == buildtype &&
appx_projecttype == projecttype) {
                     // Appropriate package found
                     Log('Appropriate package found at ' + subFolder.Path);
                     return subFolder.Path;


Mime
View raw message