move autocargo up one level (#101)

Summary:
Pull Request resolved: https://github.com/facebookexperimental/eden/pull/101

public_autocargo already existed for edenfs, but needed to move up a level so to make edenfs thrift definition visible via autocargo.

Reviewed By: markbt

Differential Revision: D32693522

fbshipit-source-id: 4c070cfa2d6294a28c17697338f0309dcab1576f

build/fbcode_builder/manifests/eden

@@ -45,20 +45,26 @@ libcurl
 
 [shipit.pathmap.fb=on]
 # for internal builds that use getdeps
+fbcode/fb303 = fb303
 fbcode/common/rust/fbwhoami = common/rust/fbwhoami
+fbcode/common/rust/shed = common/rust/shed
+fbcode/thrift/lib/rust = thrift/lib/rust
 
 [shipit.pathmap]
-# remove once autocargo in place for edenfs
-fbcode/common/rust/fbwhoami = common/rust/fbwhoami
-fbcode/common/rust/shed = common/rust/shed
+# Map hostcaps for now as eden C++ includes its .h. Rust-shed should install it
+fbcode/common/rust/shed/hostcaps = common/rust/shed/hostcaps
 fbcode/configerator/structs/scm/hg = configerator/structs/scm/hg
 fbcode/eden/oss = .
 fbcode/eden = eden
 fbcode/tools/lfs = tools/lfs
-fbcode/thrift/lib/rust = thrift/lib/rust
+
+[shipit.pathmap.fb=off]
+fbcode/eden/fs/public_autocargo = eden/fs
+fbcode/eden/scm/lib/public_autocargo = eden/scm/lib
+fbcode/common/rust/shed/hostcaps/public_cargo = common/rust/shed/hostcaps
+fbcode/configerator/structs/scm/hg/public_autocargo = configerator/structs/scm/hg
 
 [shipit.strip]
-^fbcode/configerator/structs/hg(?!/public_autocargo).*/Cargo\.toml$
 ^fbcode/eden/fs/eden-config\.h$
 ^fbcode/eden/fs/py/eden/config\.py$
 ^fbcode/eden/hg/.*$
@@ -69,6 +75,14 @@ fbcode/thrift/lib/rust = thrift/lib/rust
 /Cargo\.lock$
 \.pyc$
 
+[shipit.strip.fb=off]
+^fbcode/common/rust/shed(?!/public_autocargo).*/Cargo\.toml$
+^fbcode/configerator/structs/hg(?!/public_autocargo).*/Cargo\.toml$
+^fbcode/eden/fs(?!/public_autocargo).*/Cargo\.toml$
+^fbcode/eden/scm/lib(?!/public_autocargo).*/Cargo\.toml$
+^.*/facebook/.*$
+^.*/fb/.*$
+
 [cmake.defines.all(fb=on,os=windows)]
 ENABLE_GIT=OFF
 INSTALL_PYTHON_LIB=ON

build/fbcode_builder/manifests/eden_scm

@@ -26,11 +26,15 @@ install-getdeps
 test-getdeps
 
 [shipit.pathmap]
-fbcode/common/rust = common/rust
 fbcode/configerator/structs/scm/hg = configerator/structs/scm/hg
+fbcode/configerator/structs/scm/hg/public_autocargo = configerator/structs/scm/hg
 fbcode/eden/oss = .
 fbcode/eden = eden
+fbcode/eden/fs/public_autocargo = eden/fs
+fbcode/eden/mononoke/public_autocargo = eden/mononoke
+fbcode/eden/scm/lib/public_autocargo = eden/scm/lib
 fbcode/tools/lfs = tools/lfs
+# This is to pick up the fb303.thrift stubs
 fbcode/fboss/common = common
 
 [shipit.strip]
@@ -38,10 +42,13 @@ fbcode/fboss/common = common
 ^fbcode/eden/fs/eden-config\.h$
 ^fbcode/eden/fs/py/eden/config\.py$
 ^fbcode/eden/hg/.*$
-^fbcode/eden/mononoke/(?!lfs_protocol)
+^fbcode/eden/fs(?!/public_autocargo).*/Cargo\.toml$
+^fbcode/eden/mononoke(?!/public_autocargo).*/Cargo\.toml$
+^fbcode/eden/scm/lib(?!/public_autocargo).*/Cargo\.toml$
 ^fbcode/eden/scm/build/.*$
 ^fbcode/eden/scm/lib/third-party/rust/.*/Cargo.toml$
 ^fbcode/eden/.*/\.cargo/.*$
+^.*/facebook/.*$
 ^.*/fb/.*$
 /Cargo\.lock$
 \.pyc$