You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cordova.apache.org by an...@apache.org on 2016/07/04 16:36:40 UTC
cordova-windows git commit: CB-11516 windows: Preparing icons w/
target fails
Repository: cordova-windows
Updated Branches:
refs/heads/master 37f6494be -> b0502ae45
CB-11516 windows: Preparing icons w/ target fails
This closes #179
Project: http://git-wip-us.apache.org/repos/asf/cordova-windows/repo
Commit: http://git-wip-us.apache.org/repos/asf/cordova-windows/commit/b0502ae4
Tree: http://git-wip-us.apache.org/repos/asf/cordova-windows/tree/b0502ae4
Diff: http://git-wip-us.apache.org/repos/asf/cordova-windows/diff/b0502ae4
Branch: refs/heads/master
Commit: b0502ae450c61e8bcb99969a174d062ef751f081
Parents: 37f6494
Author: Cody Hoover <gi...@codyhoover.com>
Authored: Thu Jun 30 09:30:03 2016 +0200
Committer: Vladimir Kotikov <v-...@microsoft.com>
Committed: Mon Jul 4 19:35:49 2016 +0300
----------------------------------------------------------------------
spec/unit/Prepare.Win10.spec.js | 34 +++++++++++++++++-----------------
template/cordova/lib/prepare.js | 2 +-
2 files changed, 18 insertions(+), 18 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cordova-windows/blob/b0502ae4/spec/unit/Prepare.Win10.spec.js
----------------------------------------------------------------------
diff --git a/spec/unit/Prepare.Win10.spec.js b/spec/unit/Prepare.Win10.spec.js
index 11148bb..222b7b4 100644
--- a/spec/unit/Prepare.Win10.spec.js
+++ b/spec/unit/Prepare.Win10.spec.js
@@ -507,16 +507,16 @@ describe('copyIcons method', function () {
describe('when "target" attribute is specified for the image', function () {
it('should copy all images with the same base name and extension to destination dir', function () {
var matchingFiles = [
- 'res/Windows/Square44x44.scale-100.png',
- 'res/Windows/Square44x44.targetsize-16.png',
- 'res/Windows/Square44x44.scale-150_targetsize-16.png',
- 'res/Windows/Square44x44.targetsize-16_scale-200.png',
- 'res/Windows/Square44x44.targetsize-16_altform-unplated_scale-200.png'
+ 'Square44x44.scale-100.png',
+ 'Square44x44.targetsize-16.png',
+ 'Square44x44.scale-150_targetsize-16.png',
+ 'Square44x44.targetsize-16_scale-200.png',
+ 'Square44x44.targetsize-16_altform-unplated_scale-200.png'
];
var nonMatchingFiles = [
- 'res/Windows/Square55x55.scale-100.png',
- 'res/Windows/Square44x44.targetsize-16.jpg'
+ 'Square55x55.scale-100.png',
+ 'Square44x44.targetsize-16.jpg'
];
spyOn(fs, 'readdirSync').andReturn(matchingFiles.concat(nonMatchingFiles));
@@ -528,16 +528,16 @@ describe('copyIcons method', function () {
copyImages(project, locations);
var expectedPathMap = {};
- expectedPathMap['images' + path.sep + 'SmallIcon.scale-100.png'] =
- 'res/Windows/Square44x44.scale-100.png';
- expectedPathMap['images' + path.sep + 'SmallIcon.targetsize-16.png'] =
- 'res/Windows/Square44x44.targetsize-16.png';
- expectedPathMap['images' + path.sep + 'SmallIcon.scale-150_targetsize-16.png'] =
- 'res/Windows/Square44x44.scale-150_targetsize-16.png';
- expectedPathMap['images' + path.sep + 'SmallIcon.targetsize-16_scale-200.png'] =
- 'res/Windows/Square44x44.targetsize-16_scale-200.png';
- expectedPathMap['images' + path.sep + 'SmallIcon.targetsize-16_altform-unplated_scale-200.png'] =
- 'res/Windows/Square44x44.targetsize-16_altform-unplated_scale-200.png';
+ expectedPathMap[path.join('images', 'SmallIcon.scale-100.png')] =
+ path.join('res', 'Windows', 'Square44x44.scale-100.png');
+ expectedPathMap[path.join('images','SmallIcon.targetsize-16.png')] =
+ path.join('res', 'Windows', 'Square44x44.targetsize-16.png');
+ expectedPathMap[path.join('images', 'SmallIcon.scale-150_targetsize-16.png')] =
+ path.join('res', 'Windows', 'Square44x44.scale-150_targetsize-16.png');
+ expectedPathMap[path.join('images', 'SmallIcon.targetsize-16_scale-200.png')] =
+ path.join('res', 'Windows', 'Square44x44.targetsize-16_scale-200.png');
+ expectedPathMap[path.join('images', 'SmallIcon.targetsize-16_altform-unplated_scale-200.png')] =
+ path.join('res', 'Windows', 'Square44x44.targetsize-16_altform-unplated_scale-200.png');
expect(FileUpdater.updatePaths).toHaveBeenCalledWith(expectedPathMap, { rootDir: PROJECT }, logFileOp);
});
});
http://git-wip-us.apache.org/repos/asf/cordova-windows/blob/b0502ae4/template/cordova/lib/prepare.js
----------------------------------------------------------------------
diff --git a/template/cordova/lib/prepare.js b/template/cordova/lib/prepare.js
index b7244b4..2a3b676 100644
--- a/template/cordova/lib/prepare.js
+++ b/template/cordova/lib/prepare.js
@@ -344,7 +344,7 @@ function mapImageResources(images, imagesDir) {
// then get all matching MRT images in source directory
var candidates = fs.readdirSync(imageToCopy.location)
- .map(function (file) { return new MRTImage(file); })
+ .map(function (file) { return new MRTImage(path.join(imageToCopy.location, file)); })
.filter(imageToCopy.matchesTo, imageToCopy);
// Warn user if no images were copied
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@cordova.apache.org
For additional commands, e-mail: commits-help@cordova.apache.org