erisu commented on a change in pull request #765: Fix error parsing
plist_file_entry when adding extension in xcode
URL: https://github.com/apache/cordova-ios/pull/765#discussion_r367781085
##########
File path: bin/templates/scripts/cordova/lib/projectFile.js
##########
@@ -40,8 +40,18 @@ function parseProjectFile (locations) {
const xcodeproj = xcode.project(pbxPath);
xcodeproj.parseSync();
- const xcBuildConfiguration = xcodeproj.pbxXCBuildConfigurationSection();
- const plist_file_entry = _.find(xcBuildConfiguration, entry =>
entry.buildSettings && entry.buildSettings.INFOPLIST_FILE);
+ var projectName = '';
+ if (fs.readdirSync(project_dir).find(d => d.includes('.xcworkspace'))) {
+ projectName = fs.readdirSync(project_dir).find(d =>
d.includes('.xcworkspace')).replace('.xcworkspace', '');
+ }
+ var xcBuildConfiguration = xcodeproj.pbxXCBuildConfigurationSection();
+ var plist_file_entry = _.find(xcBuildConfiguration, function (entry) {
+ return (
+ entry.buildSettings &&
+ entry.buildSettings.INFOPLIST_FILE &&
+ projectName ?
entry.buildSettings.INFOPLIST_FILE.includes(projectName) : true
+ );
+ });
const plist_file = path.join(project_dir,
plist_file_entry.buildSettings.INFOPLIST_FILE.replace(/^"(.*)"$/g,
'$1').replace(/\\&/g, '&'));
Review comment:
Also, just wanted to point out that you wrote above:
The code you showed in comment is true,
```MyAppExtension-Info.plist".includes("MyApp-Info.plist")```
But what you wrote in code didn't reflect that previously.
```
entry.buildSettings.INFOPLIST_FILE.includes(projectName)
```
for example it would have been like these which would have matched in all
cases.
* `"MyApp/MyApp-Info.plist"".includes("MyApp")`
* `MyAppWatchExtension Extension/Info.plist`
But I do see it is updated to `${projectName}/${projectName}-Info.plist` now.
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
[email protected]
With regards,
Apache Git Services
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
