From 700004e8a680fd420818b3748fcb2260420af11f Mon Sep 17 00:00:00 2001 From: Rye Mutt Date: Sat, 10 Aug 2024 09:27:18 -0400 Subject: [PATCH] Update to zlib-ng 2.2.1-r2 libxml2 2.13.3-r1 minizip-ng 4.0.7-r1 Fix up build script --- .github/workflows/build.yaml | 2 +- autobuild.xml | 114 +++++++------------------- build-cmd.sh | 27 ++++-- projects/vc142-1.4/dom-static.vcxproj | 12 ++- projects/vc142-1.4/dom.sln | 5 +- projects/vc142-1.4/dom.vcxproj | 26 +++--- projects/vc142-1.4/domTest.vcxproj | 10 +-- 7 files changed, 78 insertions(+), 118 deletions(-) diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml index 919a3ff..d1833f4 100644 --- a/.github/workflows/build.yaml +++ b/.github/workflows/build.yaml @@ -8,7 +8,7 @@ jobs: build: strategy: matrix: - os: [windows-2022, macos-13, ubuntu-22.04] + os: [windows-2022, macos-12, ubuntu-22.04] runs-on: ${{ matrix.os }} steps: - uses: secondlife/action-autobuild@v4 diff --git a/autobuild.xml b/autobuild.xml index 0ea4801..9d68355 100755 --- a/autobuild.xml +++ b/autobuild.xml @@ -21,11 +21,11 @@ archive hash - d600779da508fbb64eb85957f2866fd2b039b674 + e86c0dba9fe7ede25fe00a1435421bce62077dc1 hash_algorithm sha1 url - https://github.com/secondlife/3p-boost/releases/download/v1.85.0-r1/boost-1.85-darwin64-10124675220.tar.zst + https://github.com/secondlife/3p-boost/releases/download/v1.85.0-r3/boost-1.85-darwin64-10333387089.tar.zst name darwin64 @@ -35,39 +35,25 @@ archive hash - ce39890fe263358d99c45f1b697107b72e3b6870 + 30e1096fede786e5553a7c65b9d55dea9555bef3 hash_algorithm sha1 url - https://github.com/secondlife/3p-boost/releases/download/v1.85.0-r1/boost-1.85-linux64-10124675220.tar.zst + https://github.com/secondlife/3p-boost/releases/download/v1.85.0-r3/boost-1.85-linux64-10333387089.tar.zst name linux64 - windows - - archive - - hash - ec285559c214456a9b52078dca63150e8be1fbc1 - hash_algorithm - sha1 - url - https://github.com/secondlife/3p-boost/releases/download/v1.81-09d25a7/boost-1.81-windows-09d25a7.tar.zst - - name - windows - windows64 archive hash - 2b0b0b0aaf3bdb1d36809db7d08bd60ae7e8fed1 + e640611a7e4b245c8900048b995e243fb68b90c9 hash_algorithm sha1 url - https://github.com/secondlife/3p-boost/releases/download/v1.85.0-r1/boost-1.85-windows64-10124675220.tar.zst + https://github.com/secondlife/3p-boost/releases/download/v1.85.0-r3/boost-1.85-windows64-10333387089.tar.zst name windows64 @@ -95,11 +81,11 @@ archive hash - 2c46547d9dc83c47f41eacc7e5092affa72f3eee + b2bf9adc84841b6fcf48d4c00787b221607cdea3 hash_algorithm sha1 url - https://github.com/secondlife/3p-libxml2/releases/download/v2.9.4.7476681/libxml2-2.9.4.7476681-darwin64-7476681.tar.zst + https://github.com/secondlife/3p-libxml2/releases/download/v2.13.3-r1/libxml2-2.13.3-r1-darwin64-10329675166.tar.zst name darwin64 @@ -109,46 +95,32 @@ archive hash - fda5d399c21c3ad29a78f29599523ca4ecf76bd2 + 6ab8108ea0a42e0bd462568c495e5ce5c4cdc0ff hash_algorithm sha1 url - https://github.com/secondlife/3p-libxml2/releases/download/v2.9.4-2db4418/libxml2-2.9.4.2db4418-linux64-2db4418.tar.zst + https://github.com/secondlife/3p-libxml2/releases/download/v2.13.3-r1/libxml2-2.13.3-r1-linux64-10329675166.tar.zst name linux64 - windows - - archive - - hash - 7446cbaed41c26b67122c203c556161893b5b425 - hash_algorithm - sha1 - url - https://github.com/secondlife/3p-libxml2/releases/download/v2.9.4.7476681/libxml2-2.9.4.7476681-windows-7476681.tar.zst - - name - windows - windows64 archive hash - 7e506d26f8cb6f205146e41d74095e7e27087e84 + 5181bd267de3ad4466227f91c7e2cbed7e8b85d9 hash_algorithm sha1 url - https://github.com/secondlife/3p-libxml2/releases/download/v2.9.4.7476681/libxml2-2.9.4.7476681-windows64-7476681.tar.zst + https://github.com/secondlife/3p-libxml2/releases/download/v2.13.3-r1/libxml2-2.13.3-r1-windows64-10329675166.tar.zst name windows64 version - 2.9.4.2db4418 + 2.13.3-r1 minizip-ng @@ -171,11 +143,11 @@ archive hash - 303fa93a0fd6c636a65fd9d5d53beceb84752b0e + 6bedaa9d770ef0ae6147f49a26fc3209fde9cb80 hash_algorithm sha1 url - https://github.com/secondlife/3p-minizip-ng/releases/download/v3.0.2.3e9876e/minizip_ng-3.0.2.3e9876e-darwin64-3e9876e.tar.zst + https://github.com/secondlife/3p-minizip-ng/releases/download/v4.0.7-r1/minizip_ng-4.0.7-r1-darwin64-10324657515.tar.zst name darwin64 @@ -185,46 +157,32 @@ archive hash - d4f35ebcea53ab6e9f2e6cbc0d680b10d10b9c53 + ce2c91b8c4f89af252ce1b6a96af6985fe54f509 hash_algorithm sha1 url - https://github.com/secondlife/3p-minizip-ng/releases/download/v3.0.2.3e9876e/minizip_ng-3.0.2.3e9876e-linux64-3e9876e.tar.zst + https://github.com/secondlife/3p-minizip-ng/releases/download/v4.0.7-r1/minizip_ng-4.0.7-r1-linux64-10324657515.tar.zst name linux64 - windows - - archive - - hash - ff191c1d6515234d8c671360215c52c5974988b1 - hash_algorithm - sha1 - url - https://github.com/secondlife/3p-minizip-ng/releases/download/v3.0.2.3e9876e/minizip_ng-3.0.2.3e9876e-windows-3e9876e.tar.zst - - name - windows - windows64 archive hash - 5dc469172ba4c6015d5b771e516bc88a65d769eb + 9cee9d85f9a7c6fb051125775f0122a926da5cc9 hash_algorithm sha1 url - https://github.com/secondlife/3p-minizip-ng/releases/download/v3.0.2.3e9876e/minizip_ng-3.0.2.3e9876e-windows64-3e9876e.tar.zst + https://github.com/secondlife/3p-minizip-ng/releases/download/v4.0.7-r1/minizip_ng-4.0.7-r1-windows64-10324657515.tar.zst name windows64 version - 3.0.2.3e9876e + 4.0.7-r1 zlib-ng @@ -247,11 +205,11 @@ archive hash - dacc5f3fb307c4d1292ed1ffb1d595d83599062d + 3a6593c71c59ace76d1349483759fcde4b719a76 hash_algorithm sha1 url - https://github.com/secondlife/3p-zlib-ng/releases/download/v1.2.11.zlib-ng.32fd361/zlib_ng-1.2.11.zlib-ng.32fd361-darwin64-32fd361.tar.zst + https://github.com/secondlife/3p-zlib-ng/releases/download/v2.2.1-r2/zlib_ng-2.2.1-r2-darwin64-10324415171.tar.zst name darwin64 @@ -261,46 +219,32 @@ archive hash - fba88375e12454ae19f4528e11ffc7ddf7d879ec + fbadeb0b8c771cb06c0055c9fab6d40c6764dacd hash_algorithm sha1 url - https://github.com/secondlife/3p-zlib-ng/releases/download/v1.2.11.zlib-ng.32fd361/zlib_ng-1.2.11.zlib-ng.32fd361-linux64-32fd361.tar.zst + https://github.com/secondlife/3p-zlib-ng/releases/download/v2.2.1-r2/zlib_ng-2.2.1-r2-linux64-10324415171.tar.zst name linux64 - windows - - archive - - hash - 2b5a50b0a3d31a07bc74cb77871ad195eb97c550 - hash_algorithm - sha1 - url - https://github.com/secondlife/3p-zlib-ng/releases/download/v1.2.11.zlib-ng.32fd361/zlib_ng-1.2.11.zlib-ng.32fd361-windows-32fd361.tar.zst - - name - windows - windows64 archive hash - ccfca9451063e2d0e95baa73b1ad2054d3e38907 + 0094031715662be626f5106ff6c814f4fc3dacfa hash_algorithm sha1 url - https://github.com/secondlife/3p-zlib-ng/releases/download/v1.2.11.zlib-ng.32fd361/zlib_ng-1.2.11.zlib-ng.32fd361-windows64-32fd361.tar.zst + https://github.com/secondlife/3p-zlib-ng/releases/download/v2.2.1-r2/zlib_ng-2.2.1-r2-windows64-10324415171.tar.zst name windows64 version - 1.2.11.zlib-ng.32fd361 + 2.2.1-r2 package_description @@ -440,8 +384,8 @@ source_directory . - version_file - VERSION.txt + use_scm_version + true type autobuild diff --git a/build-cmd.sh b/build-cmd.sh index 7e599e8..ee706ed 100755 --- a/build-cmd.sh +++ b/build-cmd.sh @@ -11,7 +11,7 @@ if [ -z "$AUTOBUILD" ] ; then exit 1 fi -if [ "$OSTYPE" = "cygwin" ] ; then +if [[ "$OSTYPE" == "cygwin" || "$OSTYPE" == "msys" ]] ; then autobuild="$(cygpath -u $AUTOBUILD)" else autobuild="$AUTOBUILD" @@ -30,6 +30,25 @@ source_environment_tempfile="$stage/source_environment.sh" [ -f "$stage"/packages/include/minizip-ng/zip.h ] || \ { echo "You haven't yet run autobuild install." 1>&2 ; exit 1; } +# Use msbuild.exe instead of devenv.com +build_sln() { + local solution=$1 + local config=$2 + local proj="${3:-}" + local toolset="${AUTOBUILD_WIN_VSTOOLSET:-v143}" + + # e.g. config = "Release|$AUTOBUILD_WIN_VSPLATFORM" per devenv.com convention + local -a confparts + IFS="|" read -ra confparts <<< "$config" + + msbuild.exe \ + "$(cygpath -w "$solution")" \ + ${proj:+-t:"$proj"} \ + -p:Configuration="${confparts[0]}" \ + -p:Platform="${confparts[1]}" \ + -p:PlatformToolset=$toolset +} + # There are two version numbers mixed up in the code below: the collada # version (e.g. 1.4, upstream from colladadom?) and the dom version (e.g. 2.3, # the version number we associate with this package). Get versions from @@ -47,8 +66,6 @@ dom_major="$(sed -n -E 's/^ *domMajorVersion *:= *([0-9]+) *$/\1/p' "$top/Makefi dom_minor="$(sed -n -E 's/^ *domMinorVersion *:= *([0-9]+) *$/\1/p' "$top/Makefile")" dom_version="$dom_major.$dom_minor" dom_shortver="$dom_major$dom_minor" -build=${AUTOBUILD_BUILD_ID:=0} -echo "${dom_version}.${build}" > "${stage}/VERSION.txt" case "$AUTOBUILD_PLATFORM" in @@ -63,9 +80,6 @@ case "$AUTOBUILD_PLATFORM" in "160"|"170") versub="vc142-${collada_version}" ;; - "170") - versub="vc17-${collada_version}" - ;; *) echo "Unknown AUTOBUILD_VSVER='$AUTOBUILD_VSVER'" 1>&2 ; exit 1 ;; @@ -110,6 +124,7 @@ case "$AUTOBUILD_PLATFORM" in # arch branch build_* changeset # helper here prefix release # repo root run_tests suffix + export MACOSX_DEPLOYMENT_TARGET="$LL_BUILD_DARWIN_DEPLOY_TARGET" opts="${TARGET_OPTS:--arch $AUTOBUILD_CONFIGURE_ARCH $LL_BUILD_RELEASE}" diff --git a/projects/vc142-1.4/dom-static.vcxproj b/projects/vc142-1.4/dom-static.vcxproj index 0f7b7fe..555ca4c 100644 --- a/projects/vc142-1.4/dom-static.vcxproj +++ b/projects/vc142-1.4/dom-static.vcxproj @@ -78,7 +78,7 @@ Disabled ..\..\include;..\..\include\1.4;..\..\stage\packages\include;..\..\stage\packages\include\libxml2;..\..\stage\packages\include\minizip-ng;..\..\stage\packages\include\zlib-ng;..\..\external-libs\tinyxml;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_CRT_SECURE_NO_DEPRECATE;DOM_INCLUDE_LIBXML;%(PreprocessorDefinitions) + WIN32;_DEBUG;_CRT_SECURE_NO_DEPRECATE;DOM_INCLUDE_LIBXML;LIBXML_STATIC;%(PreprocessorDefinitions) false EnableFastChecks MultiThreadedDebugDLL @@ -88,6 +88,7 @@ Level3 OldStyle false + stdcpp17 true @@ -98,7 +99,7 @@ Disabled ..\..\include;..\..\include\1.4;..\..\stage\packages\include;..\..\stage\packages\include\libxml2;..\..\stage\packages\include\minizip-ng;..\..\stage\packages\include\zlib-ng;..\..\external-libs\tinyxml;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_CRT_SECURE_NO_DEPRECATE;DOM_INCLUDE_LIBXML;%(PreprocessorDefinitions) + WIN32;_DEBUG;_CRT_SECURE_NO_DEPRECATE;DOM_INCLUDE_LIBXML;LIBXML_STATIC;%(PreprocessorDefinitions) false EnableFastChecks MultiThreadedDebugDLL @@ -108,6 +109,7 @@ Level3 OldStyle false + stdcpp17 true @@ -118,7 +120,7 @@ false ..\..\include;..\..\include\1.4;..\..\stage\packages\include;..\..\stage\packages\include\libxml2;..\..\stage\packages\include\minizip-ng;..\..\stage\packages\include\zlib-ng;..\..\external-libs\tinyxml;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_CRT_SECURE_NO_DEPRECATE;DOM_INCLUDE_LIBXML;%(PreprocessorDefinitions) + WIN32;NDEBUG;_CRT_SECURE_NO_DEPRECATE;DOM_INCLUDE_LIBXML;LIBXML_STATIC;%(PreprocessorDefinitions) MultiThreadedDLL false @@ -126,6 +128,7 @@ Level3 OldStyle false + stdcpp17 true @@ -138,7 +141,7 @@ false ..\..\include;..\..\include\1.4;..\..\stage\packages\include;..\..\stage\packages\include\libxml2;..\..\stage\packages\include\minizip-ng;..\..\stage\packages\include\zlib-ng;..\..\external-libs\tinyxml;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_CRT_SECURE_NO_DEPRECATE;DOM_INCLUDE_LIBXML;%(PreprocessorDefinitions) + WIN32;NDEBUG;_CRT_SECURE_NO_DEPRECATE;DOM_INCLUDE_LIBXML;LIBXML_STATIC;%(PreprocessorDefinitions) MultiThreadedDLL false @@ -146,6 +149,7 @@ Level3 OldStyle false + stdcpp17 true diff --git a/projects/vc142-1.4/dom.sln b/projects/vc142-1.4/dom.sln index af149ab..9ceb199 100644 --- a/projects/vc142-1.4/dom.sln +++ b/projects/vc142-1.4/dom.sln @@ -1,7 +1,7 @@  Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio 2013 -VisualStudioVersion = 12.0.40302.0 +# Visual Studio Version 17 +VisualStudioVersion = 17.10.35122.118 MinimumVisualStudioVersion = 10.0.40219.1 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "domTest", "domTest.vcxproj", "{32FA559B-77AB-4344-B102-BB671A299561}" EndProject @@ -18,6 +18,7 @@ Global {32FA559B-77AB-4344-B102-BB671A299561}.Release|Win32.ActiveCfg = Release|Win32 {32FA559B-77AB-4344-B102-BB671A299561}.Release|Win32.Build.0 = Release|Win32 {32FA559B-77AB-4344-B102-BB671A299561}.Release|x64.ActiveCfg = Release|x64 + {32FA559B-77AB-4344-B102-BB671A299561}.Release|x64.Build.0 = Release|x64 {E554598B-B565-4B3C-8E25-F60296AFB943}.Release|Win32.ActiveCfg = Release|Win32 {E554598B-B565-4B3C-8E25-F60296AFB943}.Release|Win32.Build.0 = Release|Win32 {E554598B-B565-4B3C-8E25-F60296AFB943}.Release|x64.ActiveCfg = Release|x64 diff --git a/projects/vc142-1.4/dom.vcxproj b/projects/vc142-1.4/dom.vcxproj index 6cb9c76..04b0a11 100644 --- a/projects/vc142-1.4/dom.vcxproj +++ b/projects/vc142-1.4/dom.vcxproj @@ -86,7 +86,7 @@ false false Disabled - WIN32;_DEBUG;_CRT_SECURE_NO_DEPRECATE;DOM_DYNAMIC;DOM_EXPORT;DOM_INCLUDE_LIBXML;%(PreprocessorDefinitions) + WIN32;_DEBUG;_CRT_SECURE_NO_DEPRECATE;DOM_DYNAMIC;DOM_EXPORT;DOM_INCLUDE_LIBXML;LIBXML_STATIC;%(PreprocessorDefinitions) MultiThreadedDebugDLL @@ -96,7 +96,7 @@ true - libxml2_a.lib;wsock32.lib;libminizip.lib;libboost_regex-mt-x32-gd.lib;libboost_filesystem-mt-x32-gd.lib;libboost_system-mt-x32-gd.lib;zlib.lib;%(AdditionalDependencies) + libxml2.lib;Bcrypt.lib;wsock32.lib;minizip.lib;libboost_regex-mt-x32-gd.lib;libboost_filesystem-mt-x32-gd.lib;libboost_system-mt-x32-gd.lib;zlib.lib;%(AdditionalDependencies) ..\..\stage\packages\lib\debug;..\..\external-libs\tinyxml\lib\vc10;%(AdditionalLibraryDirectories) @@ -120,7 +120,7 @@ false false Disabled - WIN32;_DEBUG;_CRT_SECURE_NO_DEPRECATE;DOM_DYNAMIC;DOM_EXPORT;DOM_INCLUDE_LIBXML;%(PreprocessorDefinitions) + WIN32;_DEBUG;_CRT_SECURE_NO_DEPRECATE;DOM_DYNAMIC;DOM_EXPORT;DOM_INCLUDE_LIBXML;LIBXML_STATIC;%(PreprocessorDefinitions) MultiThreadedDebugDLL @@ -130,7 +130,7 @@ true - libxml2_a.lib;wsock32.lib;libminizip.lib;libboost_regex-mt-x64-gd.lib;libboost_filesystem-mt-x64-gd.lib;libboost_system-mt-x64-gd.lib;zlib.lib;%(AdditionalDependencies) + libxml2.lib;Bcrypt.lib;wsock32.lib;minizip.lib;libboost_regex-mt-x64-gd.lib;libboost_filesystem-mt-x64-gd.lib;libboost_system-mt-x64-gd.lib;zlib.lib;%(AdditionalDependencies) ..\..\stage\packages\lib\debug;..\..\external-libs\tinyxml\lib\vc10;%(AdditionalLibraryDirectories) @@ -148,10 +148,9 @@ ..\..\include;..\..\include\1.4;..\..\stage\packages\include;..\..\stage\packages\include\libxml2;..\..\stage\packages\include\minizip-ng;..\..\stage\packages\include\zlib-ng;..\..\external-libs\tinyxml;%(AdditionalIncludeDirectories) - - + ProgramDatabase false - WIN32;NDEBUG;_CRT_SECURE_NO_DEPRECATE;DOM_DYNAMIC;DOM_EXPORT;DOM_INCLUDE_LIBXML;%(PreprocessorDefinitions) + WIN32;NDEBUG;_CRT_SECURE_NO_DEPRECATE;DOM_DYNAMIC;DOM_EXPORT;DOM_INCLUDE_LIBXML;LIBXML_STATIC;%(PreprocessorDefinitions) MultiThreadedDLL @@ -161,12 +160,12 @@ true - libxml2_a.lib;zlib.lib;wsock32.lib;libminizip.lib;libboost_regex-mt-x32.lib;libboost_filesystem-mt-x32.lib;libboost_system-mt-x32.lib;%(AdditionalDependencies) + libxml2.lib;Bcrypt.lib;zlib.lib;wsock32.lib;minizip.lib;libboost_regex-mt-x32.lib;libboost_filesystem-mt-x32.lib;libboost_system-mt-x32.lib;%(AdditionalDependencies) ..\..\stage\packages\lib\release;..\..\external-libs\tinyxml\lib\vc10;%(AdditionalLibraryDirectories) true - false + true UseLinkTimeCodeGeneration true $(OutDir)libcollada14dom23.dll @@ -180,10 +179,9 @@ ..\..\include;..\..\include\1.4;..\..\stage\packages\include;..\..\stage\packages\include\libxml2;..\..\stage\packages\include\minizip-ng;..\..\stage\packages\include\zlib-ng;..\..\external-libs\tinyxml;%(AdditionalIncludeDirectories) - - + ProgramDatabase false - WIN32;NDEBUG;_CRT_SECURE_NO_DEPRECATE;DOM_DYNAMIC;DOM_EXPORT;DOM_INCLUDE_LIBXML;%(PreprocessorDefinitions) + WIN32;NDEBUG;_CRT_SECURE_NO_DEPRECATE;DOM_DYNAMIC;DOM_EXPORT;DOM_INCLUDE_LIBXML;LIBXML_STATIC;%(PreprocessorDefinitions) MultiThreadedDLL @@ -193,12 +191,12 @@ true - libxml2_a.lib;zlib.lib;wsock32.lib;libminizip.lib;libboost_regex-mt-x64.lib;libboost_filesystem-mt-x64.lib;libboost_system-mt-x64.lib;%(AdditionalDependencies) + libxml2.lib;Bcrypt.lib;zlib.lib;wsock32.lib;minizip.lib;libboost_regex-mt-x64.lib;libboost_filesystem-mt-x64.lib;libboost_system-mt-x64.lib;%(AdditionalDependencies) ..\..\stage\packages\lib\release;..\..\external-libs\tinyxml\lib\vc10;%(AdditionalLibraryDirectories) true - false + true UseLinkTimeCodeGeneration true $(OutDir)libcollada14dom23.dll diff --git a/projects/vc142-1.4/domTest.vcxproj b/projects/vc142-1.4/domTest.vcxproj index 2f5f4d7..5daeaa3 100644 --- a/projects/vc142-1.4/domTest.vcxproj +++ b/projects/vc142-1.4/domTest.vcxproj @@ -132,8 +132,7 @@ ..\..\include;..\..\include\1.4;..\..\stage\packages\include;%(AdditionalIncludeDirectories) - - + ProgramDatabase false WIN32;NDEBUG;_CONSOLE;_CRT_SECURE_NO_DEPRECATE;DOM_DYNAMIC;%(PreprocessorDefinitions) MultiThreadedDLL @@ -150,7 +149,7 @@ true - false + true UseLinkTimeCodeGeneration true false @@ -161,8 +160,7 @@ ..\..\include;..\..\include\1.4;..\..\stage\packages\include;%(AdditionalIncludeDirectories) - - + ProgramDatabase false WIN32;NDEBUG;_CONSOLE;_CRT_SECURE_NO_DEPRECATE;DOM_DYNAMIC;%(PreprocessorDefinitions) MultiThreadedDLL @@ -179,7 +177,7 @@ true - false + true UseLinkTimeCodeGeneration true false