Working master branch

.appveyor.vs2015.yml

@@ -15,11 +15,6 @@ before_build:
   - 7z x VC14.ZIP
   - ren external-VC14 external
   - cd wesnoth
-  - mkdir projectfiles\VC14
-  - xcopy /E /I /H /Y projectfiles\VC12 projectfiles\VC14
-  - cd projectfiles\VC14
-  - "\"c:\\Program Files (x86)\\Microsoft Visual Studio 14.0\\Common7\\IDE\\devenv.exe\" wesnoth.sln /upgrade"
-  - cd ..\..
   - set PATH=C:\projects\external\dll;%PATH%
 build_script:
   - msbuild projectfiles\VC14\wesnoth.sln /logger:"C:\Program Files\AppVeyor\BuildAgent\Appveyor.MSBuildLogger.dll"

.appveyor.vs2017.yml

@@ -17,7 +17,7 @@ before_build:
   - cd wesnoth
   - set PATH=C:\projects\external\dll;%PATH%
 build_script:
-  - msbuild projectfiles\VC12\wesnoth.sln /property:PlatformToolset=v141 /m /logger:"C:\Program Files\AppVeyor\BuildAgent\Appveyor.MSBuildLogger.dll"
+  - msbuild projectfiles\VC14\wesnoth.sln /property:PlatformToolset=v141 /m /logger:"C:\Program Files\AppVeyor\BuildAgent\Appveyor.MSBuildLogger.dll"
 
 artifacts:
   - path: wesnoth.exe

.dockerignore

@@ -0,0 +1 @@
+.git

.gitignore

@@ -49,7 +49,7 @@ projectfiles/**/*objs*
 
 # Visual Studio
 projectfiles/VC*
-!projectfiles/VC12
+!projectfiles/VC14
 projectfiles/VC*/.vs/
 projectfiles/VC*/*.vc.*db
 projectfiles/VC*/*.sdf
@@ -186,6 +186,7 @@ data/campaigns/**/images/**/.gitignore
 [Tt]humbs.db
 *Neuer Ordner*
 .directory
+fonts/.uuid
 
 # extensions
 *.pyc

.travis.yml

@@ -11,31 +11,30 @@ cache:
 
 matrix:
   include:
-    - compiler: clang
-      env: TOOL=scons CXXSTD=11 NLS=true
+    - compiler: gcc
+      env: CXXSTD=14 NLS=true LTS=1604 BRANCH=master
 
     - compiler: gcc
-      env: TOOL=scons CXXSTD=14 NLS=false
+      env: TOOL=scons CXXSTD=17 NLS=false LTS=1804 BRANCH=master
 
     - compiler: gcc
-      env: TOOL=scons CXXSTD=11 NLS=false OPT=-O0
+      env: TOOL=scons CXXSTD=14 NLS=false LTS=1604 BRANCH=master OPT=-O0
 
     - compiler: gcc
-      env: TOOL=cmake CXXSTD=11 NLS=false
+      env: TOOL=cmake CXXSTD=14 NLS=false LTS=1604 BRANCH=master
 
     - compiler: clang
-      env: TOOL=scons CXXSTD=11 NLS=false OPT=-O0
+      env: TOOL=scons CXXSTD=14 NLS=false LTS=1604 BRANCH=master OPT=-O0
 
     - compiler: clang
-      env: TOOL=cmake CXXSTD=11 NLS=false
+      env: TOOL=cmake CXXSTD=14 NLS=false LTS=1604 BRANCH=master
 
     - os: osx
       compiler: clang
-      env: TOOL=scons CXXSTD=11 NLS=false OPT=-O0
+      env: TOOL=scons CXXSTD=14 NLS=false OPT=-O0
 
     - os: osx
       compiler: clang
-      osx_image: xcode9.2
       env: TOOL=xcodebuild
 
 install:

CMakeLists.txt

@@ -1,4 +1,4 @@
-
+
 # set minimum version
 cmake_minimum_required(VERSION 2.8.5)
 
