Commit Graph

331 Commits

Author SHA1 Message Date
Yonas Kolb 09209a4e2c Merge pull request #93 from keith/ks/link-dependencies
Fix dependency framework/library linking
2017-10-19 00:14:02 +02:00
Yonas Kolb c244e31676 Merge branch 'master' into ks/link-dependencies 2017-10-19 00:13:43 +02:00
Yonas Kolb 689ac58f71 Merge pull request #95 from keith/ks/copy-resources
Allow copying of resource files from targets
2017-10-19 00:10:53 +02:00
Yonas Kolb 04c8beed33 Merge pull request #99 from yonaskolb/ks/readme-help
Correct README --help argument
2017-10-19 00:09:41 +02:00
Keith Smiley b12939c110 Merge pull request #98 from keith/ks/phony-build
Make build a PHONY task
2017-10-18 13:22:32 -07:00
Keith Smiley 84437181ee Correct README --help argument
This needs dashes, if you run it without it XcodeGen does print some
help but only because the command failed.
2017-10-18 10:40:53 -07:00
Yonas Kolb 22b1ba9045 Merge pull request #94 from keith/ks/resource-files
Exclude more file types from resources
2017-10-18 18:23:37 +02:00
Keith Smiley 98f89ee758 Make build a PHONY task
This solves the issue where if someone is generating a xcodeproj to work
on XcodeGen, and their build directories are local, this command would
assume that it should only run if something in that directory is
changed, which isn't the case, we want it to run all the time and for
swiftpm to decide if something has changed.
2017-10-18 08:58:28 -07:00
Keith Smiley 894f00428a Add tests for PBXProductType booleans 2017-10-18 08:50:55 -07:00
Keith Smiley 5c90d6189c Don't copy libraries
These should only be linked. If we add a library to the project here,
Xcode will remove it next time it touches the project
2017-10-18 08:50:55 -07:00
Keith Smiley 739b9f36f7 Link framework and library dependencies 2017-10-18 08:50:54 -07:00
Keith Smiley d24df8677c Allow copying of resource files from targets
Previously we were assuming that all targets that were not app
extensions should be added to the copy frameworks build phase, even
though we didn't have any guarantee they were actually frameworks. This
updates that to ensure that things copied in the copy frameworks phase
are actually frameworks, and then falls back to the resources phase
instead. This fixes the ability to embed bundle targets, and copy them
as resources.
2017-10-18 08:44:14 -07:00
Yonas Kolb 1572938016 Merge pull request #96 from keith/ks/watch-support
Add support for copying Watch apps
2017-10-18 14:33:36 +02:00
Keith Smiley 3ab7071703 Exclude more file types from resources
Entitlements files, gpx files, and explicit lproj directories should
never be included in a target's copy resources phase.

Ideally this would also include files with the plist extension, but
there are some outliers such as AppIntentVocabulary.plist.
2017-10-16 21:33:23 -07:00
Keith Smiley 5c39cf4e14 Add support for copying Watch apps
Watch apps aren't copied to the same place as other targets, they need
their own copy files phase with a custom path just for watch targets.
2017-10-16 21:31:27 -07:00
Yonas Kolb 98706a3875 Merge pull request #70 from ryohey/fix-localize
Fix localisation variant groups
2017-10-16 20:47:24 +02:00
ryohey f2c440dd1d update fixture 2017-10-16 11:59:25 +09:00
ryohey 859609158c fix localized sources 2017-10-16 11:58:21 +09:00
ryohey bc9c007c53 add test for variant groups 2017-10-16 11:51:28 +09:00
ryohey 2f2c89e0c1 fix localisation variant groups 2017-10-16 11:51:28 +09:00
Yonas Kolb fd2bf39b28 Merge pull request #82 from toshi0383/ts-always-embed-and-link-frameworks-for-macos
Always embed and link frameworks for macOS
2017-10-13 23:12:36 +02:00
Yonas Kolb 102d0358ea Merge pull request #85 from enmiller/master
Update to xcproj 0.4.0
2017-10-12 20:02:01 +02:00
Eric Miller 6a168acb46 Remove workaround typealias 2017-10-12 07:37:22 -05:00
Eric Miller ca3c64baa6 Update xcproj to 0.4.1 and Yams to 0.3.7 2017-10-12 07:31:38 -05:00
Eric Miller 713631a459 Update GeneratedProject file to use the new classes dictionary format 2017-10-11 10:44:05 -05:00
Eric Miller 5d9c3a9ab8 Update to xcproj 0.4.0 2017-10-10 13:39:18 -05:00
Yonas Kolb ea6d606368 Merge pull request #84 from mironal/add-carthage-output-files
Add outputpaths to carthage copy-framewors script
2017-10-05 07:40:31 +02:00
mironal f6d6f17f1b sort carthage dependencies 2017-10-05 10:53:08 +09:00
toshi0383 d03fb7785e add guard for non-app target 2017-10-04 22:22:39 +09:00
toshi0383 c94de4d6cc Always embed and link frameworks for macOS 2017-10-04 22:22:39 +09:00
mironal d1efa9ac64 Add outputpaths to carthage copy-framewors script
According to Carthage README, the Output Files should be set to
`carthage copy-frameworks` script.

