From 14663b831427df3f11a3518aa03f31ca151acbdc Mon Sep 17 00:00:00 2001 From: Alexander Olofsson Date: Mon, 15 Aug 2022 10:15:29 +0200 Subject: [PATCH 1/4] Update OSGoS dependency package --- CI/before_script.msvc.sh | 26 ++++++++++++++++---------- 1 file changed, 16 insertions(+), 10 deletions(-) diff --git a/CI/before_script.msvc.sh b/CI/before_script.msvc.sh index c6004f49e9..eb475f5c8a 100644 --- a/CI/before_script.msvc.sh +++ b/CI/before_script.msvc.sh @@ -556,7 +556,7 @@ fi ICU_VER="70_1" OSG_ARCHIVE_NAME="OSGoS 3.6.5" -OSG_ARCHIVE="OSGoS-3.6.5-b02abe2-msvc${OSG_MSVC_YEAR}-win${BITS}" +OSG_ARCHIVE="OSGoS-3.6.5-dd803bc-msvc${OSG_MSVC_YEAR}-win${BITS}" OSG_ARCHIVE_REPO_URL="https://gitlab.com/OpenMW/openmw-deps/-/raw/main" if ! [ -z $OSG_MULTIVIEW_BUILD ]; then OSG_ARCHIVE_NAME="OSG-3.6-multiview" @@ -830,7 +830,7 @@ printf "${OSG_ARCHIVE_NAME}... " grep "OPENSCENEGRAPH_MINOR_VERSION 6" OSG/include/osg/Version > /dev/null && \ grep "OPENSCENEGRAPH_PATCH_VERSION 5" OSG/include/osg/Version > /dev/null then - printf "Exists. " + printf "Exists. " elif [ -z $SKIP_EXTRACT ]; then rm -rf OSG eval 7z x -y "${DEPS}/${OSG_ARCHIVE}.7z" $STRIP @@ -845,14 +845,20 @@ printf "${OSG_ARCHIVE_NAME}... " else SUFFIX="" fi - if ! [ -z $OSG_MULTIVIEW_BUILD ]; then - add_runtime_dlls $CONFIGURATION "$(pwd)/OSG/bin/"{ot21-OpenThreads,zlib,libpng16}${SUFFIX}.dll \ - "$(pwd)/OSG/bin/osg162-osg"{,Animation,DB,FX,GA,Particle,Text,Util,Viewer,Shadow}${SUFFIX}.dll - else - add_runtime_dlls $CONFIGURATION "$(pwd)/OSG/bin/"{OpenThreads,zlib,libpng}${SUFFIX}.dll \ - "$(pwd)/OSG/bin/osg"{,Animation,DB,FX,GA,Particle,Text,Util,Viewer,Shadow}${SUFFIX}.dll - fi - add_osg_dlls $CONFIGURATION "$(pwd)/OSG/bin/osgPlugins-3.6.5/osgdb_"{bmp,dds,freetype,jpeg,osg,png,tga}${SUFFIX}.dll + + if ! [ -z $OSG_MULTIVIEW_BUILD ]; then + add_runtime_dlls $CONFIGURATION "$(pwd)/OSG/bin/"{ot21-OpenThreads,zlib,libpng16}${SUFFIX}.dll \ + "$(pwd)/OSG/bin/osg162-osg"{,Animation,DB,FX,GA,Particle,Text,Util,Viewer,Shadow}${SUFFIX}.dll + else + add_runtime_dlls $CONFIGURATION "$(pwd)/OSG/bin/"{OpenThreads,collada-dom2.4-dp-vc141-mt,icudt58,icuuc58,libpng16,libxml2,zlib}${SUFFIX}.dll \ + "$(pwd)/OSG/bin/osg"{,Animation,DB,FX,GA,Particle,Text,Util,Viewer,Shadow}${SUFFIX}.dll + if [ $CONFIGURATION == "Debug" ]; then + add_runtime_dlls $CONFIGURATION "$(pwd)/OSG/bin/"{boost_filesystem-vc141-mt-gd-1_63,boost_system-vc141-mt-gd-1_63}.dll + else + add_runtime_dlls $CONFIGURATION "$(pwd)/OSG/bin/"{boost_filesystem-vc141-mt-1_63,boost_system-vc141-mt-1_63}.dll + fi + fi + add_osg_dlls $CONFIGURATION "$(pwd)/OSG/bin/osgPlugins-3.6.5/osgdb_"{bmp,dae,dds,freetype,jpeg,osg,png,tga}${SUFFIX}.dll add_osg_dlls $CONFIGURATION "$(pwd)/OSG/bin/osgPlugins-3.6.5/osgdb_serializers_osg"{,animation,fx,ga,particle,text,util,viewer,shadow}${SUFFIX}.dll done echo Done. From 944e748971ebe3d050b118c8253c2e0adff0e0ae Mon Sep 17 00:00:00 2001 From: Alexander Olofsson Date: Mon, 15 Aug 2022 10:23:06 +0200 Subject: [PATCH 2/4] Use the correct debug-suffixes for dependencies --- CI/before_script.msvc.sh | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/CI/before_script.msvc.sh b/CI/before_script.msvc.sh index eb475f5c8a..18de69d030 100644 --- a/CI/before_script.msvc.sh +++ b/CI/before_script.msvc.sh @@ -842,20 +842,24 @@ printf "${OSG_ARCHIVE_NAME}... " for CONFIGURATION in ${CONFIGURATIONS[@]}; do if [ $CONFIGURATION == "Debug" ]; then SUFFIX="d" + SUFFIX_UPCASE="D" else SUFFIX="" + SUFFIX_UPCASE="" fi if ! [ -z $OSG_MULTIVIEW_BUILD ]; then add_runtime_dlls $CONFIGURATION "$(pwd)/OSG/bin/"{ot21-OpenThreads,zlib,libpng16}${SUFFIX}.dll \ "$(pwd)/OSG/bin/osg162-osg"{,Animation,DB,FX,GA,Particle,Text,Util,Viewer,Shadow}${SUFFIX}.dll else - add_runtime_dlls $CONFIGURATION "$(pwd)/OSG/bin/"{OpenThreads,collada-dom2.4-dp-vc141-mt,icudt58,icuuc58,libpng16,libxml2,zlib}${SUFFIX}.dll \ + add_runtime_dlls $CONFIGURATION "$(pwd)/OSG/bin/"{OpenThreads,icuuc58,libpng16,zlib}${SUFFIX}.dll \ + "$(pwd)/OSG/bin/libxml2"${SUFFIX_UPCASE}.dll "$(pwd)/OSG/bin/osg"{,Animation,DB,FX,GA,Particle,Text,Util,Viewer,Shadow}${SUFFIX}.dll + add_runtime_dlls $CONFIGURATION "$(pwd)/OSG/bin/icudt58.dll" if [ $CONFIGURATION == "Debug" ]; then - add_runtime_dlls $CONFIGURATION "$(pwd)/OSG/bin/"{boost_filesystem-vc141-mt-gd-1_63,boost_system-vc141-mt-gd-1_63}.dll + add_runtime_dlls $CONFIGURATION "$(pwd)/OSG/bin/"{boost_filesystem-vc141-mt-gd-1_63,boost_system-vc141-mt-gd-1_63,collada-dom2.4-dp-vc141-mt-d}.dll else - add_runtime_dlls $CONFIGURATION "$(pwd)/OSG/bin/"{boost_filesystem-vc141-mt-1_63,boost_system-vc141-mt-1_63}.dll + add_runtime_dlls $CONFIGURATION "$(pwd)/OSG/bin/"{boost_filesystem-vc141-mt-1_63,boost_system-vc141-mt-1_63,collada-dom2.4-dp-vc141-mt}.dll fi fi add_osg_dlls $CONFIGURATION "$(pwd)/OSG/bin/osgPlugins-3.6.5/osgdb_"{bmp,dae,dds,freetype,jpeg,osg,png,tga}${SUFFIX}.dll From 619bb73d4430b24d1af6acce8309f15f48fb356f Mon Sep 17 00:00:00 2001 From: Alexander Olofsson Date: Mon, 15 Aug 2022 10:36:46 +0200 Subject: [PATCH 3/4] Add lost backslash --- CI/before_script.msvc.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CI/before_script.msvc.sh b/CI/before_script.msvc.sh index 18de69d030..0aa3c721fe 100644 --- a/CI/before_script.msvc.sh +++ b/CI/before_script.msvc.sh @@ -853,7 +853,7 @@ printf "${OSG_ARCHIVE_NAME}... " "$(pwd)/OSG/bin/osg162-osg"{,Animation,DB,FX,GA,Particle,Text,Util,Viewer,Shadow}${SUFFIX}.dll else add_runtime_dlls $CONFIGURATION "$(pwd)/OSG/bin/"{OpenThreads,icuuc58,libpng16,zlib}${SUFFIX}.dll \ - "$(pwd)/OSG/bin/libxml2"${SUFFIX_UPCASE}.dll + "$(pwd)/OSG/bin/libxml2"${SUFFIX_UPCASE}.dll \ "$(pwd)/OSG/bin/osg"{,Animation,DB,FX,GA,Particle,Text,Util,Viewer,Shadow}${SUFFIX}.dll add_runtime_dlls $CONFIGURATION "$(pwd)/OSG/bin/icudt58.dll" if [ $CONFIGURATION == "Debug" ]; then From 149d0b2f29fd2d29ae0bbaddbf5e9842e9cb026c Mon Sep 17 00:00:00 2001 From: Alexander Olofsson Date: Mon, 15 Aug 2022 23:52:29 +0200 Subject: [PATCH 4/4] Increment CI cache key for Windows builds --- .gitlab-ci.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 1cf1e5e1f2..f31b43f77d 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -440,7 +440,7 @@ macOS12_Xcode13: after_script: - Copy-Item C:\ProgramData\chocolatey\logs\chocolatey.log cache: - key: ninja-v3 + key: ninja-v4 paths: - ccache - deps @@ -541,7 +541,7 @@ macOS12_Xcode13: after_script: - Copy-Item C:\ProgramData\chocolatey\logs\chocolatey.log cache: - key: msbuild-v3 + key: msbuild-v4 paths: - ccache - deps