You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cordova.apache.org by ey...@apache.org on 2015/12/10 03:53:20 UTC
[1/2] ios commit: CB-10162 correct the paths for iOS icon and
splashscreen resources
Repository: cordova-ios
Updated Branches:
refs/heads/master bc3c148cd -> 58885067f
CB-10162 correct the paths for iOS icon and splashscreen resources
Project: http://git-wip-us.apache.org/repos/asf/cordova-ios/repo
Commit: http://git-wip-us.apache.org/repos/asf/cordova-ios/commit/d9d12638
Tree: http://git-wip-us.apache.org/repos/asf/cordova-ios/tree/d9d12638
Diff: http://git-wip-us.apache.org/repos/asf/cordova-ios/diff/d9d12638
Branch: refs/heads/master
Commit: d9d12638d2fb6e6c39f56011ffdcb213fafbee8d
Parents: bc3c148
Author: Edna Morales <ed...@gmail.com>
Authored: Tue Dec 8 00:41:43 2015 -0500
Committer: Edna Morales <ed...@gmail.com>
Committed: Wed Dec 9 11:36:46 2015 -0500
----------------------------------------------------------------------
bin/templates/scripts/cordova/lib/prepare.js | 9 +++++----
1 file changed, 5 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cordova-ios/blob/d9d12638/bin/templates/scripts/cordova/lib/prepare.js
----------------------------------------------------------------------
diff --git a/bin/templates/scripts/cordova/lib/prepare.js b/bin/templates/scripts/cordova/lib/prepare.js
index 0485e32..ac94645 100644
--- a/bin/templates/scripts/cordova/lib/prepare.js
+++ b/bin/templates/scripts/cordova/lib/prepare.js
@@ -47,8 +47,8 @@ module.exports.prepare = function (cordovaProject) {
return updateProject(self._config, self.locations);
})
.then(function () {
- handleIcons(cordovaProject.projectConfig, self.root);
- handleSplashScreens(cordovaProject.projectConfig, self.root);
+ handleIcons(cordovaProject.projectConfig, self.locations.xcodeCordovaProj);
+ handleSplashScreens(cordovaProject.projectConfig, self.locations.xcodeCordovaProj);
})
.then(function () {
self.events.emit('verbose', 'updated project successfully');
@@ -260,7 +260,7 @@ function handleBuildSettings(platformConfig, locations) {
function handleIcons(projectConfig, platformRoot) {
var icons = projectConfig.getIcons('ios');
- var appRoot = projectConfig.path;
+ var appRoot = path.dirname(projectConfig.path);
// See https://developer.apple.com/library/ios/documentation/userexperience/conceptual/mobilehig/LaunchImages.html
// for launch images sizes reference.
@@ -274,6 +274,7 @@ function handleIcons(projectConfig, platformRoot) {
{dest: 'icon-small@2x.png', width: 58, height: 58},
{dest: 'icon-40.png', width: 40, height: 40},
{dest: 'icon-40@2x.png', width: 80, height: 80},
+ {dest: 'icon-small@3x.png', width: 87, height: 87},
{dest: 'icon.png', width: 57, height: 57},
{dest: 'icon@2x.png', width: 114, height: 114},
{dest: 'icon-72.png', width: 72, height: 72},
@@ -304,7 +305,7 @@ function handleIcons(projectConfig, platformRoot) {
function handleSplashScreens(projectConfig, platformRoot) {
- var appRoot = projectConfig.path;
+ var appRoot = path.dirname(projectConfig.path);
var splashScreens = projectConfig.getSplashScreens('ios');
var platformSplashScreens = [
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@cordova.apache.org
For additional commands, e-mail: commits-help@cordova.apache.org
[2/2] ios commit: CB-10162 update reference url for icon images
(closes #182)
Posted by ey...@apache.org.
CB-10162 update reference url for icon images (closes #182)
Project: http://git-wip-us.apache.org/repos/asf/cordova-ios/repo
Commit: http://git-wip-us.apache.org/repos/asf/cordova-ios/commit/58885067
Tree: http://git-wip-us.apache.org/repos/asf/cordova-ios/tree/58885067
Diff: http://git-wip-us.apache.org/repos/asf/cordova-ios/diff/58885067
Branch: refs/heads/master
Commit: 58885067ffea1546c51da2d95f2dc6ac30b40bef
Parents: d9d1263
Author: Edna Morales <ed...@gmail.com>
Authored: Wed Dec 9 21:07:47 2015 -0500
Committer: Edna Morales <ed...@gmail.com>
Committed: Wed Dec 9 21:49:12 2015 -0500
----------------------------------------------------------------------
bin/templates/scripts/cordova/lib/prepare.js | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cordova-ios/blob/58885067/bin/templates/scripts/cordova/lib/prepare.js
----------------------------------------------------------------------
diff --git a/bin/templates/scripts/cordova/lib/prepare.js b/bin/templates/scripts/cordova/lib/prepare.js
index ac94645..62a7c8f 100644
--- a/bin/templates/scripts/cordova/lib/prepare.js
+++ b/bin/templates/scripts/cordova/lib/prepare.js
@@ -262,7 +262,7 @@ function handleIcons(projectConfig, platformRoot) {
var icons = projectConfig.getIcons('ios');
var appRoot = path.dirname(projectConfig.path);
- // See https://developer.apple.com/library/ios/documentation/userexperience/conceptual/mobilehig/LaunchImages.html
+ // See https://developer.apple.com/library/ios/documentation/UserExperience/Conceptual/MobileHIG/IconMatrix.html
// for launch images sizes reference.
var platformIcons = [
{dest: 'icon-60.png', width: 60, height: 60},
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@cordova.apache.org
For additional commands, e-mail: commits-help@cordova.apache.org