Rename cli to buck2

Summary: The root crate for buck2 really should be named buck2, so that if/when we upload it to crates.io, you can install it with Buck2. Reviewed By: krallin Differential Revision: D44093615 fbshipit-source-id: 9217c1e6a60d68e64d933b2f2174d6e05a313595
jschear · Apr 4, 2023 · f7e4776 · f7e4776
1 parent 77c2c91
commit f7e4776
Show file tree

Hide file tree

Showing 27 changed files with 17 additions and 17 deletions.
diff --git a/BUCK b/BUCK
@@ -14,7 +14,7 @@ export_file(
 
 alias(
     name = "buck2",
-    actual = "//buck2/cli:buck2",
+    actual = "//buck2/app/buck2:buck2-bin",
 )
 
 # buildifier: disable=no-effect

diff --git a/Cargo.toml b/Cargo.toml
@@ -7,6 +7,7 @@ members = [
     "allocative/allocative_derive",
     # @oss-disable: "attic/uniplate",
     # @oss-disable: "attic/uniplate_derive",
+    "app/buck2",
     "app/buck2_action_impl",
     "app/buck2_audit",
     "app/buck2_bxl",
@@ -58,7 +59,6 @@ members = [
     "app/buck2_build_api_derive",
     "app/buck2_subscription_proto",
     "app/buck2_critical_path",
-    "cli",
     "dice/dice",
     "dice/dice_examples",
     # @oss-disable: "dice/fuzzy_dice",

diff --git a/README.md b/README.md
@@ -10,13 +10,13 @@ To clone, build, and install `buck2`:
 ```sh
 git clone https://github.com/facebook/buck2.git
 cd buck2/
-cargo install --path=cli
+cargo install --path=app/buck2
 ```
 
 To build and install the latest `buck2` executable:
 ```sh
 rustup install nightly
-cargo +nightly install --git https://github.com/facebook/buck2.git cli
+cargo +nightly install --git https://github.com/facebook/buck2.git buck2
 ```
 
 Build uses prebuilt `protoc` binary from

diff --git a/cli/BUCK → app/buck2/BUCK b/cli/BUCK → app/buck2/BUCK
@@ -10,7 +10,7 @@ load("@fbsource//tools/build_defs:glob_defs.bzl", "glob")
 oncall("build_infra")
 
 rust_library(
-    name = "cli",
+    name = "buck2",
     srcs = glob([
         "src/**/*.rs",
         "src/**/*.md",
@@ -87,16 +87,16 @@ rust_library(
 )
 
 buck_rust_binary(
-    name = "buck2",
+    name = "buck2-bin",
     srcs = ["bin/buck2.rs"],
     crate_root = "bin/buck2.rs",
     unittests = False,
     deps = [
         "fbsource//third-party/rust:anyhow",
+        "//buck2/app/buck2:buck2",
         "//buck2/app/buck2_client_ctx:buck2_client_ctx",
         "//buck2/app/buck2_core:buck2_core",
         "//buck2/app/buck2_events:buck2_events",
-        "//buck2/cli:cli",
         "//common/rust/folly/logging:logging",
         "//common/rust/gflags:gflags",
         "//common/rust/shed/fbinit:fbinit",

diff --git a/cli/Cargo.toml → app/buck2/Cargo.toml b/cli/Cargo.toml → app/buck2/Cargo.toml
@@ -1,7 +1,7 @@
 [package]
 description = ""
 edition = "2021"
-name = "cli"
+name = "buck2"
 version = "0.1.0"
 
 [dependencies]
@@ -13,7 +13,7 @@ clap = { workspace = true }
 dirs = { workspace = true }
 futures = { workspace = true }
 hex = { workspace = true }
-# @oss-disable: hostcaps = { path = "../../common/rust/shed/hostcaps" }
+# @oss-disable: hostcaps = { path = "../../../common/rust/shed/hostcaps" }
 itertools = { workspace = true }
 libc = { workspace = true }
 nix = { workspace = true }
@@ -34,10 +34,10 @@ gazebo = { workspace = true }
 dupe = { workspace = true }
 gazebo_lint.version = "0.1"
 gazebo_lint.optional = true
-# @oss-disable: gazebo_lint.path = "../gazebo_lint/gazebo_lint"
+# @oss-disable: gazebo_lint.path = "../../gazebo_lint/gazebo_lint"
 host_sharing = { workspace = true }
 starlark = { workspace = true }
-# @oss-disable: user = { path = "../../common/rust/user", optional = true }
+# @oss-disable: user = { path = "../../../common/rust/user", optional = true }
 allocative = { workspace = true }
 
 buck2_audit = { workspace = true }

diff --git a/cli/bin/buck2.rs → app/buck2/bin/buck2.rs b/cli/bin/buck2.rs → app/buck2/bin/buck2.rs
@@ -17,13 +17,13 @@ use std::fs;
 use std::io;
 use std::path::PathBuf;
 
+use buck2::exec;
+use buck2::panic;
+use buck2::TracingLogFile;
 use buck2_client_ctx::exit_result::ExitResult;
 use buck2_core::fs::working_dir::WorkingDir;
 use buck2_core::logging::init_tracing_for_writer;
 use buck2_core::logging::LogConfigurationReloadHandle;
-use cli::exec;
-use cli::panic;
-use cli::TracingLogFile;
 use fbinit::FacebookInit;
 
 // fbcode likes to set its own allocator in fbcode.default_allocator

diff --git a/cli/daemon_lifecycle.md → app/buck2/daemon_lifecycle.md b/cli/daemon_lifecycle.md → app/buck2/daemon_lifecycle.md
diff --git a/cli/src/check_user_allowed.rs → app/buck2/src/check_user_allowed.rs b/cli/src/check_user_allowed.rs → app/buck2/src/check_user_allowed.rs
diff --git a/cli/src/commands/daemon.rs → app/buck2/src/commands/daemon.rs b/cli/src/commands/daemon.rs → app/buck2/src/commands/daemon.rs
diff --git a/cli/src/commands/daemon_lower_priority.rs → ...ck2/src/commands/daemon_lower_priority.rs b/cli/src/commands/daemon_lower_priority.rs → ...ck2/src/commands/daemon_lower_priority.rs
diff --git a/cli/src/commands/daemonize.rs → app/buck2/src/commands/daemonize.rs b/cli/src/commands/daemonize.rs → app/buck2/src/commands/daemonize.rs
diff --git a/cli/src/commands/docs/mod.rs → app/buck2/src/commands/docs/mod.rs b/cli/src/commands/docs/mod.rs → app/buck2/src/commands/docs/mod.rs
diff --git a/cli/src/commands/docs/output.rs → app/buck2/src/commands/docs/output.rs b/cli/src/commands/docs/output.rs → app/buck2/src/commands/docs/output.rs
diff --git a/cli/src/commands/docs/query.rs → app/buck2/src/commands/docs/query.rs b/cli/src/commands/docs/query.rs → app/buck2/src/commands/docs/query.rs
diff --git a/cli/src/commands/docs/starlark.rs → app/buck2/src/commands/docs/starlark.rs b/cli/src/commands/docs/starlark.rs → app/buck2/src/commands/docs/starlark.rs
diff --git a/cli/src/commands/docs/starlark/markdown.rs → ...k2/src/commands/docs/starlark/markdown.rs b/cli/src/commands/docs/starlark/markdown.rs → ...k2/src/commands/docs/starlark/markdown.rs
diff --git a/cli/src/commands/docs/target_patterns.md → ...uck2/src/commands/docs/target_patterns.md b/cli/src/commands/docs/target_patterns.md → ...uck2/src/commands/docs/target_patterns.md
diff --git a/cli/src/commands/docs/target_patterns.rs → ...uck2/src/commands/docs/target_patterns.rs b/cli/src/commands/docs/target_patterns.rs → ...uck2/src/commands/docs/target_patterns.rs
diff --git a/cli/src/commands/forkserver.rs → app/buck2/src/commands/forkserver.rs b/cli/src/commands/forkserver.rs → app/buck2/src/commands/forkserver.rs
diff --git a/cli/src/commands/internal_test_runner.rs → ...uck2/src/commands/internal_test_runner.rs b/cli/src/commands/internal_test_runner.rs → ...uck2/src/commands/internal_test_runner.rs
diff --git a/cli/src/commands/mod.rs → app/buck2/src/commands/mod.rs b/cli/src/commands/mod.rs → app/buck2/src/commands/mod.rs
diff --git a/cli/src/commands/schedule_termination.rs → ...uck2/src/commands/schedule_termination.rs b/cli/src/commands/schedule_termination.rs → ...uck2/src/commands/schedule_termination.rs
diff --git a/cli/src/lib.rs → app/buck2/src/lib.rs b/cli/src/lib.rs → app/buck2/src/lib.rs
diff --git a/cli/src/panic.rs → app/buck2/src/panic.rs b/cli/src/panic.rs → app/buck2/src/panic.rs
diff --git a/docs.sh b/docs.sh
@@ -30,7 +30,7 @@ for arg in "$@"; do
       shift
       ;;
     --cargo)
-      cargo install --path=cli --root=/tmp
+      cargo install --path=app/buck2 --root=/tmp
       BUCK2_COMMAND="/tmp/bin/buck2"
       shift
       ;;

diff --git a/docs/getting_started.md b/docs/getting_started.md
@@ -9,7 +9,7 @@ To get started, first install the `buck2` executable:
 
 ```bash
 rustup install nightly
-cargo +nightly install --git https://github.com/facebook/buck2.git cli
+cargo +nightly install --git https://github.com/facebook/buck2.git buck2
 ```
 
 The above commands install `buck2` into a suitable directory, such as `$HOME/.cargo/bin`, which you should then add to your `$PATH`:

diff --git a/examples/prelude/README.md b/examples/prelude/README.md
@@ -3,7 +3,7 @@
 From buck2 project root, run the following to build buck2 with cargo
 
 ```sh
-cargo install --path=cli --root=/tmp
+cargo install buck2 --root=/tmp
 export BUCK2="/tmp/bin/buck2"
 ```
-Original file line number
+Diff line change
@@ Expand Up / @@ -30,7 +30,7 @@ for arg in "$@"; do @@
           shift
           ;;
         --cargo)
-          cargo install --path=cli --root=/tmp
+          cargo install --path=app/buck2 --root=/tmp
           BUCK2_COMMAND="/tmp/bin/buck2"
           shift
           ;;
@@ Expand Down @@