Skip to content

Commit 4fef46a

Browse files
authored
Bump library versions for the latest upstream releases (#140)
zlib bumped to v1.3.1 (https://zlib.net/ChangeLog.txt) zlib-ng bumped v2.1.6 (https://github.com/zlib-ng/zlib-ng/releases/tag/2.1.6) zstd bumped to v.1.5.6 (https://github.com/facebook/zstd/releases/tag/v1.5.6) zlib no longer needs to be patched to prevent from building its example programs. LibZipSharp's own version bumped to 3.2.0
1 parent 14f591c commit 4fef46a

7 files changed

Lines changed: 8 additions & 33 deletions

File tree

‎CMakeLists.txt‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -321,6 +321,7 @@ if(BUILD_DEPENDENCIES)
321321
if(ENABLE_ZLIBNG)
322322
add_subdirectory(external/zlib-ng)
323323
else()
324+
set(ZLIB_BUILD_EXAMPLES FalseCACHEBOOL"Don't build zlib examples")
324325
add_subdirectory(external/zlib)
325326
endif()
326327

@@ -628,8 +629,8 @@ else()
628629
WORKING_DIRECTORY"$<TARGET_FILE_DIR:${PROJECT_NAME}>"
629630
COMMANDrmlib${PROJECT_NAME}-${LT_RELEASE}.so
630631
COMMANDrmlib${PROJECT_NAME}-${LT_RELEASE}.so.${LT_RELEASE}
631-
COMMANDlnlib${PROJECT_NAME}-${LT_RELEASE}.so.${LT_VERSION}lib${PROJECT_NAME}-${LT_RELEASE}.so.${LT_VERSION_SHORT}
632-
COMMANDlnlib${PROJECT_NAME}-${LT_RELEASE}.so.${LT_VERSION}lib${PROJECT_NAME}-${LT_RELEASE}.so
632+
COMMANDln-flib${PROJECT_NAME}-${LT_RELEASE}.so.${LT_VERSION}lib${PROJECT_NAME}-${LT_RELEASE}.so.${LT_VERSION_SHORT}
633+
COMMANDln-flib${PROJECT_NAME}-${LT_RELEASE}.so.${LT_VERSION}lib${PROJECT_NAME}-${LT_RELEASE}.so
633634
)
634635
endif()
635636
endif()

‎LibZipSharp.props‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
<ProjectDefaultTargets="Build"ToolsVersion="4.0"xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
22
<PropertyGroup>
33
<_LibZipSharpAssemblyVersionMajor>3</_LibZipSharpAssemblyVersionMajor>
4-
<_LibZipSharpAssemblyVersionMinor>1</_LibZipSharpAssemblyVersionMinor>
5-
<_LibZipSharpAssemblyVersionPatch>1</_LibZipSharpAssemblyVersionPatch>
4+
<_LibZipSharpAssemblyVersionMinor>2</_LibZipSharpAssemblyVersionMinor>
5+
<_LibZipSharpAssemblyVersionPatch>0</_LibZipSharpAssemblyVersionPatch>
66
<_LibZipSharpAssemblyVersion>$(_LibZipSharpAssemblyVersionMajor).$(_LibZipSharpAssemblyVersionMinor).$(_LibZipSharpAssemblyVersionPatch)</_LibZipSharpAssemblyVersion>
77
<_NativeLibraryVersionForName>$(_LibZipSharpAssemblyVersionMajor)-$(_LibZipSharpAssemblyVersionMinor)</_NativeLibraryVersionForName>
88
<_NativeLibraryBaseName>libZipSharpNative-$(_NativeLibraryVersionForName)</_NativeLibraryBaseName>

‎build.sh‎

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -251,14 +251,6 @@ if [ -z "${NINJA}" ]; then
251251
die ninja binary must be specified
252252
fi
253253

254-
if [ "${USE_ZLIBNG}"=="no" ];then
255-
ZLIB_CMAKELISTS_PATH="${ZLIB_DIR}/CMakeLists.txt"
256-
if!$(grep 'lzs: disable-examples'"${ZLIB_CMAKELISTS_PATH}"> /dev/null 2>&1);then
257-
print_banner Applying zlib patch
258-
$(cd "${ZLIB_DIR}"; git apply "${MY_DIR}/zlib-changes.patch")
259-
fi
260-
fi
261-
262254
if [ "${REBUILD}"=="yes" ];then
263255
rm -rf "${BUILD_DIR_ROOT}"
264256
rm -rf "${ARTIFACTS_DIR_ROOT}"

‎external/zlib‎

Submodule zlib updated 73 files

‎external/zlib-ng‎

Submodule zlib-ng updated 341 files

‎external/zstd‎

Submodule zstd updated 155 files

‎zlib-changes.patch‎

Lines changed: 0 additions & 18 deletions
This file was deleted.

0 commit comments

Comments
 (0)