GitHub user kerrishotts opened a pull request:
https://github.com/apache/cordova-ios/pull/279
CB-12084: Update project build settings & plist
<!--
Please make sure the checklist boxes are all checked before submitting the
PR. The checklist
is intended as a quick reference, for complete details please see our
Contributor Guidelines:
http://cordova.apache.org/contribute/contribute_guidelines.html
Thanks!
-->
### Platforms affected
- iOS
### What does this PR do?
Addresses the bug discovered in CB-12084 where cleaning would corrupt the
Xcode project. Also addresses the particular use case where the user was
eliminating legacy launch images from the Xcode project -- this code will now
take care of that automatically.
Here's the logic:
- If the user only specifies images for the storyboard, then the Xcode
project should not attempt to use an asset catalog for launch images as well.
This PR will remove that particular build property from the project
(`ASSETCATALOG_COMPILER_LAUNCHIMAGE_NAME`)
- If the user specifies both storyboard images and legacy launch images,
then nothing changes; build settings will continue to have
`ASSETCATALOG_COMPILER_LAUNCHIMAGE_NAME` set to `LaunchImage`.
- If the user specifies ONLY legacy launch images,
`ASSETCATALOG_COMPILER_LAUNCHIMAGE_NAME` is set to `LaunchImage`; this ensures
that if the user has gone back to legacy images after having tried the
storyboard images that the Xcode project still works as expected.
### What testing has been done on this change?
- Manual testing in each of the above scenarios
- `npm test` completed successfully with no errors (but it would as no
tests currently trigger any of the above behavior)
- Travis CI is green.
### Checklist
- [X] [Reported an issue](http://cordova.apache.org/contribute/issues.html)
in the JIRA database
- [X] Commit message follows the format: "CB-3232: (android) Fix bug with
resolving file paths", where CB-xxxx is the JIRA ID & "android" is the platform
affected.
- [X] Added automated test coverage as appropriate for this change.
- Note that automated test coverage is coming in a separate PR since
that test coverage will test the feature as a whole (not just this change).
You can merge this pull request into a Git repository by running:
$ git pull https://github.com/kerrishotts/cordova-ios CB-12084
Alternatively you can review and apply these changes as the patch at:
https://github.com/apache/cordova-ios/pull/279.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 #279
----
commit 7b8d7c3ef4bb6ce9c38adef61f3632e4ba6a8f32
Author: Kerri Shotts <[email protected]>
Date: 2016-11-16T05:15:16Z
CB-12084: Update project build settings & plist
If no legacy images are provided, we should remove the launch image asset
compiler setting. If legacy images are present, we should make sure it is
present. We also need to make sure to properly delete launch storyboard
rather
than setting to undefined.
----
---
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 [email protected] or file a JIRA ticket
with INFRA.
---
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
