Skip to content

Commit df1417b

Browse files
authored
Merge pull request #2844 from ananace/ci-update-46
Windows CI: Use OSG 3.4-experimental for 0.46
2 parents fb72c32 + c53d8b3 commit df1417b

File tree

1 file changed

+32
-23
lines changed

1 file changed

+32
-23
lines changed

CI/before_script.msvc.sh

+32-23
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,7 @@ KEEP=""
3232
UNITY_BUILD=""
3333
VS_VERSION=""
3434
NMAKE=""
35+
PDBS=""
3536
PLATFORM=""
3637
CONFIGURATION=""
3738
TEST_FRAMEWORK=""
@@ -76,6 +77,9 @@ while [ $# -gt 0 ]; do
7677
PLATFORM=$1
7778
shift ;;
7879

80+
P )
81+
PDBS=true ;;
82+
7983
c )
8084
CONFIGURATION=$1
8185
shift ;;
@@ -107,6 +111,8 @@ Options:
107111
Choose the Visual Studio version to use.
108112
-n
109113
Produce NMake makefiles instead of a Visual Studio solution.
114+
-P
115+
Download debug symbols where available
110116
-V
111117
Run verbosely
112118
EOF
@@ -257,6 +263,7 @@ case $VS_VERSION in
257263
MSVC_REAL_VER="16"
258264
MSVC_VER="14.2"
259265
MSVC_YEAR="2015"
266+
MSVC_REAL_YEAR="2019"
260267
MSVC_DISPLAY_YEAR="2019"
261268
BOOST_VER="1.71.0"
262269
BOOST_VER_URL="1_71_0"
@@ -269,6 +276,7 @@ case $VS_VERSION in
269276
MSVC_REAL_VER="15"
270277
MSVC_VER="14.1"
271278
MSVC_YEAR="2015"
279+
MSVC_REAL_YEAR="2017"
272280
MSVC_DISPLAY_YEAR="2017"
273281
BOOST_VER="1.67.0"
274282
BOOST_VER_URL="1_67_0"
@@ -281,22 +289,16 @@ case $VS_VERSION in
281289
MSVC_REAL_VER="14"
282290
MSVC_VER="14.0"
283291
MSVC_YEAR="2015"
292+
MSVC_REAL_YEAR="2015"
284293
MSVC_DISPLAY_YEAR="2015"
285294
BOOST_VER="1.67.0"
286295
BOOST_VER_URL="1_67_0"
287296
BOOST_VER_SDK="106700"
288297
;;
289298

290299
12|12.0|2013 )
291-
GENERATOR="Visual Studio 12 2013"
292-
TOOLSET="vc120"
293-
MSVC_REAL_VER="12"
294-
MSVC_VER="12.0"
295-
MSVC_YEAR="2013"
296-
MSVC_DISPLAY_YEAR="2013"
297-
BOOST_VER="1.58.0"
298-
BOOST_VER_URL="1_58_0"
299-
BOOST_VER_SDK="105800"
300+
echo "Visual Studio 2013 is no longer supported"
301+
exit 1
300302
;;
301303
esac
302304

@@ -387,7 +389,7 @@ if [ -z $SKIP_DOWNLOAD ]; then
387389

388390
# Bullet
389391
download "Bullet 2.86" \
390-
"https://www.lysator.liu.se/~ace/OpenMW/deps/Bullet-2.86-msvc${MSVC_YEAR}-win${BITS}.7z" \
392+
"https://rgw.ctrl-c.liu.se/openmw/Deps/Bullet-2.86-msvc${MSVC_YEAR}-win${BITS}.7z" \
391393
"Bullet-2.86-msvc${MSVC_YEAR}-win${BITS}.7z"
392394

393395
# FFmpeg
@@ -399,7 +401,7 @@ if [ -z $SKIP_DOWNLOAD ]; then
399401

400402
# MyGUI
401403
download "MyGUI 3.2.2" \
402-
"https://www.lysator.liu.se/~ace/OpenMW/deps/MyGUI-3.2.2-msvc${MSVC_YEAR}-win${BITS}.7z" \
404+
"https://rgw.ctrl-c.liu.se/openmw/Deps/MyGUI-3.2.2-msvc${MSVC_YEAR}-win${BITS}.7z" \
403405
"MyGUI-3.2.2-msvc${MSVC_YEAR}-win${BITS}.7z"
404406

405407
# OpenAL
@@ -408,9 +410,15 @@ if [ -z $SKIP_DOWNLOAD ]; then
408410
"OpenAL-Soft-1.19.1.zip"
409411