@@ -56,26 +56,20 @@ option(ENABLE_SERVER "Enable compilation of MP server" ON)
 option(ENABLE_MYSQL "Enable building MP/add-ons servers with mysql support" OFF)
 option(ENABLE_TESTS "Build unit tests")
 option(ENABLE_NLS "Enable building of translations" ${ENABLE_GAME})
-option(ENABLE_OMP "Enables OpenMP, and has additional dependencies" OFF)
-option(ENABLE_LIBPNG "Enable support for writing png files (screenshots, images)" ON)
 option(ENABLE_HISTORY "Enable using GNU history for history in lua console" ON)
 
-if(NOT CMAKE_CROSSCOMPILING)
-	try_run(IEEE754_TEST_RETURN_CODE IEEE754_TEST_COMPILED ${CMAKE_BINARY_DIR} ${CMAKE_SOURCE_DIR}/src/compile_time_tests/ieee_754.cpp
-		CMAKE_FLAGS "-DCMAKE_CXX_STANDARD=11" COMPILE_OUTPUT_VARIABLE IEEE754_TEST_COMPILE_OUTPUT)
-	if(NOT IEEE754_TEST_COMPILED)
-		message(WARNING "Failed to compile the IEEE 754 test. Skipping it.")
-		message(${IEEE754_TEST_COMPILE_OUTPUT})
-	elseif(NOT IEEE754_TEST_RETURN_CODE EQUAL 0)
-		message(FATAL_ERROR "Your platform does not represent floating point numbers in the IEEE 754 format.")
-	endif()
-else()
-	message(WARNING "You are cross-compiling. Skipping IEEE 754 test.")
+# set what std version to use
+if(NOT CXX_STD)
+	set(CXX_STD "14")
 endif()
 
-find_package(SDL2 2.0.4 REQUIRED)
+if(ENABLE_GAME OR ENABLE_TESTS)
+	find_package(OpenGL REQUIRED)
+	find_package(GLEW REQUIRED)
+	find_package(SDL2 2.0.4 REQUIRED)
+endif(ENABLE_GAME OR ENABLE_TESTS)
 find_package(Crypto 1.0 REQUIRED)
-find_package(Boost 1.56 REQUIRED COMPONENTS iostreams program_options regex system thread random)
+find_package(Boost 1.56 REQUIRED COMPONENTS iostreams program_options regex system random)
 
 # no, gettext executables are not required when NLS is deactivated
 find_package(Gettext)
@@ -152,6 +146,7 @@ if(CMAKE_SYSTEM_NAME STREQUAL "Linux")
 	option(ENABLE_APPDATA_FILE "enable installation of an appdata file for appstream" ON)
 endif(CMAKE_SYSTEM_NAME STREQUAL "Linux")
 
+option(HARDEN "Whether to enable options to harden the executables" ON)
 option(ENABLE_STRICT_COMPILATION "Sets the strict compilation mode" OFF)
 option(ENABLE_PEDANTIC_COMPILATION "Sets the pedantic compilation mode" OFF)
 option(ENABLE_DEBUG_WINDOW_LAYOUT "Add the debug option to allow the generation of debug layout files in dot format" OFF)
@@ -199,7 +194,7 @@ if(NOT DEFINED CXX_FLAGS_USER)
 
 endif(NOT DEFINED CXX_FLAGS_USER)
 
-set(COMPILER_FLAGS "-std=c++11 -Wall -Wextra -Werror=non-virtual-dtor -Wno-unused-local-typedefs -Wno-maybe-uninitialized -Wold-style-cast")
+set(COMPILER_FLAGS "-std=c++${CXX_STD} -Wall -Wextra -Werror=non-virtual-dtor -Wno-unused-local-typedefs -Wno-maybe-uninitialized -Wold-style-cast -Wtrampolines")
 
 if(CMAKE_CXX_COMPILER_ID MATCHES "Clang")
 	set(COMPILER_FLAGS "${COMPILER_FLAGS} -Qunused-arguments -Wno-unknown-warning-option -Wmismatched-tags -Wno-conditional-uninitialized")
