Merge branch 'appveyor' of github.com:ace13/openmw into appveyor

CI/before_script.msvc.sh

@@ -1,34 +1,86 @@
 #!/bin/bash
 
 while [ $# -gt 0 ]; do
-	ARG=$1
+	ARGSTR=$1
 	shift
 
+	if [ ${ARGSTR:0:1} != "-" ]; then
+		echo "Unknown argument $ARGSTR"
+		echo "Try '$0 -h'"
+		exit 1
+	fi
+
+	for (( i=1; i<${#ARGSTR}; i++ )); do
+		ARG=${ARGSTR:$i:1}
 		case $ARG in
-		-v )
+			V )
 				VERBOSE=true ;;
 
-		-d )
+			v )
+				VS_VERSION=$1
+				shift ;;
+
+			d )
 				SKIP_DOWNLOAD=true ;;
 
-		-e )
+			e )
 				SKIP_EXTRACT=true ;;
 
-		-k )
+			k )
 				KEEP=true ;;
 
-		-u )
+			u )
 				UNITY_BUILD=true ;;
 
+			p )
+				PLATFORM=$1
+				shift ;;
+
+			c )
+				CONFIGURATION=$1
+				shift ;;
+
+			h )
+				cat <<EOF
+Usage: $0 [-cdehkpuvV]
+
+Options:
+	-c <Release/Debug>
+		Set the configuration, can also be set with environment variable CONFIGURATION.
+	-d
+		Skip checking the downloads.
+	-e
+		Skip extracting dependencies.
+	-h
+		Show this message.
+	-k
+		Keep the old build directory, default is to delete it.
+	-p <Win32/Win64>
+		Set the build platform, can also be set with environment variable PLATFORM.
+	-u
+		Configure for unity builds.
+	-v <2013/2015>
+		Choose the Visual Studio version to use.
+	-V
+		Run verbosely
+EOF
+				exit 0
+				;;
+
 			* )
-			echo "Unknown arg $ARG."
+				echo "Unknown argument $ARG."
+				echo "Try '$0 -h'"
 				exit 1 ;;
 		esac
 	done
+done
 
 if [ -z $VERBOSE ]; then
 	STRIP="> /dev/null 2>&1"
 fi
+if [ -z $VS_VERSION ]; then
+	VS_VERSION="2013"
+fi
 
 if [ -z $APPVEYOR ]; then
 	echo "Running prebuild outside of Appveyor."
@@ -40,7 +92,7 @@ else
 
 	cd $APPVEYOR_BUILD_FOLDER
 	VERSION="$(cat README.md | grep Version: | awk '{ print $3; }')-$(git rev-parse --short HEAD)"
-	appveyor UpdateBuild -Version "$VERSION"
+	appveyor UpdateBuild -Version "$VERSION" > /dev/null &
 fi
 
 run_cmd() {
@@ -140,14 +192,27 @@ if [ -z $CONFIGURATION ]; then
 	CONFIGURATION="Debug"
 fi
 
+case $VS_VERSION in
+	14|2015 )
+		GENERATOR="Visual Studio 14 2015"
+		XP_TOOLSET="v140_xp"
+		;;
+
+#	12|2013|
+	* )
+		GENERATOR="Visual Studio 12 2013"
+		XP_TOOLSET="v120_xp"
+		;;
+esac
+
 case $PLATFORM in
 	x64|x86_64|x86-64|win64|Win64 )
 		ARCHNAME=x86-64
 		ARCHSUFFIX=64
 		BITS=64
 
-		BASE_OPTS="-G\"Visual Studio 12 2013 Win64\""
+		BASE_OPTS="-G\"$GENERATOR Win64\""
-		add_cmake_opts "-G\"Visual Studio 12 2013 Win64\""
+		add_cmake_opts "-G\"$GENERATOR Win64\""
 		;;
 
 	x32|x86|i686|i386|win32|Win32 )
@@ -155,8 +220,8 @@ case $PLATFORM in
 		ARCHSUFFIX=86
 		BITS=32
 
