From 3eda0b4af6655183230df6c74b8b7e560abcb5c9 Mon Sep 17 00:00:00 2001 From: elsid Date: Wed, 1 Mar 2023 23:29:44 +0100 Subject: [PATCH 1/3] Use tabs for indentation in CI/before_script.msvc.sh --- CI/before_script.msvc.sh | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/CI/before_script.msvc.sh b/CI/before_script.msvc.sh index a4fc89f832..a1a2f6fe86 100644 --- a/CI/before_script.msvc.sh +++ b/CI/before_script.msvc.sh @@ -565,9 +565,9 @@ OSG_ARCHIVE_NAME="OSGoS 3.6.5" 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" - OSG_ARCHIVE="OSG-3.6-multiview-ee297dce0-msvc${OSG_MSVC_YEAR}-win${BITS}" - OSG_ARCHIVE_REPO_URL="https://gitlab.com/madsbuvi/openmw-deps/-/raw/openmw-vr-ovr_multiview" + OSG_ARCHIVE_NAME="OSG-3.6-multiview" + OSG_ARCHIVE="OSG-3.6-multiview-ee297dce0-msvc${OSG_MSVC_YEAR}-win${BITS}" + OSG_ARCHIVE_REPO_URL="https://gitlab.com/madsbuvi/openmw-deps/-/raw/openmw-vr-ovr_multiview" fi @@ -648,10 +648,10 @@ if [ -z $SKIP_DOWNLOAD ]; then "https://gitlab.com/OpenMW/openmw-deps/-/raw/main/windows/LuaJIT-${LUAJIT_VER}-msvc${LUA_MSVC_YEAR}-win${BITS}.7z" \ "LuaJIT-${LUAJIT_VER}-msvc${LUA_MSVC_YEAR}-win${BITS}.7z" - # ICU - download "ICU ${ICU_VER/_/.}"\ - "https://github.com/unicode-org/icu/releases/download/release-${ICU_VER/_/-}/icu4c-${ICU_VER}-Win${BITS}-MSVC2019.zip" \ - "icu4c-${ICU_VER}-Win${BITS}-MSVC2019.zip" + # ICU + download "ICU ${ICU_VER/_/.}"\ + "https://github.com/unicode-org/icu/releases/download/release-${ICU_VER/_/-}/icu4c-${ICU_VER}-Win${BITS}-MSVC2019.zip" \ + "icu4c-${ICU_VER}-Win${BITS}-MSVC2019.zip" fi cd .. #/.. From 8cfd947eccb19f64400199dba4d2c4a7e65b4545 Mon Sep 17 00:00:00 2001 From: elsid Date: Wed, 1 Mar 2023 23:30:02 +0100 Subject: [PATCH 2/3] Copy osgSim.dll to openmw.exe location --- CI/before_script.msvc.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/CI/before_script.msvc.sh b/CI/before_script.msvc.sh index a1a2f6fe86..b6e0a6d827 100644 --- a/CI/before_script.msvc.sh +++ b/CI/before_script.msvc.sh @@ -850,11 +850,11 @@ printf "${OSG_ARCHIVE_NAME}... " 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 + "$(pwd)/OSG/bin/osg162-osg"{,Animation,DB,FX,GA,Particle,Text,Util,Viewer,Shadow,Sim}${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/osg"{,Animation,DB,FX,GA,Particle,Text,Util,Viewer,Shadow}${SUFFIX}.dll + "$(pwd)/OSG/bin/osg"{,Animation,DB,FX,GA,Particle,Text,Util,Viewer,Shadow,Sim}${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,collada-dom2.4-dp-vc141-mt-d}.dll From 37be3057714bde9be8b2e94825b8b8f3449411f3 Mon Sep 17 00:00:00 2001 From: elsid Date: Wed, 1 Mar 2023 23:30:19 +0100 Subject: [PATCH 3/3] Convert path to string --- scripts/integration_tests.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/integration_tests.py b/scripts/integration_tests.py index 88c70a2aa8..54dc17b75e 100755 --- a/scripts/integration_tests.py +++ b/scripts/integration_tests.py @@ -69,7 +69,7 @@ def runTest(name): stderr=subprocess.STDOUT, encoding="utf-8", env={ - "OPENMW_OSG_STATS_FILE": work_dir / f"{name}.{time_str}.osg_stats.log", + "OPENMW_OSG_STATS_FILE": str(work_dir / f"{name}.{time_str}.osg_stats.log"), "OPENMW_OSG_STATS_LIST": "times", **os.environ, },