Make only the qttypes/build.rs do the finding qt logic

ogoffart · ogoffart · commit 074f3432494c · 2021-04-19T15:28:35.000+02:00
downstream crates can just use metadata provided by qttypes
diff --git a/examples/graph/Cargo.toml b/examples/graph/Cargo.toml
@@ -7,7 +7,8 @@ build = "build.rs"
 
 [dependencies]
 qmetaobject = { path = "../../qmetaobject"}
-cstr = "0.1.4"
+qttypes = { path = "../../qttypes"} # required to get the DEP_QT_* env variables
+cstr = "0.2"
 cpp = "0.5"
 
 [build-dependencies]
diff --git a/examples/graph/build.rs b/examples/graph/build.rs
@@ -16,36 +16,12 @@ OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
 CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 */
 extern crate cpp_build;
-use std::process::Command;
-
-fn qmake_query(var: &str) -> String {
-    String::from_utf8(
-        Command::new("qmake")
-            .args(&["-query", var])
-            .output()
-            .expect("Failed to execute qmake. Make sure 'qmake' is in your path")
-            .stdout,
-    )
-    .expect("UTF-8 conversion failed")
-}
 
 fn main() {
-    let qt_include_path = qmake_query("QT_INSTALL_HEADERS");
-    let qt_library_path = qmake_query("QT_INSTALL_LIBS");
-
+    let qt_include_path = std::env::var("DEP_QT_INCLUDE_PATH").unwrap();
     cpp_build::Config::new()
         .include(qt_include_path.trim())
         .include(qt_include_path.trim().to_owned() + "/QtQuick")
         .include(qt_include_path.trim().to_owned() + "/QtCore")
         .build("src/main.rs");
-
-    let macos_lib_search = if cfg!(target_os = "macos") { "=framework" } else { "" };
-    let macos_lib_framework = if cfg!(target_os = "macos") { "" } else { "5" };
-
-    println!("cargo:rustc-link-search{}={}", macos_lib_search, qt_library_path.trim());
-    println!("cargo:rustc-link-lib{}=Qt{}Widgets", macos_lib_search, macos_lib_framework);
-    println!("cargo:rustc-link-lib{}=Qt{}Gui", macos_lib_search, macos_lib_framework);
-    println!("cargo:rustc-link-lib{}=Qt{}Core", macos_lib_search, macos_lib_framework);
-    println!("cargo:rustc-link-lib{}=Qt{}Quick", macos_lib_search, macos_lib_framework);
-    println!("cargo:rustc-link-lib{}=Qt{}Qml", macos_lib_search, macos_lib_framework);
 }
diff --git a/qmetaobject/Cargo.toml b/qmetaobject/Cargo.toml
@@ -13,21 +13,21 @@ repository = "https://github.com/woboq/qmetaobject-rs"
 [features]
 default = ["log"]
 chrono_qdatetime = ["qttypes/chrono"]
-webengine = []
+webengine = ["qttypes/qtwebengine"]
 
 [dependencies]
-qttypes = { path = "../qttypes", version = "0.1.4" }
+qttypes = { path = "../qttypes", version = "0.1.4", features = ["qtquick"] }
 qmetaobject_impl = { path = "../qmetaobject_impl", version = "=0.1.4"}
 lazy_static = "1.0"
 cpp = "0.5.4"
 log = { version = "0.4", optional = true }
 
 [build-dependencies]
 cpp_build = "0.5.4"
-semver = "0.9"
+semver = "0.11"
 
 [dev-dependencies]
-cstr = "0.1"
+cstr = "0.2"
 if_rust_version = "1"
 tempfile = "^3"
 
diff --git a/qmetaobject/build.rs b/qmetaobject/build.rs
@@ -15,108 +15,29 @@ NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FO
 OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
 CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 */
-extern crate cpp_build;
+
 use semver::Version;
-use std::io::prelude::*;
-use std::io::BufReader;
-use std::path::Path;
-use std::process::Command;
 
