Expose the curl geturl backend

And rework the CI to build/test both with and without it.

Author: pkgw

Cargo.toml

@@ -97,6 +97,7 @@ serialization = ["serde", "toml"]
 
 external-harfbuzz = ["tectonic_bridge_harfbuzz/external-harfbuzz"]
 
+geturl-curl = ["tectonic_geturl/curl"]
 geturl-reqwest = ["tectonic_geturl/reqwest"]
 
 # developer feature to compile with the necessary flags for profiling tectonic.

README.md

@@ -87,6 +87,14 @@ external library can be detected with either [pkg-config] or [vcpkg]. See the
 [vcpkg]: https://vcpkg.readthedocs.io/
 [howto-build]: https://tectonic-typesetting.github.io/book/latest/#update-link-when-published
 
+##### `geturl-curl`
+
+Use the [curl] crate to implement HTTP requests. In order for this to take
+effect, you must use `--no-default-features` because `geturl-reqwest` is a
+default feature and it takes precedence.
+
+[reqwest]: https://docs.rs/curl/
+
 ##### `geturl-reqwest` (enabled by default)
 
 Use the [reqwest] crate to implement HTTP requests. This is the default

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

@@ -16,9 +16,15 @@ parameters:
 - name: primaryBuild
   type: boolean
   default: false
-- name: externalDeps
+- name: installAllDeps
   type: boolean
   default: false
+- name: defaultFeatures
+  type: boolean
+  default: true
+- name: explicitFeatures
+  type: string
+  default: ''
 
 steps:
 - template: azure-generic-build-setup.yml
@@ -33,7 +39,7 @@ steps:
       libssl-dev
       openssl
       zlib1g-dev"
-    if [[ $EXTERNAL_DEPS == True ]] ; then
+    if [[ $INSTALL_ALL_DEPS == True ]] ; then
       pkgs="$pkgs libharfbuzz-dev"
     fi
 
@@ -42,7 +48,7 @@ steps:
   displayName: "Install pkg-config dependencies (Ubuntu)"
   condition: and(succeeded(), eq(variables['Agent.OS'], 'Linux'))
   env:
-    EXTERNAL_DEPS: ${{ parameters.externalDeps }}  # maps to "True" or "False"
+    INSTALL_ALL_DEPS: ${{ parameters.installAllDeps }}  # maps to "True" or "False"
 
 - bash: |
     set -xeuo pipefail
@@ -53,7 +59,7 @@ steps:
       icu4c
       libpng
       openssl"
-    if [[ $EXTERNAL_DEPS == True ]] ; then
+    if [[ $INSTALL_ALL_DEPS == True ]] ; then
       pkgs="$pkgs harfbuzz"
     fi
 
@@ -65,7 +71,7 @@ steps:
   displayName: "Install pkg-config dependencies (macOS)"
   condition: and(succeeded(), eq(variables['Agent.OS'], 'Darwin'))
   env:
-    EXTERNAL_DEPS: ${{ parameters.externalDeps }}
+    INSTALL_ALL_DEPS: ${{ parameters.installAllDeps }}
 
 - bash: |
     echo "##vso[task.prependpath]C:\msys64\usr\bin"
@@ -92,6 +98,7 @@ steps:
 
 - template: azure-generic-build.yml
   parameters:
-      canaryBuild: ${{ parameters.canaryBuild }}
-      primaryBuild: ${{ parameters.primaryBuild }}
-      externalDeps: ${{ parameters.externalDeps }}
+    canaryBuild: ${{ parameters.canaryBuild }}
+    primaryBuild: ${{ parameters.primaryBuild }}
+    defaultFeatures: ${{ parameters.defaultFeatures }}
+    explicitFeatures: ${{ parameters.explicitFeatures }}

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

@@ -75,4 +75,4 @@ steps:
 - template: azure-generic-build.yml
   parameters:
     canaryBuild: ${{ parameters.canaryBuild }}
-    externalDeps: true
+    explicitFeatures: "external-harfbuzz"

dist/azure-ci-cd.yml

@@ -35,7 +35,8 @@ parameters:
     vmImage: ubuntu-20.04
     params:
       canaryBuild: true
-      externalDeps: true
+      installAllDeps: true
+      explicitFeatures: "external-harfbuzz"
     vars:
       TARGET: x86_64-unknown-linux-gnu
       TOOLCHAIN: stable
@@ -44,7 +45,7 @@ parameters:
     vmImage: ubuntu-20.04
     params:
       canaryBuild: true
-      externalDeps: false
+      installAllDeps: false
     vars:
       TARGET: x86_64-unknown-linux-gnu
       TOOLCHAIN: stable
@@ -69,7 +70,7 @@ parameters:
     vmImage: macos-10.15
     params:
       canaryBuild: true
-      externalDeps: false
+      installAllDeps: false
     vars:
       TARGET: x86_64-apple-darwin
       TOOLCHAIN: stable
@@ -78,15 +79,16 @@ parameters:
     vmImage: macos-10.15
     params:
       canaryBuild: true
