Commit Graph

688 Commits

Author SHA1 Message Date
Tom Quist
0c2554db2b Add support for nested templates
It would be convenient if templates could be nested, which means
a template can be based on another template.

This change implements support for nested templates. It avoids
cycles by just ignoring templates that have already been visited
when collecting the set of templates to use.
2019-03-17 11:29:50 +01:00
yonaskolb
32b3d8c362 fix relative paths in included target templates 2019-03-17 19:38:36 +11:00
Yonas Kolb
ac00ad9615 don't modify exclueds path with relative include path 2019-03-16 23:17:33 +11:00
Dimitri Emmerich
b55223ae7c use link property in framework deps 2019-03-05 22:53:21 +01:00
ainopara
520db0eb08 Make multi platform targets parse deployment target per platform. 2019-03-04 10:24:51 +08:00
Yonas Kolb
c07f016f4d fix error on optional sources 2019-02-27 22:51:12 +11:00
Yonas Kolb
d4797c3ff6
Merge pull request #524 from elliottwilliams/emw_relative_paths
Compute relative paths to support sources outside a spec's directory
2019-02-27 08:12:51 +11:00
Elliott Williams
34f7d3a716 Remove Path.byRemovingBase(path:) 2019-02-24 16:15:13 -08:00
Elliott Williams
b5dcc9c4c4 Use relativePath(from:) in more places
This uncovered a seeming inconsisteny with how folder reference paths
were specified vs all other paths.
2019-02-24 16:13:49 -08:00
Rogerio de Paula Assis
598a5f75bd Minor refactor for better performance 2019-02-22 22:06:33 -05:00
Rogerio de Paula Assis
1e69d705b7 Added includeCarthageRelated global flag, updated tests + documentation to reflect changes 2019-02-22 21:31:23 -05:00
Rogerio de Paula Assis
a19871aaac Some additional tidy up & code improvements 2019-02-22 21:31:23 -05:00
Rogerio de Paula Assis
18f52ab098 Introduces ability to include Carthage related dependencies when creating a project configuration file 2019-02-22 21:29:56 -05:00
Elliott Williams
a03e5a198a Add comments and rename for clarity 2019-02-21 11:46:34 -08:00
Elliott Williams
3b15144033 Determine relative path for top-level groups 2019-02-21 11:46:23 -08:00
Elliott Williams
9f6f5210f7 Add Path.relativePath(from:) 2019-02-21 11:35:42 -08:00
Elliott Williams
224def7a09 Rename missingFiles to missingConfigFiles 2019-02-12 13:39:24 -08:00
Elliott Williams
751ecec14e Add missingFiles disabled validation 2019-02-11 19:08:44 -08:00
Yonas Kolb
064ab39434 make the default build phase for xcfilelist to be nothing 2019-02-02 13:05:36 +11:00
Yonas Kolb
b490851c73 Update to 2.2.0 2019-01-28 22:20:24 +11:00
Yonas Kolb
fb3f80d6af run swiftformat 2019-01-28 22:20:01 +11:00
Yonas Kolb
f154b4d1cb
Merge pull request #503 from yonaskolb/fix/config_lookup
Don't partial apply exact config matches
2019-01-28 22:18:01 +11:00
Yonas Kolb
7350349b04
Merge pull request #505 from yonaskolb/add_framework_search_paths
Add createIntermediateGroups to TargetSource
2019-01-28 22:17:22 +11:00
Yonas Kolb
d0c257e938 don't partial apply exact config matches 2019-01-28 21:53:48 +11:00
Yonas Kolb
8d06dbe8ca add createIntermediateGroups to TargetSource 2019-01-28 21:52:29 +11:00
Yonas Kolb
43d8927fdf remove some transformed path from options 2019-01-28 21:51:17 +11:00
Yonas Kolb
a6ca395033 remove basePath init requirement 2019-01-28 21:51:17 +11:00
Yonas Kolb
862b19aa1a refactor Spec 2019-01-28 21:51:17 +11:00
Yonas Kolb
6f4c7d79ac replace $target_name in target templates 2019-01-28 15:54:56 +11:00
Ell Neal
8eadc2f96c
Remove some imports that are no longer necessary 2019-01-27 15:34:41 +00:00
Ell Neal
d54bbe711c
#whitespace 2019-01-27 15:27:30 +00:00
Ell Neal
370963ec73
Move PathContainer & PathProperty into their own file 2019-01-27 15:26:58 +00:00
Ell Neal
720b2eede1
Move [PathProperty] resolver to spec loader file 2019-01-27 15:24:22 +00:00
Ell Neal
060aca8327
Rename Project.Spec --> Spec 2019-01-27 15:23:23 +00:00
Ell Neal
1d62b46423
#whitespace 2019-01-27 12:46:00 +00:00
Ell Neal
032386e41c
Merge branch 'master' into feature/current-directory-expander.yml 2019-01-27 12:37:51 +00:00
Ell Neal
71a7ec0588
Move path expansion logic into the spec file 2019-01-27 12:34:17 +00:00
Ell Neal
25a4d48b83
Remove deprecations 2019-01-27 12:24:16 +00:00
Ell Neal
4d458ad6e4
Simplify dictionary extension 2019-01-27 12:23:48 +00:00
Ell Neal
6628c382ac
Rename useRelativePaths --> relativePaths 2019-01-27 12:22:46 +00:00
Yonas Kolb
72ae41e94a
Merge pull request #497 from yonaskolb/update_compatability
Update Xcode compatibility version
2019-01-27 19:16:02 +11:00
Kryštof Matěj
ec60901ff7 Fix carhage dependency resolving 2019-01-25 07:40:12 +01:00
Yonas Kolb
4062b6c883
Merge pull request #500 from lukewakeford/build_script_xcfilelist
Adding input and output file lists to build script spec
2019-01-25 08:37:33 +11:00
Ell Neal
6589b840f6
Add option to revert to legacy path behaviour 2019-01-24 13:46:55 +00:00
Ell Neal
d2579bfe43
Refactor the PathContainer protocol to be a bit more expressive 2019-01-24 12:50:34 +00:00
Yonas Kolb
93f5492d4c update objectVersion from 46 to 50 2019-01-24 23:34:54 +11:00
Luke Wakeford
df0e396b75 Adding input and output file lists to build script spec 2019-01-23 14:40:45 +00:00
Yonas Kolb
e24fd1b68e update Xcode compatibility version 2019-01-22 15:56:42 +11:00
Yonas Kolb
7581653b85 fix tools not being added as executables in schemes 2019-01-22 15:44:55 +11:00
Ell Neal
151d78ef98
Rename PathContaining -> PathContainer 2019-01-21 13:32:13 +00:00
Ell Neal
05a564c324
Use normal imports 2019-01-21 13:12:14 +00:00
Rogerio de Paula Assis
e6e8b58db4 Fixes issue with sticker pack targets generating redundant compile sources build phase 2019-01-15 22:57:22 -05:00
Ell Neal
ccf002f8bf
Consistent default value and guard check 2019-01-15 12:27:13 +00:00
Ell Neal
8f4c0953b3
Add back deleted public functions and deprecate (prevent breaking public API) 2019-01-15 12:26:47 +00:00
Ell Neal
a7e1554115
Expand paths when initializing the Project model from a Spec 2019-01-13 18:22:56 +00:00
Ell Neal
98aeef46dc
Implement PathContaining on relevant models 2019-01-13 18:22:34 +00:00
Ell Neal
f9df768ec0
Add a PathContaining protocol for expanding paths to the source file's directory 2019-01-13 18:18:48 +00:00
Ell Neal
a2684a96a4
Replace global merge function with extension on Dictionary 2019-01-13 18:16:17 +00:00
Ell Neal
8928088dfe
Use the Spec struct rather than dictionaries directly 2019-01-13 18:14:52 +00:00
Ell Neal
c90e045bc8
Add a project spec struct to abstract spec files on disk 2019-01-13 18:08:35 +00:00
Ell Neal
a9ecef37bc
Remove the $(CURDIR) expansion (it was a bad idea) 2019-01-13 18:06:05 +00:00
Ell Neal
05fa244a89
Add $(CURDIR) helper to expand the base path of the spec file 2019-01-10 11:43:04 +00:00
Yonas Kolb
43db3254d6
Merge pull request #482 from ksulliva/xcodeproj_dependency
Update Linkage to handle additional PBXProductType case from xcodeproj
2019-01-10 20:04:53 +11:00
Daniel Ericsson
40c472112d
Fix writing to a project path 2019-01-09 00:41:28 +01:00
Kevin Sullivan
79caa6920d Merge branch 'master' into xcodeproj_dependency
# Conflicts:
#	CHANGELOG.md
2019-01-08 09:21:31 -06:00
Beniamin Sarkisian
3fec403411 Fixed bugs 2019-01-08 16:55:46 +03:00
Kevin Sullivan
9d3263a377 Update Linkage to handle additional PBXProductType case from xcodeproj 2019-01-07 12:28:43 -06:00
Beniamin Sarkisian
976841ba40 Changed the default value of generateEmptyDirectories option to false 2019-01-07 15:27:17 +03:00
Beniamin Sarkisian
e387ee52a8 Added an abbility to generate empty directories 2019-01-07 13:50:23 +03:00
Yonas Kolb
cf703cd66d Update to 2.1.0 2018-12-18 22:40:57 +11:00
Yonas Kolb
f04c3e0496 format code 2018-12-18 22:37:22 +11:00
Yonas Kolb
c8db304024 update docs 2018-12-18 22:16:45 +11:00
Yonas Kolb
f061c03e6a Merge master into lockfile 2018-12-18 20:54:38 +11:00
Yonas Kolb
f87642c938 get xcodegen working with arguments and without generate for backwards compatability 2018-12-18 20:25:03 +11:00
Brentley Jones
0617337a94 Allow static libraries to see external framework in search paths 2018-12-17 09:37:48 -06:00
Brentley Jones
f3e5aa9083 Treat SDK same as framework for skipping staticLibrary 2018-12-17 09:36:14 -06:00
Yonas Kolb
009a3ec2cb
Merge pull request #452 from yonaskolb/test_host
Generate TEST_HOST
2018-12-16 19:16:28 +11:00
David W. Berry
7e2c870762 Add mlmodel to compiled file extensions (#457) 2018-12-13 13:03:46 -06:00
Yonas Kolb
ed80164a4d fix project not generating if private settings are checked in 2018-12-05 19:36:01 +11:00
Yonas Kolb
c7a1ecd73d generate TEST_HOST for unit tests 2018-12-05 19:13:58 +11:00
Yonas Kolb
12aea54878 generate TestTargetID project attributes for unit tests 2018-12-05 19:13:27 +11:00
Yonas Kolb
c4b9b19a96 add cache-path argument 2018-12-01 18:45:06 +11:00
Yonas Kolb
281a12434d
Merge branch 'master' into fix-issue-440 2018-12-01 18:09:30 +11:00
Bryan Summersett
ea5b992745 Use process unique temporary so we don't get duplicate temporary path writes 2018-11-29 20:30:05 -08:00
feischl97
8f9e891fce
Merge branch 'master' into fix-issue-440 2018-11-26 13:26:43 +01:00
feischl97
3461bc2835 refactor if 2018-11-26 12:25:39 +01:00
Paul Feischl
58511de01b add check if INFOPLIST build setting is already defined 2018-11-23 09:13:21 +01:00
Yonas Kolb
f022d1edc9 add .intentdefinition to sources by default 2018-11-22 21:55:53 +11:00
Yonas Kolb
463ecc7e49 build phase white space 2018-11-22 21:50:39 +11:00
Yonas Kolb
20eaafd246 Merge master into lockfile 2018-11-12 23:07:29 +11:00
Yonas Kolb
b438c5e491 remove some emoji from output 2018-11-11 13:25:07 +11:00
Yonas Kolb
07cd5a4a0b add XcodeGenCLI 2018-11-11 00:42:21 +11:00
Yonas Kolb
4b9edceb18 don't fail if cache file can't be created 2018-11-08 21:37:37 +11:00
Yonas Kolb
8b5ac6f885 check if project exists before reading from cache 2018-11-08 21:37:37 +11:00
Yonas Kolb
0644f18f0b add cache fixture perf test 2018-11-08 21:37:37 +11:00
Yonas Kolb
f9be03ebc8 rename to cache and refactor 2018-11-08 21:36:12 +11:00
Yonas Kolb
ca5ad9bf14 use json for serialization 2018-11-08 21:35:38 +11:00
Yonas Kolb
e30aeee957 add lockfile 2018-11-08 21:35:38 +11:00
Brentley Jones
e6288b49df Remove ability to specify copy files phase ordering 2018-11-05 10:40:25 -06:00
Brentley Jones
ef0c87ecb5 Merge branch 'master' into copy-files-ordering 2018-11-05 10:38:21 -06:00