Skip to content

Commit f9ae5aa

Browse files
authored
Update external libraries
Update library versions: zlib to v1.2.13 zstd to v1.5.2 xz to v5.4.1
2 parents 3b0cbc5 + 47c7689 commit f9ae5aa

File tree

6 files changed

+16
-7
lines changed

6 files changed

+16
-7
lines changed

.gitmodules

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
branch = master
1515
[submodule "external/xz"]
1616
path = external/xz
17-
url = https://github.com/xz-mirror/xz.git
17+
url = https://git.tukaani.org/xz.git
1818
branch = master
1919

2020
[submodule "zlib"]
@@ -24,3 +24,5 @@
2424
[submodule "external/zstd"]
2525
path = external/zstd
2626
url = https://github.com/facebook/zstd.git
27+
[submodule "https://git.tukaani.org/xz.git"]
28+
url = external/xz

LibZipSharp.props

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
22
<PropertyGroup>
3-
<_LibZipSharpAssemblyVersion>2.0.7</_LibZipSharpAssemblyVersion>
3+
<_LibZipSharpAssemblyVersion>2.0.8</_LibZipSharpAssemblyVersion>
44
<!--
55
Nuget Version. You can append things like -alpha-1 etc to this value.
66
But always leave the $(_LibZipSharpAssemblyVersion) value at the start.

build.sh

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@ fi
2525
#
2626
NINJA="ninja"
2727
CMAKE="cmake"
28+
GENERATOR="Ninja"
2829
JOBS=""
2930
CONFIGURATION="RelWithDebInfo"
3031
REBUILD="no"
@@ -131,7 +132,7 @@ function cmake_configure()
131132
run_cmake_common \
132133
-B "${build_dir}" \
133134
-S "${MY_DIR}" \
134-
-G Ninja \
135+
-G "${GENERATOR}" \
135136
-DCMAKE_BUILD_TYPE="${CONFIGURATION}" ${use_xz} \
136137
"$@"
137138
}
@@ -234,7 +235,10 @@ while (( "$#" )); do
234235
fi
235236
;;
236237

237-
-x|--xz) USE_XZ="yes"; shift ;;
238+
-x|--xz)
239+
USE_XZ="yes"
240+
GENERATOR="Unix Makefiles"
241+
shift ;;
238242

239243
-g|--zlib-ng) USE_ZLIBNG="yes"; shift ;;
240244

@@ -277,6 +281,7 @@ if [ "${OS}" == "Darwin" ]; then
277281
fi
278282

279283
if [ "${OS}" == "Darwin" ]; then
284+
MAKE="gmake"
280285
X86_NATIVE="no"
281286
X86_BUILD_DIR=""
282287
X86_ARTIFACTS_DIR=""
@@ -325,6 +330,8 @@ if [ "${OS}" == "Darwin" ]; then
325330
cmake_install "${X86_BUILD_DIR}"
326331
fi
327332
else
333+
MAKE="make"
334+
328335
print_banner "Configuring dependency libraries"
329336
cmake_configure "${DEPS_BUILD_DIR}" -DBUILD_DEPENDENCIES=ON "-DARTIFACTS_ROOT_DIR=${ARTIFACTS_DIR_ROOT}" "-DCMAKE_INSTALL_PREFIX=${ARTIFACTS_DIR_ROOT}"
330337

external/xz

Submodule xz updated from 2327a46 to 18b845e

external/zlib

Submodule zlib updated 95 files

external/zstd

Submodule zstd updated 159 files

0 commit comments

Comments
 (0)