@trivial update to latest structural changes
Project: http://git-wip-us.apache.org/repos/asf/cordova-lib/repo
Commit: http://git-wip-us.apache.org/repos/asf/cordova-lib/commit/4670dd6e
Tree: http://git-wip-us.apache.org/repos/asf/cordova-lib/tree/4670dd6e
Diff: http://git-wip-us.apache.org/repos/asf/cordova-lib/diff/4670dd6e
Branch: refs/heads/master
Commit: 4670dd6ee90dff3ff4e2897d09b51c97cece7290
Parents: 34bfac7
Author: Tobias Bocanegra <tr...@adobe.com>
Authored: Tue Oct 13 20:48:47 2015 -0700
Committer: Steve Gill <st...@gmail.com>
Committed: Tue Oct 20 13:00:07 2015 -0700
----------------------------------------------------------------------
cordova-lib/src/cordova/metadata/osx_parser.js | 11 +++++++----
1 file changed, 7 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cordova-lib/blob/4670dd6e/cordova-lib/src/cordova/metadata/osx_parser.js
----------------------------------------------------------------------
diff --git a/cordova-lib/src/cordova/metadata/osx_parser.js b/cordova-lib/src/cordova/metadata/osx_parser.js
index c87993d..ddbb327 100644
--- a/cordova-lib/src/cordova/metadata/osx_parser.js
+++ b/cordova-lib/src/cordova/metadata/osx_parser.js
@@ -24,14 +24,15 @@ var fs = require('fs'),
path = require('path'),
xcode = require('xcode'),
util = require('../util'),
- events = require('../../events'),
+ events = require('cordova-common').events,
shell = require('shelljs'),
plist = require('plist'),
Q = require('q'),
- Parser = require('./Parser'),
+ Parser = require('./parser'),
ios_parser = require('./ios_parser'),
- ConfigParser = require('../../configparser/ConfigParser'),
- CordovaError = require('../../CordovaError');
+ ConfigParser = require('cordova-common').ConfigParser,
+ URL = require('url'),
+ CordovaError = require('cordova-common').CordovaError;
function osx_parser(project) {
@@ -134,6 +135,8 @@ osx_parser.prototype.update_from_config = function(config) {
// Move the xcodeproj and other name-based dirs over.
shell.mv(path.join(parser.cordovaproj, parser.originalName + '-Info.plist'), path.join(parser.cordovaproj, name + '-Info.plist'));
shell.mv(path.join(parser.cordovaproj, parser.originalName + '-Prefix.pch'), path.join(parser.cordovaproj, name + '-Prefix.pch'));
+ // CB-8914 remove userdata otherwise project is un-usable in xcode
+ shell.rm('-rf',path.join(parser.xcodeproj,'xcuserdata/'));
shell.mv(parser.xcodeproj, path.join(parser.path, name + '.xcodeproj'));
shell.mv(parser.cordovaproj, path.join(parser.path, name));
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@cordova.apache.org
For additional commands, e-mail: commits-help@cordova.apache.org