Cleaning up AppVeyor scripts

9 years ago · 27a4af26ab
parent 197eb6c3a1
commit 27a4af26ab
2 changed files with 221 additions and 211 deletions
--- a/CI/before_script.msvc.sh
+++ b/CI/before_script.msvc.sh
@ -124,6 +124,11 @@ add_runtime_dlls() {
 	RUNTIME_DLLS="$RUNTIME_DLLS $@"
 }

+OSG_PLUGINS=""
+add_osg_dlls() {
+	OSG_PLUGINS="$OSG_PLUGINS $@"
+}
+
 if [ -z $PLATFORM ]; then
 	PLATFORM=`uname -m`
 fi
@ -250,14 +255,16 @@ mkdir -p Build_$BITS/deps
 cd Build_$BITS/deps

 DEPS_INSTALL=`pwd`
+cd $DEPS

 echo
 echo "Extracting dependencies..."


 # Boost
-if [ -z $APPVEYOR ]; then
 printf "Boost 1.58.0... "
+{
+	if [ -z $APPVEYOR ]; then
 		cd $DEPS_INSTALL

 		BOOST_SDK="`real_pwd`/Boost"
@ -272,19 +279,21 @@ if [ -z $APPVEYOR ]; then
 		add_cmake_opts -DBOOST_ROOT="$BOOST_SDK" \
 			-DBOOST_LIBRARYDIR="$BOOST_SDK/lib$BITS-msvc-12.0"

-	cd $DEPS
-
 		echo Done.
 	else
 		# Appveyor unstable has all the boost we need already
 		BOOST_SDK="c:/Libraries/boost"
 		add_cmake_opts -DBOOST_ROOT="$BOOST_SDK" \
 			-DBOOST_LIBRARYDIR="$BOOST_SDK/lib$BITS-msvc-12.0"
-fi

+		echo AppVeyor.
+	fi
+}
+cd $DEPS

 # Bullet
 printf "Bullet 2.83.5... "
+{
 	cd $DEPS_INSTALL

 	if [ -d Bullet ]; then
@ -299,18 +308,16 @@ BULLET_SDK="`real_pwd`/Bullet"
 	add_cmake_opts -DBULLET_INCLUDE_DIR="$BULLET_SDK/include/bullet" \
 		-DBULLET_COLLISION_LIBRARY="$BULLET_SDK/lib/BulletCollision.lib" \
 		-DBULLET_COLLISION_LIBRARY_DEBUG="$BULLET_SDK/lib/BulletCollision_Debug.lib" \
-	-DBULLET_DYNAMICS_LIBRARY="$BULLET_SDK/lib/BulletDynamics.lib" \
-	-DBULLET_DYNAMICS_LIBRARY_DEBUG="$BULLET_SDK/lib/BulletDynamics_Debug.lib" \
 		-DBULLET_MATH_LIBRARY="$BULLET_SDK/lib/LinearMath.lib" \
 		-DBULLET_MATH_LIBRARY_DEBUG="$BULLET_SDK/lib/LinearMath_Debug.lib"

-cd $DEPS
-
 	echo Done.
-
+}
+cd $DEPS

 # FFmpeg
 printf "FFmpeg 2.5.2... "
+{
 	cd $DEPS_INSTALL

 	if [ -d FFmpeg ] && grep "FFmpeg version: 2.5.2" FFmpeg/README.txt > /dev/null; then
@ -348,13 +355,13 @@ if [ $BITS -eq 32 ]; then
 		add_cmake_opts "-DCMAKE_EXE_LINKER_FLAGS=\"/machine:X86 /safeseh:no\""
 	fi

-cd $DEPS
-
 	echo Done.
-
+}
+cd $DEPS

 # MyGUI
 printf "MyGUI 3.2.2... "
+{
 	cd $DEPS_INSTALL

 	if [ -d MyGUI ] && \
@ -382,13 +389,13 @@ else
 	fi
 	add_runtime_dlls `pwd`/MyGUI/bin/$CONFIGURATION/MyGUIEngine$SUFFIX.dll

-cd $DEPS
-
 	echo Done.
-
+}
+cd $DEPS

 # OpenAL
 printf "OpenAL-Soft 1.16.0... "