@@ -225,6 +220,14 @@ if(ENABLE_PEDANTIC_COMPILATION)
 
 endif(ENABLE_PEDANTIC_COMPILATION)
 
+# check for sanitizer options
+if(SANITIZE)
+	set(COMPILER_FLAGS "${COMPILER_FLAGS} -fsanitize=${SANITIZE}")
+	set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -fsanitize=${SANITIZE}")
+# manually disable some optimizations to get better stacktraces if sanitizers are used
+	set(COMPILER_FLAGS "${COMPILER_FLAGS} -fno-omit-frame-pointer -fno-optimize-sibling-calls")
+endif(SANITIZE)
+
 ### Set the final compiler flags.
 
 set(COMPILER_FLAGS "${COMPILER_FLAGS} ${CXX_FLAGS_USER}")
@@ -240,6 +243,51 @@ if(NOT "${CMAKE_CXX_FLAGS}" STREQUAL "${COMPILER_FLAGS}")
 	)
 endif(NOT "${CMAKE_CXX_FLAGS}" STREQUAL "${COMPILER_FLAGS}")
 
+# #
+# Determine optimization level
+# #
+
+if(NOT OPT)
+	set(CMAKE_CXX_FLAGS_RELEASE "-O3")
+	set(CMAKE_C_FLAGS_RELEASE "-O3")
+
+	set(CMAKE_CXX_FLAGS_DEBUG "-O0")
+	set(CMAKE_C_FLAGS_DEBUG "-O0")
+
+	if(PROFILER STREQUAL "perf")
+		set(CMAKE_CXX_FLAGS_PROFILE "-Og")
+		set(CMAKE_C_FLAGS_PROFILE "-Og")
+	else(PROFILER STREQUAL "perf")
+		set(CMAKE_CXX_FLAGS_PROFILE "-O0")
+		set(CMAKE_C_FLAGS_PROFILE "-O0")
+	endif(PROFILER STREQUAL "perf")
+else(NOT OPT)
+	set(CMAKE_CXX_FLAGS_RELEASE "${OPT}")
+	set(CMAKE_C_FLAGS_RELEASE "${OPT}")
+
+	set(CMAKE_CXX_FLAGS_DEBUG "${OPT}")
+	set(CMAKE_C_FLAGS_DEBUG "${OPT}")
+
+	set(CMAKE_CXX_FLAGS_PROFILE "${OPT}")
+	set(CMAKE_C_FLAGS_PROFILE "${OPT}")
+endif(NOT OPT)
+
+# check for hardening options
+if(HARDEN AND NOT WIN32)
+	set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fPIE -fstack-protector-strong")
+	set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -fPIE -fstack-protector-strong")
+
+	if(APPLE)
+		set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -fPIE -Wl,-pie")
+	else()
+		set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -fPIE -pie -Wl,-z,relro,-z,now")
+	endif()
+
+	if(NOT CMAKE_CXX_FLAGS_DEBUG STREQUAL "-O0")
+		add_definitions(-D_FORTIFY_SOURCE=2)
+	endif()
+endif(HARDEN AND NOT WIN32)
+
 if(UNIX AND NOT CMAKE_COMPILER_IS_GNUCXX)
 	# Assume the compiler is the clang compiler.
 	set(CMAKE_EXE_LINKER_FLAGS "-lstdc++ -lm ${CMAKE_EXE_LINKER_FLAGS}")
@@ -270,9 +318,9 @@ RemoveFlag(CMAKE_SHARED_LIBRARY_LINK_C_FLAGS SCRIPT "-rdynamic" "")
 # #
 
 # reset the base Release build option
