refactor: unify wrapper (#200)

Author: m-hilgendorf

packages/std/Cargo.lock

@@ -1,10 +1,10 @@
 [workspace]
 members = [
-  "packages/manifest_tool",
+  "packages/common",
   "packages/tgcc",
   "packages/tgld",
   "packages/tgstrip",
-  "packages/wrapper",
+  "packages/wrap",
 ]
 resolver = "3"
 
@@ -56,54 +56,15 @@ tracing = "0.1"
 tracing-subscriber = { version = "0.3", features = ["json", "parking_lot"] }
 zerocopy = { version = "0.8", features = ["derive"] }
 
-tangram_std = { path = "." }
-manifest_tool = { path = "packages/manifest_tool" }
+
+common = { path = "packages/common" }
+wrap = { path = "packages/wrap" }
 tgcc = { path = "packages/tgcc" }
 tgld = { path = "packages/tgld" }
 tgstrip = { path = "packages/tgstrip" }
-wrapper = { path = "packages/wrapper" }
 
 [profile.release]
 codegen-units = 1
 lto = true
 panic = "abort"
 strip = true
-
-[package]
-name = "tangram_std"
-
-description = { workspace = true }
-edition = { workspace = true }
-homepage = { workspace = true }
-license = { workspace = true }
-publish = { workspace = true }
-repository = { workspace = true }
-rust-version = { workspace = true }
-version = { workspace = true }
-
-[lib]
-path = "packages/std/lib.rs"
-
-[lints]
-workspace = true
-
-[dependencies]
-anstream = { workspace = true }
-manifest_tool = { workspace = true }
-bytes = { workspace = true }
-clap = { workspace = true }
-crossterm = { workspace = true }
-futures = { workspace = true }
-serde = { workspace = true }
-serde_json = { workspace = true }
-tangram_client = { workspace = true }
-tangram_either = { workspace = true }
-tangram_serialize = { workspace = true }
-tokio = { workspace = true }
-tempfile = { workspace = true }
-tracing = { workspace = true, optional = true }
-tracing-subscriber = { workspace = true, optional = true }
-
-[features]
-tracing = ["dep:tracing", "dep:tracing-subscriber"]
-default = ["tracing"]

packages/std/Cargo.toml

@@ -240,13 +240,18 @@ export async function build(...args: std.Args<Arg>): Promise<tg.Directory> {
 		const os = std.triple.os(host);
 		const runtimeLibEnvVar =
 			os === "darwin" ? "DYLD_FALLBACK_LIBRARY_PATH" : "LD_LIBRARY_PATH";
-		defaultPrepareCommand = tg`${defaultPrepareCommand}\nexport ${runtimeLibEnvVar}=$LIBRARY_PATH`;
+		defaultPrepareCommand = tg`
+			${defaultPrepareCommand}
+			export ${runtimeLibEnvVar}=$LIBRARY_PATH
+		`;
 	}
 	if (defaultCrossEnv && isCross) {
 		// Toolchain prefix is the canonical host triple (where output runs).
 		const canonicalHost = std.sdkModule.sdk.canonicalTriple(host);
 		const hostPrefix = `${canonicalHost}-`;
-		defaultPrepareCommand = tg`${defaultPrepareCommand}\nexport CC=${hostPrefix}cc && export CXX=${hostPrefix}c++ && export AR=${hostPrefix}ar`;
+		defaultPrepareCommand = tg`
+			${defaultPrepareCommand}
+			export CC=${hostPrefix}cc && export CXX=${hostPrefix}c++ && export AR=${hostPrefix}ar`;
 	}
 	const needsPrepare = buildInTree || setRuntimeLibraryPath || defaultCrossEnv;
 

packages/std/autotools.tg.ts

@@ -1,6 +1,6 @@
-[package]
-name = "wrapper"
 
+[package]
+name = "common"
 description = { workspace = true }
 edition = { workspace = true }
 homepage = { workspace = true }
@@ -14,14 +14,22 @@ version = { workspace = true }
 workspace = true
 
 [dependencies]
-libc = { workspace = true }
-fnv = { workspace = true }
+anstream = { workspace = true }
+bytes = { workspace = true }
+clap = { workspace = true }
+crossterm = { workspace = true }
+futures = { workspace = true }
 serde = { workspace = true }
 serde_json = { workspace = true }
 tangram_client = { workspace = true }
-tangram_std = { workspace = true }
+tangram_either = { workspace = true }
+tangram_serialize = { workspace = true }
+tempfile = { workspace = true }
+tokio = { workspace = true }
 tracing = { workspace = true, optional = true }
 tracing-subscriber = { workspace = true, optional = true }
+wrap = { workspace = true }
 
 [features]
 tracing = ["dep:tracing", "dep:tracing-subscriber"]
+default = ["tracing"]