+{
 	if [ -d openal-soft-1.16.0-bin ]; then
 		printf "Exists. "
 	elif [ -z $SKIP_EXTRACT ]; then
@ -402,10 +409,12 @@ add_cmake_opts -DOPENAL_INCLUDE_DIR="$OPENAL_SDK/include/AL" \
 		-DOPENAL_LIBRARY="$OPENAL_SDK/libs/Win$BITS/OpenAL32.lib"

 	echo Done.
-
+}
+cd $DEPS

 # OSG
 printf "OSG 3.3.8... "
+{
 	cd $DEPS_INSTALL

 	if [ -d OSG ] && \
@ -429,25 +438,26 @@ if [ $CONFIGURATION == "Debug" ]; then
 	else
 		SUFFIX=""
 	fi
+
 	add_runtime_dlls `pwd`/OSG/bin/{OpenThreads,zlib}$SUFFIX.dll \
 		`pwd`/OSG/bin/osg{,Animation,DB,FX,GA,Particle,Qt,Text,Util,Viewer}$SUFFIX.dll

-OSG_PLUGINS=""
-add_osg_dlls() {
-	OSG_PLUGINS="$OSG_PLUGINS $@"
-}
-
 	add_osg_dlls `pwd`/OSG/bin/osgPlugins-3.3.8/osgdb_{bmp,dds,gif,jpeg,png,tga}$SUFFIX.dll

-cd $DEPS
-
 	echo Done.
-
+}
+cd $DEPS

 # Qt
 if [ -z $APPVEYOR ]; then
 	printf "Qt 4.8.6... "
+else
+	printf "Qt 5.4... "
+fi
+{
+	if [ -z $APPVEYOR ]; then
 		cd $DEPS_INSTALL
+		QT_SDK="`real_pwd`/Qt"

 		if [ -d Qt ] && head -n2 Qt/BUILDINFO.txt | grep "4.8.6" > /dev/null; then
 			printf "Exists. "
@ -455,12 +465,13 @@ if [ -z $APPVEYOR ]; then
 			rm -rf Qt
 			eval 7z x -y $DEPS/qt$BITS-4.8.6.7z $STRIP
 			mv qt-4.8.6-* Qt
+			(
+				cd $QT_SDK
+				eval qtbinpatcher.exe $STRIP
+			)
 		fi

-	QT_SDK="`real_pwd`/Qt"
-
 		cd $QT_SDK
-	eval qtbinpatcher.exe $STRIP

 		add_cmake_opts -DDESIRED_QT_VERSION=4 \
 			-DQT_QMAKE_EXECUTABLE="$QT_SDK/bin/qmake.exe"
@ -470,14 +481,12 @@ if [ -z $APPVEYOR ]; then
 		else
 			SUFFIX="4"
 		fi
-	add_runtime_dlls `pwd`/bin/Qt{Core,Gui,Network,OpenGL}$SUFFIX.dll

-	cd $DEPS
+		add_runtime_dlls `pwd`/bin/Qt{Core,Gui,Network,OpenGL}$SUFFIX.dll

 		echo Done.
 	else
-	echo "Using Appveyor Qt 5 version."
-	if [ $PLATFORM == "win32" ]; then
+		if [ $BITS -eq 32 ]; then
 			QT_SDK="C:/Qt/5.4/msvc2013_opengl"
 		else
 			QT_SDK="C:/Qt/5.4/msvc2013_64_opengl"
@ -487,11 +496,12 @@ else
 			-DQT_QMAKE_EXECUTABLE="$QT_SDK/bin/qmake.exe" \
 			-DCMAKE_PREFIX_PATH="$QT_SDK"
 	fi
-
+}
+cd $DEPS

 # SDL2
 printf "SDL 2.0.3... "
