You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cordova.apache.org by mu...@apache.org on 2015/05/21 23:04:01 UTC
cordova-windows git commit: CB-9059 removed targetingWin10 logic from
prepare
Repository: cordova-windows
Updated Branches:
refs/heads/master 53c593981 -> 8719bf7a7
CB-9059 removed targetingWin10 logic from prepare
Project: http://git-wip-us.apache.org/repos/asf/cordova-windows/repo
Commit: http://git-wip-us.apache.org/repos/asf/cordova-windows/commit/8719bf7a
Tree: http://git-wip-us.apache.org/repos/asf/cordova-windows/tree/8719bf7a
Diff: http://git-wip-us.apache.org/repos/asf/cordova-windows/diff/8719bf7a
Branch: refs/heads/master
Commit: 8719bf7a7d3236df6a9d86661f1b351a98f4e1ae
Parents: 53c5939
Author: Murat Sutunc <su...@gmail.com>
Authored: Thu May 21 13:50:38 2015 -0700
Committer: Murat Sutunc <su...@gmail.com>
Committed: Thu May 21 13:59:40 2015 -0700
----------------------------------------------------------------------
template/cordova/lib/MSBuildTools.js | 1 -
template/cordova/lib/prepare.js | 15 ++-------------
2 files changed, 2 insertions(+), 14 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cordova-windows/blob/8719bf7a/template/cordova/lib/MSBuildTools.js
----------------------------------------------------------------------
diff --git a/template/cordova/lib/MSBuildTools.js b/template/cordova/lib/MSBuildTools.js
index 19278af..c325135 100644
--- a/template/cordova/lib/MSBuildTools.js
+++ b/template/cordova/lib/MSBuildTools.js
@@ -81,7 +81,6 @@ function getProgramFiles32Folder() {
function getAvailableUAPVersions() {
var uapFolderPath = path.join(getProgramFiles32Folder(), 'Windows Kits', '10', 'Platforms', 'UAP');
if (!shell.test('-e', uapFolderPath)) {
- console.log('No UAP SDK exists on this machine.');
return []; // No UAP SDK exists on this machine
}
http://git-wip-us.apache.org/repos/asf/cordova-windows/blob/8719bf7a/template/cordova/lib/prepare.js
----------------------------------------------------------------------
diff --git a/template/cordova/lib/prepare.js b/template/cordova/lib/prepare.js
index 2df6067..556c146 100644
--- a/template/cordova/lib/prepare.js
+++ b/template/cordova/lib/prepare.js
@@ -49,13 +49,7 @@ var TEMPLATE =
' Do not modify this file - YOUR CHANGES WILL BE ERASED!\n-->\n';
module.exports.applyPlatformConfig = function() {
-
var config = new ConfigParser(path.join(ROOT, 'config.xml'));
- var isTargetingWin10 = false;
- var winTargetVersion = config.getWindowsTargetVersion();
- if (winTargetVersion === '10.0' || winTargetVersion === 'UAP') {
- isTargetingWin10 = true;
- }
// Apply appxmanifest changes
[{ fileName: MANIFEST_WINDOWS, namespacePrefix: 'm2:' },
@@ -67,16 +61,12 @@ module.exports.applyPlatformConfig = function() {
// Break out Windows 10-specific functionality because we also need to
// apply UAP versioning to Windows 10 appx-manifests.
- var uapVersionInfo = getUAPVersions(config);
+ var uapVersionInfo = getUAPVersions();
if (uapVersionInfo) {
updateManifestFile(config, path.join(ROOT, MANIFEST_WINDOWS10), 'uap:', uapVersionInfo);
-
applyUAPVersionToProject(path.join(ROOT, PROJECT_WINDOWS10), uapVersionInfo);
}
- else if (isTargetingWin10) {
- console.warn('Warning: Requested build targeting Windows 10, but Windows 10 tools were not detected on the system.');
- }
copyImages(config);
};
@@ -620,8 +610,7 @@ function applyTargetPlatformVersion(config, manifest, uapVersionInfo) {
}
// returns {minUAPVersion: Version, targetUAPVersion: Version} | false
-function getUAPVersions(config) {
- // @param config: ConfigParser
+function getUAPVersions() {
var baselineVersions = MSBuildTools.getAvailableUAPVersions();
if (!baselineVersions || baselineVersions.length === 0) {
return false;
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@cordova.apache.org
For additional commands, e-mail: commits-help@cordova.apache.org