-		BASE_OPTS="-G\"Visual Studio 12 2013\" -Tv120_xp"
+		BASE_OPTS="-G\"$GENERATOR\" -T$XP_TOOLSET"
-		add_cmake_opts "-G\"Visual Studio 12 2013\"" -Tv120_xp
+		add_cmake_opts "-G\"$GENERATOR\"" -T$XP_TOOLSET
 		;;
 
 	* )
@@ -225,7 +290,7 @@ if [ -z $SKIP_DOWNLOAD ]; then
 
 	# OpenAL
 	download "OpenAL-Soft 1.16.0" \
-		http://kcat.strangesoft.net/openal-soft-1.16.0-bin.zip \
+		http://kcat.strangesoft.net/openal-binaries/openal-soft-1.16.0-bin.zip \
 		OpenAL-Soft-1.16.0.zip
 
 	# OSG
@@ -472,10 +537,8 @@ fi
 			rm -rf Qt
 			eval 7z x -y $DEPS/qt$BITS-4.8.6.7z $STRIP
 			mv qt-4.8.6-* Qt
-			(
+			cd Qt
-				cd $QT_SDK
+			eval ./qtbinpatcher.exe $STRIP
-				eval qtbinpatcher.exe $STRIP
-			)
 		fi
 
 		cd $QT_SDK

CMakeLists.txt

@@ -116,8 +116,37 @@ if (WIN32)
     option(USE_DEBUG_CONSOLE "whether a debug console should be enabled for debug builds, if false debug output is redirected to Visual Studio output" ON)
 endif()
 
+if (NOT BUILD_LAUNCHER AND NOT BUILD_OPENCS AND NOT BUILD_WIZARD)
+   set(USE_QT FALSE)
+else()
+   set(USE_QT TRUE)
+endif()
+
+# Dependencies
+if (USE_QT)
+    set(DESIRED_QT_VERSION 4 CACHE STRING "The QT version OpenMW should use (4 or 5)")
+    set_property(CACHE DESIRED_QT_VERSION PROPERTY STRINGS 4 5)
+    message(STATUS "Using Qt${DESIRED_QT_VERSION}")
+
+    if (DESIRED_QT_VERSION MATCHES 4)
+        find_package(Qt4 REQUIRED COMPONENTS QtCore QtGui QtNetwork QtOpenGL)
+    else()
+        find_package(Qt5Widgets REQUIRED)
+        find_package(Qt5Core REQUIRED)
+        find_package(Qt5Network REQUIRED)
+        find_package(Qt5OpenGL REQUIRED)
+    # Instruct CMake to run moc automatically when needed.
+    #set(CMAKE_AUTOMOC ON)
+    endif()
+endif()
+
+if (USE_QT AND DESIRED_QT_VERSION MATCHES 5)
+	# 2.8.11+ is required to make Qt5 happy and allow linking QtMain on Windows.
+	cmake_minimum_required(VERSION 2.8.11)
+else()
 	# We probably support older versions than this.
 	cmake_minimum_required(VERSION 2.6)
+endif()
 
 # Sound setup
 unset(FFMPEG_LIBRARIES CACHE)
@@ -171,30 +200,6 @@ if (OPENGL_ES)
     add_definitions(-DOPENGL_ES)
 endif(OPENGL_ES)
 
-if (NOT BUILD_LAUNCHER AND NOT BUILD_OPENCS AND NOT BUILD_WIZARD)
-   set(USE_QT FALSE)
-else()
-   set(USE_QT TRUE)
-endif()
- 
-# Dependencies
-if (USE_QT)
-    set(DESIRED_QT_VERSION 4 CACHE STRING "The QT version OpenMW should use (4 or 5)")
-    set_property(CACHE DESIRED_QT_VERSION PROPERTY STRINGS 4 5)
-    message(STATUS "Using Qt${DESIRED_QT_VERSION}")
-
-    if (DESIRED_QT_VERSION MATCHES 4)
-        find_package(Qt4 REQUIRED COMPONENTS QtCore QtGui QtNetwork QtOpenGL)
-    else()
-        find_package(Qt5Widgets REQUIRED)
-        find_package(Qt5Core REQUIRED)
-        find_package(Qt5Network REQUIRED)
-        find_package(Qt5OpenGL REQUIRED)
-    # Instruct CMake to run moc automatically when needed.
-    #set(CMAKE_AUTOMOC ON)
-    endif()
-endif()
-
 # Fix for not visible pthreads functions for linker with glibc 2.15
 if (UNIX AND NOT APPLE)
     find_package (Threads)

