You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cordova.apache.org by bo...@apache.org on 2016/10/31 18:31:36 UTC
android commit: CB-12077: Fix paths for Android icons/splashscreens
Repository: cordova-android
Updated Branches:
refs/heads/master 1f0617614 -> 854946e31
CB-12077: Fix paths for Android icons/splashscreens
This closes #343
Project: http://git-wip-us.apache.org/repos/asf/cordova-android/repo
Commit: http://git-wip-us.apache.org/repos/asf/cordova-android/commit/854946e3
Tree: http://git-wip-us.apache.org/repos/asf/cordova-android/tree/854946e3
Diff: http://git-wip-us.apache.org/repos/asf/cordova-android/diff/854946e3
Branch: refs/heads/master
Commit: 854946e313c6b00e0087e9aa432fad664083c96a
Parents: 1f06176
Author: Darryl Pogue <da...@ayogo.com>
Authored: Fri Oct 28 13:05:01 2016 -0700
Committer: Joe Bowser <bo...@apache.org>
Committed: Mon Oct 31 11:31:26 2016 -0700
----------------------------------------------------------------------
bin/templates/cordova/Api.js | 4 ++--
bin/templates/cordova/lib/prepare.js | 8 ++++----
2 files changed, 6 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cordova-android/blob/854946e3/bin/templates/cordova/Api.js
----------------------------------------------------------------------
diff --git a/bin/templates/cordova/Api.js b/bin/templates/cordova/Api.js
index 28a0ab5..e05c852 100644
--- a/bin/templates/cordova/Api.js
+++ b/bin/templates/cordova/Api.js
@@ -66,7 +66,7 @@ function Api(platform, platformRootDir, events) {
this.locations = {
root: self.root,
www: path.join(self.root, 'assets/www'),
- res: path.relative(self.root, path.join(self.root, 'res')),
+ res: path.join(self.root, 'res'),
platformWww: path.join(self.root, 'platform_www'),
configXml: path.join(self.root, 'res/xml/config.xml'),
defaultConfigXml: path.join(self.root, 'cordova/defaults.xml'),
@@ -85,7 +85,7 @@ function Api(platform, platformRootDir, events) {
this.locations.strings = path.join(self.root, 'app/src/main/res/xml/strings.xml');
this.locations.manifest = path.join(self.root, 'app/src/main/AndroidManifest.xml');
this.locations.www = path.join(self.root, 'app/src/main/assets/www');
- this.locations.res = path.relative(self.root, path.join(self.root, 'app/src/main/res'));
+ this.locations.res = path.join(self.root, 'app/src/main/res');
}
}
http://git-wip-us.apache.org/repos/asf/cordova-android/blob/854946e3/bin/templates/cordova/lib/prepare.js
----------------------------------------------------------------------
diff --git a/bin/templates/cordova/lib/prepare.js b/bin/templates/cordova/lib/prepare.js
index a961c82..10a69ea 100644
--- a/bin/templates/cordova/lib/prepare.js
+++ b/bin/templates/cordova/lib/prepare.js
@@ -46,8 +46,8 @@ module.exports.prepare = function (cordovaProject, options) {
return updateProjectAccordingTo(self._config, self.locations);
})
.then(function () {
- updateIcons(cordovaProject, self.locations.res);
- updateSplashes(cordovaProject, self.locations.res);
+ updateIcons(cordovaProject, path.relative(cordovaProject.root, self.locations.res));
+ updateSplashes(cordovaProject, path.relative(cordovaProject.root, self.locations.res));
})
.then(function () {
events.emit('verbose', 'Prepared android project successfully');
@@ -70,8 +70,8 @@ module.exports.clean = function (options) {
var self = this;
return Q().then(function () {
cleanWww(projectRoot, self.locations);
- cleanIcons(projectRoot, projectConfig, self.locations.res);
- cleanSplashes(projectRoot, projectConfig, self.locations.res);
+ cleanIcons(projectRoot, projectConfig, path.relative(projectRoot, self.locations.res));
+ cleanSplashes(projectRoot, projectConfig, path.relative(projectRoot, self.locations.res));
});
};
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@cordova.apache.org
For additional commands, e-mail: commits-help@cordova.apache.org