-
+{
 	if [ -d SDL2-2.0.3 ]; then
 		printf "Exists. "
 	elif [ -z $SKIP_EXTRACT ]; then
@ -502,18 +512,17 @@ fi
 	SDL_SDK="`real_pwd`/SDL2-2.0.3"
 	add_cmake_opts -DSDL2_INCLUDE_DIR="$SDL_SDK/include" \
 		-DSDL2MAIN_LIBRARY="$SDL_SDK/lib/x$ARCHSUFFIX/SDL2main.lib" \
-	-DSDL2_LIBRARY_PATH="$SDL_SDK/lib/x$ARCHSUFFIX/SDL2.lib" \
-	-DSDL2_LIBRARY_ONLY="$SDL_SDK/lib/x$ARCHSUFFIX/SDL2.lib"
+		-DSDL2_LIBRARY_PATH="$SDL_SDK/lib/x$ARCHSUFFIX/SDL2.lib"

 	add_runtime_dlls `pwd`/SDL2-2.0.3/lib/x$ARCHSUFFIX/SDL2.dll

-cd $DEPS
-
 	echo Done.
-echo
+}
+

 cd $DEPS_INSTALL/..

+echo
 echo "Setting up OpenMW build..."

 add_cmake_opts -DBUILD_BSATOOL=no \
@ -521,8 +530,8 @@ add_cmake_opts -DBUILD_BSATOOL=no \
 	-DBUILD_MYGUI_PLUGIN=no \
 	-DOPENMW_MP_BUILD=on

-if [ -z $APPVEYOR ]; then
-	echo "  (Outside of AppVeyor, doing full build.)"
+if [ -z $CI ]; then
+	echo "  (Outside of CI, doing full build.)"
 else
 	case $STEP in
 		components )
@ -533,7 +542,6 @@ else
 				-DBUILD_OPENCS=no \
 				-DBUILD_OPENMW=no \
 				-DBUILD_WIZARD=no
-			rm -rf components
 			;;
 		openmw )
 			echo "  Subproject: OpenMW."
@ -575,7 +583,8 @@ fi

 echo

-if [ -z $APPVEYOR ]; then
+# NOTE: Disable this when/if we want to run test cases
+if [ -z $CI ]; then
 	echo "Copying Runtime DLLs..."
 	mkdir -p $CONFIGURATION
 	for DLL in $RUNTIME_DLLS; do
--- a/appveyor.yml
+++ b/appveyor.yml
@ -1,17 +1,22 @@
 version: "{build}"

+branches:
+    only:
+        - appveyor
+
 platform:
    - Win32
    - x64

-configuration:
-    - Debug
+configuration: Debug

 environment:
    matrix:
-    - STEP: openmw
-    - STEP: opencs
        - STEP: misc
+#        - STEP: components # misc builds this too
+# Build takes too long for these, ignore for now
+#        - STEP: openmw
+#        - STEP: opencs

 matrix:
    fast_finish: true
@ -32,18 +37,14 @@ cache:
    - C:\projects\openmw\deps\ffmpeg64-2.5.2.7z
    - C:\projects\openmw\deps\ffmpeg64-2.5.2-dev.7z

-init:
-    - cmd: bash --version
-    - cmd: cmake --version
-    - cmd: msbuild /version
-    - cmd: echo.
-
 clone_folder: C:\projects\openmw

-build_script:
-    - cmd: bash --login C:\projects\openmw\CI\build.msvc.sh
-
 before_build:
-    - cmd: bash --login C:\projects\openmw\CI\before_script.msvc.sh
+    - cmd: sh %APPVEYOR_BUILD_FOLDER%\CI\before_script.msvc.sh
+
+build_script:
+    - cmd: if %PLATFORM%==Win32 set build=Build_32
+    - cmd: if %PLATFORM%==x64 set build=Build_64
+    - cmd: msbuild %build%\OpenMW.sln /t:Build /p:Configuration=%configuration% /m:2 /logger:"C:\Program Files\AppVeyor\BuildAgent\Appveyor.MSBuildLogger.dll"

 test: off