Add cargo-batch.

Co-Authored-By: Richard Meadows <[email protected]>

Cargo.toml

@@ -251,6 +251,11 @@ name = "cargo"
 test = false
 doc = false
 
+[[bin]]
+name = "cargo-batch"
+test = false
+doc = false
+
 [features]
 vendored-openssl = ["openssl/vendored"]
 vendored-libgit2 = ["libgit2-sys/vendored"]

src/bin/cargo-batch.rs

@@ -0,0 +1,300 @@
+#![warn(rust_2018_idioms)] // while we're getting used to 2018
+#![allow(clippy::all)]
+#![warn(clippy::needless_borrow)]
+#![warn(clippy::redundant_clone)]
+
+use cargo::core::compiler::{
+    unit_graph, BuildContext, BuildRunner, DefaultExecutor, Executor, UnitInterner,
+};
+use cargo::core::shell::Shell;
+use cargo::core::Workspace;
+use cargo::ops::CompileOptions;
+use cargo::util::network::http::{http_handle, needs_custom_http_transport};
+use cargo::util::{command_prelude, CliResult, GlobalContext};
+use std::env;
+use std::sync::Arc;
+
+use crate::command_prelude::*;
+
+fn main() {
+    setup_logger();
+
+    let mut config = match GlobalContext::default() {
+        Ok(cfg) => cfg,
+        Err(e) => {
+            let mut shell = Shell::new();
+            cargo::exit_with_error(e.into(), &mut shell)
+        }
+    };
+
+    let result = main2(&mut config);
+
+    match result {
+        Err(e) => cargo::exit_with_error(e, &mut *config.shell()),
+        Ok(()) => {}
+    }
+}
+
+fn main2(config: &mut GlobalContext) -> CliResult {
+    let args: Vec<_> = env::args().collect();
+    let mut subargs = args.split(|x| *x == "---");
+
+    let mut global_args = subargs.next().unwrap().to_vec();
+    if global_args.len() >= 2 && global_args[1] == "batch" {
+        global_args.remove(1);
+    }
+    let global_args = Command::new("cargo-batch")
+        .arg_unit_graph()
+        .arg_target_dir()
+        .arg(
+            opt(
+                "verbose",
+                "Use verbose output (-vv very verbose/build.rs output)",
+            )
+            .short('v')
+            .action(ArgAction::Count)
+            .global(true),
+        )
+        .arg_silent_suggestion()
+        .arg(
+            opt("color", "Coloring: auto, always, never")
+                .value_name("WHEN")
+                .global(true),
+        )
+        .arg(
+            flag("frozen", "Require Cargo.lock and cache are up to date")
+                .help_heading(heading::MANIFEST_OPTIONS)
+                .global(true),
+        )
+        .arg(
+            flag("locked", "Require Cargo.lock is up to date")
+                .help_heading(heading::MANIFEST_OPTIONS)
+                .global(true),
+        )
+        .arg(
+            flag("offline", "Run without accessing the network")
+                .help_heading(heading::MANIFEST_OPTIONS)
+                .global(true),
+        )
+        .arg(multi_opt("config", "KEY=VALUE", "Override a configuration value").global(true))
+        .arg(
+            Arg::new("unstable-features")
+                .help("Unstable (nightly-only) flags to Cargo, see 'cargo -Z help' for details")
+                .short('Z')
+                .value_name("FLAG")
+                .action(ArgAction::Append)
+                .global(true),
+        )
+        .try_get_matches_from(global_args)?;
+
+    config_configure(config, &global_args)?;
+    init_git_transports(config);
+
+    let unit_graph = global_args.flag("unit-graph");
+
+    struct CommandState<'a> {
+        ws: Workspace<'a>,
+        compile_opts: CompileOptions,
+    }
+
+    let mut cmds = Vec::new();
+    for args in subargs {
+        let cli = build_cli();
+        let args = cli.try_get_matches_from(args)?;
+        //println!("args opts: {:#?}", args);
+
+        let ws = args.workspace(config)?;
+
+        let mut compile_opts = args.compile_options(
+            config,
+            CompileMode::Build,
+            Some(&ws),
+            ProfileChecking::Custom,
+        )?;
+        if let Some(out_dir) = args.value_of_path("out-dir", config) {
+            compile_opts.build_config.export_dir = Some(out_dir);
+        } else if let Some(out_dir) = config.build_config()?.out_dir.as_ref() {
+            let out_dir = out_dir.resolve_path(config);
+            compile_opts.build_config.export_dir = Some(out_dir);
+        }
+        //if compile_opts.build_config.export_dir.is_some() {
+        //    config
+        //        .cli_unstable()
+        //        .fail_if_stable_opt("--out-dir", 6790)?;
+        //}
+
+        //println!("compile opts: {:#?}", compile_opts);
+        cmds.push(CommandState { ws, compile_opts });
+    }
+
+    let interner = UnitInterner::new();
+    let mut merged_bcx: Option<BuildContext<'_, '_>> = None;
+
+    for cmd in &cmds {
+        let mut bcx = cargo::ops::create_bcx(&cmd.ws, &cmd.compile_opts, &interner).unwrap();
+        if let Some(export_dir) = &cmd.compile_opts.build_config.export_dir {
+            for root in &bcx.roots {
+                bcx.unit_export_dirs
+                    .insert(root.clone(), export_dir.clone());
+            }
+        }
+
+        if let Some(merged_bcx) = &mut merged_bcx {
+            // merge!!!
+            merged_bcx.unit_graph.extend(bcx.unit_graph);
+            merged_bcx.roots.extend(bcx.roots);
+            merged_bcx.unit_export_dirs.extend(bcx.unit_export_dirs);
+            merged_bcx.all_kinds.extend(bcx.all_kinds);
+            merged_bcx
+                .target_data
+                .target_config
+                .extend(bcx.target_data.target_config);
+            merged_bcx
+                .target_data
+                .target_info
+                .extend(bcx.target_data.target_info);
+            merged_bcx.packages.packages.extend(bcx.packages.packages);
+            merged_bcx
+                .packages
+                .sources
+                .borrow_mut()
+                .add_source_map(bcx.packages.sources.into_inner());
+        } else {
+            merged_bcx = Some(bcx)
+        }
+    }
+
+    let bcx = merged_bcx.unwrap();
+
+    if unit_graph {
+        unit_graph::emit_serialized_unit_graph(&bcx.roots, &bcx.unit_graph, bcx.ws.gctx())?;
+        return Ok(());
+    }
+
+    // util::profile disappeared between cargo 1.76 and cargo 1.78
+    // let _p = cargo::util::profile::start("compiling");
+    let cx = BuildRunner::new(&bcx)?;
+    let exec: Arc<dyn Executor> = Arc::new(DefaultExecutor);
+    cx.compile(&exec)?;
+
+    Ok(())
+}
+
+fn config_configure(config: &mut GlobalContext, args: &ArgMatches) -> CliResult {
+    let arg_target_dir = &args.value_of_path("target-dir", config);
+    let verbose = args.verbose();
+    // quiet is unusual because it is redefined in some subcommands in order
+    // to provide custom help text.
+    let quiet = args.flag("quiet");
+    let color = args.get_one::<String>("color").map(String::as_str);
+    let frozen = args.flag("frozen");
+    let locked = args.flag("locked");
+    let offline = args.flag("offline");
+    let mut unstable_flags = vec![];
+    if let Some(values) = args.get_many::<String>("unstable-features") {
+        unstable_flags.extend(values.cloned());
+    }
+    let mut config_args = vec![];
+    if let Some(values) = args.get_many::<String>("config") {
+        config_args.extend(values.cloned());
+    }
+    config.configure(
+        verbose,
+        quiet,
+        color,
+        frozen,
+        locked,
+        offline,
+        arg_target_dir,
+        &unstable_flags,
+        &config_args,
+    )?;
+    Ok(())
+}
+
+pub fn build_cli() -> Command {
+    subcommand("build")
+        .about("Compile a local package and all of its dependencies")
+        .arg_ignore_rust_version()
+        .arg_future_incompat_report()
+        .arg_message_format()
+        .arg_silent_suggestion()
+        .arg_package_spec(
+            "Package to build (see `cargo help pkgid`)",
+            "Build all packages in the workspace",
+            "Exclude packages from the build",
+        )
+        .arg_targets_all(
+            "Build only this package's library",
+            "Build only the specified binary",
+            "Build all binaries",
+            "Build only the specified example",
+            "Build all examples",
+            "Build only the specified test target",
+            "Build all tests",
+            "Build only the specified bench target",
+            "Build all benches",
+            "Build all targets",
+        )
+        .arg_features()
+        .arg_release("Build artifacts in release mode, with optimizations")
+        .arg_profile("Build artifacts with the specified profile")
+        .arg_parallel()
+        .arg_target_triple("Build for the target triple")
+        .arg(
+            opt(
+                "out-dir",
+                "Copy final artifacts to this directory (unstable)",
+            )
+            .value_name("PATH")
+            .help_heading(heading::COMPILATION_OPTIONS),
+        )
+        .arg_build_plan()
+        .arg_unit_graph()
+        .arg_timings()
+        .arg_manifest_path()
+        .after_help("Run `cargo help build` for more detailed information.\n")
+}
+
+fn setup_logger() {
+    let env = tracing_subscriber::EnvFilter::from_env("CARGO_LOG");
+
+    tracing_subscriber::fmt()
+        .with_timer(tracing_subscriber::fmt::time::Uptime::default())
+        .with_ansi(std::io::IsTerminal::is_terminal(&std::io::stderr()))
+        .with_writer(std::io::stderr)
+        .with_env_filter(env)
+        .init();
+    tracing::trace!(start = humantime::format_rfc3339(std::time::SystemTime::now()).to_string());
+}
+
+/// Configure libgit2 to use libcurl if necessary.
+///
+/// If the user has a non-default network configuration, then libgit2 will be
+/// configured to use libcurl instead of the built-in networking support so
+/// that those configuration settings can be used.
+fn init_git_transports(config: &GlobalContext) {
+    match needs_custom_http_transport(config) {
+        Ok(true) => {}
+        _ => return,
+    }
+
+    let handle = match http_handle(config) {
+        Ok(handle) => handle,
+        Err(..) => return,
+    };
+
+    // The unsafety of the registration function derives from two aspects:
+    //
+    // 1. This call must be synchronized with all other registration calls as
+    //    well as construction of new transports.
+    // 2. The argument is leaked.
+    //
+    // We're clear on point (1) because this is only called at the start of this
+    // binary (we know what the state of the world looks like) and we're mostly
+    // clear on point (2) because we'd only free it after everything is done
+    // anyway
+    unsafe {
+        git2_curl::register(handle);
+    }
+}