-      externalDeps: true
+      installAllDeps: true
+      explicitFeatures: "external-harfbuzz"
     vars:
       TARGET: x86_64-apple-darwin
       TOOLCHAIN: stable
 
   - name: windows_intdeps
     vmImage: windows-2019
     params:
-      externalDeps: false
+      installAllDeps: false
     vars:
       TARGET: x86_64-pc-windows-gnu
       TOOLCHAIN: stable-x86_64-pc-windows-gnu
@@ -95,11 +97,43 @@ parameters:
     vmImage: windows-2019
     params:
       canaryBuild: true
-      externalDeps: true
+      installAllDeps: true
+      explicitFeatures: "external-harfbuzz"
     vars:
       TARGET: x86_64-pc-windows-gnu
       TOOLCHAIN: stable-x86_64-pc-windows-gnu
 
+  - name: linux_ftmtx_none
+    vmImage: ubuntu-20.04
+    params:
+      canaryBuild: true
+      installAllDeps: false
+      defaultFeatures: false
+    vars:
+      TARGET: x86_64-unknown-linux-gnu
+      TOOLCHAIN: stable
+
+  - name: linux_ftmtx_all
+    vmImage: ubuntu-20.04
+    params:
+      canaryBuild: true
+      installAllDeps: true
+      explicitFeatures: _all_
+    vars:
+      TARGET: x86_64-unknown-linux-gnu
+      TOOLCHAIN: stable
+
+  - name: linux_ftmtx_curl
+    vmImage: ubuntu-20.04
+    params:
+      canaryBuild: true
+      installAllDeps: true
+      defaultFeatures: false
+      explicitFeatures: geturl-curl
+    vars:
+      TARGET: x86_64-unknown-linux-gnu
+      TOOLCHAIN: stable
+
 - name: vcpkgBuilds
   type: object
   default:

dist/azure-generic-build.yml

@@ -16,28 +16,42 @@ parameters:
 - name: primaryBuild
   type: boolean
   default: false
-- name: externalDeps
+- name: defaultFeatures
   type: boolean
-  default: false
+  default: true
+- name: explicitFeatures
+  type: string
+  default: ''
 
 steps:
+# We use two variables for feature flagging just because I'm worried about
+# quoting the `--features` argument, which will contain spaces.
 - bash: |
-    if [[ $EXTERNAL_DEPS == True ]] ; then
-      features="external-harfbuzz"
+    ffs=
+    fts=
+
+    if [[ $DEFAULT_FEATURES_FLAG == False ]] ; then
+      ffs="--no-default-features"
+    fi
+
+    if [[ $EXPLICIT_FEATURES == _all_ ]] ; then
+      ffs="--all-features"
     else
-      features=
+      fts="$EXPLICIT_FEATURES"
     fi
 
-    echo "Cargo features for this build: $features"
-    echo "##vso[task.setvariable variable=CARGO_FEATURES;]$features"
+    echo "Cargo features for this build: $ffs --features=\"$fts\""
+    echo "##vso[task.setvariable variable=CARGO_FEATURES_EXPLICIT;]$fts"
+    echo "##vso[task.setvariable variable=CARGO_FEATURES_FLAGS;]$ffs"
   displayName: Set feature flags
   env:
-    EXTERNAL_DEPS: ${{ parameters.externalDeps }}
+    DEFAULT_FEATURES_FLAG: ${{ parameters.defaultFeatures }}
+    EXPLICIT_FEATURES: ${{ parameters.explicitFeatures }}
 
-- bash: cargo build --all --release --features="$CARGO_FEATURES" -v
+- bash: cargo build --all --release $CARGO_FEATURES_FLAGS --features="$CARGO_FEATURES_EXPLICIT" -v
   displayName: "cargo build"
 
-- bash: cargo test --all --release --features="$CARGO_FEATURES"
+- bash: cargo test --all --release $CARGO_FEATURES_FLAGS --features="$CARGO_FEATURES_EXPLICIT"
   displayName: "cargo test"
 
 # For non-canary builds, export artifacts.

docs/src/howto/build-tectonic/index.md

@@ -103,9 +103,13 @@ control build options. Tectonic offers the following features:
   to a “vendored” (static, internal) version of the [Harfbuzz] text shaping
   library. If you would like to link to an externally-supplied version instead,
   enable this feature.
+- **`geturl-curl`**. Uses the [curl] crate to get URLs. In order for this to
+  take effect, you must use `--no-default-features` because `geturl-reqwest` is
+  a default feature and it takes precedence.
 - **`geturl-reqwest`** (enabled by default). Uses the [reqwest] crate to get
   URLs. This is a good portable default.
 
+[curl]: https://docs.rs/curl/
 [reqwest]: https://docs.rs/reqwest/
 
 Some lesser-used features are:

src/io/cached_itarbundle.rs

@@ -227,7 +227,7 @@ fn make_txt_path(base: &Path, digest_text: &str) -> PathBuf {
 }
 
 /// Bundle provided by an indexed tar file over http with a local cache.
-#[derive(Clone, Debug)]
+#[derive(Debug)]
 pub struct CachedITarBundle {
     url: String,
     redirect_url: String,