From 15facd58642453f264ee28dfe05d958878cdc67a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AE=AE=E6=B0=B4=5F=E4=BA=94=E8=91=89?= <47047883+MMitsuha@users.noreply.github.com> Date: Mon, 14 Jul 2025 19:57:11 +0800 Subject: [PATCH 1/4] fix: warning: `xmake f --buildir=` has been deprecated, please use `xmake f -o/--builddir=` --- src/lib.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/lib.rs b/src/lib.rs index 6fa5ce2..6a83949 100644 --- a/src/lib.rs +++ b/src/lib.rs @@ -490,7 +490,7 @@ impl Config { .clone() .unwrap_or_else(|| PathBuf::from(getenv_unwrap("OUT_DIR"))); - cmd.arg(format!("--buildir={}", dst.display())); + cmd.arg(format!("--builddir={}", dst.display())); // Cross compilation let host = getenv_unwrap("HOST"); From 8f7a396d84fae7c914caf8c5c9f5deb74da0b3e3 Mon Sep 17 00:00:00 2001 From: Miyamizu Mitsuha Date: Mon, 14 Jul 2025 20:01:19 +0800 Subject: [PATCH 2/4] release: 0.3.3 --- Cargo.toml | 2 +- README.md | 6 +++--- src/lib.rs | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/Cargo.toml b/Cargo.toml index d432067..ef796c3 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "xmake" -version = "0.3.2" +version = "0.3.3" edition = "2021" license = "MIT" keywords = ["build-dependencies"] diff --git a/README.md b/README.md index 1ebedeb..0feaf4b 100644 --- a/README.md +++ b/README.md @@ -6,12 +6,12 @@ library. ```toml # Cargo.toml [build-dependencies] -xmake = "0.3.2" +xmake = "0.3.3" ``` The XMake executable is assumed to be `xmake` unless the `XMAKE` environmental variable is set. -There is some examples in the `tests` folder of the repo. +There is some examples in the `tests` folder of the repo. ## Difference from cmake-rs @@ -29,4 +29,4 @@ xrepo env -b "emscripten, ndk" shell ``` After executing one of these commands, xmake will automatically detect either the emscripten or NDK toolchain. -If you prefer to use your own toolchain, you can set either the ANDROID_NDK_HOME or EMSCRIPTEN_HOME environment variables to specify the path to the corresponding toolchain. \ No newline at end of file +If you prefer to use your own toolchain, you can set either the ANDROID_NDK_HOME or EMSCRIPTEN_HOME environment variables to specify the path to the corresponding toolchain. diff --git a/src/lib.rs b/src/lib.rs index 6a83949..e6ed1ef 100644 --- a/src/lib.rs +++ b/src/lib.rs @@ -12,7 +12,7 @@ //! //! ```toml //! [build-dependencies] -//! xmake = "0.3.2" +//! xmake = "0.3.3" //! ``` //! //! ## Examples @@ -1471,7 +1471,7 @@ mod tests { let expected_directories = ["path/to/libA", "path/to/libB", "path\\to\\libC"] .map(PathBuf::from) .to_vec(); - + let expected_includedirs_package_a = to_set(["includedir/a", "includedir\\aa"] .map(PathBuf::from) .to_vec()); From bba03b13d77fff3335378b64ae05ffc314ffbed4 Mon Sep 17 00:00:00 2001 From: Miyamizu Mitsuha Date: Mon, 14 Jul 2025 20:52:31 +0800 Subject: [PATCH 3/4] fix: link type syslinks error on windows --- src/lib.rs | 38 ++++++++++++++++++++++---------------- 1 file changed, 22 insertions(+), 16 deletions(-) diff --git a/src/lib.rs b/src/lib.rs index e6ed1ef..78f4209 100644 --- a/src/lib.rs +++ b/src/lib.rs @@ -187,7 +187,7 @@ impl FromStr for LinkKind { match s { "static" => Ok(LinkKind::Static), "shared" => Ok(LinkKind::Dynamic), - "system" => Ok(LinkKind::System), + "system" | "syslinks" => Ok(LinkKind::System), "framework" => Ok(LinkKind::Framework), "unknown" => Ok(LinkKind::Unknown), _ => Err(ParsingError::InvalidKind), @@ -1472,24 +1472,30 @@ mod tests { .map(PathBuf::from) .to_vec(); - let expected_includedirs_package_a = to_set(["includedir/a", "includedir\\aa"] - .map(PathBuf::from) - .to_vec()); - let expected_includedirs_package_b = to_set(["includedir/bb", "includedir\\b"] - .map(PathBuf::from) - .to_vec()); + let expected_includedirs_package_a = to_set( + ["includedir/a", "includedir\\aa"] + .map(PathBuf::from) + .to_vec(), + ); + let expected_includedirs_package_b = to_set( + ["includedir/bb", "includedir\\b"] + .map(PathBuf::from) + .to_vec(), + ); let expected_includedirs_target_c = to_set(["includedir/c"].map(PathBuf::from).to_vec()); - let expected_includedirs_both_greedy = to_set([ - "includedir/c", - "includedir/bb", - "includedir\\b", - "includedir/a", - "includedir\\aa", - ] - .map(PathBuf::from) - .to_vec()); + let expected_includedirs_both_greedy = to_set( + [ + "includedir/c", + "includedir/bb", + "includedir\\b", + "includedir/a", + "includedir\\aa", + ] + .map(PathBuf::from) + .to_vec(), + ); let expected_cxx = true; let expected_stl = false; From 990298d3914804236a5d3217bd00c188bbc0d2c8 Mon Sep 17 00:00:00 2001 From: Miyamizu Mitsuha Date: Mon, 14 Jul 2025 20:56:18 +0800 Subject: [PATCH 4/4] release: 0.3.4 --- Cargo.toml | 2 +- README.md | 2 +- src/lib.rs | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Cargo.toml b/Cargo.toml index ef796c3..d99fc66 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "xmake" -version = "0.3.3" +version = "0.3.4" edition = "2021" license = "MIT" keywords = ["build-dependencies"] diff --git a/README.md b/README.md index 0feaf4b..11a7d33 100644 --- a/README.md +++ b/README.md @@ -6,7 +6,7 @@ library. ```toml # Cargo.toml [build-dependencies] -xmake = "0.3.3" +xmake = "0.3.4" ``` The XMake executable is assumed to be `xmake` unless the `XMAKE` diff --git a/src/lib.rs b/src/lib.rs index 78f4209..95dae07 100644 --- a/src/lib.rs +++ b/src/lib.rs @@ -12,7 +12,7 @@ //! //! ```toml //! [build-dependencies] -//! xmake = "0.3.3" +//! xmake = "0.3.4" //! ``` //! //! ## Examples