CB-9762 - Fix mobilespec 'cordova build' exception. Tested on mobilespec and a new project - 'cordova build' and 'cordova clean' on both.
Project: http://git-wip-us.apache.org/repos/asf/cordova-ios/repo Commit: http://git-wip-us.apache.org/repos/asf/cordova-ios/commit/7832c02c Tree: http://git-wip-us.apache.org/repos/asf/cordova-ios/tree/7832c02c Diff: http://git-wip-us.apache.org/repos/asf/cordova-ios/diff/7832c02c Branch: refs/heads/master Commit: 7832c02ce8da6b73f7085f5b04367a496116ff0f Parents: 1939b63 Author: Shazron Abdullah <shaz...@apache.org> Authored: Sat Oct 22 01:13:07 2016 -0700 Committer: Shazron Abdullah <shaz...@apache.org> Committed: Sat Oct 22 01:13:07 2016 -0700 ---------------------------------------------------------------------- bin/templates/scripts/cordova/lib/prepare.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cordova-ios/blob/7832c02c/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 02dd457..8d1cda9 100644 --- a/bin/templates/scripts/cordova/lib/prepare.js +++ b/bin/templates/scripts/cordova/lib/prepare.js @@ -685,7 +685,7 @@ function getLaunchStoryboardImagesDir(projectRoot, platformProjDir) { */ function updateLaunchStoryboardImages(cordovaProject, locations) { var splashScreens = cordovaProject.projectConfig.getSplashScreens('ios'); - var platformProjDir = path.relative(cordovaProject.root, locations.xcodeCordovaProj); + var platformProjDir = locations.xcodeCordovaProj; var launchStoryboardImagesDir = getLaunchStoryboardImagesDir(cordovaProject.root, platformProjDir); if (launchStoryboardImagesDir) { @@ -712,7 +712,7 @@ function updateLaunchStoryboardImages(cordovaProject, locations) { */ function cleanLaunchStoryboardImages(projectRoot, projectConfig, locations) { var splashScreens = projectConfig.getSplashScreens('ios'); - var platformProjDir = path.relative(projectRoot, locations.xcodeCordovaProj); + var platformProjDir = locations.xcodeCordovaProj; var launchStoryboardImagesDir = getLaunchStoryboardImagesDir(projectRoot, platformProjDir); if (launchStoryboardImagesDir) { var resourceMap = mapLaunchStoryboardResources(splashScreens, launchStoryboardImagesDir); --------------------------------------------------------------------- To unsubscribe, e-mail: commits-unsubscr...@cordova.apache.org For additional commands, e-mail: commits-h...@cordova.apache.org