410412
# OSG
411-
download "OpenSceneGraph 3.4.1-scrawl" \
412-
"https://www.lysator.liu.se/~ace/OpenMW/deps/OSG-3.4.1-scrawl-msvc${MSVC_YEAR}-win${BITS}.7z" \
413-
"OSG-3.4.1-scrawl-msvc${MSVC_YEAR}-win${BITS}.7z"
413+
download "OpenSceneGraph 3.4.2-experimental" \
414+
"https://rgw.ctrl-c.liu.se/openmw/Deps/OSG-3.4.2-experimental-msvc${MSVC_REAL_YEAR}-win${BITS}.7z" \
415+
"OSG-3.4.2-experimental-msvc${MSVC_REAL_YEAR}-win${BITS}.7z"
416+
417+
if [ -n "$PDBS" ]; then
418+
download "OpenSceneGraph symbols" \
419+
"https://rgw.ctrl-c.liu.se/openmw/Deps/OSG-3.4.2-experimental-msvc${MSVC_REAL_YEAR}-win${BITS}-sym.7z" \
420+
"OSG-3.4.2-experimental-msvc${MSVC_REAL_YEAR}-win${BITS}-sym.7z"
421+
fi
414422

415423
# Qt
416424
if [ -z $APPVEYOR ]; then
@@ -608,19 +616,20 @@ printf "OpenAL-Soft 1.19.1... "
608616
cd $DEPS
609617
echo
610618
# OSG
611-
printf "OSG 3.4.1-scrawl... "
619+
printf "OSG 3.4.2-experimental... "
612620
{
613621
cd $DEPS_INSTALL
614622
if [ -d OSG ] && \
615623
grep "OPENSCENEGRAPH_MAJOR_VERSION 3" OSG/include/osg/Version > /dev/null && \
616624
grep "OPENSCENEGRAPH_MINOR_VERSION 4" OSG/include/osg/Version > /dev/null && \
617-
grep "OPENSCENEGRAPH_PATCH_VERSION 1" OSG/include/osg/Version > /dev/null
625+
grep "OPENSCENEGRAPH_PATCH_VERSION 2" OSG/include/osg/Version > /dev/null
618626
then
619627
printf "Exists. "
620628
elif [ -z $SKIP_EXTRACT ]; then
621629
rm -rf OSG
622-
eval 7z x -y "${DEPS}/OSG-3.4.1-scrawl-msvc${MSVC_YEAR}-win${BITS}.7z" $STRIP
623-
mv "OSG-3.4.1-scrawl-msvc${MSVC_YEAR}-win${BITS}" OSG
630+
eval 7z x -y "${DEPS}/OSG-3.4.2-experimental-msvc${MSVC_REAL_YEAR}-win${BITS}.7z" $STRIP
631+
[ -n "$PDBS" ] && eval 7z x -y "${DEPS}/OSG-3.4.2-experimental-msvc${MSVC_REAL_YEAR}-win${BITS}-sym.7z" $STRIP
632+
mv "OSG-3.4.2-experimental-msvc${MSVC_REAL_YEAR}-win${BITS}" OSG
624633
fi
625634
OSG_SDK="$(real_pwd)/OSG"
626635
add_cmake_opts -DOSG_DIR="$OSG_SDK"
@@ -629,10 +638,10 @@ printf "OSG 3.4.1-scrawl... "
629638
else
630639
SUFFIX=""
631640
fi
632-
add_runtime_dlls "$(pwd)/OSG/bin/"{OpenThreads,zlib,libpng*}${SUFFIX}.dll \
641+
add_runtime_dlls "$(pwd)/OSG/bin/"{OpenThreads,zlib,libpng}${SUFFIX}.dll \
633642
"$(pwd)/OSG/bin/osg"{,Animation,DB,FX,GA,Particle,Text,Util,Viewer,Shadow}${SUFFIX}.dll
634-
add_osg_dlls "$(pwd)/OSG/bin/osgPlugins-3.4.1/osgdb_"{bmp,dds,freetype,jpeg,osg,png,tga}${SUFFIX}.dll
635-
add_osg_dlls "$(pwd)/OSG/bin/osgPlugins-3.4.1/osgdb_serializers_osg"{,animation,fx,ga,particle,text,util,viewer,shadow}${SUFFIX}.dll
643+
add_osg_dlls "$(pwd)/OSG/bin/osgPlugins-3.4.2/osgdb_"{bmp,dds,freetype,jpeg,osg,png,tga}${SUFFIX}.dll
644+
add_osg_dlls "$(pwd)/OSG/bin/osgPlugins-3.4.2/osgdb_serializers_osg"{,animation,fx,ga,particle,text,util,viewer,shadow}${SUFFIX}.dll
636645
echo Done.
637646
}
638647
cd $DEPS
@@ -817,10 +826,10 @@ fi
817826
done
818827
echo
819828
echo "- OSG Plugin DLLs..."
820-
mkdir -p ${DLL_PREFIX}osgPlugins-3.4.1
829+
mkdir -p ${DLL_PREFIX}osgPlugins-3.4.2
821830
for DLL in $OSG_PLUGINS; do
822831
echo " $(basename $DLL)."
823-
cp "$DLL" ${DLL_PREFIX}osgPlugins-3.4.1
832+
cp "$DLL" ${DLL_PREFIX}osgPlugins-3.4.2
824833
done
825834
echo
826835
echo "- Qt Platform DLLs..."

0 commit comments

Comments
 (0)