-fn qmake_query(var: &str) -> String {
-    let qmake = std::env::var("QMAKE").unwrap_or("qmake".to_string());
-    String::from_utf8(
-        Command::new(qmake)
-            .env("QT_SELECT", "qt5")
-            .args(&["-query", var])
-            .output()
-            .expect("Failed to execute qmake. Make sure 'qmake' is in your path")
-            .stdout,
-    )
-    .expect("UTF-8 conversion failed")
-}
+fn main() {
+    eprintln!("cargo:warning={:?}", std::env::vars().collect::<Vec<_>>());
 
-// qreal is a double, unless QT_COORD_TYPE says otherwise:
-// https://doc.qt.io/qt-5/qtglobal.html#qreal-typedef
-fn detect_qreal_size(qt_include_path: &str) {
-    let path = Path::new(qt_include_path).join("QtCore").join("qconfig.h");
-    let f = std::fs::File::open(&path).expect(&format!("Cannot open `{:?}`", path));
-    let b = BufReader::new(f);
+    let qt_include_path = std::env::var("DEP_QT_INCLUDE_PATH").unwrap();
+    let qt_library_path = std::env::var("DEP_QT_LIBRARY_PATH").unwrap();
+    let qt_version = std::env::var("DEP_QT_VERSION")
+        .unwrap()
+        .parse::<Version>()
+        .expect("Parsing Qt version failed");
 
-    // Find declaration of QT_COORD_TYPE
-    for line in b.lines() {
-        let line = line.expect("qconfig.h is valid UTF-8");
-        if line.contains("QT_COORD_TYPE") {
-            if line.contains("float") {
-                println!("cargo:rustc-cfg=qreal_is_float");
-                return;
-            } else {
-                panic!("QT_COORD_TYPE with unknown declaration {}", line);
-            }
-        }
-    }
-}
-
-fn main() {
-    let qt_include_path = qmake_query("QT_INSTALL_HEADERS");
-    let qt_library_path = qmake_query("QT_INSTALL_LIBS");
-    let qt_version =
-        qmake_query("QT_VERSION").parse::<Version>().expect("Parsing Qt version failed");
     let mut config = cpp_build::Config::new();
-
     if cfg!(target_os = "macos") {
         config.flag("-F");
         config.flag(qt_library_path.trim());
     }
+    config.include(qt_include_path.trim()).build("src/lib.rs");
 
     for minor in 7..=15 {
         if qt_version >= Version::new(5, minor, 0) {
             println!("cargo:rustc-cfg=qt_{}_{}", 5, minor);
         }
     }
-
-    detect_qreal_size(&qt_include_path.trim());
-
-    config.include(qt_include_path.trim()).build("src/lib.rs");
-
-    let macos_lib_search = if cfg!(target_os = "macos") { "=framework" } else { "" };
-    let macos_lib_framework = if cfg!(target_os = "macos") { "" } else { "5" };
-
-    let debug = std::env::var("DEBUG").ok().map_or(false, |s| s == "true");
-    let windows_dbg_suffix = if debug {
-        if cfg!(target_os = "windows") {
-            println!("cargo:rustc-link-lib=msvcrtd");
-            "d"
-        } else {
-            ""
-        }
-    } else {
-        ""
-    };
-    println!("cargo:rustc-link-search{}={}", macos_lib_search, qt_library_path.trim());
-    println!(
-        "cargo:rustc-link-lib{}=Qt{}Widgets{}",
-        macos_lib_search, macos_lib_framework, windows_dbg_suffix
-    );
-    println!(
-        "cargo:rustc-link-lib{}=Qt{}Gui{}",
-        macos_lib_search, macos_lib_framework, windows_dbg_suffix
-    );
-    println!(
-        "cargo:rustc-link-lib{}=Qt{}Core{}",
-        macos_lib_search, macos_lib_framework, windows_dbg_suffix
-    );
-    println!(
-        "cargo:rustc-link-lib{}=Qt{}Quick{}",
-        macos_lib_search, macos_lib_framework, windows_dbg_suffix
-    );
-    println!(
-        "cargo:rustc-link-lib{}=Qt{}Qml{}",
-        macos_lib_search, macos_lib_framework, windows_dbg_suffix
-    );
-    if cfg!(feature = "webengine") {
-        println!(
-            "cargo:rustc-link-lib{}=Qt{}WebEngine{}",
-            macos_lib_search, macos_lib_framework, windows_dbg_suffix
-        );
-    }
 }
diff --git a/qttypes/Cargo.toml b/qttypes/Cargo.toml
@@ -4,19 +4,25 @@ version = "0.1.4"
 edition = "2018"
 authors = ["Olivier Goffart <ogoffart@woboq.com>"]
 build = "build.rs"
-description = "Manually maintained building for Qt basic types"
+description = "Manually maintained buildings for Qt value types"
 readme = "README.md"
 license = "MIT"
-keywords = ["Qt"]
+keywords = ["Qt", "QtCore", "QtGui"]
 repository = "https://github.com/woboq/qmetaobject-rs"
+links = "qt"
+
+[features]
+# Link against QtQuick
+qtquick = []
+# Link against QtWebEngine
+qtwebengine = []
 
 [dependencies]
 cpp = "0.5.6"
 chrono = { version = "0.4", optional = true }
 
 [build-dependencies]
 cpp_build = "0.5.6"
-semver = "0.11"
 
 [package.metadata.docs.rs]
 dependencies = [ "qtbase5-dev", "qtdeclarative5-dev" ]
diff --git a/qttypes/build.rs b/qttypes/build.rs
@@ -15,8 +15,7 @@ NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FO
 OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
 CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 */
-extern crate cpp_build;
-use semver::Version;
+
 use std::io::prelude::*;
 use std::io::BufReader;
 use std::path::Path;
@@ -59,64 +58,51 @@ fn detect_qreal_size(qt_include_path: &str) {
 fn main() {
     let qt_include_path = qmake_query("QT_INSTALL_HEADERS");
     let qt_library_path = qmake_query("QT_INSTALL_LIBS");
-    let qt_version =
-        qmake_query("QT_VERSION").parse::<Version>().expect("Parsing Qt version failed");
+    let qt_version = qmake_query("QT_VERSION");
+
     let mut config = cpp_build::Config::new();
 
     if cfg!(target_os = "macos") {
         config.flag("-F");
         config.flag(qt_library_path.trim());
     }
 
-    for minor in 7..=15 {
-        if qt_version >= Version::new(5, minor, 0) {
-            println!("cargo:rustc-cfg=qt_{}_{}", 5, minor);
-        }
-    }
-
     detect_qreal_size(&qt_include_path.trim());
 
     config.include(qt_include_path.trim()).build("src/lib.rs");
 
+    println!("cargo:VERSION={}", qt_version.trim());
+    println!("cargo:LIBRARY_PATH={}", qt_library_path.trim());
+    println!("cargo:INCLUDE_PATH={}", qt_include_path.trim());
+
     let macos_lib_search = if cfg!(target_os = "macos") { "=framework" } else { "" };
     let macos_lib_framework = if cfg!(target_os = "macos") { "" } else { "5" };
 
     let debug = std::env::var("DEBUG").ok().map_or(false, |s| s == "true");
-    let windows_dbg_suffix = if debug {
-        if cfg!(target_os = "windows") {
-            println!("cargo:rustc-link-lib=msvcrtd");
-            "d"
-        } else {
-            ""
-        }
+    let windows_dbg_suffix = if debug && cfg!(target_os = "windows") {
+        println!("cargo:rustc-link-lib=msvcrtd");
+        "d"
     } else {
         ""
     };
     println!("cargo:rustc-link-search{}={}", macos_lib_search, qt_library_path.trim());
-    println!(
-        "cargo:rustc-link-lib{}=Qt{}Widgets{}",
-        macos_lib_search, macos_lib_framework, windows_dbg_suffix
-    );
-    println!(
-        "cargo:rustc-link-lib{}=Qt{}Gui{}",
-        macos_lib_search, macos_lib_framework, windows_dbg_suffix
-    );
-    println!(
-        "cargo:rustc-link-lib{}=Qt{}Core{}",
-        macos_lib_search, macos_lib_framework, windows_dbg_suffix
-    );
-    println!(
-        "cargo:rustc-link-lib{}=Qt{}Quick{}",
-        macos_lib_search, macos_lib_framework, windows_dbg_suffix
-    );
-    println!(
-        "cargo:rustc-link-lib{}=Qt{}Qml{}",
-        macos_lib_search, macos_lib_framework, windows_dbg_suffix
-    );
-    if cfg!(feature = "webengine") {
+
+    let link_lib = |lib: &str| {
         println!(
-            "cargo:rustc-link-lib{}=Qt{}WebEngine{}",
-            macos_lib_search, macos_lib_framework, windows_dbg_suffix
-        );
-    }
+            "cargo:rustc-link-lib{search}=Qt{vers}{lib}{suffix}",
+            search = macos_lib_search,
+            vers = macos_lib_framework,
+            lib = lib,
+            suffix = windows_dbg_suffix
+        )
+    };
+    link_lib("Core");
+    link_lib("Gui");
+    link_lib("Widgets");
+    #[cfg(feature = "qtquick")]
+    link_lib("Quick");
+    #[cfg(feature = "qtquick")]
+    link_lib("Qml");
+    #[cfg(feature = "qtwebengine")]
+    link_lib("WebEngine");
 }
