Commit Graph

226 Commits

Author SHA1 Message Date
Yonas Kolb
63c2d08977
add TargetSource.name for renaming sources (#146) 2017-11-12 20:26:36 +01:00
Yonas Kolb
354407b165 make variant groups have same sort order as file references 2017-11-12 18:55:45 +01:00
Yonas Kolb
a2c41917e5
Fix groups (#144)
* failing createIntermediateDirectories test

* refactor sources

* add reference generator tests
2017-11-12 18:52:11 +01:00
Peyman Khanjan
91729a9694 Add support for simple files excludes from sources #5. (#135)
* Add support for simple files excludes from sources #5.

* Add pattern matching for Source excludes #5.

* Simplify getting Source.excludes from jsonDictionary.

* Remove recursive pattern matching and formatting.
2017-11-11 00:22:07 +01:00
Yonas Kolb
94a449c647
Merge pull request #139 from bkase/xcassets-as-files
Support paths directly to xcassets
2017-11-10 23:31:53 +01:00
Yonas Kolb
7cdc496f45 test refactoring 2017-11-10 23:28:16 +01:00
Brandon Kase
a27a25e76f Fix duplicate sources in groups, fixes #141 2017-11-09 15:05:56 -08:00
Brandon Kase
496a7cc4b0 Support paths directly to xcassets
Pretend xcassets are files to allow top-level xcassets in the spec.
2017-11-08 11:10:21 -08:00
Brandon Kase
fb11b06744 Support assembly files in sources 2017-11-07 13:36:18 -08:00
Yonas Kolb
b120c9da37 fix Swift 4.0.3 warnings 2017-11-04 16:01:44 +01:00
Brandon Kase
8c3821b6c8
Filegroups that subsume sources work again
Fixes #130

Plus there's something in the Fixture to catch this sorts of
regression in the future.
2017-11-03 22:10:52 -07:00
Yonas Kolb
68b4214c24 json loading refactoring
- don't convert to string and back
2017-11-04 02:05:39 +01:00
rmalik
91056efc8a Load json files directly with NSJSONSerialization if the spec path extension is
`json`
2017-11-03 12:10:00 -07:00
Yonas Kolb
b9163a0b31 sort group children 2017-11-03 15:07:28 +01:00
Yonas Kolb
e05ed6a0b9 sort build phase files 2017-11-03 15:04:10 +01:00
Yonas Kolb
a092dafec1 extract and cache XCConfig loading 2017-11-03 14:58:05 +01:00
Yonas Kolb
050ce8630d refactor config file setting removing 2017-11-03 14:42:51 +01:00
toshi0383
4204c65ee7 Merge remote-tracking branch 'upstream/master' into ts-no-overwriting-xcconfig-value 2017-11-03 22:00:44 +09:00
ryohey
66a2893dd0 Fix localized files with same name
#122
2017-11-03 11:41:13 +09:00
ryohey
ce27af0647 Refactor variant group generation
- Add getVariantGroup() in the same manner as getFileReference()
2017-11-03 10:51:48 +09:00
ryohey
e24c0e29c7 Refactor localized file references generation
- Use getFileReference() to generate localized file references
- Add name parameter to getFileReference
2017-11-03 10:35:54 +09:00
Yonas Kolb
b166634322
Merge pull request #121 from bkase/support-compiler-flags
Support CompilerFlags in Sources
2017-11-03 01:03:12 +01:00
Brandon Kase
4138032711 Interpret .c files as sources 2017-11-02 13:49:06 -07:00
Brandon Kase
6b17b76435 Support CompilerFlags in Sources
Added support for compilerFlags in source list. If any source file
metadata (like compilerFlags) is attached to a directory the metadata
propagates downwards to all children recursively until the files are
reached.

Files are now processed in the same way as directories in `getSources`
this depends on #108 to not over-eagerly cache groups. The `source` is
propagated as metadata down all the way (thanks @yonaskolb)

Fixtures and unit tests are updated as well.
2017-11-02 13:47:26 -07:00
Brandon Kase
e48045da9e Optionally make intermediate filler groups
This commit adds a new option `createIntermediateGroups` that defaults
to false. When it is false, the behavior of XcodeGen is the same as
before. When it is true, we make intermediate groups recursively until
we reach the basePath. In practice that means if you've chosen
`Platform/PINFoundation/Sources` as one of your sourcePaths, you get a
top-level group of `Platform` and under that `PINFoundation` and under
that `Sources`. This is instead of the default behavior of just making
`Sources` a top-level group (which is confusing when your directory is
called `Sources` for example).
2017-11-01 18:02:31 -07:00
Yonas Kolb
b274ae6f63 swiftformat 2017-11-02 00:25:13 +01:00
Yonas Kolb
e4d42cb6eb getSources tweak 2017-11-02 00:25:13 +01:00
Eric Miller
a27d65b7d0 Add .mm file as a source type 2017-11-01 17:35:31 -05:00
Brandon Kase
4a54fe6d2a Support file sources
The `sources` key of the project spec only supported directories and not
files. Now it supports both!

This commit introduces a `getSourceFiles` overload that doesn't explicitly
invoke `path.children()`, but instead accepts `children` as a parameter.
This allows us to invoke the `children` overload of getSourceFiles with just
the files we want to include (determined by specifying the sources).

Now for sourcePaths that are files, we group by parents before invoking
getSourceFiles in order to reuse the same groups.
2017-11-01 11:37:19 -07:00
Yonas Kolb
ec576e31c5
Merge pull request #118 from ryohey/fix-copy-headers
Don't add unnecessary headers build phase
2017-10-31 21:15:34 +01:00
ryohey
f67609f97e Don't add unnecessary headers build phase 2017-11-01 01:40:21 +09:00
Yonas Kolb
cda8931e30 refactor source generating 2017-10-31 17:33:35 +01:00
Yonas Kolb
698d8d85b4 change target source from String to Source struct 2017-10-31 17:22:14 +01:00
Yonas Kolb
92c2e5c5b5 run format-code.sh 2017-10-29 22:27:05 +01:00
Yonas Kolb
f8b4b5792e move and rename files 2017-10-29 22:15:02 +01:00
Yonas Kolb
9a41bb9ab6 minor refactoring of spec validation 2017-10-29 20:32:36 +01:00
toshi0383
9c603af5e9 Refactor remove value logic 2017-10-29 08:41:10 +09:00
toshi0383
cd910fe714 remove values before loading buildSettings from user spec 2017-10-29 08:32:28 +09:00
toshi0383
f68f96e249 Remove basePath parameter for spec 2017-10-29 08:27:42 +09:00
toshi0383
28b6e2cfbf Merge remote-tracking branch 'upstream/master' into ts-no-overwriting-xcconfig-value 2017-10-29 07:52:04 +09:00
Yonas Kolb
e14a85fd69
Merge pull request #113 from yonaskolb/xcproj_1.2
Update to xcproj 1.2
2017-10-28 20:11:18 +02:00
Yonas Kolb
a4471e839e update to xcproj 1.2 2017-10-28 20:01:01 +02:00
mironal
ac2a1ac2d6 add support --vesion option 2017-10-27 11:45:18 +09:00
Yonas Kolb
770b502638 change target description 2017-10-27 00:50:21 +02:00
Yonas Kolb
ebb945ede2 add spec validation that a spec has debug and release configs when generating a target scheme 2017-10-26 23:52:18 +02:00
Yonas Kolb
e44868530f Merge pull request #111 from yonaskolb/config_reference
Partial config matching
2017-10-26 23:32:10 +02:00
Yonas Kolb
08079c914e make Settings.configs case insensitive 2017-10-26 21:53:16 +02:00
Yonas Kolb
11abfb0ae2 apply partial matching to Settings.configs 2017-10-26 21:50:45 +02:00
Yonas Kolb
5c65ef13b7 add setting config reference linting 2017-10-26 19:40:46 +02:00
Keith Smiley
08de6077d9
Add option for not linking dependencies
This adds a new attribute to Dependency that allows consumers to choose
to not link a dependency. This is useful for if you have this dependency
tree with static libraries:

App -> A -> Shared
App -> B -> Shared

Where A and B both share a static library dependency, that is finally
linked into App. If Shared is added to the link phase of A and B, you
end up with duplicate symbols during the link phase. With this change
consumers could set link: False on A and B's dependency on Shared, this
way Shared will get build before A and B, but not linked.
2017-10-25 15:55:49 -07:00