Split binaries from brioche-pack crate into separate crates

brioche-dev · Dec 31, 2023 · e2c2b8e · e2c2b8e
1 parent e785787
commit e2c2b8e
Show file tree

Hide file tree

Showing 10 changed files with 78 additions and 8 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -48,11 +48,25 @@ jobs:
             --target x86_64-unknown-linux-musl \
             --component rust-src
       - name: Build Brioche
-        run: cargo build --release --target=x86_64-unknown-linux-gnu
-      - name: Build brioche-pack
         run: |
+            cargo build \
+              --all \
+              --bin brioche \
+              --release \
+              --target=x86_64-unknown-linux-gnu
+      - name: Build brioche-pack tools
+        run: |
+          cargo build \
+            --all \
+            --bin brioche-packer \
+            --bin brioche-ld \
+            --release \
+            --target=x86_64-unknown-linux-musl
+
           cargo +"$NIGHTLY_TOOLCHAIN" build \
-            -p brioche-pack \
+            --all \
+            --bin brioche-packed-exec \
+            --bin brioche-packed-userland-exec \
             --profile=release-tiny \
             --target=x86_64-unknown-linux-musl \
             -Z 'build-std=std,panic_abort' \
@@ -65,10 +79,10 @@ jobs:
             target/x86_64-unknown-linux-gnu/release/brioche \
             artifacts/brioche/x86_64-linux/
           cp \
-            target/x86_64-unknown-linux-musl/release-tiny/brioche-ld \
+            target/x86_64-unknown-linux-musl/release/brioche-packer \
+            target/x86_64-unknown-linux-musl/release/brioche-ld \
             target/x86_64-unknown-linux-musl/release-tiny/brioche-packed-exec \
             target/x86_64-unknown-linux-musl/release-tiny/brioche-packed-userland-exec \
-            target/x86_64-unknown-linux-musl/release-tiny/brioche-packer \
             artifacts/brioche-pack/x86_64-linux/
           (cd artifacts/brioche-pack/x86_64-linux/ && tar --zstd -cf ../../brioche/x86_64-linux/brioche-pack.tar.zstd .)
           tree -h artifacts/brioche-pack

diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -1,5 +1,5 @@
 [workspace]
-members = ["crates/brioche", "crates/brioche-pack"]
+members = ["crates/brioche", "crates/brioche-ld", "crates/brioche-pack", "crates/brioche-packed-exec", "crates/brioche-packed-userland-exec"]
 default-members = ["crates/brioche"]
 resolver = "2"
 

diff --git a/crates/brioche-ld/Cargo.toml b/crates/brioche-ld/Cargo.toml
@@ -0,0 +1,10 @@
+[package]
+name = "brioche-ld"
+version = "0.1.0"
+edition = "2021"
+
+[dependencies]
+brioche-pack = { path = "../brioche-pack" }
+bstr = "1.8.0"
+goblin = "0.7.1"
+thiserror = "1.0.51"
diff --git a/crates/brioche-pack/src/bin/brioche-ld.rs → crates/brioche-ld/src/main.rs b/crates/brioche-pack/src/bin/brioche-ld.rs → crates/brioche-ld/src/main.rs
diff --git a/crates/brioche-packed-exec/Cargo.toml b/crates/brioche-packed-exec/Cargo.toml
@@ -0,0 +1,9 @@
+[package]
+name = "brioche-packed-exec"
+version = "0.1.0"
+edition = "2021"
+
+[dependencies]
+brioche-pack = { path = "../brioche-pack" }
+bstr = "1.8.0"
+thiserror = "1.0.51"
diff --git a/...ioche-pack/src/bin/brioche-packed-exec.rs → crates/brioche-packed-exec/src/main.rs b/...ioche-pack/src/bin/brioche-packed-exec.rs → crates/brioche-packed-exec/src/main.rs
diff --git a/crates/brioche-packed-userland-exec/Cargo.toml b/crates/brioche-packed-userland-exec/Cargo.toml
@@ -0,0 +1,10 @@
+[package]
+name = "brioche-packed-userland-exec"
+version = "0.1.0"
+edition = "2021"
+
+[dependencies]
+brioche-pack = { path = "../brioche-pack" }
+bstr = "1.8.0"
+thiserror = "1.0.51"
+userland-execve = { git = "https://github.com/brioche-dev/userland-execve-rust.git" }
diff --git a/...k/src/bin/brioche-packed-userland-exec.rs → .../brioche-packed-userland-exec/src/main.rs b/...k/src/bin/brioche-packed-userland-exec.rs → .../brioche-packed-userland-exec/src/main.rs
diff --git a/crates/brioche/Cargo.toml b/crates/brioche/Cargo.toml
@@ -3,8 +3,6 @@ name = "brioche"
 version = "0.0.1"
 edition = "2021"
 
-# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
-
 [dependencies]
 anyhow = { version = "1.0.75", features = ["backtrace"] }
 async-compression = { version = "0.4.5", features = ["tokio", "gzip", "xz", "zstd"] }