[GitHub] cordova-lib pull request: CB-9033 : fix WatchKit support
Github user shazron commented on the pull request: https://github.com/apache/cordova-lib/pull/219#issuecomment-154149943 Thanks. An update on this. I still want to get this in, but I will have to postpone it unless someone else wants to take this up right now. With the merge/rebase etc this is more complex than it seems to review, to make sure this does not affect anything else. This is not your fault -- I wish we had more resources to work on pull requests in a timely manner, but unfortunately we do not and we will have to just carry on as best we can. The newest tools release is coming as we speak so I will aim to get it reviewed and out for the next tools release (currently I'm working on getting cordova-ios 4.0 out). We really value your contribution and I apologize that it has taken months and months to take a look at this. --- If your project is set up for it, you can reply to this email and have your reply appear on GitHub as well. If your project does not have this feature enabled and wishes so, or if the feature is enabled but not working, please contact infrastructure at infrastruct...@apache.org or file a JIRA ticket with INFRA. --- - To unsubscribe, e-mail: dev-unsubscr...@cordova.apache.org For additional commands, e-mail: dev-h...@cordova.apache.org
[GitHub] cordova-lib pull request: CB-9033 : fix WatchKit support
Github user ogoguel commented on the pull request: https://github.com/apache/cordova-lib/pull/219#issuecomment-151969906 Merged with cordova-lib/master. Some tests fail but those failure were already present in the master branch. --- If your project is set up for it, you can reply to this email and have your reply appear on GitHub as well. If your project does not have this feature enabled and wishes so, or if the feature is enabled but not working, please contact infrastructure at infrastruct...@apache.org or file a JIRA ticket with INFRA. --- - To unsubscribe, e-mail: dev-unsubscr...@cordova.apache.org For additional commands, e-mail: dev-h...@cordova.apache.org
[GitHub] cordova-lib pull request: Cb 9033
GitHub user ogoguel opened a pull request: https://github.com/apache/cordova-lib/pull/330 Cb 9033 new submission : removed unnecessary project files You can merge this pull request into a Git repository by running: $ git pull https://github.com/ogoguel/cordova-lib CB-9033 Alternatively you can review and apply these changes as the patch at: https://github.com/apache/cordova-lib/pull/330.patch To close this pull request, make a commit to your master/trunk branch with (at least) the following in the commit message: This closes #330 commit b1dad14ff23f8428a5d3cb789f902597e45df4d8 Author: Olivier GoguelDate: 2015-05-16T11:21:55Z CB-9033 : fix WatchKit support commit 85c0f62c768c2e3790e79db727c3686f3067f3b8 Author: Olivier Goguel Date: 2015-05-20T23:06:45Z fix test commit 53beb08e560172758c54b902bc89b44a858541b0 Author: Olivier Goguel Date: 2015-05-20T23:25:07Z adding target support commit 918f02b177c6621d73744faed2f6accbc9eddcb9 Author: Olivier Goguel Date: 2015-06-02T19:06:34Z Using SKIP_INSTALL commit f6db84ee019fb647ea5d70ac4d972f30575c0f9b Author: Olivier Goguel Date: 2015-06-02T19:13:58Z updated node-xcode version commit be430221dba153b30279421498048e1f597045df Author: Olivier Goguel (Betomorrow) Date: 2015-06-05T15:54:48Z using strict not equal commit ce044f54fe08501cfbf151de8ef985f69a3aa8f3 Author: Olivier Goguel Date: 2015-10-27T19:58:33Z removed unnecessary files --- If your project is set up for it, you can reply to this email and have your reply appear on GitHub as well. If your project does not have this feature enabled and wishes so, or if the feature is enabled but not working, please contact infrastructure at infrastruct...@apache.org or file a JIRA ticket with INFRA. --- - To unsubscribe, e-mail: dev-unsubscr...@cordova.apache.org For additional commands, e-mail: dev-h...@cordova.apache.org
[GitHub] cordova-lib pull request: Cb 9033
Github user ogoguel closed the pull request at: https://github.com/apache/cordova-lib/pull/330 --- If your project is set up for it, you can reply to this email and have your reply appear on GitHub as well. If your project does not have this feature enabled and wishes so, or if the feature is enabled but not working, please contact infrastructure at infrastruct...@apache.org or file a JIRA ticket with INFRA. --- - To unsubscribe, e-mail: dev-unsubscr...@cordova.apache.org For additional commands, e-mail: dev-h...@cordova.apache.org
[GitHub] cordova-lib pull request: CB-9033 : fix WatchKit support
Github user ogoguel commented on the pull request: https://github.com/apache/cordova-lib/pull/219#issuecomment-151641072 Removed source files, and fixed merge issue --- If your project is set up for it, you can reply to this email and have your reply appear on GitHub as well. If your project does not have this feature enabled and wishes so, or if the feature is enabled but not working, please contact infrastructure at infrastruct...@apache.org or file a JIRA ticket with INFRA. --- - To unsubscribe, e-mail: dev-unsubscr...@cordova.apache.org For additional commands, e-mail: dev-h...@cordova.apache.org
[GitHub] cordova-lib pull request: CB-9033 : fix WatchKit support
Github user ogoguel commented on the pull request: https://github.com/apache/cordova-lib/pull/219#issuecomment-151628253 Removed source files --- If your project is set up for it, you can reply to this email and have your reply appear on GitHub as well. If your project does not have this feature enabled and wishes so, or if the feature is enabled but not working, please contact infrastructure at infrastruct...@apache.org or file a JIRA ticket with INFRA. --- - To unsubscribe, e-mail: dev-unsubscr...@cordova.apache.org For additional commands, e-mail: dev-h...@cordova.apache.org
[GitHub] cordova-lib pull request: CB-9033 : fix WatchKit support
Github user shazron commented on the pull request: https://github.com/apache/cordova-lib/pull/219#issuecomment-151667700 Unfortunately even though the tests pass -- there are too many conflicts with the master branch. --- If your project is set up for it, you can reply to this email and have your reply appear on GitHub as well. If your project does not have this feature enabled and wishes so, or if the feature is enabled but not working, please contact infrastructure at infrastruct...@apache.org or file a JIRA ticket with INFRA. --- - To unsubscribe, e-mail: dev-unsubscr...@cordova.apache.org For additional commands, e-mail: dev-h...@cordova.apache.org
[GitHub] cordova-lib pull request: CB-9033 : fix WatchKit support
Github user shazron commented on the pull request: https://github.com/apache/cordova-lib/pull/219#issuecomment-151667847 Try rebasing your branch with cordova-lib/master --- If your project is set up for it, you can reply to this email and have your reply appear on GitHub as well. If your project does not have this feature enabled and wishes so, or if the feature is enabled but not working, please contact infrastructure at infrastruct...@apache.org or file a JIRA ticket with INFRA. --- - To unsubscribe, e-mail: dev-unsubscr...@cordova.apache.org For additional commands, e-mail: dev-h...@cordova.apache.org
[GitHub] cordova-lib pull request: CB-9033 : fix WatchKit support
Github user shazron commented on the pull request: https://github.com/apache/cordova-lib/pull/219#issuecomment-151321669 Unfortunately I can't take this patch in as is. The apple watch sample extension contains source files, which are not Apache Licensed: projects/ios-apple-watch/AppleWatch WatchKit Extension (but that's not the main point). Firstly - there is no need to add the source files in. See https://github.com/apache/cordova-lib/tree/master/cordova-lib/spec-plugman/projects where the projects only contain only the necessary files for the test. --- If your project is set up for it, you can reply to this email and have your reply appear on GitHub as well. If your project does not have this feature enabled and wishes so, or if the feature is enabled but not working, please contact infrastructure at infrastruct...@apache.org or file a JIRA ticket with INFRA. --- - To unsubscribe, e-mail: dev-unsubscr...@cordova.apache.org For additional commands, e-mail: dev-h...@cordova.apache.org
[GitHub] cordova-lib pull request: CB-9033 : fix WatchKit support
Github user shazron commented on the pull request: https://github.com/apache/cordova-lib/pull/219#issuecomment-151323347 11 failing tests: ``` Failures: 1) ios project handler installation of elements should call into xcodeproj's addSourceFile appropriately when element has no target-dir Message: Expected spy addSourceFile to have been called with [ 'Plugins/org.test.plugins.dummyplugin/DummyPluginCommand.m', { target : '571A463A14DB0A1B007FEAC7' } ] but actual calls were [ 'Plugins/org.test.plugins.dummyplugin/DummyPluginCommand.m', { } ] Stacktrace: Error: Expected spy addSourceFile to have been called with [ 'Plugins/org.test.plugins.dummyplugin/DummyPluginCommand.m', { target : '571A463A14DB0A1B007FEAC7' } ] but actual calls were [ 'Plugins/org.test.plugins.dummyplugin/DummyPluginCommand.m', { } ] at null. (/Users/shaz/Documents/Git/Apache/cordova-lib/cordova-lib/spec-plugman/platforms/ios.spec.js:167:29) 2) ios project handler installation of elements should call into xcodeproj's addSourceFile appropriately when element has a target-dir Message: Expected spy addSourceFile to have been called with [ 'Plugins/org.test.plugins.dummyplugin/targetDir/TargetDirTest.m', { target : '571A463A14DB0A1B007FEAC7' } ] but actual calls were [ 'Plugins/org.test.plugins.dummyplugin/targetDir/TargetDirTest.m', { } ] Stacktrace: Error: Expected spy addSourceFile to have been called with [ 'Plugins/org.test.plugins.dummyplugin/targetDir/TargetDirTest.m', { target : '571A463A14DB0A1B007FEAC7' } ] but actual calls were [ 'Plugins/org.test.plugins.dummyplugin/targetDir/TargetDirTest.m', { } ] at null. (/Users/shaz/Documents/Git/Apache/cordova-lib/cordova-lib/spec-plugman/platforms/ios.spec.js:173:29) 3) ios project handler installation of elements should call into xcodeproj's addFramework appropriately when element has framework=true set Message: Expected spy addFramework to have been called with [ 'SampleApp/Plugins/org.test.plugins.dummyplugin/SourceWithFramework.m', { weak : false, target : '571A463A14DB0A1B007FEAC7' } ] but actual calls were [ 'SampleApp/Plugins/org.test.plugins.dummyplugin/SourceWithFramework.m', { weak : false } ] Stacktrace: Error: Expected spy addFramework to have been called with [ 'SampleApp/Plugins/org.test.plugins.dummyplugin/SourceWithFramework.m', { weak : false, target : '571A463A14DB0A1B007FEAC7' } ] but actual calls were [ 'SampleApp/Plugins/org.test.plugins.dummyplugin/SourceWithFramework.m', { weak : false } ] at null. (/Users/shaz/Documents/Git/Apache/cordova-lib/cordova-lib/spec-plugman/platforms/ios.spec.js:192:29) 4) ios project handler installation of elements should call into xcodeproj's addResourceFile Message: Expected spy addResourceFile to have been called with [ 'Resources/DummyPlugin.bundle', { target : '571A463A14DB0A1B007FEAC7' } ] but actual calls were [ 'Resources/DummyPlugin.bundle' ] Stacktrace: Error: Expected spy addResourceFile to have been called with [ 'Resources/DummyPlugin.bundle', { target : '571A463A14DB0A1B007FEAC7' } ] but actual calls were [ 'Resources/DummyPlugin.bundle' ] at null. (/Users/shaz/Documents/Git/Apache/cordova-lib/cordova-lib/spec-plugman/platforms/ios.spec.js:258:29) 5) ios project handler installation of elements should call into xcodeproj's addFramework Message: Expected spy addFramework to have been called with [ 'SampleApp/Plugins/org.test.plugins.dummyplugin/Custom.framework', { customFramework : true, target : '571A463A14DB0A1B007FEAC7' } ] but actual calls were [ 'SampleApp/Plugins/org.test.plugins.dummyplugin/Custom.framework', { customFramework : true } ] Stacktrace: Error: Expected spy addFramework to have been called with [ 'SampleApp/Plugins/org.test.plugins.dummyplugin/Custom.framework', { customFramework : true, target : '571A463A14DB0A1B007FEAC7' } ] but actual calls were [ 'SampleApp/Plugins/org.test.plugins.dummyplugin/Custom.framework', { customFramework : true } ] at null. (/Users/shaz/Documents/Git/Apache/cordova-lib/cordova-lib/spec-plugman/platforms/ios.spec.js:286:29) 6) ios project handler uninstallation of elements should call into xcodeproj's removeSourceFile appropriately when element has no target-dir Message: Expected spy removeSourceFile to have been called with [ 'Plugins/org.test.plugins.dummyplugin/DummyPluginCommand.m', { target : '571A463A14DB0A1B007FEAC7' } ] but actual calls were [ 'Plugins/org.test.plugins.dummyplugin/DummyPluginCommand.m' ] Stacktrace: Error: Expected spy removeSourceFile to have been called with [ 'Plugins/org.test.plugins.dummyplugin/DummyPluginCommand.m', { target : '571A463A14DB0A1B007FEAC7' } ] but actual
[GitHub] cordova-lib pull request: CB-9033 : fix WatchKit support
Github user TimBarham commented on the pull request: https://github.com/apache/cordova-lib/pull/219#issuecomment-130869708 Hey @shazron - are you a good person to take a look at this change? --- If your project is set up for it, you can reply to this email and have your reply appear on GitHub as well. If your project does not have this feature enabled and wishes so, or if the feature is enabled but not working, please contact infrastructure at infrastruct...@apache.org or file a JIRA ticket with INFRA. --- - To unsubscribe, e-mail: dev-unsubscr...@cordova.apache.org For additional commands, e-mail: dev-h...@cordova.apache.org
[GitHub] cordova-lib pull request: CB-9033 : fix WatchKit support
Github user sdesapio commented on the pull request: https://github.com/apache/cordova-lib/pull/219#issuecomment-118887096 @ogoguel You're definitely not the only one. I'm the one that posted that bug report you're referring to. Waiting patiently. --- If your project is set up for it, you can reply to this email and have your reply appear on GitHub as well. If your project does not have this feature enabled and wishes so, or if the feature is enabled but not working, please contact infrastructure at infrastruct...@apache.org or file a JIRA ticket with INFRA. --- - To unsubscribe, e-mail: dev-unsubscr...@cordova.apache.org For additional commands, e-mail: dev-h...@cordova.apache.org
[GitHub] cordova-lib pull request: CB-9033 : fix WatchKit support
Github user ogoguel commented on the pull request: https://github.com/apache/cordova-lib/pull/219#issuecomment-118605960 Any update on that ? I'd like to avoid having to patch my cordova lib every time, and I believe I am not the only one in that case (cf. https://issues.apache.org/jira/browse/CB-9176). @TimBarham : have you been able to find someone to help with the review? Let me know how I could help you on that matter. --- If your project is set up for it, you can reply to this email and have your reply appear on GitHub as well. If your project does not have this feature enabled and wishes so, or if the feature is enabled but not working, please contact infrastructure at infrastruct...@apache.org or file a JIRA ticket with INFRA. --- - To unsubscribe, e-mail: dev-unsubscr...@cordova.apache.org For additional commands, e-mail: dev-h...@cordova.apache.org
[GitHub] cordova-lib pull request: CB-9033 : fix WatchKit support
Github user ligaz commented on a diff in the pull request: https://github.com/apache/cordova-lib/pull/219#discussion_r31790359 --- Diff: cordova-lib/src/plugman/platforms/ios.js --- @@ -184,13 +192,65 @@ module.exports = { var xcBuildConfiguration = xcodeproj.pbxXCBuildConfigurationSection(); -var plist_file_entry = _.find(xcBuildConfiguration, function (entry) { return entry.buildSettings entry.buildSettings.INFOPLIST_FILE; }); -var plist_file = path.join(project_dir, plist_file_entry.buildSettings.INFOPLIST_FILE.replace(/^(.*)$/g, '$1').replace(/\\/g, '')); -var config_file = path.join(path.dirname(plist_file), 'config.xml'); -if (!fs.existsSync(plist_file) || !fs.existsSync(config_file)) { +// CB-9033 +var plist_file_index; +var plist_file_entry = _.find(xcBuildConfiguration, function (entry,index) { +if (entry.buildSettings entry.buildSettings.INFOPLIST_FILE entry.buildSettings.SKIP_INSTALL != 'YES') { --- End diff -- It is better to use `!==` check here for the last condition. --- If your project is set up for it, you can reply to this email and have your reply appear on GitHub as well. If your project does not have this feature enabled and wishes so, or if the feature is enabled but not working, please contact infrastructure at infrastruct...@apache.org or file a JIRA ticket with INFRA. --- - To unsubscribe, e-mail: dev-unsubscr...@cordova.apache.org For additional commands, e-mail: dev-h...@cordova.apache.org
[GitHub] cordova-lib pull request: CB-9033 : fix WatchKit support
Github user TimBarham commented on the pull request: https://github.com/apache/cordova-lib/pull/219#issuecomment-109377681 It's certainly a common JavaScript recommendation to always use strict equality / inequality operators so you don't accidentally get an invalid match because of type conversion. It can also be much faster (because no type conversion), though that is unlikely to be significant in most of the stuff we do. So it can be a good habit to form, but in this particular scenario I can't see it making a difference. Ultimately as long as we're *intentional* about which we use in each situation, all is good (personally my approach is to always use the strict operators unless I have a specific, intentional reason not to). --- If your project is set up for it, you can reply to this email and have your reply appear on GitHub as well. If your project does not have this feature enabled and wishes so, or if the feature is enabled but not working, please contact infrastructure at infrastruct...@apache.org or file a JIRA ticket with INFRA. --- - To unsubscribe, e-mail: dev-unsubscr...@cordova.apache.org For additional commands, e-mail: dev-h...@cordova.apache.org
[GitHub] cordova-lib pull request: CB-9033 : fix WatchKit support
Github user purplecabbage commented on the pull request: https://github.com/apache/cordova-lib/pull/219#issuecomment-109379851 Great answer(s)! I was actually partially trolling @ligaz, our style-guide does say be strict so it's all good. Are there any side effects of the change to the required node-xcode version to 0.7.0? --- If your project is set up for it, you can reply to this email and have your reply appear on GitHub as well. If your project does not have this feature enabled and wishes so, or if the feature is enabled but not working, please contact infrastructure at infrastruct...@apache.org or file a JIRA ticket with INFRA. --- - To unsubscribe, e-mail: dev-unsubscr...@cordova.apache.org For additional commands, e-mail: dev-h...@cordova.apache.org
[GitHub] cordova-lib pull request: CB-9033 : fix WatchKit support
Github user TimBarham commented on the pull request: https://github.com/apache/cordova-lib/pull/219#issuecomment-109383817 Heh - I tried turning on the JSHint rule in `cordova-lib` just for kicks. 150 hits :). --- If your project is set up for it, you can reply to this email and have your reply appear on GitHub as well. If your project does not have this feature enabled and wishes so, or if the feature is enabled but not working, please contact infrastructure at infrastruct...@apache.org or file a JIRA ticket with INFRA. --- - To unsubscribe, e-mail: dev-unsubscr...@cordova.apache.org For additional commands, e-mail: dev-h...@cordova.apache.org
[GitHub] cordova-lib pull request: CB-9033 : fix WatchKit support
Github user ogoguel commented on the pull request: https://github.com/apache/cordova-lib/pull/219#issuecomment-109339921 Using !== instead of != --- If your project is set up for it, you can reply to this email and have your reply appear on GitHub as well. If your project does not have this feature enabled and wishes so, or if the feature is enabled but not working, please contact infrastructure at infrastruct...@apache.org or file a JIRA ticket with INFRA. --- - To unsubscribe, e-mail: dev-unsubscr...@cordova.apache.org For additional commands, e-mail: dev-h...@cordova.apache.org
[GitHub] cordova-lib pull request: CB-9033 : fix WatchKit support
Github user ogoguel commented on the pull request: https://github.com/apache/cordova-lib/pull/219#issuecomment-109357001 It is not better. Just trying to follow cordova-lib coding guidelines requirements ! --- If your project is set up for it, you can reply to this email and have your reply appear on GitHub as well. If your project does not have this feature enabled and wishes so, or if the feature is enabled but not working, please contact infrastructure at infrastruct...@apache.org or file a JIRA ticket with INFRA. --- - To unsubscribe, e-mail: dev-unsubscr...@cordova.apache.org For additional commands, e-mail: dev-h...@cordova.apache.org
[GitHub] cordova-lib pull request: CB-9033 : fix WatchKit support
Github user ogoguel commented on a diff in the pull request: https://github.com/apache/cordova-lib/pull/219#discussion_r31824683 --- Diff: cordova-lib/src/plugman/platforms/ios.js --- @@ -184,13 +192,65 @@ module.exports = { var xcBuildConfiguration = xcodeproj.pbxXCBuildConfigurationSection(); -var plist_file_entry = _.find(xcBuildConfiguration, function (entry) { return entry.buildSettings entry.buildSettings.INFOPLIST_FILE; }); -var plist_file = path.join(project_dir, plist_file_entry.buildSettings.INFOPLIST_FILE.replace(/^(.*)$/g, '$1').replace(/\\/g, '')); -var config_file = path.join(path.dirname(plist_file), 'config.xml'); -if (!fs.existsSync(plist_file) || !fs.existsSync(config_file)) { +// CB-9033 +var plist_file_index; +var plist_file_entry = _.find(xcBuildConfiguration, function (entry,index) { +if (entry.buildSettings entry.buildSettings.INFOPLIST_FILE entry.buildSettings.SKIP_INSTALL != 'YES') { --- End diff -- ok, I will change it, even though I don't believe it would make a difference... unless there are cases I've missed. if it is part of the cordova-lib coding requirements, it would be good to update the jslint rules accordingly so it is catched during the test phase --- If your project is set up for it, you can reply to this email and have your reply appear on GitHub as well. If your project does not have this feature enabled and wishes so, or if the feature is enabled but not working, please contact infrastructure at infrastruct...@apache.org or file a JIRA ticket with INFRA. --- - To unsubscribe, e-mail: dev-unsubscr...@cordova.apache.org For additional commands, e-mail: dev-h...@cordova.apache.org
[GitHub] cordova-lib pull request: CB-9033 : fix WatchKit support
Github user purplecabbage commented on the pull request: https://github.com/apache/cordova-lib/pull/219#issuecomment-109353274 Why is it better? --- If your project is set up for it, you can reply to this email and have your reply appear on GitHub as well. If your project does not have this feature enabled and wishes so, or if the feature is enabled but not working, please contact infrastructure at infrastruct...@apache.org or file a JIRA ticket with INFRA. --- - To unsubscribe, e-mail: dev-unsubscr...@cordova.apache.org For additional commands, e-mail: dev-h...@cordova.apache.org
[GitHub] cordova-lib pull request: CB-9033 : fix WatchKit support
Github user galexandrov commented on a diff in the pull request: https://github.com/apache/cordova-lib/pull/219#discussion_r31506402 --- Diff: cordova-lib/package.json --- @@ -42,7 +42,7 @@ underscore: 1.7.0, unorm: 1.3.3, valid-identifier: 0.0.1, -xcode: 0.6.7 +xcode: https://github.com/ogoguel/node-xcode/tarball/17926117b388d08f05ec2db1e1ad8262f67a2a8d; --- End diff -- You should create PR with your changes to [node-xcode](https://github.com/alunny/node-xcode) instead of using tarball dependency --- If your project is set up for it, you can reply to this email and have your reply appear on GitHub as well. If your project does not have this feature enabled and wishes so, or if the feature is enabled but not working, please contact infrastructure at infrastruct...@apache.org or file a JIRA ticket with INFRA. --- - To unsubscribe, e-mail: dev-unsubscr...@cordova.apache.org For additional commands, e-mail: dev-h...@cordova.apache.org
[GitHub] cordova-lib pull request: CB-9033 : fix WatchKit support
Github user galexandrov commented on a diff in the pull request: https://github.com/apache/cordova-lib/pull/219#discussion_r31507207 --- Diff: cordova-lib/src/plugman/platforms/ios.js --- @@ -184,13 +192,76 @@ module.exports = { var xcBuildConfiguration = xcodeproj.pbxXCBuildConfigurationSection(); -var plist_file_entry = _.find(xcBuildConfiguration, function (entry) { return entry.buildSettings entry.buildSettings.INFOPLIST_FILE; }); -var plist_file = path.join(project_dir, plist_file_entry.buildSettings.INFOPLIST_FILE.replace(/^(.*)$/g, '$1').replace(/\\/g, '')); -var config_file = path.join(path.dirname(plist_file), 'config.xml'); -if (!fs.existsSync(plist_file) || !fs.existsSync(config_file)) { +// CB-9033 +var plist_file_index; +var plist_file_entry = _.find(xcBuildConfiguration, function (entry,index) { +if (entry.buildSettings entry.buildSettings.INFOPLIST_FILE) { + +var plist_file = path.join(project_dir, entry.buildSettings.INFOPLIST_FILE.replace(/^(.*)$/g, '$1').replace(/\\/g, '')); + if (!fs.existsSync(plist_file)) +return false; + +var config_file = path.join(path.dirname(plist_file), 'config.xml'); + if (!fs.existsSync(config_file)) +return false; + +// only return project that contains both a plist and a config.xml (especially to discard apple watch extension/app) +plist_file_index = index; --- End diff -- Instead of checking for config.xml can we check for SKIP_INSTALL property in BuildSettings. SKIP_INSTALL property should be missing or equals to NO for the iPhone app target and should equals to YES for WatchKit Extension and WatchKit App. --- If your project is set up for it, you can reply to this email and have your reply appear on GitHub as well. If your project does not have this feature enabled and wishes so, or if the feature is enabled but not working, please contact infrastructure at infrastruct...@apache.org or file a JIRA ticket with INFRA. --- - To unsubscribe, e-mail: dev-unsubscr...@cordova.apache.org For additional commands, e-mail: dev-h...@cordova.apache.org
[GitHub] cordova-lib pull request: CB-9033 : fix WatchKit support
Github user ogoguel commented on the pull request: https://github.com/apache/cordova-lib/pull/219#issuecomment-108063507 Added SKIP_INSTALL to improve plist detection Using node-xcode 0.7.0 (which includes the required modification) --- If your project is set up for it, you can reply to this email and have your reply appear on GitHub as well. If your project does not have this feature enabled and wishes so, or if the feature is enabled but not working, please contact infrastructure at infrastruct...@apache.org or file a JIRA ticket with INFRA. --- - To unsubscribe, e-mail: dev-unsubscr...@cordova.apache.org For additional commands, e-mail: dev-h...@cordova.apache.org
[GitHub] cordova-lib pull request: CB-9033 : fix WatchKit support
Github user ogoguel commented on a diff in the pull request: https://github.com/apache/cordova-lib/pull/219#discussion_r31520090 --- Diff: cordova-lib/src/plugman/platforms/ios.js --- @@ -184,13 +192,76 @@ module.exports = { var xcBuildConfiguration = xcodeproj.pbxXCBuildConfigurationSection(); -var plist_file_entry = _.find(xcBuildConfiguration, function (entry) { return entry.buildSettings entry.buildSettings.INFOPLIST_FILE; }); -var plist_file = path.join(project_dir, plist_file_entry.buildSettings.INFOPLIST_FILE.replace(/^(.*)$/g, '$1').replace(/\\/g, '')); -var config_file = path.join(path.dirname(plist_file), 'config.xml'); -if (!fs.existsSync(plist_file) || !fs.existsSync(config_file)) { +// CB-9033 +var plist_file_index; +var plist_file_entry = _.find(xcBuildConfiguration, function (entry,index) { +if (entry.buildSettings entry.buildSettings.INFOPLIST_FILE) { + +var plist_file = path.join(project_dir, entry.buildSettings.INFOPLIST_FILE.replace(/^(.*)$/g, '$1').replace(/\\/g, '')); + if (!fs.existsSync(plist_file)) +return false; + +var config_file = path.join(path.dirname(plist_file), 'config.xml'); + if (!fs.existsSync(config_file)) +return false; + +// only return project that contains both a plist and a config.xml (especially to discard apple watch extension/app) +plist_file_index = index; --- End diff -- I did not know about the SKIP_INSTALL but that would be a good additional check : thanks for the pointer. Nevertheless, you still need to check that both the .PLIST and the CONFIG.XML files exist eventually, so it won't totally replace the test. I will upgrade my code anyway Olivier 2015-06-02 11:49 GMT+02:00 Georgi Alexandrov notificati...@github.com: In cordova-lib/src/plugman/platforms/ios.js https://github.com/apache/cordova-lib/pull/219#discussion_r31507207: -if (!fs.existsSync(plist_file) || !fs.existsSync(config_file)) { +// CB-9033 +var plist_file_index; +var plist_file_entry = _.find(xcBuildConfiguration, function (entry,index) { +if (entry.buildSettings entry.buildSettings.INFOPLIST_FILE) { + +var plist_file = path.join(project_dir, entry.buildSettings.INFOPLIST_FILE.replace(/^(.*)$/g, '$1').replace(/\\/g, '')); + if (!fs.existsSync(plist_file)) +return false; + +var config_file = path.join(path.dirname(plist_file), 'config.xml'); + if (!fs.existsSync(config_file)) +return false; + +// only return project that contains both a plist and a config.xml (especially to discard apple watch extension/app) +plist_file_index = index; Instead of checking for config.xml can we check for SKIP_INSTALL property in BuildSettings. SKIP_INSTALL property should be missing or equals to NO for the iPhone app target and should equals to YES for WatchKit Extension and WatchKit App. â Reply to this email directly or view it on GitHub https://github.com/apache/cordova-lib/pull/219/files#r31507207. -- ıllıllı ɹÇ!Ê!×o ıllıllı --- If your project is set up for it, you can reply to this email and have your reply appear on GitHub as well. If your project does not have this feature enabled and wishes so, or if the feature is enabled but not working, please contact infrastructure at infrastruct...@apache.org or file a JIRA ticket with INFRA. --- - To unsubscribe, e-mail: dev-unsubscr...@cordova.apache.org For additional commands, e-mail: dev-h...@cordova.apache.org
[GitHub] cordova-lib pull request: CB-9033 : fix WatchKit support
Github user ogoguel commented on a diff in the pull request: https://github.com/apache/cordova-lib/pull/219#discussion_r31519205 --- Diff: cordova-lib/package.json --- @@ -42,7 +42,7 @@ underscore: 1.7.0, unorm: 1.3.3, valid-identifier: 0.0.1, -xcode: 0.6.7 +xcode: https://github.com/ogoguel/node-xcode/tarball/17926117b388d08f05ec2db1e1ad8262f67a2a8d; --- End diff -- A pull request has been sent to node-xcode ( https://github.com/alunny/node-xcode/pull/47), but in the meantime, I was using a tarball reference to have a working version Actually, my pull request has just been merged into node-xcode master, but the version not yet updated into the npm repository : what should I put into the package.json in the meantime ? https://github.com/alunny/node-xcode.git ? Thanks for your pointer Cheers Olivier 2015-06-02 11:38 GMT+02:00 Georgi Alexandrov notificati...@github.com: In cordova-lib/package.json https://github.com/apache/cordova-lib/pull/219#discussion_r31506402: @@ -42,7 +42,7 @@ underscore: 1.7.0, unorm: 1.3.3, valid-identifier: 0.0.1, -xcode: 0.6.7 +xcode: https://github.com/ogoguel/node-xcode/tarball/17926117b388d08f05ec2db1e1ad8262f67a2a8d; You should create PR with your changes to node-xcode https://github.com/alunny/node-xcode instead of using tarball dependency â Reply to this email directly or view it on GitHub https://github.com/apache/cordova-lib/pull/219/files#r31506402. -- ıllıllı ɹÇ!Ê!×o ıllıllı --- If your project is set up for it, you can reply to this email and have your reply appear on GitHub as well. If your project does not have this feature enabled and wishes so, or if the feature is enabled but not working, please contact infrastructure at infrastruct...@apache.org or file a JIRA ticket with INFRA. --- - To unsubscribe, e-mail: dev-unsubscr...@cordova.apache.org For additional commands, e-mail: dev-h...@cordova.apache.org
[GitHub] cordova-lib pull request: CB-9033 : fix WatchKit support
Github user ogoguel commented on the pull request: https://github.com/apache/cordova-lib/pull/219#issuecomment-104160107 Replace the node-xcode package to support multiple target support Now, plugman install the files/resources within the proper buildphase in the Xcode Project --- If your project is set up for it, you can reply to this email and have your reply appear on GitHub as well. If your project does not have this feature enabled and wishes so, or if the feature is enabled but not working, please contact infrastructure at infrastruct...@apache.org or file a JIRA ticket with INFRA. --- - To unsubscribe, e-mail: dev-unsubscr...@cordova.apache.org For additional commands, e-mail: dev-h...@cordova.apache.org
[GitHub] cordova-lib pull request: CB-9033 : fix WatchKit support
Github user agrieve commented on the pull request: https://github.com/apache/cordova-lib/pull/219#issuecomment-103903180 Looks like this pr breaks tests. Could you please address? (run npm test) --- If your project is set up for it, you can reply to this email and have your reply appear on GitHub as well. If your project does not have this feature enabled and wishes so, or if the feature is enabled but not working, please contact infrastructure at infrastruct...@apache.org or file a JIRA ticket with INFRA. --- - To unsubscribe, e-mail: dev-unsubscr...@cordova.apache.org For additional commands, e-mail: dev-h...@cordova.apache.org
[GitHub] cordova-lib pull request: CB-9033 : fix WatchKit support
Github user ogoguel commented on the pull request: https://github.com/apache/cordova-lib/pull/219#issuecomment-104068019 Fix Test And Make the Test More Reliable --- If your project is set up for it, you can reply to this email and have your reply appear on GitHub as well. If your project does not have this feature enabled and wishes so, or if the feature is enabled but not working, please contact infrastructure at infrastruct...@apache.org or file a JIRA ticket with INFRA. --- - To unsubscribe, e-mail: dev-unsubscr...@cordova.apache.org For additional commands, e-mail: dev-h...@cordova.apache.org
[GitHub] cordova-lib pull request: CB-9033 : fix WatchKit support
GitHub user ogoguel opened a pull request: https://github.com/apache/cordova-lib/pull/219 CB-9033 : fix WatchKit support Fixing plugin support while WatchKit has been added to an iOS project by discard any list .plist file containing WKCompanionAppBundleIdentifier or WKAppBundleIdentifier, so the plugin manager properly identifies the main plist file of the project To test cordova create myApp cd myApp cordova platform add ios Goto Xcode, open the project add a new Watch Kit Target cordova plugin add cordova-plugin-console Installing cordova-plugin-console for ios Failed to install 'cordova-plugin-console':CordovaError: could not find -Info.plist file, or config.xml file. You can merge this pull request into a Git repository by running: $ git pull https://github.com/ogoguel/cordova-lib master Alternatively you can review and apply these changes as the patch at: https://github.com/apache/cordova-lib/pull/219.patch To close this pull request, make a commit to your master/trunk branch with (at least) the following in the commit message: This closes #219 commit b1fab9297f95fe6e0e28701255631ca0aa47 Author: Olivier Goguel o...@goguel.com Date: 2015-05-16T11:21:55Z CB-9033 : fix WatchKit support --- If your project is set up for it, you can reply to this email and have your reply appear on GitHub as well. If your project does not have this feature enabled and wishes so, or if the feature is enabled but not working, please contact infrastructure at infrastruct...@apache.org or file a JIRA ticket with INFRA. --- - To unsubscribe, e-mail: dev-unsubscr...@cordova.apache.org For additional commands, e-mail: dev-h...@cordova.apache.org