Merge pull request #29 from jkvargas/v5.2.5

V5.2.5
jkvargas · Oct 12, 2022 · 175081c · 175081c
2 parents 7844f0d + cc0e891
commit 175081c
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 10 deletions.
diff --git a/Cargo.toml b/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "russimp-sys"
-version = "1.0.2"
+version = "1.0.3"
 authors = ["Jhonny Knaak de Vargas"]
 edition = "2018"
 license-file = "LICENSE"
@@ -10,7 +10,7 @@ categories = ["rendering", "external-ffi-bindings", "game-engines", "multimedia"
 keywords = ["assimp", "3d", "blend", "3ds", "glTF"]
 repository = "https://github.com/jkvargas/russimp-sys"
 description = "Raw Assimp bindings for rust"
-exclude = ["/assimp"]
+exclude = ["/assimp", "*.bash", "*.ps1"]
 
 [lib]
 name = "russimp_sys"
@@ -24,9 +24,9 @@ nozlib = []
 nolibcxx = []
 
 [build-dependencies]
-bindgen = "0.59"
+bindgen = "0.59.2"
 vcpkg = "0.2.15"
-ureq = "2.4"
+ureq = "2.5"
 serde_json = "1.0"
 serde = { version = "1.0", features = ["derive"] }
 tar = "0.4"
@@ -35,7 +35,7 @@ num_cpus = "1.13"
 
 [package.metadata.vcpkg]
 git = "https://github.com/microsoft/vcpkg"
-rev = "8e1f46d"
+rev = "7178ff9"
 
 [package.metadata.vcpkg.target]
 x86_64-pc-windows-msvc = { triplet = "x64-windows-static-md", install = ["assimp", "zlib"] }

diff --git a/README.md b/README.md
@@ -48,6 +48,8 @@ By default `russimp-sys` links to `libstdc++` in linux and `libc++` in macos, tu
 
 ## Changelog
 
+### 1.0.3
+* Builds based on 5.2.5 release
 ### 1.0.0
 
 - Builds based on 5.1.0 release
diff --git a/build.rs b/build.rs
@@ -274,7 +274,7 @@ fn package(manifest: &BuildManifest, output: impl AsRef<Path>) {
 
 fn download_from_cache(cache_tar_name: impl AsRef<str>, version: impl AsRef<str>) -> BuildManifest {
     let download_url = format!(
-        "https://github.com/EYHN/russimp-sys/releases/download/v{}/{}",
+        "https://github.com/jkvargas/russimp-sys/releases/download/v{}/{}",
         version.as_ref(),
         cache_tar_name.as_ref()
     );
@@ -348,7 +348,7 @@ fn main() {
         let (include, libdir, libname) = assimp_dynamic_linking();
 
         if cfg!(target_os = "windows") {
-            let _ = std::process::Command::new("cargo")
+            let _ = Command::new("cargo")
                 .arg("vcpkg")
                 .arg("build")
                 .output()

diff --git a/install_assimp.bash b/install_assimp.bash
@@ -11,14 +11,14 @@ fi
 apt install -y git cmake ninja-build
 
 if [ ! -d ${path_assimp_repo} ]; then
-	git clone --depth 1 --branch v5.1.0 https://github.com/assimp/assimp.git ${path_assimp_repo}
+	git clone --depth 1 --branch v5.2.5 https://github.com/assimp/assimp.git ${path_assimp_repo}
 fi
 
 if [ ! -d ${path_assimp_build} ]; then
-        mkdir ${path_assimp_build}
+  mkdir ${path_assimp_build}
 	# shellcheck disable=SC2164
 	cd ${path_assimp_build}
-	cmake -DCMAKE_BUILD_TYPE=Release -DCMAKE_CXX_COMPILER=/usr/bin/clang++-11 -DCMAKE_C_COMPILER=/usr/bin/clang-11 -DCMAKE_INSTALL_PREFIX=/usr/local -G Ninja ..
+	cmake -DCMAKE_BUILD_TYPE=Release -DCMAKE_CXX_COMPILER=/usr/bin/clang++ -DCMAKE_C_COMPILER=/usr/bin/clang -DCMAKE_INSTALL_PREFIX=/usr/local -G Ninja ..
 	ninja
 	ninja install
 fi