Merge pull request #786 from pkgw/bundles-crate

Separate bundles into their own crate

Author: pkgw

CARGO_README.md

@@ -57,8 +57,10 @@ sub-crates:
 - [`tectonic_bridge_graphite2`](https://crates.io/crates/tectonic_bridge_graphite2)
 - [`tectonic_bridge_harfbuzz`](https://crates.io/crates/tectonic_bridge_harfbuzz)
 - [`tectonic_bridge_icu`](https://crates.io/crates/tectonic_bridge_icu)
+- [`tectonic_bundles`](https://crates.io/crates/tectonic_bundles)
 - [`tectonic_cfg_support`](https://crates.io/crates/tectonic_cfg_support)
 - [`tectonic_dep_support`](https://crates.io/crates/tectonic_dep_support)
+- [`tectonic_docmodel`](https://crates.io/crates/tectonic_docmodel)
 - [`tectonic_engine_bibtex`](https://crates.io/crates/tectonic_engine_bibtex)
 - [`tectonic_engine_xdvipdfmx`](https://crates.io/crates/tectonic_engine_xdvipdfmx)
 - [`tectonic_engine_xetex`](https://crates.io/crates/tectonic_engine_xetex)

Cargo.lock

@@ -32,6 +32,7 @@ members = [
   "crates/bridge_graphite2",
   "crates/bridge_harfbuzz",
   "crates/bridge_icu",
+  "crates/bundles",
   "crates/cfg_support",
   "crates/dep_support",
   "crates/docmodel",
@@ -52,7 +53,6 @@ name = "tectonic"
 crate-type = ["rlib"]
 
 [dependencies]
-app_dirs = { version = "2", package = "app_dirs2" }
 atty = "0.2"
 byte-unit = "^4.0"
 cfg-if = "1.0"
@@ -67,6 +67,7 @@ serde = { version = "^1.0", features = ["derive"], optional = true }
 sha2 = "^0.9"
 structopt = "0.3"
 tectonic_bridge_core = { path = "crates/bridge_core", version = "0.0.0-dev.0" }
+tectonic_bundles = { path = "crates/bundles", version = "0.0.0-dev.0", default-features = false }
 tectonic_docmodel = { path = "crates/docmodel", version = "0.0.0-dev.0", optional = true }
 tectonic_engine_bibtex = { path = "crates/engine_bibtex", version = "0.0.0-dev.0" }
 tectonic_engine_xdvipdfmx = { path = "crates/engine_xdvipdfmx", version = "0.0.0-dev.0" }
@@ -97,10 +98,10 @@ serialization = ["serde", "tectonic_docmodel", "toml"]
 
 external-harfbuzz = ["tectonic_engine_xetex/external-harfbuzz"]
 
-geturl-curl = ["tectonic_geturl/curl"]
-geturl-reqwest = ["tectonic_geturl/reqwest"]
+geturl-curl = ["tectonic_bundles/geturl-curl", "tectonic_geturl/curl"]
+geturl-reqwest = ["tectonic_bundles/geturl-reqwest", "tectonic_geturl/reqwest"]
 
-native-tls-vendored = ["tectonic_geturl/native-tls-vendored"]
+native-tls-vendored = ["tectonic_bundles/native-tls-vendored", "tectonic_geturl/native-tls-vendored"]
 
 # developer feature to compile with the necessary flags for profiling tectonic.
 profile = []
@@ -129,6 +130,7 @@ tectonic_bridge_flate = "thiscommit:2021-01-01:eer4ahL4"
 tectonic_bridge_graphite2 = "2c1ffcd702a662c003bd3d7d0ca4d169784cb6ad"
 tectonic_bridge_harfbuzz = "2c1ffcd702a662c003bd3d7d0ca4d169784cb6ad"
 tectonic_bridge_icu = "2c1ffcd702a662c003bd3d7d0ca4d169784cb6ad"
+tectonic_bundles = "thiscommit:2021-06-13:Q0esYor"
 tectonic_cfg_support = "thiscommit:aeRoo7oa"
 tectonic_dep_support = "5faf4205bdd3d31101b749fc32857dd746f9e5bc"
 tectonic_docmodel = "cd77b60d48b1ae3ef80d708e6858ea91cd9fa812"
@@ -137,7 +139,7 @@ tectonic_engine_xdvipdfmx = "7dcbc52e58f9774b3d592919a9105377faeac509"
 tectonic_engine_xetex = "b7a4085fa67c831d4532da6661bddafd1f9c24ff"
 tectonic_errors = "317ae79ceaa2593fb56090e37bf1f5cc24213dd9"
 tectonic_geturl = "thiscommit:2021-01-16:Aikoob9c"
-tectonic_io_base = "f7eeff461778f7082db7ed5097d93aa63119eb12"
+tectonic_io_base = "thiscommit:2021-06-13:XFjtSsZ"
 tectonic_status_base = "317ae79ceaa2593fb56090e37bf1f5cc24213dd9"
 tectonic_xdv = "c91f2ef37858d1a0a724a5c3ddc2f7ea46373c77"
 tectonic_xetex_layout = "2c1ffcd702a662c003bd3d7d0ca4d169784cb6ad"

Cargo.toml

@@ -0,0 +1,8 @@
+# See elsewhere for changelog
+
+This project’s release notes are curated from the Git history of its main
+branch. You can find them by looking at [the version of this file on the
+`release` branch][branch] or the [GitHub release history][gh-releases].
+
+[branch]: https://github.com/tectonic-typesetting/tectonic/blob/release/crates/bundles/CHANGELOG.md
+[gh-releases]: https://github.com/tectonic-typesetting/tectonic/releases

crates/bundles/CHANGELOG.md

@@ -0,0 +1,39 @@
+# Copyright 2020-2021 the Tectonic Project
+# Licensed under the MIT License.
+
+# See README.md for discussion of features (or lack thereof) in this crate.
+
+[package]
+name = "tectonic_bundles"
+version = "0.0.0-dev.0"  # assigned with cranko (see README)
+authors = ["Peter Williams <[email protected]>"]
+description = """
+Tectonic "bundle" (support file collection) implementations.
+"""
+homepage = "https://tectonic-typesetting.github.io/"
+documentation = "https://docs.rs/tectonic_bundles"
+repository = "https://github.com/tectonic-typesetting/tectonic/"
+readme = "README.md"
+license = "MIT"
+edition = "2018"
+
+[dependencies]
+flate2 = { version = "^1.0.19", default-features = false, features = ["zlib"] }
+fs2 = "^0.4"
+tectonic_errors = { path = "../errors", version = "0.0.0-dev.0" }
+tectonic_geturl = { path = "../geturl", version = "0.0.0-dev.0", default-features = false }
+tectonic_io_base = { path = "../io_base", version = "0.0.0-dev.0" }
+tectonic_status_base = { path = "../status_base", version = "0.0.0-dev.0" }
+zip = { version = "^0.5", default-features = false, features = ["deflate"] }
+
+[features]
+default = ["geturl-reqwest"]
+geturl-curl = ["tectonic_geturl/curl"]
+geturl-reqwest = ["tectonic_geturl/reqwest"]
+native-tls-vendored = ["tectonic_geturl/native-tls-vendored"]
+
+[package.metadata.internal_dep_versions]
+tectonic_errors = "5c9ba661edf5ef669f24f9904f99cca369d999e7"
+tectonic_geturl = "c828bee7361ebd30e28392507a1406d27dc8fdbb"
+tectonic_io_base = "thiscommit:2021-06-13:s9130zU"
+tectonic_status_base = "317ae79ceaa2593fb56090e37bf1f5cc24213dd9"

crates/bundles/Cargo.toml

@@ -0,0 +1,29 @@
+# The `tectonic_bundles` crate
+
+[![](http://meritbadge.herokuapp.com/tectonic_bundles)](https://crates.io/crates/tectonic_bundles)
+
+This crate is part of [the Tectonic
+project](https://tectonic-typesetting.github.io/en-US/). It implements various
+Tectonic “bundles” that provide access to collections of TeX support files.
+
+- [API documentation](https://docs.rs/tectonic_bundles/).
+- [Main Git repository](https://github.com/tectonic-typesetting/tectonic/).
+
+
+## Cargo features
+
+This crate provides the following [Cargo features][features]:
+
+[features]: https://doc.rust-lang.org/cargo/reference/features.html
+
+- `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
+- `geturl-reqwest`: use the [reqwest] crate to implement HTTP requests (enabled
+  by default)
+- `native-tls-vendored`: if using [reqwest], activate the `vendored` option in
+  the [native-tls] crate, causing OpenSSL to be vendored
+
+[curl]: https://docs.rs/curl/
+[reqwest]: https://docs.rs/reqwest/
+[native-tls]: https://github.com/sfackler/rust-native-tls