You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cordova.apache.org by ja...@apache.org on 2018/02/27 12:43:18 UTC
[cordova-windows] branch janpio-win10only updated (6236b85 ->
34c29b3)
This is an automated email from the ASF dual-hosted git repository.
janpio pushed a change to branch janpio-win10only
in repository https://gitbox.apache.org/repos/asf/cordova-windows.git.
omit 6236b85 remove unused param from method getBuildTargets
omit f732f52 clean up switch by pkg.type (is always `windows10` now)
omit 52ce711 general comments and TODO
omit 4bb1e2f no more `win10tools` param
omit 6ae7979 comments and changes regarding Visual Studio and UAP
omit 523586b fix eslint
omit c3b1cbc fix problem for e2e tests
omit 4669761 fix mistake in Prepare.Win10.spec.js
omit e2519c3 fix mistage in splashscreen.js
omit 0c45f9b fix unittests
omit fc25d4b fix eslint
omit d39ed09 comment
omit 60ea04b more: remove appx
omit 913b641 remove VS13
omit 5e577ab more: remove package.phone.appxmanifest and package.windows.appxmanifest and related
omit 351c782 remove CordovaApp.Phone.jsproj and CordovaApp.Windows.jsproj
omit 254dec9 remove package.phone.appxmanifest and package.windows.appxmanifest and related
omit 229abf6 remove 8.1 (...81) variables, conditionals and expects
omit 2c1f8c0 remove --appx param
omit 7a62ce8 add exception for 8.1 projects
omit c7f37ba remove 8.1 prebuild files
omit 43331f8 remove 8.1 project files (and templates)
omit 575d47b remove 8.1 code
omit 2f4830d rename 8.1 tests that are (probably) really 10 tests
omit 55fcc69 remove 8.1 tests
omit 54457ef README
add b1fbd9d Commenting out (most) of the left over debug logging for release
add 55e71c7 CB-13896 Updated checked-in node_modules
add a246616 CB-13896 Updated RELEASENOTES and Version for release 6.0.0
add 825dc77 Set VERSION to 6.1.0-dev (via coho)
add 4987f2c Update JS snapshot to version 6.1.0-dev (via coho)
add 8cc627b Update requirements, issues and Platform Guide link
new 1dc4478 README
new a3f0490 remove 8.1 tests
new 6c6d34c rename 8.1 tests that are (probably) really 10 tests
new d36554a remove 8.1 code
new 8dfb123 remove 8.1 project files (and templates)
new a2276a0 remove 8.1 prebuild files
new 0c313eb add exception for 8.1 projects
new cf485e5 remove --appx param
new 9bf5362 remove 8.1 (...81) variables, conditionals and expects
new c56569c remove package.phone.appxmanifest and package.windows.appxmanifest and related
new 8ee432d remove CordovaApp.Phone.jsproj and CordovaApp.Windows.jsproj
new a92e3ab more: remove package.phone.appxmanifest and package.windows.appxmanifest and related
new 9c7b0c8 remove VS13
new 6803bbc more: remove appx
new 08c3d64 comment
new d0b78c3 fix eslint
new 6a871c4 fix unittests
new c06af73 fix mistage in splashscreen.js
new ce87519 fix mistake in Prepare.Win10.spec.js
new e2a07b7 fix problem for e2e tests
new d1d2a1e fix eslint
new 376e007 comments and changes regarding Visual Studio and UAP
new a19e37b no more `win10tools` param
new babd839 general comments and TODO
new 0c54662 clean up switch by pkg.type (is always `windows10` now)
new 34c29b3 remove unused param from method getBuildTargets
This update added new revisions after undoing existing revisions.
That is to say, some revisions that were in the old version of the
branch are not in the new version. This situation occurs
when a user --force pushes a change and generates a repository
containing something like this:
* -- * -- B -- O -- O -- O (6236b85)
\
N -- N -- N refs/heads/janpio-win10only (34c29b3)
You should already have received notification emails for all of the O
revisions, and so the following emails describe only the N revisions
from the common base, B.
Any revisions marked "omit" are not gone; other references still
refer to them. Any revisions marked "discard" are gone forever.
The 26 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
RELEASENOTES.md | 34 +
VERSION | 2 +-
bin/lib/check_reqs.js | 4 +
node_modules/abbrev/package.json | 62 +-
node_modules/ansi/package.json | 63 +-
node_modules/balanced-match/package.json | 60 +-
node_modules/base64-js/package.json | 56 +-
node_modules/big-integer/package.json | 4 +-
node_modules/bplist-parser/package.json | 56 +-
node_modules/brace-expansion/package.json | 64 +-
node_modules/concat-map/package.json | 57 +-
.../node_modules/elementtree}/.npmignore | 0
.../node_modules}/elementtree/.travis.yml | 0
.../node_modules}/elementtree/CHANGES.md | 0
.../node_modules}/elementtree/LICENSE.txt | 0
.../node_modules}/elementtree/Makefile | 0
.../node_modules}/elementtree/NOTICE | 0
.../node_modules}/elementtree/README.md | 0
.../node_modules}/elementtree/lib/constants.js | 0
.../node_modules}/elementtree/lib/elementpath.js | 0
.../node_modules}/elementtree/lib/elementtree.js | 0
.../node_modules}/elementtree/lib/errors.js | 0
.../node_modules}/elementtree/lib/parser.js | 0
.../node_modules}/elementtree/lib/parsers/index.js | 0
.../node_modules}/elementtree/lib/parsers/sax.js | 0
.../node_modules}/elementtree/lib/sprintf.js | 0
.../node_modules}/elementtree/lib/treebuilder.js | 0
.../node_modules}/elementtree/lib/utils.js | 0
.../node_modules}/elementtree/package.json | 59 +-
.../node_modules}/elementtree/tests/data/xml1.xml | 0
.../node_modules}/elementtree/tests/data/xml2.xml | 0
.../node_modules}/elementtree/tests/test-simple.js | 0
node_modules/cordova-common/package.json | 18 +-
node_modules/cordova-registry-mapper/README.md | 2 +-
node_modules/cordova-registry-mapper/package.json | 57 +-
node_modules/elementtree/.travis.yml | 6 +-
node_modules/elementtree/CHANGES.md | 2 +-
node_modules/elementtree/node_modules/sax/LICENSE | 41 +
.../elementtree/node_modules/sax/LICENSE-W3C.html | 188 +
.../{ => elementtree/node_modules}/sax/README.md | 105 +-
.../elementtree/node_modules/sax/lib/sax.js | 1563 +++++++
.../elementtree/node_modules/sax/package.json | 63 +
node_modules/elementtree/package.json | 72 +-
.../tests/data/{xml1.xml => bom-xml.xml} | 2 +-
node_modules/elementtree/tests/test-simple.js | 9 +
node_modules/glob/package.json | 59 +-
node_modules/inflight/package.json | 78 +-
node_modules/inherits/package.json | 69 +-
node_modules/lodash/package.json | 73 +-
node_modules/minimatch/package.json | 62 +-
node_modules/node-uuid/README.md | 254 +-
node_modules/node-uuid/lib/sha1-browser.js | 120 +
node_modules/node-uuid/package.json | 59 +-
node_modules/node-uuid/v3.js | 54 +
node_modules/nopt/package.json | 68 +-
node_modules/once/package.json | 66 +-
node_modules/os-homedir/package.json | 61 +-
node_modules/os-tmpdir/package.json | 64 +-
node_modules/osenv/package.json | 71 +-
node_modules/path-is-absolute/package.json | 67 +-
node_modules/plist/package.json | 64 +-
node_modules/q/CHANGES.md | 14 +
node_modules/q/LICENSE | 2 +-
node_modules/q/README.md | 19 +-
node_modules/q/package.json | 73 +-
node_modules/q/q.js | 56 +-
node_modules/sax/package.json | 59 +-
node_modules/semver/README.md | 112 +-
node_modules/semver/bin/semver | 14 +-
node_modules/semver/package.json | 80 +-
node_modules/semver/range.bnf | 4 +-
node_modules/semver/semver.js | 147 +-
node_modules/shelljs/package.json | 56 +-
node_modules/underscore/package.json | 56 +-
node_modules/unorm/package.json | 58 +-
node_modules/util-deprecate/package.json | 55 +-
node_modules/winjs/README.md | 8 +-
node_modules/winjs/css/ui-dark.css | 11 +-
node_modules/winjs/css/ui-dark.min.css | 2 +-
node_modules/winjs/css/ui-light.css | 11 +-
node_modules/winjs/css/ui-light.min.css | 2 +-
node_modules/winjs/js/base.js | 46 +-
node_modules/winjs/js/base.min.js | 22 +-
node_modules/winjs/js/base.min.js.map | 2 +-
node_modules/winjs/js/en-US/ui.strings.js | 6 +-
node_modules/winjs/js/ui.js | 477 ++-
node_modules/winjs/js/ui.min.js | 50 +-
node_modules/winjs/js/ui.min.js.map | 2 +-
node_modules/winjs/package.json | 88 +-
node_modules/wrappy/package.json | 63 +-
node_modules/xmlbuilder/package.json | 49 +-
node_modules/xmldom/package.json | 73 +-
package.json | 16 +-
template/cordova/lib/MSBuildTools.js | 28 +-
template/cordova/prebuild.js | 6 +-
template/cordova/version | 2 +-
template/www/cordova.js | 4258 ++++++++++----------
97 files changed, 5628 insertions(+), 4337 deletions(-)
copy node_modules/{nopt => cordova-common/node_modules/elementtree}/.npmignore (100%)
copy node_modules/{ => cordova-common/node_modules}/elementtree/.travis.yml (100%)
copy node_modules/{ => cordova-common/node_modules}/elementtree/CHANGES.md (100%)
copy node_modules/{ => cordova-common/node_modules}/elementtree/LICENSE.txt (100%)
copy node_modules/{ => cordova-common/node_modules}/elementtree/Makefile (100%)
mode change 100755 => 100644
copy node_modules/{ => cordova-common/node_modules}/elementtree/NOTICE (100%)
copy node_modules/{ => cordova-common/node_modules}/elementtree/README.md (100%)
copy node_modules/{ => cordova-common/node_modules}/elementtree/lib/constants.js (100%)
copy node_modules/{ => cordova-common/node_modules}/elementtree/lib/elementpath.js (100%)
copy node_modules/{ => cordova-common/node_modules}/elementtree/lib/elementtree.js (100%)
copy node_modules/{ => cordova-common/node_modules}/elementtree/lib/errors.js (100%)
copy node_modules/{ => cordova-common/node_modules}/elementtree/lib/parser.js (100%)
copy node_modules/{ => cordova-common/node_modules}/elementtree/lib/parsers/index.js (100%)
copy node_modules/{ => cordova-common/node_modules}/elementtree/lib/parsers/sax.js (100%)
copy node_modules/{ => cordova-common/node_modules}/elementtree/lib/sprintf.js (100%)
copy node_modules/{ => cordova-common/node_modules}/elementtree/lib/treebuilder.js (100%)
copy node_modules/{ => cordova-common/node_modules}/elementtree/lib/utils.js (100%)
copy node_modules/{ => cordova-common/node_modules}/elementtree/package.json (51%)
copy node_modules/{ => cordova-common/node_modules}/elementtree/tests/data/xml1.xml (100%)
copy node_modules/{ => cordova-common/node_modules}/elementtree/tests/data/xml2.xml (100%)
copy node_modules/{ => cordova-common/node_modules}/elementtree/tests/test-simple.js (100%)
create mode 100644 node_modules/elementtree/node_modules/sax/LICENSE
create mode 100644 node_modules/elementtree/node_modules/sax/LICENSE-W3C.html
copy node_modules/{ => elementtree/node_modules}/sax/README.md (77%)
create mode 100644 node_modules/elementtree/node_modules/sax/lib/sax.js
create mode 100644 node_modules/elementtree/node_modules/sax/package.json
copy node_modules/elementtree/tests/data/{xml1.xml => bom-xml.xml} (96%)
create mode 100644 node_modules/node-uuid/lib/sha1-browser.js
create mode 100644 node_modules/node-uuid/v3.js
--
To stop receiving notification emails like this one, please contact
janpio@apache.org.
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@cordova.apache.org
For additional commands, e-mail: commits-help@cordova.apache.org
[cordova-windows] 25/26: clean up switch by pkg.type (is always
`windows10` now)
Posted by ja...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
janpio pushed a commit to branch janpio-win10only
in repository https://gitbox.apache.org/repos/asf/cordova-windows.git
commit 0c54662d4d2cb0bb2b875d798fa0732d8b4ea691
Author: Jan Piotrowski <pi...@gmail.com>
AuthorDate: Fri Feb 16 13:56:32 2018 +0100
clean up switch by pkg.type (is always `windows10` now)
---
template/cordova/lib/run.js | 31 ++++++++-----------------------
1 file changed, 8 insertions(+), 23 deletions(-)
diff --git a/template/cordova/lib/run.js b/template/cordova/lib/run.js
index 98e69fc..53577cc 100644
--- a/template/cordova/lib/run.js
+++ b/template/cordova/lib/run.js
@@ -80,30 +80,15 @@ module.exports.run = function (options) {
return buildPackages
.then(function (pkg) {
events.emit('log', 'Deploying ' + pkg.type + ' package to ' + deployTarget + ':\n' + pkg.appx);
- switch (pkg.type) {
- case 'phone': // TODO remove I guess?
- return packages.deployToPhone(pkg, deployTarget, args.win10tools)
- .catch(function (e) {
- if (options.target || options.emulator || options.device) {
- return Q.reject(e); // Explicit target, carry on
- }
- // 'device' was inferred initially, because no target was specified
- return packages.deployToPhone(pkg, 'emulator', args.win10tools);
- });
- case 'windows10':
- if (args.phone) {
- // Win10 emulator launch is not currently supported, always force device
- if (options.emulator || options.target === 'emulator') {
- events.emit('warn', 'Windows 10 Phone emulator is currently not supported. ' +
- 'If you want to deploy to emulator, use Visual Studio instead. ' +
- 'Attempting to deploy to device...');
- }
- return packages.deployToPhone(pkg, deployTarget, true);
- } else {
- return packages.deployToDesktop(pkg, deployTarget);
+ if (args.phone) {
+ // Win10 emulator launch is not currently supported, always force device
+ if (options.emulator || options.target === 'emulator') {
+ events.emit('warn', 'Windows 10 Phone emulator is currently not supported. ' +
+ 'If you want to deploy to emulator, use Visual Studio instead. ' +
+ 'Attempting to deploy to device...');
}
- break; /* eslint no-unreachable : 0 */
- default: // 'windows'
+ return packages.deployToPhone(pkg, deployTarget);
+ } else {
return packages.deployToDesktop(pkg, deployTarget);
}
});
--
To stop receiving notification emails like this one, please contact
janpio@apache.org.
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@cordova.apache.org
For additional commands, e-mail: commits-help@cordova.apache.org
[cordova-windows] 15/26: comment
Posted by ja...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
janpio pushed a commit to branch janpio-win10only
in repository https://gitbox.apache.org/repos/asf/cordova-windows.git
commit 08c3d64fb09dfd450a67c5010f268dfad14659f6
Author: Jan Piotrowski <pi...@gmail.com>
AuthorDate: Thu Feb 15 23:34:24 2018 +0100
comment
---
template/cordova/lib/run.js | 1 +
1 file changed, 1 insertion(+)
diff --git a/template/cordova/lib/run.js b/template/cordova/lib/run.js
index 715a635..e1f62c0 100644
--- a/template/cordova/lib/run.js
+++ b/template/cordova/lib/run.js
@@ -109,6 +109,7 @@ module.exports.run = function (options) {
});
};
+// TODO remove as only one project type
// Retrieves project type for the project file specified.
// @param {String} projFile Project file, for example 'CordovaApp.Windows10.jsproj'
// @returns {String} Proejct type, for example 'windows10'
--
To stop receiving notification emails like this one, please contact
janpio@apache.org.
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@cordova.apache.org
For additional commands, e-mail: commits-help@cordova.apache.org
[cordova-windows] 13/26: remove VS13
Posted by ja...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
janpio pushed a commit to branch janpio-win10only
in repository https://gitbox.apache.org/repos/asf/cordova-windows.git
commit 9c7b0c8b48a2cc768bf994e4116c0ad321dc6e2c
Author: Jan Piotrowski <pi...@gmail.com>
AuthorDate: Thu Feb 15 23:33:34 2018 +0100
remove VS13
---
template/cordova/lib/MSBuildTools.js | 7 +------
1 file changed, 1 insertion(+), 6 deletions(-)
diff --git a/template/cordova/lib/MSBuildTools.js b/template/cordova/lib/MSBuildTools.js
index 8fd0c74..2f48660 100644
--- a/template/cordova/lib/MSBuildTools.js
+++ b/template/cordova/lib/MSBuildTools.js
@@ -255,10 +255,6 @@ var projFiles = {
// TODO: Fix this so that it outlines supported versions based on version criteria:
// - v14: Windows 8.1, Windows 10
// - v12: Windows 8.1
-function msBuild12TargetsFilter (target) {
- return target === projFiles.win || target === projFiles.phone;
-}
-
function msBuild14TargetsFilter (target) {
return target === projFiles.win || target === projFiles.phone || target === projFiles.win10;
}
@@ -300,8 +296,7 @@ function filterSupportedTargets (targets, msbuild) {
// unsupported targets have been detected
if (supportedTargets.length !== targets.length) {
events.emit('warn', 'Not all desired build targets are compatible with the current build environment. ' +
- 'Please install Visual Studio 2015 for Windows 8.1 and Windows 10, ' +
- 'or Visual Studio 2013 Update 2 for Windows 8.1.');
+ 'Please install Visual Studio 2017.');
}
return supportedTargets;
}
--
To stop receiving notification emails like this one, please contact
janpio@apache.org.
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@cordova.apache.org
For additional commands, e-mail: commits-help@cordova.apache.org
[cordova-windows] 04/26: remove 8.1 code
Posted by ja...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
janpio pushed a commit to branch janpio-win10only
in repository https://gitbox.apache.org/repos/asf/cordova-windows.git
commit d36554a6a34d4997869436de1325024cb2eedafc
Author: Jan Piotrowski <pi...@gmail.com>
AuthorDate: Thu Feb 15 19:17:38 2018 +0100
remove 8.1 code
---
bin/lib/check_reqs.js | 18 +----------------
cordova-js-src/platform.js | 38 +++++++++++-------------------------
cordova-js-src/splashscreen.js | 5 ++---
template/cordova/lib/AppxManifest.js | 3 ---
template/cordova/lib/MSBuildTools.js | 8 +-------
template/cordova/lib/build.js | 12 ------------
template/cordova/lib/deployment.js | 9 ++-------
template/cordova/prebuild.js | 12 +++---------
8 files changed, 20 insertions(+), 85 deletions(-)
diff --git a/bin/lib/check_reqs.js b/bin/lib/check_reqs.js
index 5006f34..e388cf5 100644
--- a/bin/lib/check_reqs.js
+++ b/bin/lib/check_reqs.js
@@ -41,13 +41,6 @@ try {
// reference: https://msdn.microsoft.com/en-us/library/bb164659(v=vs.120).aspx
var VS2013_UPDATE2_RC = new Version(12, 0, 30324);
var REQUIRED_VERSIONS = {
- '8.1': {
- os: '6.3',
- msbuild: '12.0',
- visualstudio: '12.0',
- windowssdk: '8.1',
- phonesdk: '8.1'
- },
'10.0': {
// Note that Windows 10 target is also supported on Windows 7, so this should look
// like '6.1 || >=6.3', but due to Version module restricted functionality we handle
@@ -187,18 +180,9 @@ function getInstalledWindowsSdks () {
*/
function getInstalledPhoneSdks () {
var installedSdks = [];
- return spawn('reg', ['query', 'HKLM\\SOFTWARE\\Microsoft\\Microsoft SDKs\\Windows Phone\\v8.1', '/v', 'InstallationFolder', '/reg:32'])
+ return spawn('reg', ['query', 'HKLM\\SOFTWARE\\Microsoft\\Microsoft SDKs\\Windows\\v10.0', '/v', 'InstallationFolder', '/reg:32'])
.fail(function () { return ''; })
.then(function (output) {
- var match = /\\Microsoft SDKs\\Windows Phone\\v(\d+\.\d+)\s*InstallationFolder\s+REG_SZ\s+(.*)/gim.exec(output);
- if (match && shell.test('-e', path.join(match[2], 'SDKManifest.xml'))) {
- installedSdks.push(Version.tryParse(match[1]));
- }
- }).then(function () {
- return spawn('reg', ['query', 'HKLM\\SOFTWARE\\Microsoft\\Microsoft SDKs\\Windows\\v10.0', '/v', 'InstallationFolder', '/reg:32']);
- }).fail(function () {
- return '';
- }).then(function (output) {
var match = /\\Microsoft SDKs\\Windows\\v(\d+\.\d+)\s*InstallationFolder\s+REG_SZ\s+(.*)/gim.exec(output);
if (match && shell.test('-e', path.join(match[2], 'SDKManifest.xml'))) {
installedSdks.push(Version.tryParse(match[1]));
diff --git a/cordova-js-src/platform.js b/cordova-js-src/platform.js
index 4bc4025..d920f64 100644
--- a/cordova-js-src/platform.js
+++ b/cordova-js-src/platform.js
@@ -119,17 +119,7 @@ module.exports = {
if (!window.WinJS) {
var scriptElem = document.createElement("script");
-
- if (navigator.appVersion.indexOf('MSAppHost/3.0') !== -1) {
- // Windows 10 UWP
- scriptElem.src = '/www/WinJS/js/base.js';
- } else if (navigator.appVersion.indexOf("Windows Phone 8.1;") !== -1) {
- // windows phone 8.1 + Mobile IE 11
- scriptElem.src = "//Microsoft.Phone.WinJS.2.1/js/base.js";
- } else if (navigator.appVersion.indexOf("MSAppHost/2.0;") !== -1) {
- // windows 8.1 + IE 11
- scriptElem.src = "//Microsoft.WinJS.2.0/js/base.js";
- }
+ scriptElem.src = '/www/WinJS/js/base.js';
scriptElem.addEventListener("load", onWinJSReady);
document.head.appendChild(scriptElem);
}
@@ -169,21 +159,15 @@ function injectBackButtonHandler() {
}
};
- // Only load this code if we're running on Win10 in a non-emulated app frame, otherwise crash \o/
- if (navigator.appVersion.indexOf('MSAppHost/3.0') !== -1) { // Windows 10 UWP (PC/Tablet/Phone)
- var navigationManager = Windows.UI.Core.SystemNavigationManager.getForCurrentView();
- // Inject a listener for the backbutton on the document.
- backButtonChannel.onHasSubscribersChange = function () {
- // If we just attached the first handler or detached the last handler,
- // let native know we need to override the back button.
- navigationManager.appViewBackButtonVisibility = (this.numHandlers > 0) ?
- Windows.UI.Core.AppViewBackButtonVisibility.visible :
- Windows.UI.Core.AppViewBackButtonVisibility.collapsed;
- };
+ var navigationManager = Windows.UI.Core.SystemNavigationManager.getForCurrentView();
+ // Inject a listener for the backbutton on the document.
+ backButtonChannel.onHasSubscribersChange = function () {
+ // If we just attached the first handler or detached the last handler,
+ // let native know we need to override the back button.
+ navigationManager.appViewBackButtonVisibility = (this.numHandlers > 0) ?
+ Windows.UI.Core.AppViewBackButtonVisibility.visible :
+ Windows.UI.Core.AppViewBackButtonVisibility.collapsed;
+ };
- navigationManager.addEventListener("backrequested", backRequestedHandler, false);
- } else { // Windows 8.1 Phone
- // inject new back button handler
- app.onbackclick = backRequestedHandler;
- }
+ navigationManager.addEventListener("backrequested", backRequestedHandler, false);
}
diff --git a/cordova-js-src/splashscreen.js b/cordova-js-src/splashscreen.js
index 97fd86c..7cddd35 100644
--- a/cordova-js-src/splashscreen.js
+++ b/cordova-js-src/splashscreen.js
@@ -19,15 +19,14 @@
*
*/
-var isWp81 = navigator.appVersion.indexOf("Windows Phone 8.1") !== -1;
var isWp10 = navigator.appVersion.indexOf("Windows Phone 10") !== -1;
-var isPhoneDevice = isWp81 || isWp10;
+var isPhoneDevice = isWp10;
var isWin10UWP = navigator.appVersion.indexOf('MSAppHost/3.0') !== -1;
var isHosted = window.location.protocol.indexOf('http') === 0;
var isMsAppxWeb = window.location.protocol.indexOf('ms-appx-web') === 0;
var schema = (isHosted || isWin10UWP && isMsAppxWeb) ? 'ms-appx-web' : 'ms-appx';
-var fileName = isWp81 ? 'splashscreenphone.png' : 'splashscreen.png';
+var fileName = 'splashscreen.png';
var splashImageSrc = schema + ':///images/' + fileName;
var splashElement = null,
diff --git a/template/cordova/lib/AppxManifest.js b/template/cordova/lib/AppxManifest.js
index acaeefd..a2d4e8c 100644
--- a/template/cordova/lib/AppxManifest.js
+++ b/template/cordova/lib/AppxManifest.js
@@ -43,15 +43,12 @@ var KNOWN_ORIENTATIONS = {
var MANIFESTS = {
'windows': {
- '8.1.0': 'package.windows.appxmanifest',
'10.0.0': 'package.windows10.appxmanifest'
},
'phone': {
- '8.1.0': 'package.phone.appxmanifest',
'10.0.0': 'package.windows10.appxmanifest'
},
'all': {
- '8.1.0': ['package.windows.appxmanifest', 'package.phone.appxmanifest'],
'10.0.0': 'package.windows10.appxmanifest'
}
};
diff --git a/template/cordova/lib/MSBuildTools.js b/template/cordova/lib/MSBuildTools.js
index 2a0de96..7399e32 100644
--- a/template/cordova/lib/MSBuildTools.js
+++ b/template/cordova/lib/MSBuildTools.js
@@ -59,13 +59,7 @@ MSBuildTools.prototype.buildProject = function (projFile, buildType, buildarch,
var promise;
// Check if SDK required to build the respective platform is present. If not present, return with corresponding error, else call msbuild.
- if (projFile.indexOf('CordovaApp.Phone.jsproj') > -1) {
- promise = checkPhoneSDK();
- } else if (projFile.indexOf('CordovaApp.Windows.jsproj') > -1) {
- promise = checkWinSDK('8.1');
- } else {
- promise = checkWinSDK('10.0');
- }
+ promise = checkWinSDK('10.0');
return promise.then(function () {
console.log('buildProject spawn:', path.join(that.path, 'msbuild'), [projFile].concat(args), { stdio: 'inherit' });
diff --git a/template/cordova/lib/build.js b/template/cordova/lib/build.js
index d172736..c8a8d78 100644
--- a/template/cordova/lib/build.js
+++ b/template/cordova/lib/build.js
@@ -116,9 +116,6 @@ function getBuildTargets (isWinSwitch, isPhoneSwitch, projOverride, buildConfig)
if (isPhoneSwitch || noSwitches) { // if --phone or no arg
var windowsPhoneTargetVersion = configXML.getWindowsPhoneTargetVersion();
switch (windowsPhoneTargetVersion.toLowerCase()) {
- case '8.1':
- targets.push(projFiles.phone);
- break;
case '10.0':
case 'uap':
case 'uwp':
@@ -137,15 +134,6 @@ function getBuildTargets (isWinSwitch, isPhoneSwitch, projOverride, buildConfig)
// apply build target override if one was specified
if (projOverride) {
switch (projOverride.toLowerCase()) {
- case '8.1':
- targets = [projFiles.win, projFiles.phone];
- break;
- case '8.1-phone':
- targets = [projFiles.phone];
- break;
- case '8.1-win':
- targets = [projFiles.win];
- break;
case 'uap':
case 'uwp':
targets = [projFiles.win10];
diff --git a/template/cordova/lib/deployment.js b/template/cordova/lib/deployment.js
index 080f936..6ae6b31 100644
--- a/template/cordova/lib/deployment.js
+++ b/template/cordova/lib/deployment.js
@@ -71,8 +71,7 @@ DeploymentTool.prototype.uninstallAppPackage = function (packageInfo, targetDevi
};
/**
- * Gets a list of installed apps on the target device. This function is not supported for
- * Windows Phone 8.1.
+ * Gets a list of installed apps on the target device.
* @param targetDevice {Object} An object returned from a successful call to enumerateDevices.
* @returns A Promise for an array of app names.
*/
@@ -95,11 +94,7 @@ DeploymentTool.prototype.launchApp = function (packageInfo, targetDevice) {
* @param targetOsVersion {String} The version of the
*/
DeploymentTool.getDeploymentTool = function (targetOsVersion) {
- if (targetOsVersion === '8.1') {
- return new AppDeployCmdTool(targetOsVersion);
- } else {
- return new WinAppDeployCmdTool(targetOsVersion);
- }
+ return new WinAppDeployCmdTool(targetOsVersion);
};
// DeviceInfo is an opaque object passed to install/uninstall.
diff --git a/template/cordova/prebuild.js b/template/cordova/prebuild.js
index 1c0abc8..6223c48 100644
--- a/template/cordova/prebuild.js
+++ b/template/cordova/prebuild.js
@@ -30,21 +30,15 @@ module.exports = function patch (platform) {
var url = require('url');
var basejsSrcMap = {
- '10': '/www/WinJS/js/base.js',
- '8.1': '//Microsoft.WinJS.2.0/js/base.js',
- 'phone-8.1': '//Microsoft.Phone.WinJS.2.1/js/base.js'
+ '10': '/www/WinJS/js/base.js'
};
var escapedBasejsSrcMap = {
- '10': '\/www\/WinJS\/js\/base\.js',
- '8.1': '\/\/Microsoft\.WinJS\.2\.0\/js\/base\.js',
- 'phone-8.1': '\/\/Microsoft\.Phone\.WinJS\.2\.1\/js\/base\.js'
+ '10': '\/www\/WinJS\/js\/base\.js'
};
var basejsSrc = basejsSrcMap[platform];
var appxmanifestMap = {
- '10': 'package.windows10.appxmanifest',
- '8.1': 'package.windows.appxmanifest',
- 'phone-8.1': 'package.phone.appxmanifest'
+ '10': 'package.windows10.appxmanifest'
};
// 1. Find start page path in appxmanifest
--
To stop receiving notification emails like this one, please contact
janpio@apache.org.
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@cordova.apache.org
For additional commands, e-mail: commits-help@cordova.apache.org
[cordova-windows] 23/26: no more `win10tools` param
Posted by ja...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
janpio pushed a commit to branch janpio-win10only
in repository https://gitbox.apache.org/repos/asf/cordova-windows.git
commit a19e37bd94aec504e1b1fe1ade364aef0c5a1778
Author: Jan Piotrowski <pi...@gmail.com>
AuthorDate: Fri Feb 16 13:54:57 2018 +0100
no more `win10tools` param
---
template/cordova/lib/deployment.js | 10 ++++++----
template/cordova/lib/package.js | 10 ++--------
template/cordova/lib/run.js | 1 -
template/cordova/lib/utils.js | 5 ++---
4 files changed, 10 insertions(+), 16 deletions(-)
diff --git a/template/cordova/lib/deployment.js b/template/cordova/lib/deployment.js
index 6ae6b31..5394e74 100644
--- a/template/cordova/lib/deployment.js
+++ b/template/cordova/lib/deployment.js
@@ -93,8 +93,8 @@ DeploymentTool.prototype.launchApp = function (packageInfo, targetDevice) {
* Gets a DeploymentTool to deploy to devices or emulators.
* @param targetOsVersion {String} The version of the
*/
-DeploymentTool.getDeploymentTool = function (targetOsVersion) {
- return new WinAppDeployCmdTool(targetOsVersion);
+DeploymentTool.getDeploymentTool = function () {
+ return new WinAppDeployCmdTool();
};
// DeviceInfo is an opaque object passed to install/uninstall.
@@ -200,11 +200,13 @@ AppDeployCmdTool.prototype.launchApp = function (packageInfo, targetDevice) {
return spawn(this.path, ['/launch', packageInfo, '/targetdevice:' + targetDevice.__shorthand]);
};
-function WinAppDeployCmdTool (targetOsVersion) {
+// Deploy to Desktop
+
+function WinAppDeployCmdTool () {
if (!(this instanceof WinAppDeployCmdTool)) { throw new ReferenceError('Only create a WinAppDeployCmdTool as an instance object.'); }
DeploymentTool.call(this);
- this.targetOsVersion = targetOsVersion;
+ this.targetOsVersion = '10.0';
var programFilesPath = process.env['ProgramFiles(x86)'] || process.env['ProgramFiles'];
this.path = path.join(programFilesPath, 'Windows Kits', '10', 'bin', 'x86', 'WinAppDeployCmd.exe');
}
diff --git a/template/cordova/lib/package.js b/template/cordova/lib/package.js
index f938fc3..84a1f6e 100644
--- a/template/cordova/lib/package.js
+++ b/template/cordova/lib/package.js
@@ -184,14 +184,8 @@ function uninstallAppFromPhone (appDeployUtils, pkg, target) {
}
// deploys specified phone package to device/emulator and launches it
-module.exports.deployToPhone = function (pkg, deployTarget, targetWindows10, deploymentTool) {
- var deployment;
- if (deploymentTool) {
- deployment = Q(deploymentTool);
- } else {
- deployment = utils.getAppDeployUtils(targetWindows10);
- }
-
+module.exports.deployToPhone = function (pkg, deployTarget, deploymentTool) {
+ var deployment = utils.getAppDeployUtils();
return deployment.then(function (deploymentTool) {
return module.exports.findDevice(deploymentTool, deployTarget).then(function (target) {
return uninstallAppFromPhone(deploymentTool, pkg, target)
diff --git a/template/cordova/lib/run.js b/template/cordova/lib/run.js
index bfec351..2d7b869 100644
--- a/template/cordova/lib/run.js
+++ b/template/cordova/lib/run.js
@@ -43,7 +43,6 @@ module.exports.run = function (options) {
'archs': [String],
'phone': Boolean,
'win': Boolean,
- 'win10tools': Boolean
}, {'r': '--release'}, options.argv, 0);
// Validate args
diff --git a/template/cordova/lib/utils.js b/template/cordova/lib/utils.js
index b4f04d8..d766e35 100644
--- a/template/cordova/lib/utils.js
+++ b/template/cordova/lib/utils.js
@@ -35,9 +35,8 @@ module.exports.getAppStoreUtils = function () {
};
// returns path to AppDeploy util from Windows Phone 8.1 SDK
-module.exports.getAppDeployUtils = function (targetWin10) {
- var version = targetWin10 ? '10.0' : '8.1';
- var tool = DeploymentTool.getDeploymentTool(version);
+module.exports.getAppDeployUtils = function () {
+ var tool = DeploymentTool.getDeploymentTool();
if (!tool.isAvailable()) {
return Q.reject('App deployment utilities: "' + tool.path + '", not found. Ensure the Windows SDK is installed.');
--
To stop receiving notification emails like this one, please contact
janpio@apache.org.
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@cordova.apache.org
For additional commands, e-mail: commits-help@cordova.apache.org
[cordova-windows] 05/26: remove 8.1 project files (and templates)
Posted by ja...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
janpio pushed a commit to branch janpio-win10only
in repository https://gitbox.apache.org/repos/asf/cordova-windows.git
commit 8dfb123df749729408d853d3c9800e471bebb2b3
Author: Jan Piotrowski <pi...@gmail.com>
AuthorDate: Thu Feb 15 19:18:17 2018 +0100
remove 8.1 project files (and templates)
---
.../fixtures/DummyProject/CordovaApp.Phone.jsproj | 99 -------------------
.../DummyProject/CordovaApp.Windows.jsproj | 99 -------------------
.../platforms/windows/CordovaApp.Phone.jsproj | 99 -------------------
.../platforms/windows/CordovaApp.Windows.jsproj | 99 -------------------
template/CordovaApp.Phone.jsproj | 106 ---------------------
template/CordovaApp.Windows.jsproj | 106 ---------------------
6 files changed, 608 deletions(-)
diff --git a/spec/unit/fixtures/DummyProject/CordovaApp.Phone.jsproj b/spec/unit/fixtures/DummyProject/CordovaApp.Phone.jsproj
deleted file mode 100644
index 43e4fe2..0000000
--- a/spec/unit/fixtures/DummyProject/CordovaApp.Phone.jsproj
+++ /dev/null
@@ -1,99 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
- Licensed to the Apache Software Foundation (ASF) under one
- or more contributor license agreements. See the NOTICE file
- distributed with this work for additional information
- regarding copyright ownership. The ASF licenses this file
- to you under the Apache License, Version 2.0 (the
- "License"); you may not use this file except in compliance
- with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied. See the License for the
- specific language governing permissions and limitations
- under the License.
--->
-<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
- <PropertyGroup>
- <OutputPath>build\phone\$(Configuration)\$(Platform)\</OutputPath>
- <IntermediateOutputPath>build\phone\bld\</IntermediateOutputPath>
- </PropertyGroup>
- <ItemGroup Label="ProjectConfigurations">
- <ProjectConfiguration Include="Debug|AnyCPU">
- <Configuration>Debug</Configuration>
- <Platform>AnyCPU</Platform>
- </ProjectConfiguration>
- <ProjectConfiguration Include="Debug|ARM">
- <Configuration>Debug</Configuration>
- <Platform>ARM</Platform>
- </ProjectConfiguration>
- <ProjectConfiguration Include="Debug|x64">
- <Configuration>Debug</Configuration>
- <Platform>x64</Platform>
- </ProjectConfiguration>
- <ProjectConfiguration Include="Debug|x86">
- <Configuration>Debug</Configuration>
- <Platform>x86</Platform>
- </ProjectConfiguration>
- <ProjectConfiguration Include="Release|AnyCPU">
- <Configuration>Release</Configuration>
- <Platform>AnyCPU</Platform>
- </ProjectConfiguration>
- <ProjectConfiguration Include="Release|ARM">
- <Configuration>Release</Configuration>
- <Platform>ARM</Platform>
- </ProjectConfiguration>
- <ProjectConfiguration Include="Release|x64">
- <Configuration>Release</Configuration>
- <Platform>x64</Platform>
- </ProjectConfiguration>
- <ProjectConfiguration Include="Release|x86">
- <Configuration>Release</Configuration>
- <Platform>x86</Platform>
- </ProjectConfiguration>
- </ItemGroup>
- <PropertyGroup Label="Globals">
- <ProjectGuid>31b67a35-9503-4213-857e-f44eb42ae549</ProjectGuid>
- </PropertyGroup>
- <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
- <PropertyGroup Condition="'$(VisualStudioVersion)' == '' or '$(VisualStudioVersion)' < '12.0'">
- <VisualStudioVersion>12.0</VisualStudioVersion>
- </PropertyGroup>
- <Import Project="$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)\$(WMSJSProjectDirectory)\Microsoft.VisualStudio.$(WMSJSProject).Default.props" />
- <PropertyGroup Label="Configuration">
- <TargetPlatformIdentifier>WindowsPhoneApp</TargetPlatformIdentifier>
- <TargetPlatformVersion>8.1</TargetPlatformVersion>
- <RequiredPlatformVersion>8.1</RequiredPlatformVersion>
- <MinimumVisualStudioVersion>12.0</MinimumVisualStudioVersion>
- </PropertyGroup>
- <Import Project="$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)\$(WMSJSProjectDirectory)\Microsoft.VisualStudio.$(WMSJSProject).props" />
- <PropertyGroup>
- <DefaultLanguage>en-US</DefaultLanguage>
- </PropertyGroup>
- <ItemGroup>
- <AppxManifest Include="package.phone.appxmanifest">
- <SubType>Designer</SubType>
- </AppxManifest>
- <Content Include="images\*.png" Exclude="images\*.scale-180.*" />
- </ItemGroup>
- <ItemGroup>
- <SDKReference Include="Microsoft.Phone.WinJS.2.1, Version=1.0" />
- </ItemGroup>
- <Import Project="CordovaApp.projitems" Label="Shared" />
- <Import Project="$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)\$(WMSJSProjectDirectory)\Microsoft.VisualStudio.$(WMSJSProject).targets" />
- <!-- To modify your build process, add your task inside one of the targets below then uncomment
- that target and the DisableFastUpToDateCheck PropertyGroup.
- Other similar extension points exist, see Microsoft.Common.targets.
- <Target Name="BeforeBuild">
- </Target>
- <Target Name="AfterBuild">
- </Target>
- <PropertyGroup>
- <DisableFastUpToDateCheck>true</DisableFastUpToDateCheck>
- </PropertyGroup>
- -->
-</Project>
\ No newline at end of file
diff --git a/spec/unit/fixtures/DummyProject/CordovaApp.Windows.jsproj b/spec/unit/fixtures/DummyProject/CordovaApp.Windows.jsproj
deleted file mode 100644
index 6905ba6..0000000
--- a/spec/unit/fixtures/DummyProject/CordovaApp.Windows.jsproj
+++ /dev/null
@@ -1,99 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
- Licensed to the Apache Software Foundation (ASF) under one
- or more contributor license agreements. See the NOTICE file
- distributed with this work for additional information
- regarding copyright ownership. The ASF licenses this file
- to you under the Apache License, Version 2.0 (the
- "License"); you may not use this file except in compliance
- with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied. See the License for the
- specific language governing permissions and limitations
- under the License.
--->
-<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
- <PropertyGroup>
- <OutputPath>build\windows\$(Configuration)\$(Platform)\</OutputPath>
- <IntermediateOutputPath>build\windows\bld\</IntermediateOutputPath>
- </PropertyGroup>
- <ItemGroup Label="ProjectConfigurations">
- <ProjectConfiguration Include="Debug|AnyCPU">
- <Configuration>Debug</Configuration>
- <Platform>AnyCPU</Platform>
- </ProjectConfiguration>
- <ProjectConfiguration Include="Debug|ARM">
- <Configuration>Debug</Configuration>
- <Platform>ARM</Platform>
- </ProjectConfiguration>
- <ProjectConfiguration Include="Debug|x64">
- <Configuration>Debug</Configuration>
- <Platform>x64</Platform>
- </ProjectConfiguration>
- <ProjectConfiguration Include="Debug|x86">
- <Configuration>Debug</Configuration>
- <Platform>x86</Platform>
- </ProjectConfiguration>
- <ProjectConfiguration Include="Release|AnyCPU">
- <Configuration>Release</Configuration>
- <Platform>AnyCPU</Platform>
- </ProjectConfiguration>
- <ProjectConfiguration Include="Release|ARM">
- <Configuration>Release</Configuration>
- <Platform>ARM</Platform>
- </ProjectConfiguration>
- <ProjectConfiguration Include="Release|x64">
- <Configuration>Release</Configuration>
- <Platform>x64</Platform>
- </ProjectConfiguration>
- <ProjectConfiguration Include="Release|x86">
- <Configuration>Release</Configuration>
- <Platform>x86</Platform>
- </ProjectConfiguration>
- </ItemGroup>
- <PropertyGroup Label="Globals">
- <ProjectGuid>58950fb6-2f93-4963-b9cd-637f83f3efbf</ProjectGuid>
- </PropertyGroup>
- <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
- <PropertyGroup Condition="'$(VisualStudioVersion)' == '' or '$(VisualStudioVersion)' < '12.0'">
- <VisualStudioVersion>12.0</VisualStudioVersion>
- </PropertyGroup>
- <Import Project="$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)\$(WMSJSProjectDirectory)\Microsoft.VisualStudio.$(WMSJSProject).Default.props" />
- <Import Project="$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)\$(WMSJSProjectDirectory)\Microsoft.VisualStudio.$(WMSJSProject).props" />
- <PropertyGroup>
- <TargetPlatformIdentifier>Windows</TargetPlatformIdentifier>
- <TargetPlatformVersion>8.1</TargetPlatformVersion>
- <RequiredPlatformVersion>8.1</RequiredPlatformVersion>
- <MinimumVisualStudioVersion>12.0</MinimumVisualStudioVersion>
- <DefaultLanguage>en-US</DefaultLanguage>
- <PackageCertificateKeyFile>CordovaApp_TemporaryKey.pfx</PackageCertificateKeyFile>
- </PropertyGroup>
- <ItemGroup>
- <AppxManifest Include="package.windows.appxmanifest">
- <SubType>Designer</SubType>
- </AppxManifest>
- <Content Include="images\*.png" Exclude="images\*.scale-240.*" />
- <None Include="CordovaApp_TemporaryKey.pfx" />
- </ItemGroup>
- <ItemGroup>
- <SDKReference Include="Microsoft.WinJS.2.0, Version=1.0" />
- </ItemGroup>
- <Import Project="CordovaApp.projitems" Label="Shared" />
- <Import Project="$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)\$(WMSJSProjectDirectory)\Microsoft.VisualStudio.$(WMSJSProject).targets" />
- <!-- To modify your build process, add your task inside one of the targets below then uncomment
- that target and the DisableFastUpToDateCheck PropertyGroup.
- Other similar extension points exist, see Microsoft.Common.targets.
- <Target Name="BeforeBuild">
- </Target>
- <Target Name="AfterBuild">
- </Target>
- <PropertyGroup>
- <DisableFastUpToDateCheck>true</DisableFastUpToDateCheck>
- </PropertyGroup>
- -->
-</Project>
\ No newline at end of file
diff --git a/spec/unit/fixtures/testProj/platforms/windows/CordovaApp.Phone.jsproj b/spec/unit/fixtures/testProj/platforms/windows/CordovaApp.Phone.jsproj
deleted file mode 100644
index 43e4fe2..0000000
--- a/spec/unit/fixtures/testProj/platforms/windows/CordovaApp.Phone.jsproj
+++ /dev/null
@@ -1,99 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
- Licensed to the Apache Software Foundation (ASF) under one
- or more contributor license agreements. See the NOTICE file
- distributed with this work for additional information
- regarding copyright ownership. The ASF licenses this file
- to you under the Apache License, Version 2.0 (the
- "License"); you may not use this file except in compliance
- with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied. See the License for the
- specific language governing permissions and limitations
- under the License.
--->
-<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
- <PropertyGroup>
- <OutputPath>build\phone\$(Configuration)\$(Platform)\</OutputPath>
- <IntermediateOutputPath>build\phone\bld\</IntermediateOutputPath>
- </PropertyGroup>
- <ItemGroup Label="ProjectConfigurations">
- <ProjectConfiguration Include="Debug|AnyCPU">
- <Configuration>Debug</Configuration>
- <Platform>AnyCPU</Platform>
- </ProjectConfiguration>
- <ProjectConfiguration Include="Debug|ARM">
- <Configuration>Debug</Configuration>
- <Platform>ARM</Platform>
- </ProjectConfiguration>
- <ProjectConfiguration Include="Debug|x64">
- <Configuration>Debug</Configuration>
- <Platform>x64</Platform>
- </ProjectConfiguration>
- <ProjectConfiguration Include="Debug|x86">
- <Configuration>Debug</Configuration>
- <Platform>x86</Platform>
- </ProjectConfiguration>
- <ProjectConfiguration Include="Release|AnyCPU">
- <Configuration>Release</Configuration>
- <Platform>AnyCPU</Platform>
- </ProjectConfiguration>
- <ProjectConfiguration Include="Release|ARM">
- <Configuration>Release</Configuration>
- <Platform>ARM</Platform>
- </ProjectConfiguration>
- <ProjectConfiguration Include="Release|x64">
- <Configuration>Release</Configuration>
- <Platform>x64</Platform>
- </ProjectConfiguration>
- <ProjectConfiguration Include="Release|x86">
- <Configuration>Release</Configuration>
- <Platform>x86</Platform>
- </ProjectConfiguration>
- </ItemGroup>
- <PropertyGroup Label="Globals">
- <ProjectGuid>31b67a35-9503-4213-857e-f44eb42ae549</ProjectGuid>
- </PropertyGroup>
- <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
- <PropertyGroup Condition="'$(VisualStudioVersion)' == '' or '$(VisualStudioVersion)' < '12.0'">
- <VisualStudioVersion>12.0</VisualStudioVersion>
- </PropertyGroup>
- <Import Project="$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)\$(WMSJSProjectDirectory)\Microsoft.VisualStudio.$(WMSJSProject).Default.props" />
- <PropertyGroup Label="Configuration">
- <TargetPlatformIdentifier>WindowsPhoneApp</TargetPlatformIdentifier>
- <TargetPlatformVersion>8.1</TargetPlatformVersion>
- <RequiredPlatformVersion>8.1</RequiredPlatformVersion>
- <MinimumVisualStudioVersion>12.0</MinimumVisualStudioVersion>
- </PropertyGroup>
- <Import Project="$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)\$(WMSJSProjectDirectory)\Microsoft.VisualStudio.$(WMSJSProject).props" />
- <PropertyGroup>
- <DefaultLanguage>en-US</DefaultLanguage>
- </PropertyGroup>
- <ItemGroup>
- <AppxManifest Include="package.phone.appxmanifest">
- <SubType>Designer</SubType>
- </AppxManifest>
- <Content Include="images\*.png" Exclude="images\*.scale-180.*" />
- </ItemGroup>
- <ItemGroup>
- <SDKReference Include="Microsoft.Phone.WinJS.2.1, Version=1.0" />
- </ItemGroup>
- <Import Project="CordovaApp.projitems" Label="Shared" />
- <Import Project="$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)\$(WMSJSProjectDirectory)\Microsoft.VisualStudio.$(WMSJSProject).targets" />
- <!-- To modify your build process, add your task inside one of the targets below then uncomment
- that target and the DisableFastUpToDateCheck PropertyGroup.
- Other similar extension points exist, see Microsoft.Common.targets.
- <Target Name="BeforeBuild">
- </Target>
- <Target Name="AfterBuild">
- </Target>
- <PropertyGroup>
- <DisableFastUpToDateCheck>true</DisableFastUpToDateCheck>
- </PropertyGroup>
- -->
-</Project>
\ No newline at end of file
diff --git a/spec/unit/fixtures/testProj/platforms/windows/CordovaApp.Windows.jsproj b/spec/unit/fixtures/testProj/platforms/windows/CordovaApp.Windows.jsproj
deleted file mode 100644
index 6905ba6..0000000
--- a/spec/unit/fixtures/testProj/platforms/windows/CordovaApp.Windows.jsproj
+++ /dev/null
@@ -1,99 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
- Licensed to the Apache Software Foundation (ASF) under one
- or more contributor license agreements. See the NOTICE file
- distributed with this work for additional information
- regarding copyright ownership. The ASF licenses this file
- to you under the Apache License, Version 2.0 (the
- "License"); you may not use this file except in compliance
- with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied. See the License for the
- specific language governing permissions and limitations
- under the License.
--->
-<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
- <PropertyGroup>
- <OutputPath>build\windows\$(Configuration)\$(Platform)\</OutputPath>
- <IntermediateOutputPath>build\windows\bld\</IntermediateOutputPath>
- </PropertyGroup>
- <ItemGroup Label="ProjectConfigurations">
- <ProjectConfiguration Include="Debug|AnyCPU">
- <Configuration>Debug</Configuration>
- <Platform>AnyCPU</Platform>
- </ProjectConfiguration>
- <ProjectConfiguration Include="Debug|ARM">
- <Configuration>Debug</Configuration>
- <Platform>ARM</Platform>
- </ProjectConfiguration>
- <ProjectConfiguration Include="Debug|x64">
- <Configuration>Debug</Configuration>
- <Platform>x64</Platform>
- </ProjectConfiguration>
- <ProjectConfiguration Include="Debug|x86">
- <Configuration>Debug</Configuration>
- <Platform>x86</Platform>
- </ProjectConfiguration>
- <ProjectConfiguration Include="Release|AnyCPU">
- <Configuration>Release</Configuration>
- <Platform>AnyCPU</Platform>
- </ProjectConfiguration>
- <ProjectConfiguration Include="Release|ARM">
- <Configuration>Release</Configuration>
- <Platform>ARM</Platform>
- </ProjectConfiguration>
- <ProjectConfiguration Include="Release|x64">
- <Configuration>Release</Configuration>
- <Platform>x64</Platform>
- </ProjectConfiguration>
- <ProjectConfiguration Include="Release|x86">
- <Configuration>Release</Configuration>
- <Platform>x86</Platform>
- </ProjectConfiguration>
- </ItemGroup>
- <PropertyGroup Label="Globals">
- <ProjectGuid>58950fb6-2f93-4963-b9cd-637f83f3efbf</ProjectGuid>
- </PropertyGroup>
- <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
- <PropertyGroup Condition="'$(VisualStudioVersion)' == '' or '$(VisualStudioVersion)' < '12.0'">
- <VisualStudioVersion>12.0</VisualStudioVersion>
- </PropertyGroup>
- <Import Project="$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)\$(WMSJSProjectDirectory)\Microsoft.VisualStudio.$(WMSJSProject).Default.props" />
- <Import Project="$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)\$(WMSJSProjectDirectory)\Microsoft.VisualStudio.$(WMSJSProject).props" />
- <PropertyGroup>
- <TargetPlatformIdentifier>Windows</TargetPlatformIdentifier>
- <TargetPlatformVersion>8.1</TargetPlatformVersion>
- <RequiredPlatformVersion>8.1</RequiredPlatformVersion>
- <MinimumVisualStudioVersion>12.0</MinimumVisualStudioVersion>
- <DefaultLanguage>en-US</DefaultLanguage>
- <PackageCertificateKeyFile>CordovaApp_TemporaryKey.pfx</PackageCertificateKeyFile>
- </PropertyGroup>
- <ItemGroup>
- <AppxManifest Include="package.windows.appxmanifest">
- <SubType>Designer</SubType>
- </AppxManifest>
- <Content Include="images\*.png" Exclude="images\*.scale-240.*" />
- <None Include="CordovaApp_TemporaryKey.pfx" />
- </ItemGroup>
- <ItemGroup>
- <SDKReference Include="Microsoft.WinJS.2.0, Version=1.0" />
- </ItemGroup>
- <Import Project="CordovaApp.projitems" Label="Shared" />
- <Import Project="$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)\$(WMSJSProjectDirectory)\Microsoft.VisualStudio.$(WMSJSProject).targets" />
- <!-- To modify your build process, add your task inside one of the targets below then uncomment
- that target and the DisableFastUpToDateCheck PropertyGroup.
- Other similar extension points exist, see Microsoft.Common.targets.
- <Target Name="BeforeBuild">
- </Target>
- <Target Name="AfterBuild">
- </Target>
- <PropertyGroup>
- <DisableFastUpToDateCheck>true</DisableFastUpToDateCheck>
- </PropertyGroup>
- -->
-</Project>
\ No newline at end of file
diff --git a/template/CordovaApp.Phone.jsproj b/template/CordovaApp.Phone.jsproj
deleted file mode 100644
index 4dc71e5..0000000
--- a/template/CordovaApp.Phone.jsproj
+++ /dev/null
@@ -1,106 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
- Licensed to the Apache Software Foundation (ASF) under one
- or more contributor license agreements. See the NOTICE file
- distributed with this work for additional information
- regarding copyright ownership. The ASF licenses this file
- to you under the Apache License, Version 2.0 (the
- "License"); you may not use this file except in compliance
- with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied. See the License for the
- specific language governing permissions and limitations
- under the License.
--->
-<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
- <PropertyGroup>
- <OutputPath>build\phone\$(Configuration)\$(Platform)\</OutputPath>
- <IntermediateOutputPath>build\phone\bld\</IntermediateOutputPath>
- </PropertyGroup>
- <ItemGroup Label="ProjectConfigurations">
- <ProjectConfiguration Include="Debug|AnyCPU">
- <Configuration>Debug</Configuration>
- <Platform>AnyCPU</Platform>
- </ProjectConfiguration>
- <ProjectConfiguration Include="Debug|ARM">
- <Configuration>Debug</Configuration>
- <Platform>ARM</Platform>
- </ProjectConfiguration>
- <ProjectConfiguration Include="Debug|x64">
- <Configuration>Debug</Configuration>
- <Platform>x64</Platform>
- </ProjectConfiguration>
- <ProjectConfiguration Include="Debug|x86">
- <Configuration>Debug</Configuration>
- <Platform>x86</Platform>
- </ProjectConfiguration>
- <ProjectConfiguration Include="Release|AnyCPU">
- <Configuration>Release</Configuration>
- <Platform>AnyCPU</Platform>
- </ProjectConfiguration>
- <ProjectConfiguration Include="Release|ARM">
- <Configuration>Release</Configuration>
- <Platform>ARM</Platform>
- </ProjectConfiguration>
- <ProjectConfiguration Include="Release|x64">
- <Configuration>Release</Configuration>
- <Platform>x64</Platform>
- </ProjectConfiguration>
- <ProjectConfiguration Include="Release|x86">
- <Configuration>Release</Configuration>
- <Platform>x86</Platform>
- </ProjectConfiguration>
- </ItemGroup>
- <PropertyGroup Label="Globals">
- <ProjectGuid>31b67a35-9503-4213-857e-f44eb42ae549</ProjectGuid>
- </PropertyGroup>
- <PropertyGroup Label="CordovaBuildParameters" Condition="'$(CordovaBundlePlatforms)' != ''">
- <AppxBundle>Always</AppxBundle>
- <AppxBundlePlatforms>$(CordovaBundlePlatforms)</AppxBundlePlatforms>
- </PropertyGroup>
- <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
- <PropertyGroup Condition="'$(VisualStudioVersion)' == '' or '$(VisualStudioVersion)' < '12.0'">
- <VisualStudioVersion>12.0</VisualStudioVersion>
- </PropertyGroup>
- <Import Project="$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)\$(WMSJSProjectDirectory)\Microsoft.VisualStudio.$(WMSJSProject).Default.props" />
- <PropertyGroup Label="Configuration">
- <TargetPlatformIdentifier>WindowsPhoneApp</TargetPlatformIdentifier>
- <TargetPlatformVersion>8.1</TargetPlatformVersion>
- <RequiredPlatformVersion>8.1</RequiredPlatformVersion>
- <MinimumVisualStudioVersion>12.0</MinimumVisualStudioVersion>
- </PropertyGroup>
- <Import Project="$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)\$(WMSJSProjectDirectory)\Microsoft.VisualStudio.$(WMSJSProject).props" />
- <ItemGroup>
- <AppxManifest Include="package.phone.appxmanifest">
- <SubType>Designer</SubType>
- </AppxManifest>
- <Content Exclude="images\*SplashScreen.*" Include="images\*.png" />
- <Content Exclude="images\*SplashScreen.*" Include="images\*.jpg" />
- <Content Exclude="images\*SplashScreen.*" Include="images\*.jpeg" />
- </ItemGroup>
- <ItemGroup>
- <SDKReference Include="Microsoft.Phone.WinJS.2.1, Version=1.0" />
- </ItemGroup>
- <Import Project="CordovaApp.projitems" Label="Shared" />
- <Import Project="$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)\$(WMSJSProjectDirectory)\Microsoft.VisualStudio.$(WMSJSProject).targets" />
- <!-- To modify your build process, add your task inside one of the targets below then uncomment
- that target and the DisableFastUpToDateCheck PropertyGroup.
- Other similar extension points exist, see Microsoft.Common.targets.
- <Target Name="BeforeBuild">
- </Target>
- <Target Name="AfterBuild">
- </Target>
- <PropertyGroup>
- <DisableFastUpToDateCheck>true</DisableFastUpToDateCheck>
- </PropertyGroup>
- -->
- <PropertyGroup>
- <PreBuildEvent>node "$(ProjectDir)\\cordova\\prebuild-phone-81.js"</PreBuildEvent>
- <DisableFastUpToDateCheck>true</DisableFastUpToDateCheck>
- </PropertyGroup>
-</Project>
\ No newline at end of file
diff --git a/template/CordovaApp.Windows.jsproj b/template/CordovaApp.Windows.jsproj
deleted file mode 100644
index 35c8f68..0000000
--- a/template/CordovaApp.Windows.jsproj
+++ /dev/null
@@ -1,106 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
- Licensed to the Apache Software Foundation (ASF) under one
- or more contributor license agreements. See the NOTICE file
- distributed with this work for additional information
- regarding copyright ownership. The ASF licenses this file
- to you under the Apache License, Version 2.0 (the
- "License"); you may not use this file except in compliance
- with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied. See the License for the
- specific language governing permissions and limitations
- under the License.
--->
-<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
- <PropertyGroup>
- <OutputPath>build\windows\$(Configuration)\$(Platform)\win8.1\</OutputPath>
- <IntermediateOutputPath>build\windows\bld\</IntermediateOutputPath>
- </PropertyGroup>
- <ItemGroup Label="ProjectConfigurations">
- <ProjectConfiguration Include="Debug|AnyCPU">
- <Configuration>Debug</Configuration>
- <Platform>AnyCPU</Platform>
- </ProjectConfiguration>
- <ProjectConfiguration Include="Debug|ARM">
- <Configuration>Debug</Configuration>
- <Platform>ARM</Platform>
- </ProjectConfiguration>
- <ProjectConfiguration Include="Debug|x64">
- <Configuration>Debug</Configuration>
- <Platform>x64</Platform>
- </ProjectConfiguration>
- <ProjectConfiguration Include="Debug|x86">
- <Configuration>Debug</Configuration>
- <Platform>x86</Platform>
- </ProjectConfiguration>
- <ProjectConfiguration Include="Release|AnyCPU">
- <Configuration>Release</Configuration>
- <Platform>AnyCPU</Platform>
- </ProjectConfiguration>
- <ProjectConfiguration Include="Release|ARM">
- <Configuration>Release</Configuration>
- <Platform>ARM</Platform>
- </ProjectConfiguration>
- <ProjectConfiguration Include="Release|x64">
- <Configuration>Release</Configuration>
- <Platform>x64</Platform>
- </ProjectConfiguration>
- <ProjectConfiguration Include="Release|x86">
- <Configuration>Release</Configuration>
- <Platform>x86</Platform>
- </ProjectConfiguration>
- </ItemGroup>
- <PropertyGroup Label="Globals">
- <ProjectGuid>58950fb6-2f93-4963-b9cd-637f83f3efbf</ProjectGuid>
- </PropertyGroup>
- <PropertyGroup Label="CordovaBuildParameters" Condition="'$(CordovaBundlePlatforms)' != ''">
- <AppxBundle>Always</AppxBundle>
- <AppxBundlePlatforms>$(CordovaBundlePlatforms)</AppxBundlePlatforms>
- </PropertyGroup>
- <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
- <PropertyGroup Condition="'$(VisualStudioVersion)' == '' or '$(VisualStudioVersion)' < '12.0'">
- <VisualStudioVersion>12.0</VisualStudioVersion>
- </PropertyGroup>
- <Import Project="$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)\$(WMSJSProjectDirectory)\Microsoft.VisualStudio.$(WMSJSProject).Default.props" />
- <Import Project="$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)\$(WMSJSProjectDirectory)\Microsoft.VisualStudio.$(WMSJSProject).props" />
- <PropertyGroup>
- <TargetPlatformIdentifier>Windows</TargetPlatformIdentifier>
- <TargetPlatformVersion>8.1</TargetPlatformVersion>
- <RequiredPlatformVersion>8.1</RequiredPlatformVersion>
- <MinimumVisualStudioVersion>12.0</MinimumVisualStudioVersion>
- </PropertyGroup>
- <ItemGroup>
- <AppxManifest Include="package.windows.appxmanifest">
- <SubType>Designer</SubType>
- </AppxManifest>
- <Content Exclude="images\*SplashScreenPhone*;images\*.scale-240.*" Include="images\*.png" />
- <Content Exclude="images\*SplashScreenPhone*;images\*.scale-240.*" Include="images\*.jpg" />
- <Content Exclude="images\*SplashScreenPhone*;images\*.scale-240.*" Include="images\*.jpeg" />
- </ItemGroup>
- <ItemGroup>
- <SDKReference Include="Microsoft.WinJS.2.0, Version=1.0" />
- </ItemGroup>
- <Import Project="CordovaApp.projitems" Label="Shared" />
- <Import Project="$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)\$(WMSJSProjectDirectory)\Microsoft.VisualStudio.$(WMSJSProject).targets" />
- <!-- To modify your build process, add your task inside one of the targets below then uncomment
- that target and the DisableFastUpToDateCheck PropertyGroup.
- Other similar extension points exist, see Microsoft.Common.targets.
- <Target Name="BeforeBuild">
- </Target>
- <Target Name="AfterBuild">
- </Target>
- <PropertyGroup>
- <DisableFastUpToDateCheck>true</DisableFastUpToDateCheck>
- </PropertyGroup>
- -->
- <PropertyGroup>
- <PreBuildEvent>node "$(ProjectDir)\\cordova\\prebuild-81.js"</PreBuildEvent>
- <DisableFastUpToDateCheck>true</DisableFastUpToDateCheck>
- </PropertyGroup>
-</Project>
\ No newline at end of file
--
To stop receiving notification emails like this one, please contact
janpio@apache.org.
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@cordova.apache.org
For additional commands, e-mail: commits-help@cordova.apache.org
[cordova-windows] 01/26: README
Posted by ja...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
janpio pushed a commit to branch janpio-win10only
in repository https://gitbox.apache.org/repos/asf/cordova-windows.git
commit 1dc4478dae9d4d5cea77cf0a60c4d45f089c2382
Author: Jan Piotrowski <pi...@gmail.com>
AuthorDate: Thu Feb 15 19:07:01 2018 +0100
README
---
README.md | 24 ++++++------------------
1 file changed, 6 insertions(+), 18 deletions(-)
diff --git a/README.md b/README.md
index e16ce9d..78b4261 100644
--- a/README.md
+++ b/README.md
@@ -25,28 +25,19 @@
[](https://travis-ci.org/apache/cordova-windows)
[](https://codecov.io/github/apache/cordova-windows?branch=master)
-This repo contains the code for an [Apache Cordova](http://cordova.apache.org) platform that allows you to build applications that target Windows 10, and Windows 8.1, as well as Windows Phone 8.1. An Apache Cordova based applications is written in HTML, CSS and JavaScript.
+This repo contains the code for an [Apache Cordova](http://cordova.apache.org) platform that allows you to build applications that target Windows 10. An Apache Cordova based applications is written in HTML, CSS and JavaScript.
-(Warning: Windows 8 has been deprecated, please update your applications to target Windows 8.1 or above)
+(Warning: Windows 8 and Windows 8.1 has been deprecated, please update your applications to target Windows 10 or above)
[Apache Cordova](http://cordova.apache.org) is a project of [The Apache Software Foundation (ASF)](http://apache.org)
# Requirements
-### Windows 10, Windows 8.1, Windows Phone 8.1
+Host OS: Windows 10
-Host OS: Windows 8.1 or Windows 10
-
-Install the tools: [Visual Studio 2015](http://www.visualstudio.com/downloads) or newer
-
-### Windows 8.1,Windows Phone 8.1
-
-Host OS: Windows 8.1
-
-Install the tools: [Visual Studio 2013 Express](http://www.visualstudio.com/downloads/download-visual-studio-vs#d-express-windows-8).
+Install the tools: [Visual Studio](http://www.visualstudio.com/downloads)
# Getting started
-
The best way to use this is to install the [Cordova CLI](https://www.npmjs.com/package/cordova), create a project, add the windows platform, and run the app:
npm install -g cordova
@@ -55,7 +46,6 @@ The best way to use this is to install the [Cordova CLI](https://www.npmjs.com/p
cordova run windows
# Getting logs from Windows Store applications
-
You can get your JavaScript logs as well as Windows logs related to your Windows Store application by running the following command from your app directory:
platforms\windows\cordova\log
@@ -69,10 +59,8 @@ In most cases, this command requires administrator privileges. However, if you w
Please note that the log command is supported only for Windows Store applications and cannot get logs from Windows Phone application.
# Report Issues
-
-Report them [right here at GitHub using the "Issues" tab](https://github.com/apache/cordova-windows/issues).
+Report them at the [Apache Cordova Issue Tracker](https://issues.apache.org/jira/browse/CB). Create a user account, use `windows` as the component.
# Further Reading
-
-- [Windows Platform Guide](http://cordova.apache.org/docs/en/latest/guide/platforms/win8/index.html)
+- [Windows Platform Guide](http://cordova.apache.org/docs/en/edge/guide_platforms_win8_index.md.html#Windows%208%20Platform%20Guide)
- [Apache Cordova Documentation](http://docs.cordova.io)
--
To stop receiving notification emails like this one, please contact
janpio@apache.org.
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@cordova.apache.org
For additional commands, e-mail: commits-help@cordova.apache.org
[cordova-windows] 17/26: fix unittests
Posted by ja...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
janpio pushed a commit to branch janpio-win10only
in repository https://gitbox.apache.org/repos/asf/cordova-windows.git
commit 6a871c48bfc3097cb57d422762ee337e40dc5a5c
Author: Jan Piotrowski <pi...@gmail.com>
AuthorDate: Fri Feb 16 00:44:15 2018 +0100
fix unittests
---
spec/unit/AppxManifest.spec.js | 20 ++------------------
spec/unit/ConfigChanges.spec.js | 30 ++++++++++++------------------
spec/unit/Prepare.Win10.spec.js | 8 ++++----
spec/unit/package.spec.js | 8 ++++----
spec/unit/run.spec.js | 12 ++++++------
template/cordova/lib/package.js | 2 +-
6 files changed, 29 insertions(+), 51 deletions(-)
diff --git a/spec/unit/AppxManifest.spec.js b/spec/unit/AppxManifest.spec.js
index fd2cbd9..e7a7147 100644
--- a/spec/unit/AppxManifest.spec.js
+++ b/spec/unit/AppxManifest.spec.js
@@ -107,8 +107,7 @@ describe('AppxManifest', function () {
});
it('Test #009 : should detect manifest prefix based on "Package" element attributes', function () {
- expect(AppxManifest.get(WINDOWS_10_MANIFEST).prefix).toEqual('m2:');
- expect(AppxManifest.get(WINDOWS_10_MANIFEST).prefix).toEqual('m3:');
+ expect(AppxManifest.get(WINDOWS_10_MANIFEST).prefix).toEqual('uap:');
});
it('Test #010 : should instantiate either AppxManifest or Windows 10 AppxManifest based on manifest prefix', function () {
@@ -186,25 +185,10 @@ describe('AppxManifest', function () {
expect(refineColor(CSS_COLOR_NAME)).toEqual(CSS_COLOR_NAME);
});
- it('Test #017 : setForegroundText should change the ForegroundText property on non-Windows 10 platforms', function () {
- var visualElementsWindows = AppxManifest.get(WINDOWS_10_MANIFEST).getVisualElements();
+ it('Test #017 : setForegroundText do nothing on non-Windows 10 platforms', function () {
var visualElementsWindows10 = AppxManifest.get(WINDOWS_10_MANIFEST).getVisualElements();
var foregroundTextLight = 'light';
- var foregroundTextDark = 'dark';
- var foregroundTextDefault = foregroundTextLight;
-
- // Set to 'light'
- visualElementsWindows.setForegroundText(foregroundTextLight);
- expect(visualElementsWindows.getForegroundText()).toEqual(foregroundTextLight);
-
- // Set to 'dark'
- visualElementsWindows.setForegroundText(foregroundTextDark);
- expect(visualElementsWindows.getForegroundText()).toEqual(foregroundTextDark);
-
- // Simulate removal of preference, should change back to default vlaue 'light'
- visualElementsWindows.setForegroundText(undefined);
- expect(visualElementsWindows.getForegroundText()).toEqual(foregroundTextDefault);
// Returns nothing on Windows 10
visualElementsWindows10.setForegroundText(foregroundTextLight);
diff --git a/spec/unit/ConfigChanges.spec.js b/spec/unit/ConfigChanges.spec.js
index b823687..ffab2ac 100644
--- a/spec/unit/ConfigChanges.spec.js
+++ b/spec/unit/ConfigChanges.spec.js
@@ -89,15 +89,14 @@ describe('PlatformMunger', function () {
describe('Capabilities within package.windows.appxmanifest', function () {
- var testDir, windowsPlatform, windowsManifest, windowsManifest10, dummyPluginInfo, api;
+ var testDir, windowsPlatform, windows10Manifest, dummyPluginInfo, api;
beforeEach(function () {
testDir = path.join(__dirname, 'testDir');
shell.mkdir('-p', testDir);
shell.cp('-rf', windowsProject + '/*', testDir);
windowsPlatform = path.join(testDir, 'platforms/windows');
- windowsManifest = path.join(windowsPlatform, WINDOWS10_MANIFEST);
- windowsManifest10 = path.join(windowsPlatform, WINDOWS10_MANIFEST);
+ windows10Manifest = path.join(windowsPlatform, WINDOWS10_MANIFEST);
dummyPluginInfo = new PluginInfo(dummyPlugin);
api = new Api();
api.root = windowsPlatform;
@@ -127,11 +126,11 @@ describe('Capabilities within package.windows.appxmanifest', function () {
api.addPlugin(dummyPluginInfo)
.then(function () {
// There is the one default capability in manifest with 'internetClient' name
- expect(getManifestCapabilities(windowsManifest).length).toBe(getPluginCapabilities(dummyPluginInfo).length + 1);
+ expect(getManifestCapabilities(windows10Manifest).length).toBe(getPluginCapabilities(dummyPluginInfo).length + 1);
api.removePlugin(dummyPluginInfo);
})
.then(function () {
- expect(getManifestCapabilities(windowsManifest).length).toBe(1);
+ expect(getManifestCapabilities(windows10Manifest).length).toBe(1);
})
.catch(fail)
.finally(function () {
@@ -144,7 +143,7 @@ describe('Capabilities within package.windows.appxmanifest', function () {
api.addPlugin(dummyPluginInfo)
.then(function () {
// There is the one default capability in manifest with 'internetClient' name
- var manifestCapabilities = getManifestCapabilities(windowsManifest10);
+ var manifestCapabilities = getManifestCapabilities(windows10Manifest);
expect(manifestCapabilities.length).toBe(getPluginCapabilities(dummyPluginInfo).length + 1);
// Count 'uap' prefixed capabilities
@@ -156,7 +155,7 @@ describe('Capabilities within package.windows.appxmanifest', function () {
api.removePlugin(dummyPluginInfo);
})
.then(function () {
- expect(getManifestCapabilities(windowsManifest10).length).toBe(1);
+ expect(getManifestCapabilities(windows10Manifest).length).toBe(1);
})
.catch(fail)
.finally(function () {
@@ -188,13 +187,11 @@ describe('Capabilities within package.windows.appxmanifest', function () {
api.addPlugin(dummyPluginInfo)
.then(function () {
- checkCapabilitiesAfterInstall(windowsManifest);
- checkCapabilitiesAfterInstall(windowsManifest10);
+ checkCapabilitiesAfterInstall(windows10Manifest);
api.removePlugin(dummyPluginInfo);
})
.then(function () {
- checkCapabilitiesAfterRemove(windowsManifest);
- checkCapabilitiesAfterRemove(windowsManifest10);
+ checkCapabilitiesAfterRemove(windows10Manifest);
})
.catch(fail)
.finally(function () {
@@ -229,15 +226,12 @@ describe('generate_plugin_config_munge for windows project', function () {
it('should not process change w/o target package.appxmanifest', function () {
var testChanges = [
{
- target: 'package.windows.appxmanifest'
- },
- {
- target: 'package.appxmanifest'
+ target: 'package.windows10.appxmanifest'
}
];
var changes = AppxManifest.processChanges(testChanges);
- expect(changes.length).toBe(4);
+ expect(changes.length).toBe(1);
expect(changes[0].target).toBe(testChanges[0].target);
});
@@ -248,7 +242,7 @@ describe('generate_plugin_config_munge for windows project', function () {
}];
var changes = AppxManifest.processChanges(testChanges);
- expect(changes.length).toBe(3);
- expect(changes[2].target).toBe('package.windows10.appxmanifest');
+ expect(changes.length).toBe(1);
+ expect(changes[0].target).toBe('package.windows10.appxmanifest');
});
});
diff --git a/spec/unit/Prepare.Win10.spec.js b/spec/unit/Prepare.Win10.spec.js
index a9fcd68..7a01c0d 100644
--- a/spec/unit/Prepare.Win10.spec.js
+++ b/spec/unit/Prepare.Win10.spec.js
@@ -344,7 +344,7 @@ describe('Package description', function () {
var desc = mockConfig.manifest.doc.find('.//Properties/Description');
expect(desc.text).toBe('My custom description');
- desc = mockConfig.manifest.doc.find('.//Application/m2:VisualElements');
+ desc = mockConfig.manifest.doc.find('.//Application/uap:VisualElements');
expect(desc.attrib.Description).toBe('My custom description');
});
@@ -355,7 +355,7 @@ describe('Package description', function () {
var desc = mockConfig.manifest.doc.find('.//Properties/Description');
expect(desc).toBe(null);
- desc = mockConfig.manifest.doc.find('.//Application/m2:VisualElements');
+ desc = mockConfig.manifest.doc.find('.//Application/uap:VisualElements');
expect(desc.attrib.Description).toEqual(prepare.__get__('DEFAULT_DESCRIPTION'));
});
@@ -370,7 +370,7 @@ describe('Package description', function () {
var desc = mockConfig.manifest.doc.find('.//Properties/Description');
expect(desc.text.length).toBe(2048);
- desc = mockConfig.manifest.doc.find('.//Application/m2:VisualElements');
+ desc = mockConfig.manifest.doc.find('.//Application/uap:VisualElements');
expect(desc.attrib.Description.length).toBe(2048);
});
@@ -384,7 +384,7 @@ describe('Package description', function () {
var desc = mockConfig.manifest.doc.find('.//Properties/Description');
expect(desc).not.toMatch(/\n|\t/);
- desc = mockConfig.manifest.doc.find('.//Application/m2:VisualElements');
+ desc = mockConfig.manifest.doc.find('.//Application/:VisualElements');
expect(desc.attrib.Description).not.toMatch(/\n|\t/);
});
});
diff --git a/spec/unit/package.spec.js b/spec/unit/package.spec.js
index 271a777..0142990 100644
--- a/spec/unit/package.spec.js
+++ b/spec/unit/package.spec.js
@@ -47,14 +47,14 @@ describe('getPackage method', function () {
it('spec.1 should find windows anycpu debug package', function (done) {
var rejected = jasmine.createSpy();
- pkg.getPackage('windows', 'debug', 'anycpu')
+ pkg.getPackage('debug', 'anycpu')
.then(function (pkgInfo) {
- expect(pkgInfo.type).toBe('windows');
+ expect(pkgInfo.type).toBe('windows10');
expect(pkgInfo.buildtype).toBe('debug');
expect(pkgInfo.arch).toBe('anycpu');
expect(pkgInfo.script).toBeDefined();
}, function (err) {
- console.error(err);
+ console.error('foo', err);
rejected();
})
.finally(function () {
@@ -66,7 +66,7 @@ describe('getPackage method', function () {
it('spec.2 should find windows phone anycpu debug package', function (done) {
var rejected = jasmine.createSpy();
- pkg.getPackage('phone', 'debug', 'anycpu')
+ pkg.getPackage('debug', 'anycpu')
.then(function (pkgInfo) {
expect(pkgInfo.type).toBe('phone');
expect(pkgInfo.buildtype).toBe('debug');
diff --git a/spec/unit/run.spec.js b/spec/unit/run.spec.js
index 82d2078..2d8f480 100644
--- a/spec/unit/run.spec.js
+++ b/spec/unit/run.spec.js
@@ -265,15 +265,15 @@ describe('run method', function () {
run.run({ nobuild: true, argv: ['--archs=arm'] })
.then(function () {
- expect(packages.getPackage).toHaveBeenCalledWith(anyString, anyString, 'arm');
- expect(packages.deployToDesktop).toHaveBeenCalledWith(expectedDeployOptions, anyString, anyString);
+ expect(packages.getPackage).toHaveBeenCalledWith(anyString, 'arm');
+ expect(packages.deployToDesktop).toHaveBeenCalledWith(expectedDeployOptions, anyString);
})
.then(function () {
return run.run({ nobuild: true, archs: 'arm' });
})
.then(function () {
- expect(packages.getPackage).toHaveBeenCalledWith(anyString, anyString, 'arm');
- expect(packages.deployToDesktop).toHaveBeenCalledWith(expectedDeployOptions, anyString, anyString);
+ expect(packages.getPackage).toHaveBeenCalledWith(anyString, 'arm');
+ expect(packages.deployToDesktop).toHaveBeenCalledWith(expectedDeployOptions, anyString);
})
.catch(fail)
.finally(function () {
@@ -295,8 +295,8 @@ describe('run method', function () {
run.run({nobuild: true})
.then(function () {
- expect(packages.getPackage).toHaveBeenCalledWith(anyString, anyString, 'anycpu');
- expect(packages.deployToDesktop).toHaveBeenCalledWith(expectedDeployOptions, anyString, anyString);
+ expect(packages.getPackage).toHaveBeenCalledWith(anyString, 'anycpu');
+ expect(packages.deployToDesktop).toHaveBeenCalledWith(expectedDeployOptions, anyString);
})
.catch(fail)
.finally(function () {
diff --git a/template/cordova/lib/package.js b/template/cordova/lib/package.js
index ef0dba4..f938fc3 100644
--- a/template/cordova/lib/package.js
+++ b/template/cordova/lib/package.js
@@ -33,7 +33,7 @@ module.exports.getPackage = function (buildtype, buildArch) {
var appPackages = path.resolve(path.join(__dirname, '..', '..', 'AppPackages'));
// reject promise if AppPackages folder doesn't exist
if (!fs.existsSync(appPackages)) {
- return Q.reject('AppPackages folder doesn\'t exist');
+ return Q.reject('AppPackages folder doesn\'t exist' + appPackages);
}
// find out and resolve paths for all folders inside AppPackages
var pkgDirs = fs.readdirSync(appPackages).map(function (relative) {
--
To stop receiving notification emails like this one, please contact
janpio@apache.org.
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@cordova.apache.org
For additional commands, e-mail: commits-help@cordova.apache.org
[cordova-windows] 12/26: more: remove package.phone.appxmanifest
and package.windows.appxmanifest and related
Posted by ja...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
janpio pushed a commit to branch janpio-win10only
in repository https://gitbox.apache.org/repos/asf/cordova-windows.git
commit a92e3abf8073aef534e9d878f6287783256bce24
Author: Jan Piotrowski <pi...@gmail.com>
AuthorDate: Thu Feb 15 23:32:41 2018 +0100
more: remove package.phone.appxmanifest and package.windows.appxmanifest and related
---
bin/lib/create.js | 3 +--
spec/unit/ConfigChanges.spec.js | 1 -
2 files changed, 1 insertion(+), 3 deletions(-)
diff --git a/bin/lib/create.js b/bin/lib/create.js
index 975fc35..221cc2d 100644
--- a/bin/lib/create.js
+++ b/bin/lib/create.js
@@ -98,8 +98,7 @@ module.exports.create = function (destinationDir, config, options) {
// replace specific values in manifests' templates
events.emit('verbose', 'Updating manifest files with project configuration.');
- [ 'package.windows.appxmanifest', 'package.phone.appxmanifest',
- 'package.windows10.appxmanifest' ]
+ [ 'package.windows10.appxmanifest' ] // TODO simplify
.forEach(function (item) {
var manifest = AppxManifest.get(path.join(projectPath, item));
if (manifest.hasPhoneIdentity) {
diff --git a/spec/unit/ConfigChanges.spec.js b/spec/unit/ConfigChanges.spec.js
index 5ad96b5..77287d5 100644
--- a/spec/unit/ConfigChanges.spec.js
+++ b/spec/unit/ConfigChanges.spec.js
@@ -30,7 +30,6 @@ var shell = require('shelljs');
var configChanges = require('../../template/cordova/lib/ConfigChanges');
var tempDir = path.join(os.tmpdir(), 'windows');
-var WINDOWS_MANIFEST = 'package.windows.appxmanifest';
var WINDOWS10_MANIFEST = 'package.windows10.appxmanifest';
var FIXTURES = path.join(__dirname, 'fixtures');
var DUMMY_PLUGIN = 'org.test.plugins.capabilityplugin';
--
To stop receiving notification emails like this one, please contact
janpio@apache.org.
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@cordova.apache.org
For additional commands, e-mail: commits-help@cordova.apache.org
[cordova-windows] 08/26: remove --appx param
Posted by ja...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
janpio pushed a commit to branch janpio-win10only
in repository https://gitbox.apache.org/repos/asf/cordova-windows.git
commit cf485e557d82afb993caf1529a85f90e1708f4b2
Author: Jan Piotrowski <pi...@gmail.com>
AuthorDate: Thu Feb 15 20:22:08 2018 +0100
remove --appx param
---
spec/e2e/endtoend.spec.js | 12 -----------
spec/unit/build.spec.js | 20 +-----------------
template/cordova/build | 6 +-----
template/cordova/lib/build.js | 46 ++++++-----------------------------------
template/cordova/lib/package.js | 3 ++-
template/cordova/lib/run.js | 9 ++------
template/cordova/run | 6 ------
7 files changed, 12 insertions(+), 90 deletions(-)
diff --git a/spec/e2e/endtoend.spec.js b/spec/e2e/endtoend.spec.js
index be3deb8..e0153cb 100644
--- a/spec/e2e/endtoend.spec.js
+++ b/spec/e2e/endtoend.spec.js
@@ -81,18 +81,6 @@ describe('Cordova create and build', function () {
_expectSubdirAndFileExist('CordovaApp.Windows10_1.0.0.0_anycpu_debug_Test', 'CordovaApp.Windows10_1.0.0.0_anycpu_debug.appx');
});
- // --appx
-
- it('spec.2b should build uap (win10) project', function () {
- shell.exec(buildScriptPath + ' --appx=uap', {silent: silent});
- _expectSubdirAndFileExist('CordovaApp.Windows10_1.0.0.0_anycpu_debug_Test', 'CordovaApp.Windows10_1.0.0.0_anycpu_debug.appx');
- });
-
- it('spec.2c should build uwp (win10) project', function () {
- shell.exec(buildScriptPath + ' --appx=uwp', {silent: silent});
- _expectSubdirAndFileExist('CordovaApp.Windows10_1.0.0.0_anycpu_debug_Test', 'CordovaApp.Windows10_1.0.0.0_anycpu_debug.appx');
- });
-
// --archs
it('spec.3a should build project for particular CPU', function () {
diff --git a/spec/unit/build.spec.js b/spec/unit/build.spec.js
index e6bb97b..d5470ae 100644
--- a/spec/unit/build.spec.js
+++ b/spec/unit/build.spec.js
@@ -375,25 +375,7 @@ describe('run method', function () {
var buildTools151 = { version: '15.1', buildProject: jasmine.createSpy('buildTools151'), path: testPath };
createFindAllAvailableVersionsMock([buildTools14, buildTools15, buildTools151]);
- // explicitly specify Windows 10 as target
- build.run({argv: ['--appx=uap']})
- .fail(fail)
- .finally(function () {
- expect(fail).not.toHaveBeenCalled();
- expect(buildTools151.buildProject).toHaveBeenCalled();
- done();
- });
- });
-
- it('spec.15b should choose latest version if there are multiple versions available with minor version difference', function (done) {
- var fail = jasmine.createSpy('fail');
- var buildTools14 = { version: '14.0', buildProject: jasmine.createSpy('buildTools14'), path: testPath };
- var buildTools15 = { version: '15.0', buildProject: jasmine.createSpy('buildTools15'), path: testPath };
- var buildTools151 = { version: '15.1', buildProject: jasmine.createSpy('buildTools151'), path: testPath };
-
- createFindAllAvailableVersionsMock([buildTools14, buildTools15, buildTools151]);
- // explicitly specify Windows 10 as target
- build.run({argv: ['--appx=uwp']})
+ build.run({argv: ['']})
.fail(fail)
.finally(function () {
expect(fail).not.toHaveBeenCalled();
diff --git a/template/cordova/build b/template/cordova/build
index 2f8a771..a0f1c09 100644
--- a/template/cordova/build
+++ b/template/cordova/build
@@ -41,10 +41,6 @@ if(['--help', '/?', '-h', 'help', '-help', '/help'].indexOf(process.argv[2]) >=
console.log(' architectures (`anycpu`, `arm`, `x86`, `x64`).');
console.log(' Separate multiple choices with spaces and if');
console.log(' passing multiple choices, enclose with " ".');
- console.log(' --appx=<8.1-win|8.1-phone|uap|uwp>');
- console.log(' : Overrides windows-target-version to build');
- console.log(' Windows 8.1, Windows Phone 8.1, or');
- console.log(' Windows 10 Universal.');
console.log(' --packageCertificateKeyFile : Builds the project using provided certificate.');
console.log(' --packageThumbprint : Thumbprint associated with the certificate.');
console.log(' --publisherId : Sets publisher id field in manifest.');
@@ -56,7 +52,7 @@ if(['--help', '/?', '-h', 'help', '-help', '/help'].indexOf(process.argv[2]) >=
console.log(' build --debug');
console.log(' build --release');
console.log(' build --release --archs="arm x86" --bundle');
- console.log(' build --appx=8.1-phone -r');
+ console.log(' build -r');
console.log(' build --packageCertificateKeyFile="CordovaApp_TemporaryKey.pfx"');
console.log(' build --publisherId="CN=FakeCorp, C=US"');
console.log(' build --buildConfig="build.json"');
diff --git a/template/cordova/lib/build.js b/template/cordova/lib/build.js
index 90ad2df..e1a95fb 100644
--- a/template/cordova/lib/build.js
+++ b/template/cordova/lib/build.js
@@ -58,7 +58,7 @@ module.exports.run = function run (buildOptions) {
var buildConfig = parseAndValidateArgs(buildOptions);
// get build targets
- var selectedBuildTargets = getBuildTargets(buildConfig.win, buildConfig.phone, buildConfig.projVerOverride, buildConfig);
+ var selectedBuildTargets = getBuildTargets(buildConfig.win, buildConfig.phone, buildConfig);
return MSBuildTools.getLatestMatchingMSBuild(selectedBuildTargets) // get latest msbuild tools
.then(function (result) {
@@ -84,8 +84,8 @@ module.exports.run = function run (buildOptions) {
});
};
-// returns list of projects to be built based on config.xml and additional parameters (-appx)
-function getBuildTargets (isWinSwitch, isPhoneSwitch, projOverride, buildConfig) {
+// returns list of projects to be built based on config.xml and additional parameters
+function getBuildTargets (isWinSwitch, isPhoneSwitch, buildConfig) {
buildConfig = typeof buildConfig !== 'undefined' ? buildConfig : null;
var configXML = new ConfigParser(path.join(ROOT, 'config.xml'));
@@ -130,39 +130,6 @@ function getBuildTargets (isWinSwitch, isPhoneSwitch, projOverride, buildConfig)
}
}
- // apply build target override if one was specified
- if (projOverride) {
- switch (projOverride.toLowerCase()) {
- case 'uap':
- case 'uwp':
- targets = [projFiles.win10];
- break;
- default:
- events.emit('warn', 'Ignoring unrecognized --appx parameter passed to build: "' + projOverride + '"');
- break;
- }
- }
-
- if (buildConfig !== null) {
- // As part of reworking how build and package determine the winning project, set the 'target type' project
- // as part of build configuration. This will be used for determining the binary to 'run' after build is done.
- if (targets.length > 0) {
- switch (targets[0]) {
- case projFiles.phone:
- buildConfig.targetProject = 'phone';
- break;
- case projFiles.win10:
- buildConfig.targetProject = 'windows10';
- break;
- case projFiles.win:
- /* falls through */
- default:
- buildConfig.targetProject = 'windows';
- break;
- }
- }
- }
-
return targets;
}
module.exports.getBuildTargets = getBuildTargets;
@@ -180,7 +147,6 @@ function parseAndValidateArgs (options) {
// parse and validate args
var args = nopt({
'archs': [String],
- 'appx': String,
'phone': Boolean,
'win': Boolean,
'bundle': Boolean,
@@ -211,7 +177,7 @@ function parseAndValidateArgs (options) {
config.phone = !!args.phone;
config.win = !!args.win;
- config.projVerOverride = args.appx;
+
// only set config.bundle if architecture is not anycpu
if (args.bundle) {
if (config.buildArchs.length > 1 && (config.buildArchs.indexOf('anycpu') > -1 || config.buildArchs.indexOf('any cpu') > -1)) {
@@ -365,7 +331,7 @@ function buildTargets (config, myBuildTargets, msbuild) {
}
// https://issues.apache.org/jira/browse/CB-12298
- if (config.targetProject === 'windows10' && config.buildType === 'release') {
+ if (config.buildType === 'release') {
otherProperties.push('/p:UapAppxPackageBuildMode=StoreUpload');
}
@@ -379,7 +345,7 @@ function buildTargets (config, myBuildTargets, msbuild) {
});
} else {
return buildsCompleted.then(function () {
- return pckage.getPackage(config.targetProject, config.buildType, config.buildArchs[0]);
+ return pckage.getPackage(config.buildType, config.buildArchs[0]);
});
}
}
diff --git a/template/cordova/lib/package.js b/template/cordova/lib/package.js
index 5386074..ef0dba4 100644
--- a/template/cordova/lib/package.js
+++ b/template/cordova/lib/package.js
@@ -28,7 +28,8 @@ var CordovaError = require('cordova-common').CordovaError;
// returns folder that contains package with chip architecture,
// build and project types specified by script parameters
-module.exports.getPackage = function (projectType, buildtype, buildArch) {
+module.exports.getPackage = function (buildtype, buildArch) {
+ var projectType = 'windows10'; // TODO remove below
var appPackages = path.resolve(path.join(__dirname, '..', '..', 'AppPackages'));
// reject promise if AppPackages folder doesn't exist
if (!fs.existsSync(appPackages)) {
diff --git a/template/cordova/lib/run.js b/template/cordova/lib/run.js
index cbf46e0..715a635 100644
--- a/template/cordova/lib/run.js
+++ b/template/cordova/lib/run.js
@@ -43,7 +43,6 @@ module.exports.run = function (options) {
'archs': [String],
'phone': Boolean,
'win': Boolean,
- 'appx': String,
'win10tools': Boolean
}, {'r': '--release'}, options.argv, 0);
@@ -68,18 +67,14 @@ module.exports.run = function (options) {
var buildArchs = archs.map(function (arch) { return arch.toLowerCase(); });
var deployTarget = options.target ? options.target : (options.emulator ? 'emulator' : 'device');
- var buildTargets = build.getBuildTargets(args.win, args.phone, args.appx);
+ var buildTargets = build.getBuildTargets(args.win, args.phone);
if (!buildTargets || buildTargets.length <= 0) {
return Q.reject(new CordovaError('Unable to determine deploy target.'));
}
- // we deploy the first build target so we use buildTargets[0] to determine
- // what project type we should deploy
- var projectType = projFileToType(buildTargets[0]);
-
// if --nobuild isn't specified then build app first
- var buildPackages = options.nobuild ? packages.getPackage(projectType, buildType, buildArchs[0]) : build.run.call(this, options);
+ var buildPackages = options.nobuild ? packages.getPackage(buildType, buildArchs[0]) : build.run.call(this, options);
// buildPackages also deploys bundles
return buildPackages
diff --git a/template/cordova/run b/template/cordova/run
index 0c544e8..0eccbd6 100644
--- a/template/cordova/run
+++ b/template/cordova/run
@@ -41,11 +41,6 @@ if (['--help', '/?', '-h', 'help', '-help', '/help'].indexOf(args[2]) > -1) {
console.log(' architectures are used.');
console.log(' --phone, --win');
console.log(' : Specifies project type to deploy');
- console.log(' --appx=<8.1-win|8.1-phone|uap|uwp>');
- console.log(' : Overrides windows-target-version to build Windows 8.1, ');
- console.log(' Windows Phone 8.1, or Windows 10.');
- console.log(' --win10tools : Uses Windows 10 deployment tools (used for a Windows 8.1 app when');
- console.log(' being deployed to a Windows 10 device)');
console.log('Examples:');
console.log(' run');
console.log(' run --emulator');
@@ -54,7 +49,6 @@ if (['--help', '/?', '-h', 'help', '-help', '/help'].indexOf(args[2]) > -1) {
console.log(' run --device --release');
console.log(' run --emulator --debug');
console.log(' run --archs="x64 x86 arm" --no-bundle');
- console.log(' run --device --appx=phone-8.1');
console.log(' run --device --archs="x64 x86 arm"');
console.log('');
--
To stop receiving notification emails like this one, please contact
janpio@apache.org.
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@cordova.apache.org
For additional commands, e-mail: commits-help@cordova.apache.org
[cordova-windows] 18/26: fix mistage in splashscreen.js
Posted by ja...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
janpio pushed a commit to branch janpio-win10only
in repository https://gitbox.apache.org/repos/asf/cordova-windows.git
commit c06af73b6d283c997f7e0d68a83ccbea53afc966
Author: Jan Piotrowski <pi...@gmail.com>
AuthorDate: Fri Feb 16 01:05:49 2018 +0100
fix mistage in splashscreen.js
---
cordova-js-src/splashscreen.js | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
diff --git a/cordova-js-src/splashscreen.js b/cordova-js-src/splashscreen.js
index 8acdcd0..e26f1a9 100644
--- a/cordova-js-src/splashscreen.js
+++ b/cordova-js-src/splashscreen.js
@@ -156,7 +156,11 @@ function init(config, manifest) {
extendedSplashImage.classList.add('phone');
}
- extendedSplashProgress.classList.add('extended-splash-progress-wp10');
+ if (isWp10) {
+ extendedSplashProgress.classList.add('extended-splash-progress-wp10');
+ } else {
+ extendedSplashProgress.classList.add('extended-splash-progress-desktop');
+ }
if (!showSplashScreenSpinner) {
extendedSplashProgress.classList.add('hidden');
--
To stop receiving notification emails like this one, please contact
janpio@apache.org.
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@cordova.apache.org
For additional commands, e-mail: commits-help@cordova.apache.org
[cordova-windows] 16/26: fix eslint
Posted by ja...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
janpio pushed a commit to branch janpio-win10only
in repository https://gitbox.apache.org/repos/asf/cordova-windows.git
commit d0b78c36d66a9721eea8bb0c76698846c60cfd15
Author: Jan Piotrowski <pi...@gmail.com>
AuthorDate: Fri Feb 16 00:43:49 2018 +0100
fix eslint
---
spec/unit/AppxManifest.spec.js | 14 +++++++-------
spec/unit/ConfigChanges.spec.js | 6 +++---
spec/unit/Prepare.Win10.spec.js | 2 +-
spec/unit/deployment.spec.js | 3 +--
template/cordova/lib/MSBuildTools.js | 4 ----
template/cordova/lib/prepare.js | 7 +------
template/cordova/lib/run.js | 14 +++-----------
7 files changed, 16 insertions(+), 34 deletions(-)
diff --git a/spec/unit/AppxManifest.spec.js b/spec/unit/AppxManifest.spec.js
index b11fb9f..fd2cbd9 100644
--- a/spec/unit/AppxManifest.spec.js
+++ b/spec/unit/AppxManifest.spec.js
@@ -47,7 +47,7 @@ describe('AppxManifest', function () {
it('Test #000 : should create a new AppxManifest instance', function () {
var manifest;
- expect(function () { manifest = new AppxManifest(WINDOWS_MANIFEST); }).not.toThrow();
+ expect(function () { manifest = new AppxManifest(WINDOWS_10_MANIFEST); }).not.toThrow();
expect(manifest instanceof AppxManifest).toBe(true);
});
@@ -60,7 +60,7 @@ describe('AppxManifest', function () {
});
it('Test #003 : should add ":" to manifest prefix if needed', function () {
- expect(new AppxManifest(WINDOWS_MANIFEST, 'prefix').prefix).toEqual('prefix:');
+ expect(new AppxManifest(WINDOWS_10_MANIFEST, 'prefix').prefix).toEqual('prefix:');
});
});
@@ -103,12 +103,12 @@ describe('AppxManifest', function () {
describe('static get() method', function () {
it('Test #008 : should return an AppxManifest instance', function () {
- expect(AppxManifest.get(WINDOWS_MANIFEST) instanceof AppxManifest).toBe(true);
+ expect(AppxManifest.get(WINDOWS_10_MANIFEST) instanceof AppxManifest).toBe(true);
});
it('Test #009 : should detect manifest prefix based on "Package" element attributes', function () {
- expect(AppxManifest.get(WINDOWS_MANIFEST).prefix).toEqual('m2:');
- expect(AppxManifest.get(WINDOWS_PHONE_MANIFEST).prefix).toEqual('m3:');
+ expect(AppxManifest.get(WINDOWS_10_MANIFEST).prefix).toEqual('m2:');
+ expect(AppxManifest.get(WINDOWS_10_MANIFEST).prefix).toEqual('m3:');
});
it('Test #010 : should instantiate either AppxManifest or Windows 10 AppxManifest based on manifest prefix', function () {
@@ -155,7 +155,7 @@ describe('AppxManifest', function () {
var methods = ['getPhoneIdentity', 'getIdentity', 'getProperties', 'getApplication', 'getVisualElements'];
it('Test #014 : should exists', function () {
- var manifest = AppxManifest.get(WINDOWS_PHONE_MANIFEST);
+ var manifest = AppxManifest.get(WINDOWS_10_MANIFEST);
var emptyManifest = AppxManifest.get('/no/prefixed');
methods.forEach(function (method) {
@@ -187,7 +187,7 @@ describe('AppxManifest', function () {
});
it('Test #017 : setForegroundText should change the ForegroundText property on non-Windows 10 platforms', function () {
- var visualElementsWindows = AppxManifest.get(WINDOWS_MANIFEST).getVisualElements();
+ var visualElementsWindows = AppxManifest.get(WINDOWS_10_MANIFEST).getVisualElements();
var visualElementsWindows10 = AppxManifest.get(WINDOWS_10_MANIFEST).getVisualElements();
var foregroundTextLight = 'light';
diff --git a/spec/unit/ConfigChanges.spec.js b/spec/unit/ConfigChanges.spec.js
index 77287d5..b823687 100644
--- a/spec/unit/ConfigChanges.spec.js
+++ b/spec/unit/ConfigChanges.spec.js
@@ -60,8 +60,8 @@ describe('PlatformMunger', function () {
describe('apply_file_munge method', function () {
it('should call parent\'s method with the same parameters', function () {
- munger.apply_file_munge(WINDOWS_MANIFEST, munge, false);
- expect(BaseMunger.prototype.apply_file_munge).toHaveBeenCalledWith(WINDOWS_MANIFEST, munge, false);
+ munger.apply_file_munge(WINDOWS10_MANIFEST, munge, false);
+ expect(BaseMunger.prototype.apply_file_munge).toHaveBeenCalledWith(WINDOWS10_MANIFEST, munge, false);
});
it('should additionally call parent\'s method with another munge if removing changes from windows 10 appxmanifest', function () {
@@ -96,7 +96,7 @@ describe('Capabilities within package.windows.appxmanifest', function () {
shell.mkdir('-p', testDir);
shell.cp('-rf', windowsProject + '/*', testDir);
windowsPlatform = path.join(testDir, 'platforms/windows');
- windowsManifest = path.join(windowsPlatform, WINDOWS_MANIFEST);
+ windowsManifest = path.join(windowsPlatform, WINDOWS10_MANIFEST);
windowsManifest10 = path.join(windowsPlatform, WINDOWS10_MANIFEST);
dummyPluginInfo = new PluginInfo(dummyPlugin);
api = new Api();
diff --git a/spec/unit/Prepare.Win10.spec.js b/spec/unit/Prepare.Win10.spec.js
index afeff6e..a9fcd68 100644
--- a/spec/unit/Prepare.Win10.spec.js
+++ b/spec/unit/Prepare.Win10.spec.js
@@ -330,7 +330,7 @@ function createMockConfigAndManifestForDescription (description) {
getPreference: function () { }
};
- var manifest = AppxManifest.get(Win81ManifestPath, /* ignoreCache= */true);
+ var manifest = AppxManifest.get(Win10ManifestPath, /* ignoreCache= */true);
spyOn(fs, 'writeFileSync');
return { config: config, manifest: manifest };
diff --git a/spec/unit/deployment.spec.js b/spec/unit/deployment.spec.js
index 24177d1..1b20ffc 100644
--- a/spec/unit/deployment.spec.js
+++ b/spec/unit/deployment.spec.js
@@ -21,7 +21,6 @@ var rewire = require('rewire');
var deployment = rewire('../../template/cordova/lib/deployment');
var Q = require('q');
var path = require('path');
-var AppDeployCmdTool = deployment.__get__('AppDeployCmdTool');
var WinAppDeployCmdTool = deployment.__get__('WinAppDeployCmdTool');
var TEST_APP_PACKAGE_NAME = '"c:\\testapppackage.appx"';
@@ -141,4 +140,4 @@ describe('Windows 10 deployment interacts with the file system as expected.', fu
done();
});
});
-});
\ No newline at end of file
+});
diff --git a/template/cordova/lib/MSBuildTools.js b/template/cordova/lib/MSBuildTools.js
index c479483..098d2dc 100644
--- a/template/cordova/lib/MSBuildTools.js
+++ b/template/cordova/lib/MSBuildTools.js
@@ -41,9 +41,6 @@ MSBuildTools.prototype.buildProject = function (projFile, buildType, buildarch,
var checkWinSDK = function (target_platform) {
return require('./check_reqs').isWinSDKPresent(target_platform);
};
- var checkPhoneSDK = function () {
- return require('./check_reqs').isPhoneSDKPresent();
- };
// default build args
var args = ['/clp:NoSummary;NoItemAndPropertyList;Verbosity=minimal', '/nologo',
@@ -275,7 +272,6 @@ function filterSupportedTargets (targets, msbuild) {
}
var targetFilters = {
- '12.0': msBuild12TargetsFilter,
'14.0': msBuild14TargetsFilter,
'15.x': msBuild15TargetsFilter,
'15.5': msBuild155TargetsFilter,
diff --git a/template/cordova/lib/prepare.js b/template/cordova/lib/prepare.js
index bc97c8f..421035d 100644
--- a/template/cordova/lib/prepare.js
+++ b/template/cordova/lib/prepare.js
@@ -50,7 +50,6 @@ var SUPPORTED_IMAGE_EXTENSIONS = ['.png', '.jpg', '.jpeg'];
var SPLASH_SCREEN_SIZE_LIMIT = 200 * 1024; // 200 KBytes
var TARGET_PROJECT_10 = 'TARGET_PROJECT_10';
var SPLASH_SCREEN_DESKTOP_TARGET_NAME = 'SplashScreen';
-var SPLASH_SCREEN_PHONE_TARGET_NAME = 'SplashScreenPhone';
/** Note: this is only for backward compatibility, since it is being called directly from windows_parser */
module.exports.applyPlatformConfig = function () {
@@ -321,7 +320,7 @@ var PLATFORM_IMAGES = [
{dest: 'Square150x150Logo.scale-240', width: 360, height: 360},
{dest: 'Square310x310Logo.scale-100', width: 310, height: 310},
{dest: 'Wide310x150Logo.scale-100', width: 310, height: 150},
- {dest: 'Wide310x150Logo.scale-240', width: 744, height: 360},
+ {dest: 'Wide310x150Logo.scale-240', width: 744, height: 360}
];
function findPlatformImage (width, height) {
@@ -557,10 +556,6 @@ function updateSplashScreenImageExtensions (cordovaProject, locations) {
return checkTargetMatchAndUpdateUsedExtensions(img, SPLASH_SCREEN_DESKTOP_TARGET_NAME);
})[0];
- var phoneSplashScreen = splashScreens.filter(function (img) {
- return checkTargetMatchAndUpdateUsedExtensions(img, SPLASH_SCREEN_PHONE_TARGET_NAME);
- })[0];
-
checkThatExtensionsAreNotMixed();
var manifestSplashScreenMap = {};
diff --git a/template/cordova/lib/run.js b/template/cordova/lib/run.js
index e1f62c0..bfec351 100644
--- a/template/cordova/lib/run.js
+++ b/template/cordova/lib/run.js
@@ -81,7 +81,7 @@ module.exports.run = function (options) {
.then(function (pkg) {
events.emit('log', 'Deploying ' + pkg.type + ' package to ' + deployTarget + ':\n' + pkg.appx);
switch (pkg.type) {
- case 'phone':
+ case 'phone': // TODO remove I guess?
return packages.deployToPhone(pkg, deployTarget, args.win10tools)
.catch(function (e) {
if (options.target || options.emulator || options.device) {
@@ -100,23 +100,15 @@ module.exports.run = function (options) {
}
return packages.deployToPhone(pkg, deployTarget, true);
} else {
- return packages.deployToDesktop(pkg, deployTarget, projectType);
+ return packages.deployToDesktop(pkg, deployTarget);
}
break; /* eslint no-unreachable : 0 */
default: // 'windows'
- return packages.deployToDesktop(pkg, deployTarget, projectType);
+ return packages.deployToDesktop(pkg, deployTarget);
}
});
};
-// TODO remove as only one project type
-// Retrieves project type for the project file specified.
-// @param {String} projFile Project file, for example 'CordovaApp.Windows10.jsproj'
-// @returns {String} Proejct type, for example 'windows10'
-function projFileToType (projFile) {
- return projFile.replace(/CordovaApp|jsproj|\./gi, '').toLowerCase();
-}
-
/**
* Checks if current process is an with administrative permissions (e.g. from
* elevated command prompt).
--
To stop receiving notification emails like this one, please contact
janpio@apache.org.
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@cordova.apache.org
For additional commands, e-mail: commits-help@cordova.apache.org
[cordova-windows] 24/26: general comments and TODO
Posted by ja...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
janpio pushed a commit to branch janpio-win10only
in repository https://gitbox.apache.org/repos/asf/cordova-windows.git
commit babd839bc2590b27c584d29ee6a86c5245746917
Author: Jan Piotrowski <pi...@gmail.com>
AuthorDate: Fri Feb 16 13:56:00 2018 +0100
general comments and TODO
---
bin/lib/check_reqs.js | 2 +-
template/cordova/lib/build.js | 10 ++++++----
template/cordova/lib/deployment.js | 2 ++
template/cordova/lib/package.js | 2 +-
template/cordova/lib/run.js | 3 ++-
5 files changed, 12 insertions(+), 7 deletions(-)
diff --git a/bin/lib/check_reqs.js b/bin/lib/check_reqs.js
index aca562b..61f1075 100644
--- a/bin/lib/check_reqs.js
+++ b/bin/lib/check_reqs.js
@@ -347,7 +347,7 @@ module.exports.isWinSDKPresent = function (target_platform) {
// Checks if min SDK required to build Windows Phone 8.1 project is present
module.exports.isPhoneSDKPresent = function () {
- return checkPhoneSdk('8.1', '8.1');
+ return checkPhoneSdk('8.1', '8.1'); // TODO
};
/**
diff --git a/template/cordova/lib/build.js b/template/cordova/lib/build.js
index 52c0c28..37ead69 100644
--- a/template/cordova/lib/build.js
+++ b/template/cordova/lib/build.js
@@ -84,6 +84,8 @@ module.exports.run = function run (buildOptions) {
function getBuildTargets (isWinSwitch, isPhoneSwitch, buildConfig) {
buildConfig = typeof buildConfig !== 'undefined' ? buildConfig : null;
+ // TODO This whole method can be super simplified as there is only one target
+
var configXML = new ConfigParser(path.join(ROOT, 'config.xml'));
var targets = [];
var noSwitches = !(isPhoneSwitch || isWinSwitch);
@@ -337,6 +339,10 @@ function buildTargets (config, myBuildTargets, msbuild) {
if (shouldBundle) {
return buildsCompleted.then(function () {
+ // msbuild isn't capable of generating bundles unless you enable bundling for each individual arch
+ // However, that generates intermediate bundles, like "CordovaApp.Windows10_0.0.1.0_x64.appxbundle"
+ // We need to clear the intermediate bundles, or else "cordova run" will fail because of too
+ // many .appxbundle files.
return clearIntermediatesAndGetPackage(bundleTerms, config, hasAnyCpu);
});
} else {
@@ -347,10 +353,6 @@ function buildTargets (config, myBuildTargets, msbuild) {
}
function clearIntermediatesAndGetPackage (bundleTerms, config, hasAnyCpu) {
- // msbuild isn't capable of generating bundles unless you enable bundling for each individual arch
- // However, that generates intermediate bundles, like "CordovaApp.Windows10_0.0.1.0_x64.appxbundle"
- // We need to clear the intermediate bundles, or else "cordova run" will fail because of too
- // many .appxbundle files.
events.emit('verbose', 'Clearing intermediates...');
var appPackagesPath = path.join(ROOT, 'AppPackages');
var childDirectories = shell.ls(path.join(appPackagesPath, '*')).map(function (pathName) {
diff --git a/template/cordova/lib/deployment.js b/template/cordova/lib/deployment.js
index 5394e74..0efebc0 100644
--- a/template/cordova/lib/deployment.js
+++ b/template/cordova/lib/deployment.js
@@ -110,6 +110,8 @@ DeviceInfo.prototype.toString = function () {
return this.index + '. ' + this.name + ' (' + this.type + ')';
};
+// Deploy to Phone
+
function AppDeployCmdTool (targetOsVersion) {
if (!(this instanceof AppDeployCmdTool)) { throw new ReferenceError('Only create an AppDeployCmdTool as an instance object.'); }
diff --git a/template/cordova/lib/package.js b/template/cordova/lib/package.js
index 84a1f6e..4cb6226 100644
--- a/template/cordova/lib/package.js
+++ b/template/cordova/lib/package.js
@@ -88,7 +88,7 @@ module.exports.getPackageFileInfo = function (packageFile) {
var props = /.*\.(Phone|Windows|Windows10)_((?:\d*\.)*\d*)*((?:_(AnyCPU|x86|x64|ARM)){1,4})(?:(_Debug))?.(appx|appxbundle)$/i.exec(pkgName);
if (props) {
return {
- type: props[1].toLowerCase(),
+ type: props[1].toLowerCase(), // TODO remove as this can be phone, windows or windows10
arch: props[3].toLowerCase().substring(1),
archs: props[3].toLowerCase().substring(1).split('_'),
buildtype: props[5] ? props[5].substring(1).toLowerCase() : 'release',
diff --git a/template/cordova/lib/run.js b/template/cordova/lib/run.js
index 2d7b869..98e69fc 100644
--- a/template/cordova/lib/run.js
+++ b/template/cordova/lib/run.js
@@ -58,12 +58,13 @@ module.exports.run = function (options) {
// Get build/deploy options
var buildType = options.release ? 'release' : 'debug';
+
// CB-11478 Allow to specify 'archs' parameter as either cli or platform
// option i.e. 'cordova run --archs' vs. 'cordova run -- --archs'
var archs = options.archs || args.archs || ['anycpu'];
if (typeof archs === 'string') { archs = archs.split(' '); }
-
var buildArchs = archs.map(function (arch) { return arch.toLowerCase(); });
+
var deployTarget = options.target ? options.target : (options.emulator ? 'emulator' : 'device');
var buildTargets = build.getBuildTargets(args.win, args.phone);
--
To stop receiving notification emails like this one, please contact
janpio@apache.org.
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@cordova.apache.org
For additional commands, e-mail: commits-help@cordova.apache.org
[cordova-windows] 07/26: add exception for 8.1 projects
Posted by ja...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
janpio pushed a commit to branch janpio-win10only
in repository https://gitbox.apache.org/repos/asf/cordova-windows.git
commit 0c313eb6513901271e8c4bb5272f8834aa2136fb
Author: Jan Piotrowski <pi...@gmail.com>
AuthorDate: Thu Feb 15 19:19:48 2018 +0100
add exception for 8.1 projects
---
bin/lib/check_reqs.js | 5 +++++
template/cordova/lib/build.js | 3 +--
2 files changed, 6 insertions(+), 2 deletions(-)
diff --git a/bin/lib/check_reqs.js b/bin/lib/check_reqs.js
index e388cf5..d2f0f70 100644
--- a/bin/lib/check_reqs.js
+++ b/bin/lib/check_reqs.js
@@ -61,6 +61,11 @@ function getMinimalRequiredVersionFor (requirement, windowsTargetVersion, window
if (windowsPhoneTargetVersion === '8' || windowsPhoneTargetVersion === '8.0') {
throw new CordovaError('8.0 is not a valid version for windows-phone-target-version (use the wp8 Cordova platform instead)');
}
+
+ if (windowsTargetVersion === '8.1' || windowsPhoneTargetVersion === '8.1') {
+ throw new CordovaError('Windows (Phone) 8.1 projects are deprecated. To use you may downgrade to cordova-windows@6.');
+ }
+
var windowsReqVersion = Version.tryParse(REQUIRED_VERSIONS[windowsTargetVersion][requirement]);
var phoneReqVersion = Version.tryParse(REQUIRED_VERSIONS[windowsPhoneTargetVersion][requirement]);
diff --git a/template/cordova/lib/build.js b/template/cordova/lib/build.js
index c8a8d78..90ad2df 100644
--- a/template/cordova/lib/build.js
+++ b/template/cordova/lib/build.js
@@ -100,8 +100,7 @@ function getBuildTargets (isWinSwitch, isPhoneSwitch, projOverride, buildConfig)
case '8.0':
throw new CordovaError('windows8 platform is deprecated. To use windows-target-version=8.0 you must downgrade to cordova-windows@4.');
case '8.1':
- targets.push(projFiles.win);
- break;
+ throw new CordovaError('windows8.1 platform is deprecated. To use windows-target-version=8.1 you must downgrade to cordova-windows@6.');
case '10.0':
case 'uap':
case 'uwp':
--
To stop receiving notification emails like this one, please contact
janpio@apache.org.
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@cordova.apache.org
For additional commands, e-mail: commits-help@cordova.apache.org
[cordova-windows] 19/26: fix mistake in Prepare.Win10.spec.js
Posted by ja...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
janpio pushed a commit to branch janpio-win10only
in repository https://gitbox.apache.org/repos/asf/cordova-windows.git
commit ce875192a8f40d838d8f4e80108d7e485e585b03
Author: Jan Piotrowski <pi...@gmail.com>
AuthorDate: Fri Feb 16 01:06:09 2018 +0100
fix mistake in Prepare.Win10.spec.js
---
spec/unit/Prepare.Win10.spec.js | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/spec/unit/Prepare.Win10.spec.js b/spec/unit/Prepare.Win10.spec.js
index 7a01c0d..543b1b7 100644
--- a/spec/unit/Prepare.Win10.spec.js
+++ b/spec/unit/Prepare.Win10.spec.js
@@ -384,7 +384,7 @@ describe('Package description', function () {
var desc = mockConfig.manifest.doc.find('.//Properties/Description');
expect(desc).not.toMatch(/\n|\t/);
- desc = mockConfig.manifest.doc.find('.//Application/:VisualElements');
+ desc = mockConfig.manifest.doc.find('.//Application/uap:VisualElements');
expect(desc.attrib.Description).not.toMatch(/\n|\t/);
});
});
--
To stop receiving notification emails like this one, please contact
janpio@apache.org.
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@cordova.apache.org
For additional commands, e-mail: commits-help@cordova.apache.org
[cordova-windows] 22/26: comments and changes regarding Visual
Studio and UAP
Posted by ja...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
janpio pushed a commit to branch janpio-win10only
in repository https://gitbox.apache.org/repos/asf/cordova-windows.git
commit 376e007cd7de1380630f539e14c3a234471c2b77
Author: Jan Piotrowski <pi...@gmail.com>
AuthorDate: Fri Feb 16 13:53:39 2018 +0100
comments and changes regarding Visual Studio and UAP
---
bin/lib/check_reqs.js | 15 +++++++++------
template/cordova/lib/MSBuildTools.js | 3 +++
2 files changed, 12 insertions(+), 6 deletions(-)
diff --git a/bin/lib/check_reqs.js b/bin/lib/check_reqs.js
index 14702bf..aca562b 100644
--- a/bin/lib/check_reqs.js
+++ b/bin/lib/check_reqs.js
@@ -119,6 +119,7 @@ function getWindowsVersion () {
function getInstalledVSVersions () {
// Query all keys with Install value equal to 1, then filter out
// those, which are not related to VS itself
+ // TODO Move to VisualStudio.js (a la MSBuildTools.js)
return spawn('reg', ['query', 'HKLM\\SOFTWARE\\Microsoft\\DevDiv\\vs\\Servicing', '/s', '/v', 'Install', '/f', '1', '/d', '/e', '/reg:32'])
.fail(function () { return ''; })
.then(function (output) {
@@ -132,11 +133,11 @@ function getInstalledVSVersions () {
// If there is no VS2013 installed, the we have nothing to do
if (installedVersions.indexOf('12.0') === -1) return installedVersions;
- // special case for VS 2013. We need to check if VS2013 update 2 is installed
+ // special case for VS 2013. We need to check if at least VS2013 update 2 is installed
return spawn('reg', ['query', 'HKLM\\SOFTWARE\\Microsoft\\Updates\\Microsoft Visual Studio 2013\\vsupdate_KB2829760', '/v', 'PackageVersion', '/reg:32'])
.then(function (output) {
var updateVer = Version.fromString(/PackageVersion\s+REG_SZ\s+(.*)/i.exec(output)[1]);
- // if update version is lover than Update2, reject the promise
+ // if update version is lower than Update2, reject the promise
if (VS2013_UPDATE2_RC.gte(updateVer)) return Q.reject();
return installedVersions;
}).fail(function () {
@@ -147,6 +148,7 @@ function getInstalledVSVersions () {
});
})
.then(function (installedVersions) {
+ // Visual Studio 2017+
var willowVersions = MSBuildTools.getWillowInstallations().map(function (installation) {
return installation.version;
});
@@ -217,9 +219,10 @@ function mapWindowsVersionToName (version) {
function mapVSVersionToName (version) {
var map = {
- '11.0': '2012 Express for Windows',
- '12.0': '2013 Express for Windows Update2',
- '14.0': '2015 Community'
+ '11.0': '2012 Express for Windows (11.0)',
+ '12.0': '2013 Express for Windows Update2 (12.0)',
+ '14.0': '2015 Community (14.0)',
+ '15.5': '2017 Community (15.5)'
};
var majorMinor = shortenVersion(version);
return map[majorMinor];
@@ -284,7 +287,7 @@ var checkVS = function (windowsTargetVersion, windowsPhoneTargetVersion) {
.then(function (installedVersions) {
var appropriateVersion = getHighestAppropriateVersion(installedVersions, vsRequiredVersion);
return appropriateVersion
- ? shortenVersion(appropriateVersion)
+ ? mapVSVersionToName(shortenVersion(appropriateVersion))
: Q.reject('Required version of Visual Studio not found. Please install Visual Studio ' +
mapVSVersionToName(vsRequiredVersion) +
' or higher from https://www.visualstudio.com/downloads/download-visual-studio-vs');
diff --git a/template/cordova/lib/MSBuildTools.js b/template/cordova/lib/MSBuildTools.js
index 098d2dc..ed8617f 100644
--- a/template/cordova/lib/MSBuildTools.js
+++ b/template/cordova/lib/MSBuildTools.js
@@ -297,6 +297,8 @@ function filterSupportedTargets (targets, msbuild) {
return supportedTargets;
}
+// TODO Move will methods to own VisualStudio.js file as it has nothing to do with MSBuildTools
+
/**
* Lists all VS 2017+ instances dirs in ProgramData
*
@@ -347,6 +349,7 @@ module.exports.getWillowInstallations = function () {
return installations;
};
+// TODO move wherever it is used and makes sense
// returns an array of available UAP Versions
// prepare.js
module.exports.getAvailableUAPVersions = function () {
--
To stop receiving notification emails like this one, please contact
janpio@apache.org.
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@cordova.apache.org
For additional commands, e-mail: commits-help@cordova.apache.org
[cordova-windows] 26/26: remove unused param from method
getBuildTargets
Posted by ja...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
janpio pushed a commit to branch janpio-win10only
in repository https://gitbox.apache.org/repos/asf/cordova-windows.git
commit 34c29b316aa95c02af15023c115e1a651256d98b
Author: Jan Piotrowski <pi...@gmail.com>
AuthorDate: Fri Feb 16 13:57:02 2018 +0100
remove unused param from method getBuildTargets
---
template/cordova/lib/build.js | 5 ++---
1 file changed, 2 insertions(+), 3 deletions(-)
diff --git a/template/cordova/lib/build.js b/template/cordova/lib/build.js
index 37ead69..d7f8744 100644
--- a/template/cordova/lib/build.js
+++ b/template/cordova/lib/build.js
@@ -54,7 +54,7 @@ module.exports.run = function run (buildOptions) {
var buildConfig = parseAndValidateArgs(buildOptions);
// get build targets
- var selectedBuildTargets = getBuildTargets(buildConfig.win, buildConfig.phone, buildConfig);
+ var selectedBuildTargets = getBuildTargets(buildConfig.win, buildConfig.phone);
return MSBuildTools.getLatestMatchingMSBuild(selectedBuildTargets) // get latest msbuild tools
.then(function (result) {
@@ -81,8 +81,7 @@ module.exports.run = function run (buildOptions) {
};
// returns list of projects to be built based on config.xml and additional parameters
-function getBuildTargets (isWinSwitch, isPhoneSwitch, buildConfig) {
- buildConfig = typeof buildConfig !== 'undefined' ? buildConfig : null;
+function getBuildTargets (isWinSwitch, isPhoneSwitch) {
// TODO This whole method can be super simplified as there is only one target
--
To stop receiving notification emails like this one, please contact
janpio@apache.org.
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@cordova.apache.org
For additional commands, e-mail: commits-help@cordova.apache.org
[cordova-windows] 11/26: remove CordovaApp.Phone.jsproj and
CordovaApp.Windows.jsproj
Posted by ja...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
janpio pushed a commit to branch janpio-win10only
in repository https://gitbox.apache.org/repos/asf/cordova-windows.git
commit 8ee432de810e132aa622f90f6dd4085fc0d5a2b0
Author: Jan Piotrowski <pi...@gmail.com>
AuthorDate: Thu Feb 15 23:24:16 2018 +0100
remove CordovaApp.Phone.jsproj and CordovaApp.Windows.jsproj
---
spec/unit/pluginHandler/windows.spec.js | 3 ---
template/cordova/lib/MSBuildTools.js | 2 --
template/cordova/lib/build.js | 2 --
3 files changed, 7 deletions(-)
diff --git a/spec/unit/pluginHandler/windows.spec.js b/spec/unit/pluginHandler/windows.spec.js
index 9364d14..a8c6994 100644
--- a/spec/unit/pluginHandler/windows.spec.js
+++ b/spec/unit/pluginHandler/windows.spec.js
@@ -92,9 +92,6 @@ var computeResourcePath = function (resourceFile) {
var PLATFORM_PROJECTS = {
all: 'CordovaApp.projitems',
- phone: 'CordovaApp.Phone.jsproj',
- windows: 'CordovaApp.Windows.jsproj',
- windows8: 'CordovaApp.Windows80.jsproj',
windows10: 'CordovaApp.Windows10.jsproj'
};
diff --git a/template/cordova/lib/MSBuildTools.js b/template/cordova/lib/MSBuildTools.js
index 7399e32..8fd0c74 100644
--- a/template/cordova/lib/MSBuildTools.js
+++ b/template/cordova/lib/MSBuildTools.js
@@ -249,8 +249,6 @@ module.exports.getLatestMSBuild = function () {
};
var projFiles = {
- phone: 'CordovaApp.Phone.jsproj',
- win: 'CordovaApp.Windows.jsproj',
win10: 'CordovaApp.Windows10.jsproj'
};
diff --git a/template/cordova/lib/build.js b/template/cordova/lib/build.js
index 9da94fe..52c0c28 100644
--- a/template/cordova/lib/build.js
+++ b/template/cordova/lib/build.js
@@ -33,8 +33,6 @@ var events = require('cordova-common').events;
var CordovaError = require('cordova-common').CordovaError;
var projFiles = {
- phone: 'CordovaApp.Phone.jsproj',
- win: 'CordovaApp.Windows.jsproj',
win10: 'CordovaApp.Windows10.jsproj'
};
var projFilesToManifests = {
--
To stop receiving notification emails like this one, please contact
janpio@apache.org.
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@cordova.apache.org
For additional commands, e-mail: commits-help@cordova.apache.org
[cordova-windows] 20/26: fix problem for e2e tests
Posted by ja...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
janpio pushed a commit to branch janpio-win10only
in repository https://gitbox.apache.org/repos/asf/cordova-windows.git
commit e2a07b7f05865b15cfc35b61dba1a570c4b0ef14
Author: Jan Piotrowski <pi...@gmail.com>
AuthorDate: Fri Feb 16 01:20:49 2018 +0100
fix problem for e2e tests
---
bin/lib/check_reqs.js | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/bin/lib/check_reqs.js b/bin/lib/check_reqs.js
index 951d785..c8bae2f 100644
--- a/bin/lib/check_reqs.js
+++ b/bin/lib/check_reqs.js
@@ -291,7 +291,7 @@ var checkVS = function (windowsTargetVersion, windowsPhoneTargetVersion) {
});
};
-var checkWinSdk = function (windowsTargetVersion, windowsPhoneTargetVersion) {
+var checkWinSdk = function (windowsTargetVersion, windowsPhoneTargetVersion) { // TODO remove phone?
return getInstalledWindowsSdks()
.then(function (installedSdks) {
var requiredVersion = getMinimalRequiredVersionFor('windowssdk', windowsTargetVersion, windowsPhoneTargetVersion);
@@ -339,7 +339,7 @@ module.exports.run = function () {
* @param {String} target_platorm Target platform ('8.1' or '10.0')
*/
module.exports.isWinSDKPresent = function (target_platform) {
- return checkWinSdk(target_platform, '8.1');
+ return checkWinSdk(target_platform, target_platform);
};
// Checks if min SDK required to build Windows Phone 8.1 project is present
--
To stop receiving notification emails like this one, please contact
janpio@apache.org.
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@cordova.apache.org
For additional commands, e-mail: commits-help@cordova.apache.org
[cordova-windows] 21/26: fix eslint
Posted by ja...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
janpio pushed a commit to branch janpio-win10only
in repository https://gitbox.apache.org/repos/asf/cordova-windows.git
commit d1d2a1e1a1647f9f4d0f5728dc916d40626457d4
Author: Jan Piotrowski <pi...@gmail.com>
AuthorDate: Fri Feb 16 01:40:10 2018 +0100
fix eslint
---
bin/lib/check_reqs.js | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/bin/lib/check_reqs.js b/bin/lib/check_reqs.js
index c8bae2f..14702bf 100644
--- a/bin/lib/check_reqs.js
+++ b/bin/lib/check_reqs.js
@@ -339,7 +339,7 @@ module.exports.run = function () {
* @param {String} target_platorm Target platform ('8.1' or '10.0')
*/
module.exports.isWinSDKPresent = function (target_platform) {
- return checkWinSdk(target_platform, target_platform);
+ return checkWinSdk(target_platform, target_platform);
};
// Checks if min SDK required to build Windows Phone 8.1 project is present
--
To stop receiving notification emails like this one, please contact
janpio@apache.org.
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@cordova.apache.org
For additional commands, e-mail: commits-help@cordova.apache.org
[cordova-windows] 06/26: remove 8.1 prebuild files
Posted by ja...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
janpio pushed a commit to branch janpio-win10only
in repository https://gitbox.apache.org/repos/asf/cordova-windows.git
commit a2276a0091f58a52115589187e754b9fa26a1e18
Author: Jan Piotrowski <pi...@gmail.com>
AuthorDate: Thu Feb 15 19:18:32 2018 +0100
remove 8.1 prebuild files
---
template/cordova/prebuild-81.js | 20 --------------------
template/cordova/prebuild-phone-81.js | 20 --------------------
2 files changed, 40 deletions(-)
diff --git a/template/cordova/prebuild-81.js b/template/cordova/prebuild-81.js
deleted file mode 100644
index c37284b..0000000
--- a/template/cordova/prebuild-81.js
+++ /dev/null
@@ -1,20 +0,0 @@
-/**
- Licensed to the Apache Software Foundation (ASF) under one
- or more contributor license agreements. See the NOTICE file
- distributed with this work for additional information
- regarding copyright ownership. The ASF licenses this file
- to you under the Apache License, Version 2.0 (the
- "License"); you may not use this file except in compliance
- with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied. See the License for the
- specific language governing permissions and limitations
- under the License.
-*/
-var patch = require('./prebuild');
-patch('8.1');
diff --git a/template/cordova/prebuild-phone-81.js b/template/cordova/prebuild-phone-81.js
deleted file mode 100644
index d3f7fa8..0000000
--- a/template/cordova/prebuild-phone-81.js
+++ /dev/null
@@ -1,20 +0,0 @@
-/**
- Licensed to the Apache Software Foundation (ASF) under one
- or more contributor license agreements. See the NOTICE file
- distributed with this work for additional information
- regarding copyright ownership. The ASF licenses this file
- to you under the Apache License, Version 2.0 (the
- "License"); you may not use this file except in compliance
- with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied. See the License for the
- specific language governing permissions and limitations
- under the License.
-*/
-var patch = require('./prebuild');
-patch('phone-8.1');
--
To stop receiving notification emails like this one, please contact
janpio@apache.org.
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@cordova.apache.org
For additional commands, e-mail: commits-help@cordova.apache.org
[cordova-windows] 02/26: remove 8.1 tests
Posted by ja...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
janpio pushed a commit to branch janpio-win10only
in repository https://gitbox.apache.org/repos/asf/cordova-windows.git
commit a3f0490ae543a731a11f6d20d835c54ccdb928b7
Author: Jan Piotrowski <pi...@gmail.com>
AuthorDate: Thu Feb 15 19:07:47 2018 +0100
remove 8.1 tests
---
spec/e2e/endtoend.spec.js | 84 -------------------------
spec/unit/Prepare.Win10.spec.js | 64 -------------------
spec/unit/build.spec.js | 60 ------------------
spec/unit/deployment.spec.js | 133 +---------------------------------------
4 files changed, 1 insertion(+), 340 deletions(-)
diff --git a/spec/e2e/endtoend.spec.js b/spec/e2e/endtoend.spec.js
index 97dbf41..be3deb8 100644
--- a/spec/e2e/endtoend.spec.js
+++ b/spec/e2e/endtoend.spec.js
@@ -93,22 +93,6 @@ describe('Cordova create and build', function () {
_expectSubdirAndFileExist('CordovaApp.Windows10_1.0.0.0_anycpu_debug_Test', 'CordovaApp.Windows10_1.0.0.0_anycpu_debug.appx');
});
- it('spec.2d should build 8.1 win project', function () {
- shell.exec(buildScriptPath + ' --appx=8.1-win', {silent: silent});
- _expectExist(/.*Windows.*\.appxupload/);
- });
-
- it('spec.2e should build 8.1 phone project', function () {
- shell.exec(buildScriptPath + ' --appx=8.1-phone', {silent: silent});
- _expectExist(/.*Phone.*\.appxupload/);
- });
-
- it('spec.2f should build 8.1 win + phone project', function () {
- shell.exec(buildScriptPath + ' --appx=8.1', {silent: silent});
- _expectExist(/.*Windows.*\.appxupload/);
- _expectExist(/.*Phone.*\.appxupload/);
- });
-
// --archs
it('spec.3a should build project for particular CPU', function () {
@@ -116,22 +100,6 @@ describe('Cordova create and build', function () {
_expectSubdirAndFileExist('CordovaApp.Windows10_1.0.0.0_x64_debug_Test', 'CordovaApp.Windows10_1.0.0.0_x64_debug.appx');
});
- it('spec.3b should build project (8.1) for particular CPU', function () {
- shell.exec(buildScriptPath + ' --appx=8.1 --archs=\"x64\"', {silent: silent}); /* eslint no-useless-escape : 0 */
- _expectExist(/.*Phone.*x64.*\.appxupload/);
- _expectExist(/.*Windows.*x64.*\.appxupload/);
- });
-
- it('spec.3c should build project (8.1-win) for particular CPU', function () {
- shell.exec(buildScriptPath + ' --appx=8.1-win --archs=\"x64\"', {silent: silent}); /* eslint no-useless-escape : 0 */
- _expectExist(/.*Windows.*x64.*\.appxupload/);
- });
-
- it('spec.3d should build project (8.1-phone) for particular CPU', function () {
- shell.exec(buildScriptPath + ' --appx=8.1-phone --archs=\"x64\"', {silent: silent}); /* eslint no-useless-escape : 0 */
- _expectExist(/.*Phone.*x64.*\.appxupload/);
- });
-
it('spec.4a should build project for CPUs separated by whitespaces', function () {
shell.exec(buildScriptPath + ' --archs=\"x64 x86 arm anycpu\"', {silent: silent}); /* eslint no-useless-escape : 0 */
_expectSubdirAndFileExist('CordovaApp.Windows10_1.0.0.0_x64_debug_Test', 'CordovaApp.Windows10_1.0.0.0_x64_debug.appx');
@@ -140,18 +108,6 @@ describe('Cordova create and build', function () {
_expectSubdirAndFileExist('CordovaApp.Windows10_1.0.0.0_anycpu_debug_Test', 'CordovaApp.Windows10_1.0.0.0_anycpu_debug.appx');
});
- it('spec.4b should build project (8.1) for CPUs separated by whitespaces', function () {
- shell.exec(buildScriptPath + ' --appx=8.1 --archs=\"x64 x86 arm anycpu\"', {silent: silent}); /* eslint no-useless-escape : 0 */
- _expectExist(/.*Phone.*x86.*\.appxupload/);
- _expectExist(/.*Phone.*x64.*\.appxupload/);
- _expectExist(/.*Phone.*arm.*\.appxupload/);
- _expectExist(/.*Phone.*AnyCPU.*\.appxupload/i);
- _expectExist(/.*Windows.*x64.*\.appxupload/);
- _expectExist(/.*Windows.*x86.*\.appxupload/);
- _expectExist(/.*Windows.*arm.*\.appxupload/);
- _expectExist(/.*Windows.*anycpu.*\.appxupload/i);
- });
-
// "InProcessServer extension"
it('spec.5a should build project containing plugin with InProcessServer extension', function (done) {
@@ -180,43 +136,10 @@ describe('Cordova create and build', function () {
});
});
- it('spec.5b should build project (8.1) containing plugin with InProcessServer extension', function (done) {
- var extensionsPluginInfo, api;
-
- extensionsPluginInfo = new PluginInfo(extensionsPlugin);
- api = new Api();
- api.root = projectFolder;
- api.locations.root = projectFolder;
- api.locations.www = path.join(projectFolder, 'www');
-
- var fail = jasmine.createSpy('fail')
- .and.callFake(function (err) {
- console.error(err);
- });
-
- api.addPlugin(extensionsPluginInfo)
- .then(function () {
- shell.exec(buildScriptPath + ' --appx=8.1', {silent: silent});
- _expectExist(/.*Windows.*\.appxupload/);
- _expectExist(/.*Phone.*\.appxupload/);
- })
- .catch(fail)
- .finally(function () {
- expect(fail).not.toHaveBeenCalled();
- done();
- });
- });
-
// --release --bundle
// here be 6a
- it('spec.6b should generate appxupload and appxbundle for Windows Phone 8.1 project bundle release build', function () {
- shell.exec(buildScriptPath + ' --release --appx=8.1-phone --bundle --archs=\"x64 x86 arm\"', {silent: silent});
- _expectExist(/.*bundle\.appxupload$/, 3);
- _expectSubdirAndFileExist('CordovaApp.Phone_1.0.0.0_Test', 'CordovaApp.Phone_1.0.0.0_x64_x86_arm.appxbundle');
- });
-
// --release (non-bundle)
it('spec.7 should generate appxupload for Windows 10 project non-bundle release build', function () {
@@ -230,13 +153,6 @@ describe('Cordova create and build', function () {
_expectSubdirAndFileExist('CordovaApp.Windows10_1.0.0.0_x86_Test', 'CordovaApp.Windows10_1.0.0.0_x86.appx');
});
- it('spec.8 for a non-bundle case for Windows Phone 8.1 it should build appx in separate dirs for each architecture', function () {
- shell.exec(buildScriptPath + ' --release --appx=8.1-phone --phone --archs=\"x86 arm\"', {silent: silent});
- _expectExist(/.*\.appxupload$/, 2);
- _expectSubdirAndFileExist('CordovaApp.Phone_1.0.0.0_arm_Test', 'CordovaApp.Phone_1.0.0.0_arm.appx');
- _expectSubdirAndFileExist('CordovaApp.Phone_1.0.0.0_x86_Test', 'CordovaApp.Phone_1.0.0.0_x86.appx');
- });
-
// this will be move up again when it is fixed for VS 2017 on AppVeyor
it('spec.6a should generate appxupload and appxbundle for Windows 10 project bundle release build', function () {
shell.exec(buildScriptPath + ' --release --bundle --archs=\"x64 x86 arm\"', {silent: silent});
diff --git a/spec/unit/Prepare.Win10.spec.js b/spec/unit/Prepare.Win10.spec.js
index 847ed01..52377be 100644
--- a/spec/unit/Prepare.Win10.spec.js
+++ b/spec/unit/Prepare.Win10.spec.js
@@ -92,33 +92,6 @@ function addCapabilityDeclarationToMockManifest (manifest, capability) {
capRoot.append(cap);
}
-describe('Windows 8.1 project', function () {
-
- it('should not have an HTTP or HTTPS scheme for its startup URI.', function () {
-
- // arrange
- var mockConfig = createMockConfigAndManifestForApplyCoreProperties('index.html', { 'WindowsDefaultUriPrefix': 'http://' }, false);
-
- // act
- applyCoreProperties(mockConfig.config, mockConfig.manifest, 'fake-path', 'm2:', false);
-
- var app = mockConfig.manifest.doc.find('.//Application');
- expect(app.attrib.StartPage).toBe('www/index.html');
- });
-
- it('should not have any scheme for its startup URI.', function () {
-
- // arrange
- var mockConfig = createMockConfigAndManifestForApplyCoreProperties('index.html', { 'WindowsDefaultUriPrefix': 'ms-appx://' }, false);
-
- // act
- applyCoreProperties(mockConfig.config, mockConfig.manifest, 'fake-path', 'm2:', false);
-
- var app = mockConfig.manifest.doc.find('.//Application');
- expect(app.attrib.StartPage).toBe('www/index.html');
- });
-});
-
describe('Windows 10 project', function () {
it('should default to ms-appx-web for its startup URI.', function () {
@@ -285,24 +258,6 @@ function createMockConfigAndManifestForApplyAccessRules (isWin10) {
describe('Access rules management', function () {
// body...
- it('A Windows 8.1 project should not have WindowsRuntimeAccess attributes in access rules.', function () {
-
- var mockConfig = createMockConfigAndManifestForApplyAccessRules(false, 'https://www.contoso.com');
-
- applyAccessRules(mockConfig.config, mockConfig.manifest);
-
- var app = mockConfig.manifest.doc.find('.//Application');
- var accessRules = app.find('.//ApplicationContentUriRules');
-
- expect(accessRules).toBeDefined();
- expect(accessRules.len()).toBe(1);
-
- var rule = accessRules.getItem(0);
- expect(rule).toBeDefined();
- expect(rule.attrib.WindowsRuntimeAccess).toBeUndefined();
-
- });
-
it('A Windows 10 project should have WindowsRuntimeAccess attributes in access rules.', function () {
var mockConfig = createMockConfigAndManifestForApplyAccessRules(true, 'https://www.contoso.com');
@@ -322,25 +277,6 @@ describe('Access rules management', function () {
});
- describe('A Windows 8.1 project should reject http:// URI scheme rules.', function () {
-
- var stringIndex = -1;
- var searchStr = 'Access rules must begin with "https://", the following rule will be ignored: ';
-
- beforeEach(function () {
- require('cordova-common').events.on('warn', function (evt) {
- stringIndex = evt.indexOf(searchStr);
- });
- });
-
- it('applies access rules and verifies at least one was rejected', function () {
- var mockConfig = createMockConfigAndManifestForApplyAccessRules(false, 'http://www.contoso.com');
- applyAccessRules(mockConfig.config, mockConfig.manifest, false);
-
- expect(stringIndex).toBe(0);
- });
- });
-
describe('A Windows 10 project should accept http:// URI access rules.', function () {
var stringIndex = -1;
diff --git a/spec/unit/build.spec.js b/spec/unit/build.spec.js
index f9f55fa..e6bb97b 100644
--- a/spec/unit/build.spec.js
+++ b/spec/unit/build.spec.js
@@ -273,19 +273,6 @@ describe('run method', function () {
});
});
- it('spec.9 should call buildProject of MSBuildTools if built for windows 8.1', function (done) {
- var buildSpy = jasmine.createSpy();
-
- createFindAllAvailableVersionsMock([{ version: '14.0', buildProject: buildSpy, path: testPath }]);
- createConfigParserMock('8.1');
-
- build.run({argv: ['--win']})
- .finally(function () {
- expect(buildSpy).toHaveBeenCalled();
- done();
- });
- });
-
xit('spec.10 should throw an error if windows-target-version has unsupported value', function (done) {
var buildSpy = jasmine.createSpy();
var errorSpy = jasmine.createSpy();
@@ -305,19 +292,6 @@ describe('run method', function () {
});
});
- it('spec.11 should call buildProject of MSBuildTools if built for windows phone 8.1', function (done) {
- var buildSpy = jasmine.createSpy();
-
- createFindAllAvailableVersionsMock([{ version: '14.0', buildProject: buildSpy, path: testPath }]);
- createConfigParserMock(null, '8.1');
-
- build.run({argv: ['--phone']})
- .finally(function () {
- expect(buildSpy).toHaveBeenCalled();
- done();
- });
- });
-
xit('spec.12 should throw an error if windows-phone-target-version has unsupported value', function (done) {
var buildSpy = jasmine.createSpy();
var errorSpy = jasmine.createSpy();
@@ -337,40 +311,6 @@ describe('run method', function () {
});
});
- it('spec.13a should be able to override target via --appx parameter', function (done) {
- var buildSpy = jasmine.createSpy().and.callFake(function (solutionFile, buildType, buildArch) {
- // check that we build Windows 10 and not Windows 8.1
- expect(solutionFile.toLowerCase()).toMatch('cordovaapp.windows10.jsproj');
- });
-
- createFindAllAvailableVersionsMock([{ version: '14.0', buildProject: buildSpy, path: testPath }]);
- // provision config to target Windows 8.1
- createConfigParserMock('8.1', '8.1');
- // explicitly specify Windows 10 as target
- build.run({argv: ['--appx=uap']})
- .finally(function () {
- expect(buildSpy).toHaveBeenCalled();
- done();
- });
- });
-
- it('spec.13b should be able to override target via --appx parameter', function (done) {
- var buildSpy = jasmine.createSpy().and.callFake(function (solutionFile, buildType, buildArch) {
- // check that we build Windows 10 and not Windows 8.1
- expect(solutionFile.toLowerCase()).toMatch('cordovaapp.windows10.jsproj');
- });
-
- createFindAllAvailableVersionsMock([{ version: '14.0', buildProject: buildSpy, path: testPath }]);
- // provision config to target Windows 8.1
- createConfigParserMock('8.1', '8.1');
- // explicitly specify Windows 10 as target
- build.run({argv: ['--appx=uwp']})
- .finally(function () {
- expect(buildSpy).toHaveBeenCalled();
- done();
- });
- });
-
it('spec.14a should use user-specified msbuild if VSINSTALLDIR variable is set', function (done) {
var customMSBuildPath = '/some/path';
var msBuildBinPath = path.join(customMSBuildPath, 'MSBuild/15.0/Bin');
diff --git a/spec/unit/deployment.spec.js b/spec/unit/deployment.spec.js
index fb62d48..24177d1 100644
--- a/spec/unit/deployment.spec.js
+++ b/spec/unit/deployment.spec.js
@@ -43,13 +43,6 @@ describe('The correct version of the app deployment tool is obtained.', function
}
});
- it('Test #000 : Provides an AppDeployCmdTool when 8.1 is requested.', function () {
-
- var tool = deployment.getDeploymentTool('8.1');
- expect(tool instanceof AppDeployCmdTool).toBe(true);
-
- });
-
it('Test #001 : Provides a WinAppDeployCmdTool when 10.0 is requested.', function () {
var tool = deployment.getDeploymentTool('10.0');
@@ -148,128 +141,4 @@ describe('Windows 10 deployment interacts with the file system as expected.', fu
done();
});
});
-});
-
-describe('Windows 8.1 deployment interacts with the file system as expected.', function () {
-
- function fakeSpawn (cmd, args, cwd) {
- expect(cmd).toBe(path.join('c:/Program Files (x86)/Microsoft SDKs/Windows Phone/v8.1/Tools/AppDeploy/AppDeployCmd.exe'));
- switch (args[0]) {
- case '/EnumerateDevices':
- var output = '\r\nDevice Index Device Name\r\n------------ -------------------------------\r\n 0 Device\r\n 1 Mobile Emulator 10.0.10150.0 WVGA 4 inch 512MB\r\n 2 Mobile Emulator 10.0.10150.0 WVGA 4 inch 1GB\r\n 3 Mobile Emulator 10.0.10150.0 WXGA 4.5 inch 1GB\r\n 4 Mobile Emulator 10.0.10150.0 720p 5 inch 1GB\r\n 5 Mobile Emulator 10.0.10150.0 1080p 6 inch 2GB\r\n 6 Emulator 8.1 [...]
- return Q(output);
-
- case '/update':
- case '/install':
- case '/updatelaunch':
- case '/installlaunch':
- expect(args[1]).toBe(TEST_APP_PACKAGE_NAME);
- expect(args[2]).toBe('/targetdevice:de');
- return Q('');
-
- case '/uninstall':
- expect(args[1]).toBe(TEST_APP_PACKAGE_ID);
- expect(args[2]).toBe('/targetdevice:5');
- return Q('');
-
- default:
- throw new Error('Unrecognized AppDeployCmd parameter "' + args[0] + '"');
-
- }
- }
-
- var mockedSpawn = deployment.__get__('spawn');
- var mockedProgramFiles = process.env['ProgramFiles(x86)'];
-
- beforeEach(function () {
- deployment.__set__('spawn', fakeSpawn);
- process.env['ProgramFiles(x86)'] = path.join('c:/Program Files (x86)');
- });
-
- afterEach(function () {
- deployment.__set__('spawn', mockedSpawn);
- if (mockedProgramFiles) {
- process.env['ProgramFiles(x86)'] = mockedProgramFiles;
- } else {
- delete process.env['ProgramFiles(x86)'];
- }
- });
-
- it('Test #006 : enumerateDevices returns a valid set of objects', function (done) {
- var deploymentTool = deployment.getDeploymentTool('8.1');
- deploymentTool.enumerateDevices()
- .then(function (deviceList) {
- expect(deviceList.length).toBe(12);
- expect(deviceList[0].name).toBe('Device');
- expect(deviceList[0].index).toBe(0);
- expect(deviceList[0].type).toBe('device');
- expect(deviceList[5].name).toBe('Mobile Emulator 10.0.10150.0 1080p 6 inch 2GB');
- expect(deviceList[5].index).toBe(5);
- expect(deviceList[5].type).toBe('emulator');
- done();
- }).fail(function err (errMsg) {
- expect(errMsg).toBeUndefined();
- done();
- });
- });
-
- it('Test #007 : installAppPackage passes the correct set of parameters', function (done) {
- var deploymentTool = deployment.getDeploymentTool('8.1');
- deploymentTool.enumerateDevices()
- .then(function (deviceList) {
- deploymentTool.installAppPackage(TEST_APP_PACKAGE_NAME, deviceList[0], /* shouldLaunch */ false, /* shouldUpdate */ false);
- done();
- }).fail(function err (errMsg) {
- expect(errMsg).toBeUndefined();
- done();
- });
- });
-
- it('Test #008 : installAppPackage passes the correct set of parameters when updating', function (done) {
- var deploymentTool = deployment.getDeploymentTool('8.1');
- deploymentTool.enumerateDevices()
- .then(function (deviceList) {
- deploymentTool.installAppPackage(TEST_APP_PACKAGE_NAME, deviceList[0], /* shouldLaunch */ false, /* shouldUpdate */ true);
- done();
- }).fail(function err (errMsg) {
- expect(errMsg).toBeUndefined();
- done();
- });
- });
-
- it('Test #009 : installAppPackage passes the correct set of parameters when launching', function (done) {
- var deploymentTool = deployment.getDeploymentTool('8.1');
- deploymentTool.enumerateDevices()
- .then(function (deviceList) {
- deploymentTool.installAppPackage(TEST_APP_PACKAGE_NAME, deviceList[0], /* shouldLaunch */ true, /* shouldUpdate */ false);
- done();
- }).fail(function err (errMsg) {
- expect(errMsg).toBeUndefined();
- done();
- });
- });
-
- it('Test #010 : installAppPackage passes the correct set of parameters when updating and launching', function (done) {
- var deploymentTool = deployment.getDeploymentTool('8.1');
- deploymentTool.enumerateDevices()
- .then(function (deviceList) {
- deploymentTool.installAppPackage(TEST_APP_PACKAGE_NAME, deviceList[0], /* shouldLaunch */ true, /* shouldUpdate */ true);
- done();
- }).fail(function err (errMsg) {
- expect(errMsg).toBeUndefined();
- done();
- });
- });
-
- it('Test #011 : uninstallAppPackage passes the correct set of parameters', function (done) {
- var deploymentTool = deployment.getDeploymentTool('8.1');
- deploymentTool.enumerateDevices()
- .then(function (deviceList) {
- deploymentTool.uninstallAppPackage(TEST_APP_PACKAGE_ID, deviceList[5]);
- done();
- }).fail(function err (errMsg) {
- expect(errMsg).toBeUndefined();
- done();
- });
- });
-});
+});
\ No newline at end of file
--
To stop receiving notification emails like this one, please contact
janpio@apache.org.
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@cordova.apache.org
For additional commands, e-mail: commits-help@cordova.apache.org
[cordova-windows] 09/26: remove 8.1 (...81) variables,
conditionals and expects
Posted by ja...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
janpio pushed a commit to branch janpio-win10only
in repository https://gitbox.apache.org/repos/asf/cordova-windows.git
commit 9bf5362e909585140b908c7763ce5cc4e748f833
Author: Jan Piotrowski <pi...@gmail.com>
AuthorDate: Thu Feb 15 23:11:17 2018 +0100
remove 8.1 (...81) variables, conditionals and expects
---
bin/lib/check_reqs.js | 4 +---
cordova-js-src/splashscreen.js | 16 ++++------------
spec/unit/ConfigChanges.spec.js | 16 ----------------
spec/unit/Prepare.Win10.spec.js | 21 ++-------------------
template/cordova/lib/prepare.js | 15 +--------------
5 files changed, 8 insertions(+), 64 deletions(-)
diff --git a/bin/lib/check_reqs.js b/bin/lib/check_reqs.js
index d2f0f70..951d785 100644
--- a/bin/lib/check_reqs.js
+++ b/bin/lib/check_reqs.js
@@ -177,9 +177,7 @@ function getInstalledWindowsSdks () {
}
/**
- * Gets list of installed Windows Phone SDKs. Separately searches for 8.1 Phone
- * SDK and Windows 10 SDK, because the latter is needed for both Windows and
- * Windows Phone applications.
+ * Gets list of installed Windows Phone SDKs.
*
* @return {Version[]} List of installed Phone SDKs' versions.
*/
diff --git a/cordova-js-src/splashscreen.js b/cordova-js-src/splashscreen.js
index 7cddd35..8acdcd0 100644
--- a/cordova-js-src/splashscreen.js
+++ b/cordova-js-src/splashscreen.js
@@ -156,13 +156,7 @@ function init(config, manifest) {
extendedSplashImage.classList.add('phone');
}
- if (isWp81) {
- extendedSplashProgress.classList.add('extended-splash-progress-phone');
- } else if (isWp10) {
- extendedSplashProgress.classList.add('extended-splash-progress-wp10');
- } else {
- extendedSplashProgress.classList.add('extended-splash-progress-desktop');
- }
+ extendedSplashProgress.classList.add('extended-splash-progress-wp10');
if (!showSplashScreenSpinner) {
extendedSplashProgress.classList.add('hidden');
@@ -267,12 +261,10 @@ function positionControls() {
extendedSplashImage.style.top = splash.imageLocation.y + 'px';
}
- if (!isWp81) {
- extendedSplashImage.style.height = splash.imageLocation.height + 'px';
- extendedSplashImage.style.width = splash.imageLocation.width + 'px';
+ extendedSplashImage.style.height = splash.imageLocation.height + 'px';
+ extendedSplashImage.style.width = splash.imageLocation.width + 'px';
- extendedSplashProgress.style.marginTop = Math.min(window.innerHeight - PROGRESSRING_HEIGHT - PROGRESSRING_BOTTOM_MARGIN, splash.imageLocation.y + splash.imageLocation.height + 32) + 'px';
- }
+ extendedSplashProgress.style.marginTop = Math.min(window.innerHeight - PROGRESSRING_HEIGHT - PROGRESSRING_BOTTOM_MARGIN, splash.imageLocation.y + splash.imageLocation.height + 32) + 'px';
}
// Updates the location of the extended splash screen image. Should be used to respond to window size changes.
diff --git a/spec/unit/ConfigChanges.spec.js b/spec/unit/ConfigChanges.spec.js
index 71ca461..80ed0b9 100644
--- a/spec/unit/ConfigChanges.spec.js
+++ b/spec/unit/ConfigChanges.spec.js
@@ -219,24 +219,8 @@ describe('generate_plugin_config_munge for windows project', function () {
var pluginInfoProvider = new PluginInfoProvider();
var munger = new configChanges.PlatformMunger('windows', tempDir, 'unused', null, pluginInfoProvider);
var munge = munger.generate_plugin_config_munge(new PluginInfo(configplugin), {});
- var windows81AppxManifest = munge.files['package.windows.appxmanifest'];
- var winphone81AppxManifest = munge.files['package.phone.appxmanifest'];
var windows10AppxManifest = munge.files['package.windows10.appxmanifest'];
- // 1 comes from versions="=8.1.0" + 1 from versions="=8.1.0" device-target="windows"
- expect(windows81AppxManifest.parents['/Parent/Capabilities'][0].xml).toBe('<Capability Note="should-exist-for-all-appxmanifest-target-files" />');
- expect(windows81AppxManifest.parents['/Parent/Capabilities'][1].xml).toBe('<Capability Note="should-exist-for-win81-win-and-phone" />');
- expect(windows81AppxManifest.parents['/Parent/Capabilities'][2].xml).toBe('<Capability Note="should-exist-for-win81-win-only" />');
- expect(windows81AppxManifest.parents['/Parent/Capabilities'][3].xml).toBe('<Capability Note="should-exist-for-win10-and-win81-win-and-phone" />');
- expect(windows81AppxManifest.parents['/Parent/Capabilities'].length).toBe(4);
-
- // 1 comes from versions="=8.1.0" + 1 from versions="=8.1.0" device-target="phone"
- expect(winphone81AppxManifest.parents['/Parent/Capabilities'][0].xml).toBe('<Capability Note="should-exist-for-all-appxmanifest-target-files" />');
- expect(winphone81AppxManifest.parents['/Parent/Capabilities'][1].xml).toBe('<Capability Note="should-exist-for-win81-win-and-phone" />');
- expect(winphone81AppxManifest.parents['/Parent/Capabilities'][2].xml).toBe('<Capability Note="should-exist-for-win81-phone-only" />');
- expect(winphone81AppxManifest.parents['/Parent/Capabilities'][3].xml).toBe('<Capability Note="should-exist-for-win10-and-win81-win-and-phone" />');
- expect(winphone81AppxManifest.parents['/Parent/Capabilities'].length).toBe(4);
-
expect(windows10AppxManifest.parents['/Parent/Capabilities'][0].xml).toBe('<Capability Note="should-exist-for-all-appxmanifest-target-files" />');
expect(windows10AppxManifest.parents['/Parent/Capabilities'][1].xml).toBe('<Capability Note="should-exist-for-win10-and-win81-win-and-phone" />');
expect(windows10AppxManifest.parents['/Parent/Capabilities'][2].xml).toBe('<Capability Note="should-exist-in-win10-only" />');
diff --git a/spec/unit/Prepare.Win10.spec.js b/spec/unit/Prepare.Win10.spec.js
index 52377be..afeff6e 100644
--- a/spec/unit/Prepare.Win10.spec.js
+++ b/spec/unit/Prepare.Win10.spec.js
@@ -34,12 +34,7 @@ var applyNavigationWhitelist = prepare.__get__('applyNavigationWhitelist');
var applyStartPage = prepare.__get__('applyStartPage');
var Win10ManifestPath = 'template/package.windows10.appxmanifest';
-var Win81ManifestPath = 'template/package.windows.appxmanifest';
-var WP81ManifestPath = 'template/package.phone.appxmanifest';
-
var Win10ManifestName = path.basename(Win10ManifestPath);
-var Win81ManifestName = path.basename(Win81ManifestPath);
-var WP81ManifestName = path.basename(WP81ManifestPath);
/***
* Unit tests for validating default ms-appx-web:// URI scheme in Win10
@@ -78,7 +73,7 @@ function createMockConfigAndManifestForApplyCoreProperties (startPage, preferenc
}
};
- var filePath = win10 ? Win10ManifestPath : Win81ManifestPath;
+ var filePath = Win10ManifestPath;
var manifest = AppxManifest.get(filePath);
spyOn(fs, 'writeFileSync');
@@ -249,7 +244,7 @@ function createMockConfigAndManifestForApplyAccessRules (isWin10) {
return [];
};
- var filePath = isWin10 ? Win10ManifestPath : Win81ManifestPath;
+ var filePath = Win10ManifestPath;
var manifest = AppxManifest.get(filePath);
spyOn(fs, 'writeFileSync');
@@ -603,21 +598,11 @@ describe('copyIcons method', function () {
spyOn(fs, 'writeFileSync');
var win10Manifest = AppxManifest.get(Win10ManifestPath);
- var win81Manifest = AppxManifest.get(Win81ManifestPath);
- var wp81Manifest = AppxManifest.get(WP81ManifestPath);
spyOn(AppxManifest, 'get').and.callFake(function (manifestPath) {
if (manifestPath.indexOf(Win10ManifestName) !== -1) {
return win10Manifest;
}
-
- if (manifestPath.indexOf(Win81ManifestName) !== -1) {
- return win81Manifest;
- }
-
- if (manifestPath.indexOf(WP81ManifestName) !== -1) {
- return wp81Manifest;
- }
});
var splashScreens = [
@@ -641,7 +626,5 @@ describe('copyIcons method', function () {
updateSplashScreenImageExtensions(project, locations);
expect(win10Manifest.getVisualElements().getSplashScreenExtension()).toBe('.jpg');
- expect(win81Manifest.getVisualElements().getSplashScreenExtension()).toBe('.jpg');
- expect(wp81Manifest.getVisualElements().getSplashScreenExtension()).toBe('.jpg');
});
});
diff --git a/template/cordova/lib/prepare.js b/template/cordova/lib/prepare.js
index e16b5de..31ecab0 100644
--- a/template/cordova/lib/prepare.js
+++ b/template/cordova/lib/prepare.js
@@ -50,8 +50,6 @@ var TEMPLATE =
var SUPPORTED_IMAGE_EXTENSIONS = ['.png', '.jpg', '.jpeg'];
var SPLASH_SCREEN_SIZE_LIMIT = 200 * 1024; // 200 KBytes
-var TARGET_PROJECT_81 = 'TARGET_PROJECT_81';
-var TARGET_PROJECT_WP81 = 'TARGET_PROJECT_WP81';
var TARGET_PROJECT_10 = 'TARGET_PROJECT_10';
var SPLASH_SCREEN_DESKTOP_TARGET_NAME = 'SplashScreen';
var SPLASH_SCREEN_PHONE_TARGET_NAME = 'SplashScreenPhone';
@@ -312,9 +310,7 @@ var PLATFORM_IMAGES = [
{dest: 'StoreLogo.scale-100', width: 50, height: 50},
{dest: 'SplashScreen.scale-100', width: 620, height: 300, targetProject: TARGET_PROJECT_10},
{dest: 'SplashScreen.scale-125', width: 775, height: 375, targetProject: TARGET_PROJECT_10},
- {dest: 'SplashScreen.scale-140', width: 868, height: 420, targetProject: TARGET_PROJECT_81},
{dest: 'SplashScreen.scale-150', width: 930, height: 450, targetProject: TARGET_PROJECT_10},
- {dest: 'SplashScreen.scale-180', width: 1116, height: 540, targetProject: TARGET_PROJECT_81},
{dest: 'SplashScreen.scale-200', width: 1240, height: 600, targetProject: TARGET_PROJECT_10},
{dest: 'SplashScreen.scale-400', width: 2480, height: 1200, targetProject: TARGET_PROJECT_10},
// scaled images are specified here for backward compatibility only so we can find them by size
@@ -328,9 +324,6 @@ var PLATFORM_IMAGES = [
{dest: 'Square310x310Logo.scale-100', width: 310, height: 310},
{dest: 'Wide310x150Logo.scale-100', width: 310, height: 150},
{dest: 'Wide310x150Logo.scale-240', width: 744, height: 360},
- {dest: 'SplashScreenPhone.scale-100', width: 480, height: 800, targetProject: TARGET_PROJECT_WP81},
- {dest: 'SplashScreenPhone.scale-140', width: 672, height: 1120, targetProject: TARGET_PROJECT_WP81},
- {dest: 'SplashScreenPhone.scale-240', width: 1152, height: 1920, targetProject: TARGET_PROJECT_WP81}
];
function findPlatformImage (width, height) {
@@ -514,13 +507,7 @@ function getTargetForImage (splash) {
return;
}
- if (targetImg.targetProject === TARGET_PROJECT_81 || targetImg.targetProject === TARGET_PROJECT_10) {
- return SPLASH_SCREEN_DESKTOP_TARGET_NAME;
- }
-
- if (targetImg.targetProject === TARGET_PROJECT_WP81) {
- return SPLASH_SCREEN_PHONE_TARGET_NAME;
- }
+ return SPLASH_SCREEN_DESKTOP_TARGET_NAME;
}
// Updates manifests to match the app splash screen image types (PNG/JPG/JPEG)
--
To stop receiving notification emails like this one, please contact
janpio@apache.org.
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@cordova.apache.org
For additional commands, e-mail: commits-help@cordova.apache.org
[cordova-windows] 10/26: remove package.phone.appxmanifest and
package.windows.appxmanifest and related
Posted by ja...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
janpio pushed a commit to branch janpio-win10only
in repository https://gitbox.apache.org/repos/asf/cordova-windows.git
commit c56569c04cec16e155c8b5e279d3285c5c619bb0
Author: Jan Piotrowski <pi...@gmail.com>
AuthorDate: Thu Feb 15 23:22:02 2018 +0100
remove package.phone.appxmanifest and package.windows.appxmanifest and related
---
bin/lib/update.js | 2 +-
spec/unit/AppxManifest.spec.js | 10 ----------
spec/unit/ConfigChanges.spec.js | 2 --
template/cordova/lib/AppxManifest.js | 2 +-
template/cordova/lib/build.js | 2 --
template/cordova/lib/prepare.js | 6 +-----
6 files changed, 3 insertions(+), 21 deletions(-)
diff --git a/bin/lib/update.js b/bin/lib/update.js
index 68ff26c..d708adc 100644
--- a/bin/lib/update.js
+++ b/bin/lib/update.js
@@ -47,7 +47,7 @@ module.exports.update = function (destinationDir, options) {
// The only place, where it is being persisted - phone/win10 appxmanifest file,
// but since win10 introduced just recently, we can't rely on its manifest
// for old platform versions.
- var manifestPath = path.join(destinationDir, 'package.phone.appxmanifest');
+ var manifestPath = path.join(destinationDir, 'package.phone.appxmanifest'); // TODO
try {
guid = AppxManifest.get(manifestPath).getPhoneIdentity().getPhoneProductId();
} catch (e) { /* ignore IO errors */ }
diff --git a/spec/unit/AppxManifest.spec.js b/spec/unit/AppxManifest.spec.js
index 882b1d3..b11fb9f 100644
--- a/spec/unit/AppxManifest.spec.js
+++ b/spec/unit/AppxManifest.spec.js
@@ -24,9 +24,7 @@ var AppxManifest = rewire('../../template/cordova/lib/AppxManifest');
var Win10AppxManifest = AppxManifest.__get__('Win10AppxManifest');
var refineColor = AppxManifest.__get__('refineColor');
-var WINDOWS_MANIFEST = 'template/package.windows.appxmanifest';
var WINDOWS_10_MANIFEST = 'template/package.windows10.appxmanifest';
-var WINDOWS_PHONE_MANIFEST = 'template/package.phone.appxmanifest';
var CSS_COLOR_NAME = 'turquoise';
describe('AppxManifest', function () {
@@ -214,23 +212,15 @@ describe('AppxManifest', function () {
});
it('Test #018 : getSplashScreenExtension/setSplashScreenExtension', function () {
- var visualElementsWindows = AppxManifest.get(WINDOWS_MANIFEST).getVisualElements();
var visualElementsWindows10 = AppxManifest.get(WINDOWS_10_MANIFEST).getVisualElements();
- var visualElementsWindowsPhone = AppxManifest.get(WINDOWS_PHONE_MANIFEST).getVisualElements();
var jpgExtension = '.jpg';
// PNG is default extension
- expect(visualElementsWindows.getSplashScreenExtension()).toEqual('.png');
expect(visualElementsWindows10.getSplashScreenExtension()).toEqual('.png');
- expect(visualElementsWindowsPhone.getSplashScreenExtension()).toEqual('.png');
// Set to jpg
- visualElementsWindows.setSplashScreenExtension(jpgExtension);
- expect(visualElementsWindows.getSplashScreenExtension()).toEqual(jpgExtension);
visualElementsWindows10.setSplashScreenExtension(jpgExtension);
expect(visualElementsWindows10.getSplashScreenExtension()).toEqual(jpgExtension);
- visualElementsWindowsPhone.setSplashScreenExtension(jpgExtension);
- expect(visualElementsWindowsPhone.getSplashScreenExtension()).toEqual(jpgExtension);
});
});
});
diff --git a/spec/unit/ConfigChanges.spec.js b/spec/unit/ConfigChanges.spec.js
index 80ed0b9..5ad96b5 100644
--- a/spec/unit/ConfigChanges.spec.js
+++ b/spec/unit/ConfigChanges.spec.js
@@ -250,8 +250,6 @@ describe('generate_plugin_config_munge for windows project', function () {
var changes = AppxManifest.processChanges(testChanges);
expect(changes.length).toBe(3);
- expect(changes[0].target).toBe('package.windows.appxmanifest');
- expect(changes[1].target).toBe('package.phone.appxmanifest');
expect(changes[2].target).toBe('package.windows10.appxmanifest');
});
});
diff --git a/template/cordova/lib/AppxManifest.js b/template/cordova/lib/AppxManifest.js
index a2d4e8c..9c7164b 100644
--- a/template/cordova/lib/AppxManifest.js
+++ b/template/cordova/lib/AppxManifest.js
@@ -53,7 +53,7 @@ var MANIFESTS = {
}
};
-var SUBSTS = ['package.phone.appxmanifest', 'package.windows.appxmanifest', 'package.windows10.appxmanifest'];
+var SUBSTS = ['package.windows10.appxmanifest'];
var TARGETS = ['windows', 'phone', 'all'];
/**
diff --git a/template/cordova/lib/build.js b/template/cordova/lib/build.js
index e1a95fb..9da94fe 100644
--- a/template/cordova/lib/build.js
+++ b/template/cordova/lib/build.js
@@ -38,8 +38,6 @@ var projFiles = {
win10: 'CordovaApp.Windows10.jsproj'
};
var projFilesToManifests = {
- 'CordovaApp.Phone.jsproj': 'package.phone.appxmanifest',
- 'CordovaApp.Windows.jsproj': 'package.windows.appxmanifest',
'CordovaApp.Windows10.jsproj': 'package.windows10.appxmanifest'
};
diff --git a/template/cordova/lib/prepare.js b/template/cordova/lib/prepare.js
index 31ecab0..bc97c8f 100644
--- a/template/cordova/lib/prepare.js
+++ b/template/cordova/lib/prepare.js
@@ -39,8 +39,6 @@ var PluginInfoProvider = require('cordova-common').PluginInfoProvider;
var DEFAULT_DESCRIPTION = 'CordovaApp';
var PROJECT_WINDOWS10 = 'CordovaApp.Windows10.jsproj';
-var MANIFEST_WINDOWS = 'package.windows.appxmanifest';
-var MANIFEST_PHONE = 'package.phone.appxmanifest';
var MANIFEST_WINDOWS10 = 'package.windows10.appxmanifest';
var TEMPLATE =
@@ -566,9 +564,7 @@ function updateSplashScreenImageExtensions (cordovaProject, locations) {
checkThatExtensionsAreNotMixed();
var manifestSplashScreenMap = {};
- manifestSplashScreenMap[MANIFEST_WINDOWS] = desktopSplashScreen;
manifestSplashScreenMap[MANIFEST_WINDOWS10] = desktopSplashScreen;
- manifestSplashScreenMap[MANIFEST_PHONE] = phoneSplashScreen;
for (var manifest in manifestSplashScreenMap) {
if (manifestSplashScreenMap.hasOwnProperty(manifest)) {
@@ -779,7 +775,7 @@ function cleanWww (projectRoot, locations) {
*/
function updateProjectAccordingTo (projectConfig, locations) {
// Apply appxmanifest changes
- [MANIFEST_WINDOWS, MANIFEST_WINDOWS10, MANIFEST_PHONE]
+ [MANIFEST_WINDOWS10] // TODO simplify
.forEach(function (manifestFile) {
updateManifestFile(projectConfig, path.join(locations.root, manifestFile));
});
--
To stop receiving notification emails like this one, please contact
janpio@apache.org.
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@cordova.apache.org
For additional commands, e-mail: commits-help@cordova.apache.org
[cordova-windows] 14/26: more: remove appx
Posted by ja...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
janpio pushed a commit to branch janpio-win10only
in repository https://gitbox.apache.org/repos/asf/cordova-windows.git
commit 6803bbcd0d96e37ea02e5894ee1e159bd605acbe
Author: Jan Piotrowski <pi...@gmail.com>
AuthorDate: Thu Feb 15 23:33:58 2018 +0100
more: remove appx
---
template/cordova/lib/MSBuildTools.js | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/template/cordova/lib/MSBuildTools.js b/template/cordova/lib/MSBuildTools.js
index 2f48660..c479483 100644
--- a/template/cordova/lib/MSBuildTools.js
+++ b/template/cordova/lib/MSBuildTools.js
@@ -256,11 +256,11 @@ var projFiles = {
// - v14: Windows 8.1, Windows 10
// - v12: Windows 8.1
function msBuild14TargetsFilter (target) {
- return target === projFiles.win || target === projFiles.phone || target === projFiles.win10;
+ return target === projFiles.win10;
}
function msBuild15TargetsFilter (target) {
- return target === projFiles.win || target === projFiles.phone || target === projFiles.win10;
+ return target === projFiles.win10;
}
function msBuild155TargetsFilter (target) {
--
To stop receiving notification emails like this one, please contact
janpio@apache.org.
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@cordova.apache.org
For additional commands, e-mail: commits-help@cordova.apache.org
[cordova-windows] 03/26: rename 8.1 tests that are (probably)
really 10 tests
Posted by ja...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
janpio pushed a commit to branch janpio-win10only
in repository https://gitbox.apache.org/repos/asf/cordova-windows.git
commit 6c6d34c5e0c0bd6d5fbea5cf77313c5a6d0c42cb
Author: Jan Piotrowski <pi...@gmail.com>
AuthorDate: Thu Feb 15 19:08:09 2018 +0100
rename 8.1 tests that are (probably) really 10 tests
---
spec/unit/package.spec.js | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/spec/unit/package.spec.js b/spec/unit/package.spec.js
index 03bac51..271a777 100644
--- a/spec/unit/package.spec.js
+++ b/spec/unit/package.spec.js
@@ -127,7 +127,7 @@ describe('getPackageFileInfo method', function () {
expect(pkgInfo.buildtype).toBe('debug');
});
- it('spec.7 should get file info correctly for windows 8.1 anycpu debug package', function () {
+ it('spec.7 should get file info correctly for windows anycpu debug package', function () {
var packageFile = path.join(pkgPath, 'CordovaApp.Windows_0.0.1.0_anycpu_debug_Test', 'CordovaApp.Windows_0.0.1.0_anycpu_debug.appx');
var pkgInfo = pkg.getPackageFileInfo(packageFile);
@@ -136,7 +136,7 @@ describe('getPackageFileInfo method', function () {
expect(pkgInfo.buildtype).toBe('debug');
});
- it('spec.8 should get file info correctly for windows 8.1 x64 release package', function () {
+ it('spec.8 should get file info correctly for windows x64 release package', function () {
var packageFile = path.join(pkgPath, 'CordovaApp.Windows_0.0.1.0_x64_Test', 'CordovaApp.Windows_0.0.1.0_x64.appx');
var pkgInfo = pkg.getPackageFileInfo(packageFile);
@@ -145,7 +145,7 @@ describe('getPackageFileInfo method', function () {
expect(pkgInfo.buildtype).toBe('release');
});
- it('spec.9 should get file info correctly for windows 8.1 x86 release package', function () {
+ it('spec.9 should get file info correctly for windows x86 release package', function () {
var packageFile = path.join(pkgPath, 'CordovaApp.Windows_0.0.1.0_x86_Test', 'CordovaApp.Windows_0.0.1.0_x86.appx');
var pkgInfo = pkg.getPackageFileInfo(packageFile);
--
To stop receiving notification emails like this one, please contact
janpio@apache.org.
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@cordova.apache.org
For additional commands, e-mail: commits-help@cordova.apache.org