-MESSAGE("Replacing default flags used for Release build with -O3 ${EXTRA_FLAGS_CONFIG} ${EXTRA_FLAGS_RELEASE}")
-set(CMAKE_CXX_FLAGS_RELEASE "-O3 ${EXTRA_FLAGS_CONFIG} ${EXTRA_FLAGS_RELEASE}" CACHE STRING "Release build flags" FORCE)
-set(CMAKE_C_FLAGS_RELEASE "-O3 ${EXTRA_FLAGS_CONFIG} ${EXTRA_FLAGS_RELEASE}" CACHE STRING "Release build flags" FORCE)
+MESSAGE("Replacing default flags used for Release build with ${OPT} ${EXTRA_FLAGS_CONFIG} ${EXTRA_FLAGS_RELEASE}")
+set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} ${EXTRA_FLAGS_CONFIG} ${EXTRA_FLAGS_RELEASE}" CACHE STRING "Release build flags" FORCE)
+set(CMAKE_C_FLAGS_RELEASE "${CMAKE_C_FLAGS_RELEASE} ${EXTRA_FLAGS_CONFIG} ${EXTRA_FLAGS_RELEASE}" CACHE STRING "Release build flags" FORCE)
 set(CMAKE_EXE_LINKER_FLAGS_RELEASE "" CACHE STRING "" FORCE)
 # set the arch to use for Release build if provided
 if(ARCH)