README.md

@@ -1,7 +1,7 @@
 OpenMW
 ======
 
-[![Build Status](https://img.shields.io/travis/OpenMW/openmw.svg)](https://travis-ci.org/OpenMW/openmw) [![Coverity Scan Build Status](https://scan.coverity.com/projects/3740/badge.svg)](https://scan.coverity.com/projects/3740)
+[![Build Status](https://img.shields.io/travis/OpenMW/openmw.svg)](https://travis-ci.org/OpenMW/openmw) [![Build status](https://ci.appveyor.com/api/projects/status/e6bqw8oouy8ufd46?svg=true)](https://ci.appveyor.com/project/ace13/openmw)  [![Coverity Scan Build Status](https://scan.coverity.com/projects/3740/badge.svg)](https://scan.coverity.com/projects/3740)
 
 OpenMW is a recreation of the engine for the popular role-playing game Morrowind by Bethesda Softworks. You need to own and install the original game for OpenMW to work.
 

apps/launcher/CMakeLists.txt

@@ -99,9 +99,6 @@ if (DESIRED_QT_VERSION MATCHES 4)
     endif(WIN32)
 else()
     qt5_use_modules(openmw-launcher Widgets Core)
-    if (WIN32)
-        target_link_libraries(Qt5::WinMain)
-    endif()
 endif()
 
 if (BUILD_WITH_CODE_COVERAGE)

apps/opencs/CMakeLists.txt

@@ -215,9 +215,6 @@ if (DESIRED_QT_VERSION MATCHES 4)
     endif()
 else()
     qt5_use_modules(openmw-cs Widgets Core Network OpenGL)
-    if (WIN32)
-        target_link_libraries(Qt5::WinMain)
-    endif()
 endif()
 
 if (WIN32)

apps/wizard/CMakeLists.txt

@@ -129,9 +129,6 @@ if (DESIRED_QT_VERSION MATCHES 4)
     endif()
 else()
     qt5_use_modules(openmw-wizard Widgets Core)
-    if (WIN32)
-        target_link_libraries(Qt5::WinMain)
-    endif()
 endif()
 
 if (OPENMW_USE_UNSHIELD)

appveyor.yml

@@ -2,27 +2,24 @@ version: "{build}"
 
 branches:
     only:
+        - master
+        - /openmw-.*$/
         - appveyor
 
 platform:
     - Win32
-    - x64
+#    - x64
 
 configuration: Debug
 
-#environment:
-#    matrix:
-#        - 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
 
+# For the Qt, Boost, CMake, etc installs
 os: unstable
 
+# We want the git revision for versioning,
+# so shallow clones don't work.
 clone_depth: 1
 
 cache:
@@ -40,7 +37,7 @@ cache:
 clone_folder: C:\projects\openmw
 
 before_build:
-    - cmd: sh %APPVEYOR_BUILD_FOLDER%\CI\before_script.msvc.sh -u
+    - cmd: sh %APPVEYOR_BUILD_FOLDER%\CI\before_script.msvc.sh -u -p %PLATFORM%
 
 build_script:
     - cmd: if %PLATFORM%==Win32 set build=Build_32
@@ -48,3 +45,10 @@ build_script:
     - cmd: msbuild %build%\OpenMW.sln /t:Build /p:Configuration=%configuration% /m:2 /logger:"C:\Program Files\AppVeyor\BuildAgent\Appveyor.MSBuildLogger.dll"
 
 test: off
+
+#notifications:
+#    - provider: Email
+#    to:
+#        -  
+#    on_build_failure: true
+#    on_build_status_changed: true