https://github.com/Carthage/Carthage#if-youre-building-for-ios-tvos-or-watchos
2017-10-04 15:02:35 +09:00
Yonas Kolb 388bc9280c Merge pull request #83 from toshi0383/typo-in-code
Fix typo: dependancies => dependencies
2017-10-02 17:13:28 +02:00
toshi0383 668a75fce8 Fix typo: dependancies => dependencies 2017-10-03 00:08:39 +09:00
Yonas Kolb 3ea100b7d1 Update README.md 2017-10-02 17:08:15 +02:00
Yonas Kolb 1ed1237bf6 Update README.md 2017-10-02 17:05:55 +02:00
Yonas Kolb e3d41161fd update homebrew formula 2017-10-02 01:52:18 +02:00
Yonas Kolb 91c5c6d4b2 1.2.4 changelog 1.2.4 2017-10-02 01:47:40 +02:00
Yonas Kolb c23ad0033b don't add carthage dependency to copy-frameworks script if embed: false 2017-10-02 01:41:37 +02:00
Yonas Kolb 2cdf1cec38 setting presets: only apply ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES: YES to applications 2017-10-02 01:41:37 +02:00
Yonas Kolb 4c5401dd80 sort group files for APFS 2017-10-01 12:43:42 +02:00
Yonas Kolb 836fa4d3fd update xcodeproj to xcproj in tests 2017-10-01 11:43:27 +02:00
Yonas Kolb fec6066d91 updated to xcproj 0.3.0 2017-10-01 11:42:07 +02:00
Yonas Kolb 6385097041 update homebrew formula 2017-09-29 18:22:05 +02:00
Yonas Kolb eef423970f filter out nulls from all yaml files including setting presets 1.2.3 2017-09-29 18:20:36 +02:00
Yonas Kolb dc916ae5ec update homebrew formula for 1.2.3 2017-09-29 17:56:45 +02:00
Yonas Kolb 618ad2ec90 update 1.2.3 changelog 2017-09-29 17:55:29 +02:00
Yonas Kolb 1d1335b53e add more framework settings, especially SKIP_INSTALL=YES 2017-09-29 17:51:39 +02:00
Toshihiro Suzuki 4227ac243e No need carthage copy-frameworks for macOS app (#76)
* No need carthage copy-frameworks for macOS

* Update CHANGELOG.md
2017-09-29 17:51:08 +02:00
Toshihiro Suzuki 6901f8b325 Fix typo: dependancy => dependency (#75) 2017-09-29 17:34:01 +02:00
Toshihiro Suzuki a271fec18d Fixed wrong directory path for macOS (#74)
* Fixed wrong directory path for macOS

before: Carthage/Build/macOS
after: Carthage/Build/Mac

* Update CHANGELOG.md
2017-09-29 17:23:01 +02:00