@@ -369,9 +417,9 @@ set_directory_properties(PROPERTIES ADDITIONAL_MAKE_CLEAN_FILES "${CMAKE_SOURCE_
 
 # replace the default Debug flag of -g with -O0 -DDEBUG -ggdb3
 # this matches the flags of scons' debug build
-MESSAGE("Replacing flags used for Debug build -O0 -DDEBUG -ggdb3 ${EXTRA_FLAGS_CONFIG} ${EXTRA_FLAGS_DEBUG}")
-set(CMAKE_CXX_FLAGS_DEBUG "-O0 -DDEBUG -ggdb3 ${EXTRA_FLAGS_CONFIG} ${EXTRA_FLAGS_DEBUG}" CACHE STRING "change cmake's Debug flags to match scons' flags" FORCE)
-set(CMAKE_C_FLAGS_DEBUG "-O0 -DDEBUG -ggdb3 ${EXTRA_FLAGS_CONFIG} ${EXTRA_FLAGS_DEBUG}" CACHE STRING "change cmake's Debug flags to match scons' flags" FORCE)
+MESSAGE("Replacing flags used for Debug build ${OPT} -DDEBUG -ggdb3 ${EXTRA_FLAGS_CONFIG} ${EXTRA_FLAGS_DEBUG}")
+set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -DDEBUG -ggdb3 ${EXTRA_FLAGS_CONFIG} ${EXTRA_FLAGS_DEBUG}" CACHE STRING "change cmake's Debug flags to match scons' flags" FORCE)
+set(CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG} -DDEBUG -ggdb3 ${EXTRA_FLAGS_CONFIG} ${EXTRA_FLAGS_DEBUG}" CACHE STRING "change cmake's Debug flags to match scons' flags" FORCE)
 set(CMAKE_EXE_LINKER_FLAGS_DEBUG "${LINK_EXTRA_FLAGS_CONFIG} ${LINK_EXTRA_FLAGS_DEBUG}" CACHE STRING "" FORCE)
 
 # adds GLIBCXX_DEBUG definitions
@@ -388,29 +436,29 @@ endif(GLIBCXX_DEBUG)
 
 if(PROFILER STREQUAL "gprof" OR NOT PROFILER)
 	MESSAGE("Profiler is gprof")
-	set(CMAKE_CXX_FLAGS_PROFILE "-pg ${EXTRA_FLAGS_CONFIG} ${EXTRA_FLAGS_PROFILE}" CACHE STRING "Flags for profiling with gprof" FORCE)
-	set(CMAKE_C_FLAGS_PROFILE "-pg ${EXTRA_FLAGS_CONFIG} ${EXTRA_FLAGS_PROFILE}" CACHE STRING "Flags for profiling with gprof" FORCE)
+	set(CMAKE_CXX_FLAGS_PROFILE "${CMAKE_CXX_FLAGS_PROFILE} -pg ${EXTRA_FLAGS_CONFIG} ${EXTRA_FLAGS_PROFILE}" CACHE STRING "Flags for profiling with gprof" FORCE)
+	set(CMAKE_C_FLAGS_PROFILE "${CMAKE_C_FLAGS_PROFILE} -pg ${EXTRA_FLAGS_CONFIG} ${EXTRA_FLAGS_PROFILE}" CACHE STRING "Flags for profiling with gprof" FORCE)
 	set(CMAKE_EXE_LINKER_FLAGS_PROFILE "${LINK_EXTRA_FLAGS_CONFIG} ${LINK_EXTRA_FLAGS_PROFILE}" CACHE STRING "" FORCE)
 endif()
 
 if(PROFILER STREQUAL "gcov")
 	MESSAGE("Profiler is gcov")
-	set(CMAKE_CXX_FLAGS_PROFILE "-fprofile-arcs -ftest-coverage ${EXTRA_FLAGS_CONFIG} ${EXTRA_FLAGS_PROFILE}" CACHE STRING "Flags for profiling with gcov" FORCE)
-	set(CMAKE_C_FLAGS_PROFILE "-fprofile-arcs -ftest-coverage ${EXTRA_FLAGS_CONFIG} ${EXTRA_FLAGS_PROFILE}" CACHE STRING "Flags for profiling with gcov" FORCE)
+	set(CMAKE_CXX_FLAGS_PROFILE "${CMAKE_CXX_FLAGS_PROFILE} -fprofile-arcs -ftest-coverage ${EXTRA_FLAGS_CONFIG} ${EXTRA_FLAGS_PROFILE}" CACHE STRING "Flags for profiling with gcov" FORCE)
+	set(CMAKE_C_FLAGS_PROFILE "${CMAKE_C_FLAGS_PROFILE} -fprofile-arcs -ftest-coverage ${EXTRA_FLAGS_CONFIG} ${EXTRA_FLAGS_PROFILE}" CACHE STRING "Flags for profiling with gcov" FORCE)
 	set(CMAKE_EXE_LINKER_FLAGS_PROFILE "${LINK_EXTRA_FLAGS_CONFIG} ${LINK_EXTRA_FLAGS_PROFILE}" CACHE STRING "" FORCE)
 endif()
 
 if(PROFILER STREQUAL "gperftools")
 	MESSAGE("Profiler is gperftools")
-	set(CMAKE_CXX_FLAGS_PROFILE "${EXTRA_FLAGS_CONFIG} ${EXTRA_FLAGS_PROFILE}" CACHE STRING "Flags for profiling with gperftools" FORCE)
-	set(CMAKE_C_FLAGS_PROFILE "${EXTRA_FLAGS_CONFIG} ${EXTRA_FLAGS_PROFILE}" CACHE STRING "Flags for profiling with gperftools" FORCE)
+	set(CMAKE_CXX_FLAGS_PROFILE "${CMAKE_CXX_FLAGS_PROFILE} ${EXTRA_FLAGS_CONFIG} ${EXTRA_FLAGS_PROFILE}" CACHE STRING "Flags for profiling with gperftools" FORCE)
+	set(CMAKE_C_FLAGS_PROFILE "${CMAKE_C_FLAGS_PROFILE} ${EXTRA_FLAGS_CONFIG} ${EXTRA_FLAGS_PROFILE}" CACHE STRING "Flags for profiling with gperftools" FORCE)
 	set(CMAKE_EXE_LINKER_FLAGS_PROFILE "-Wl,--no-as-needed,-lprofiler ${LINK_EXTRA_FLAGS_CONFIG} ${LINK_EXTRA_FLAGS_PROFILE}" CACHE STRING "" FORCE)
 endif()
 
 if(PROFILER STREQUAL "perf")
 	MESSAGE("Profiler is perf")
-	set(CMAKE_CXX_FLAGS_PROFILE "-ggdb -Og ${EXTRA_FLAGS_CONFIG} ${EXTRA_FLAGS_PROFILE}" CACHE STRING "Flags for profiling with perf" FORCE)
-	set(CMAKE_C_FLAGS_PROFILE "-ggdb -Og ${EXTRA_FLAGS_CONFIG} ${EXTRA_FLAGS_PROFILE}" CACHE STRING "Flags for profiling with perf" FORCE)
+	set(CMAKE_CXX_FLAGS_PROFILE "${CMAKE_CXX_FLAGS_PROFILE} -ggdb ${EXTRA_FLAGS_CONFIG} ${EXTRA_FLAGS_PROFILE}" CACHE STRING "Flags for profiling with perf" FORCE)
+	set(CMAKE_C_FLAGS_PROFILE "${CMAKE_C_FLAGS_PROFILE} -ggdb ${EXTRA_FLAGS_CONFIG} ${EXTRA_FLAGS_PROFILE}" CACHE STRING "Flags for profiling with perf" FORCE)
 	set(CMAKE_EXE_LINKER_FLAGS_PROFILE "${LINK_EXTRA_FLAGS_CONFIG} ${LINK_EXTRA_FLAGS_PROFILE}" CACHE STRING "" FORCE)
 endif()
 
@@ -443,12 +491,6 @@ if(DEFAULT_PREFS_FILE)
 	endif(NOT DEFAULT_PREFS_FILE MATCHES "^/")
 endif(DEFAULT_PREFS_FILE)
 
-if(ENABLE_OMP)
-	find_package(OpenMP REQUIRED)
-	set(CMAKE_C_FLAGS "${OpenMP_C_FLAGS} ${CMAKE_C_FLAGS}")
-	set(CMAKE_CXX_FLAGS "${OpenMP_CXX_FLAGS} ${CMAKE_C_FLAGS}")
-endif(ENABLE_OMP)
-
 if(ENABLE_DEBUG_WINDOW_LAYOUT)
 	add_definitions(-DDEBUG_WINDOW_LAYOUT_GRAPHS)
 endif(ENABLE_DEBUG_WINDOW_LAYOUT)
@@ -497,13 +539,6 @@ if(ENABLE_GAME)
 		unset(LIBDBUS_FOUND CACHE)
 	endif()
 
-	find_package( PNG )
-	if(ENABLE_LIBPNG AND PNG_FOUND)
-		add_definitions(-DHAVE_LIBPNG)
-	else(ENABLE_LIBPNG AND PNG_FOUND)
-		message("Could not find lib PNG. Disabling support for writing PNG images.")
-	endif(ENABLE_LIBPNG AND PNG_FOUND)
-
 	find_package( History )
 	if(ENABLE_HISTORY AND HISTORY_FOUND)
 		add_definitions(-DHAVE_HISTORY)
@@ -520,9 +555,11 @@ if(ENABLE_POT_UPDATE_TARGET)
 endif(ENABLE_POT_UPDATE_TARGET)
 
 # get languages
-file(READ po/LINGUAS LINGUAS)
-string(REPLACE "\n" "" LINGUAS ${LINGUAS})
-separate_arguments(LINGUAS)
+if(ENABLE_NLS)
+	file(READ po/LINGUAS LINGUAS)
+	string(REPLACE "\n" "" LINGUAS ${LINGUAS})
+	separate_arguments(LINGUAS)
+endif(ENABLE_NLS)
 
 #
 # Include subdirectories

Doxyfile

@@ -38,7 +38,7 @@ PROJECT_NAME           = "The Battle for Wesnoth"
 # could be handy for archiving the generated documentation or if some version
 # control system is used.
 
-PROJECT_NUMBER         = 1.13.12
+PROJECT_NUMBER         = 1.15.0-dev
 
 # Using the PROJECT_BRIEF tag one can provide an optional one line description
 # for a project that appears at the top of each page and should give viewer a