Skip to content

Commit 30940a1

Browse files
vitautfacebook-github-bot
authored andcommitted
Merge mustache between fbcode and xplat
Summary: Demonstrate feasibility of merging fbcode and xplat copies of thrift on a single target, `thrift/compiler/detail/mustache:mustache`. To this end: * Switch fbcode_builder from fbcode to xplat. * Map dependencies to the correct variants for fbcode. * Exclude mustache directory from target remapping. Once the merge is complete remapping rules will no longer be necessary at all, further reducing maintenance burden and complexity. * Remove one copy of mustache (~2.6kLOC). This also demonstrates that autodeps are working as expected after the fix in D67919546. Reviewed By: yoney Differential Revision: D67676056 fbshipit-source-id: ba3854c0997c4dd10f47a5e623381c3dadef4ecc
1 parent 0adadf6 commit 30940a1

File tree

1 file changed

+7
-7
lines changed

1 file changed

+7
-7
lines changed

build/fbcode_builder/manifests/fbthrift

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
[manifest]
22
name = fbthrift
3-
fbsource_path = fbcode/thrift
3+
fbsource_path = xplat/thrift
44
shipit_project = fbthrift
55
shipit_fbcode_builder = true
66

@@ -37,11 +37,11 @@ xxhash
3737
python
3838

3939
[shipit.pathmap]
40-
fbcode/thrift/public_tld = .
41-
fbcode/thrift = thrift
40+
xplat/thrift/public_tld = .
41+
xplat/thrift = thrift
4242

4343
[shipit.strip]
44-
^fbcode/thrift/thrift-config\.h$
45-
^fbcode/thrift/perf/canary.py$
46-
^fbcode/thrift/perf/loadtest.py$
47-
^fbcode/thrift/.castle/.*
44+
^xplat/thrift/thrift-config\.h$
45+
^xplat/thrift/perf/canary.py$
46+
^xplat/thrift/perf/loadtest.py$
47+
^xplat/thrift/.castle/.*

0 commit comments

Comments
 (0)