Skip to content

Commit

Permalink
Merge mustache between fbcode and xplat
Browse files Browse the repository at this point in the history
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
  • Loading branch information
vitaut authored and facebook-github-bot committed Jan 14, 2025
1 parent f5a873c commit 6c1d916
Showing 1 changed file with 7 additions and 7 deletions.
14 changes: 7 additions & 7 deletions build/fbcode_builder/manifests/fbthrift
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[manifest]
name = fbthrift
fbsource_path = fbcode/thrift
fbsource_path = xplat/thrift
shipit_project = fbthrift
shipit_fbcode_builder = true

Expand Down Expand Up @@ -37,11 +37,11 @@ xxhash
python

[shipit.pathmap]
fbcode/thrift/public_tld = .
fbcode/thrift = thrift
xplat/thrift/public_tld = .
xplat/thrift = thrift

[shipit.strip]
^fbcode/thrift/thrift-config\.h$
^fbcode/thrift/perf/canary.py$
^fbcode/thrift/perf/loadtest.py$
^fbcode/thrift/.castle/.*
^xplat/thrift/thrift-config\.h$
^xplat/thrift/perf/canary.py$
^xplat/thrift/perf/loadtest.py$
^xplat/thrift/.castle/.*

0 comments on commit 6c1d916

Please sign in to comment.