src/cargo/core/compiler/build_context/mod.rs

@@ -10,6 +10,7 @@ use crate::util::errors::CargoResult;
 use crate::util::interning::InternedString;
 use crate::util::Rustc;
 use std::collections::{HashMap, HashSet};
+use std::path::PathBuf;
 
 mod target_info;
 pub use self::target_info::{
@@ -78,6 +79,8 @@ pub struct BuildContext<'a, 'gctx> {
 
     /// The list of all kinds that are involved in this build
     pub all_kinds: HashSet<CompileKind>,
+
+    pub unit_export_dirs: HashMap<Unit, PathBuf>,
 }
 
 impl<'a, 'gctx> BuildContext<'a, 'gctx> {
@@ -111,6 +114,7 @@ impl<'a, 'gctx> BuildContext<'a, 'gctx> {
             unit_graph,
             scrape_units,
             all_kinds,
+            unit_export_dirs: HashMap::new(),
         })
     }
 

src/cargo/core/compiler/build_context/target_info.rs

@@ -873,9 +873,9 @@ pub struct RustcTargetData<'gctx> {
     host_info: TargetInfo,
 
     /// Build information for targets that we're building for.
-    target_config: HashMap<CompileTarget, TargetConfig>,
+    pub target_config: HashMap<CompileTarget, TargetConfig>,
     /// Information about the target platform that we're building for.
-    target_info: HashMap<CompileTarget, TargetInfo>,
+    pub target_info: HashMap<CompileTarget, TargetInfo>,
 }
 
 impl<'gctx> RustcTargetData<'gctx> {