Merge pull request #877 from clbarnes/v2-cli-doc

src/bin/tectonic/main.rs: -X option in CLI docs

Author: pkgw

Cargo.toml

@@ -120,7 +120,7 @@ tokio = "0.1.22"
 
 [package.metadata.vcpkg]
 git = "https://github.com/microsoft/vcpkg"
-rev = "997cd412fa4dff71bec6c99dea95f0b9a3c2c240"
+rev = "6b6a35335c9064fac2ec6684c4f79808dce59b7d"
 
 [package.metadata.vcpkg.target]
 x86_64-apple-darwin = { install = ["freetype","harfbuzz[icu,graphite2]"] }

dist/azure-build-and-test-vcpkg.yml

@@ -22,7 +22,7 @@ steps:
 
 - bash: |
     set -xeuo pipefail
-    brew install pkg-config
+    brew install automake libtool pkg-config
   displayName: "Install vcpkg dependencies (macOS)"
   condition: and(succeeded(), eq(variables['Agent.OS'], 'Darwin'))
 

src/bin/tectonic/main.rs

@@ -6,6 +6,7 @@ use std::{env, process, str::FromStr};
 use structopt::StructOpt;
 use tectonic_status_base::plain::PlainStatusBackend;
 
+use structopt::clap;
 use tectonic::{
     config::PersistentConfig,
     errors::SyncError,
@@ -36,6 +37,10 @@ mod v2cli {
 #[derive(Debug, StructOpt)]
 #[structopt(name = "Tectonic", about = "Process a (La)TeX document")]
 struct CliOptions {
+    /// Use experimental V2 interface (see `tectonic -X --help`); must be the first argument
+    #[structopt(short = "X")]
+    use_v2: bool,
+
     /// How much chatter to print when running
     #[structopt(long = "chatter", short, name = "level", default_value = "default", possible_values(&["default", "minimal"]))]
     chatter_level: String,
@@ -127,6 +132,15 @@ fn main() {
         Box::new(PlainStatusBackend::new(chatter_level)) as Box<dyn StatusBackend>
     };
 
+    if args.use_v2 {
+        let err = clap::Error::with_description(
+            "-X option must be the first argument if given",
+            clap::ErrorKind::ArgumentConflict,
+        );
+        status.report_error(&err.into());
+        process::exit(1)
+    }
+
     // Now that we've got colorized output, pass off to the inner function ...
     // all so that we can print out the word "error:" in red. This code
     // parallels various bits of the `error_chain` crate.

tests/executable.rs

@@ -883,3 +883,18 @@ fn extra_search_paths() {
     );
     error_or_panic(&output);
 }
+
+/// -X in non-initial position fails
+#[test]
+fn bad_v2_position() {
+    let output = run_tectonic(&PathBuf::from("."), &["-", "-X"]);
+    error_or_panic(&output);
+}
+
+#[cfg(feature = "serialization")]
+#[test]
+fn bad_v2_position_build() {
+    let (_tempdir, temppath) = setup_v2();
+    let output = run_tectonic(&temppath, &["build", "-X"]);
+    error_or_panic(&output);
+}