Merge pull request #546 from filmor/drop-rustler-nif-version-env

Drop support for RUSTLER_NIF_VERSION
rusterlium · Jun 22, 2023 · 5aa3f18 · 5aa3f18
2 parents b1a4da7 + 3ccd2d5
commit 5aa3f18
Show file tree

Hide file tree

Showing 6 changed files with 10 additions and 75 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -9,6 +9,12 @@ See [`UPGRADE.md`](./UPGRADE.md) for additional help when upgrading to newer ver
 
 ## [unreleased]
 
+### Added
+
+### Changed
+
+* Dropped support for `RUSTLER_NIF_VERSION`
+
 ## [0.29.0] - 2023-06-22
 
 ### Added

diff --git a/README.md b/README.md
@@ -67,9 +67,6 @@ enabled on the dependency:
 rustler = { version = "...", features = ["nif_version_2_16"] }
 ```
 
-For compatibility reasons, this can be defined (and overridden) by setting the
-`RUSTLER_NIF_VERSION` environment variable during build.
-
 #### Community
 
 You can find us in the `#rustler:matrix.org` channel on [Matrix](https://matrix.to/#/#rustler:matrix.org)

diff --git a/build_common.rs b/build_common.rs
diff --git a/rustler/build.rs b/rustler/build.rs
diff --git a/rustler/build_common.rs b/rustler/build_common.rs
diff --git a/rustler_sys/build.rs b/rustler_sys/build.rs
@@ -2,16 +2,15 @@
 //
 // Generate the NIF APIs that will be built in `src/rustler_sys_api.rs`.
 //
-// This script rely on the `RUSTLER_NIF_VERSION` environment variable
-// and will fallback to the installed OTP version to detect the version.
-// If none of them are available, then we are going to use the latest version.
-//
 
 use regex::Regex;
 use std::fmt::Write;
 use std::path::Path;
 use std::{env, fs};
 
+pub const MIN_SUPPORTED_VERSION: (u32, u32) = (2, 14);
+pub const MAX_SUPPORTED_VERSION: (u32, u32) = (2, 17);
+
 const SNIPPET_NAME: &str = "nif_api.snippet";
 
 trait ApiBuilder {
@@ -880,9 +879,6 @@ fn build_api(b: &mut dyn ApiBuilder, opts: &GenerateOptions) {
     }
 }
 
-include!("build_common.rs");
-use common::*;
-
 fn get_nif_version_from_features() -> (u32, u32) {
     for major in ((MIN_SUPPORTED_VERSION.0)..=(MAX_SUPPORTED_VERSION.0)).rev() {
         for minor in ((MIN_SUPPORTED_VERSION.1)..=(MAX_SUPPORTED_VERSION.1)).rev() {
@@ -898,7 +894,7 @@ fn get_nif_version_from_features() -> (u32, u32) {
 }
 
 fn main() {
-    let nif_version = handle_nif_version_from_env().unwrap_or_else(get_nif_version_from_features);
+    let nif_version = get_nif_version_from_features();
 
     let target_family = if cfg!(target_family = "windows") {
         OsFamily::Win