Merge master as of v0.9.0

Author: dg0yt

.clang-tidy

@@ -0,0 +1,71 @@
+Checks: >-
+  *,
+  -bugprone-integer-division,
+  -bugprone-narrowing-conversions,
+  -bugprone-too-small-loop-variable,
+  -cert-dcl16-c,
+  -cert-err58-cpp,
+  -cert-flp30-c,
+  -clang-analyzer-cplusplus.Move,
+  -cppcoreguidelines-avoid-c-arrays,
+  -cppcoreguidelines-avoid-magic-numbers,
+  -cppcoreguidelines-macro-usage,
+  -cppcoreguidelines-narrowing-conversions,
+  -cppcoreguidelines-non-private-member-variables-in-classes,
+  -cppcoreguidelines-owning-memory,
+  -cppcoreguidelines-pro-bounds-array-to-pointer-decay,
+  -cppcoreguidelines-pro-bounds-constant-array-index,
+  -cppcoreguidelines-pro-bounds-pointer-arithmetic,
+  -cppcoreguidelines-pro-type-const-cast,
+  -cppcoreguidelines-pro-type-member-init,
+  -cppcoreguidelines-pro-type-reinterpret-cast,
+  -cppcoreguidelines-pro-type-static-cast-downcast,
+  -cppcoreguidelines-pro-type-union-access,
+  -cppcoreguidelines-pro-type-vararg,
+  -cppcoreguidelines-special-member-functions,
+  -fuchsia*,
+  -google*,
+  -hicpp*,
+  -llvm*,
+  -misc-non-private-member-variables-in-classes,
+  -modernize-avoid-c-arrays,
+  -modernize-make-unique,
+  -modernize-pass-by-value,
+  -modernize-raw-string-literal,
+  -modernize-return-braced-init-list,
+  -modernize-use-auto,
+  -modernize-use-default-member-init,
+  -modernize-use-emplace,
+  -modernize-use-equals-default,
+  -modernize-use-nullptr,
+  -modernize-use-using,
+  -performance-move-const-arg,
+  -performance-type-promotion-in-math-fn,
+  -performance-unnecessary-copy-initialization,
+  -performance-unnecessary-value-param,
+  -readability-braces-around-statements,
+  -readability-const-return-type,
+  -readability-container-size-empty,
+  -readability-delete-null-pointer,
+  -readability-else-after-return,
+  -readability-implicit-bool-conversion,
+  -readability-inconsistent-declaration-parameter-name,
+  -readability-isolate-declaration,
+  -readability-magic-numbers,
+  -readability-misleading-indentation,
+  -readability-non-const-parameter,
+  -readability-redundant-control-flow,
+  -readability-redundant-declaration,
+  -readability-redundant-member-init,
+  -readability-simplify-boolean-expr,
+  -readability-static-accessed-through-instance,
+  -readability-static-definition-in-anonymous-namespace,
+  -readability-uppercase-literal-suffix,
+
+CheckOptions:
+ - key:   AllowIntegerConditions
+   value: 1
+ - key:   AllowPointerConditions
+   value: 1
+
+HeaderFilterRegex: '^(.*/|)[^q][^/]*$'

.gitignore

@@ -9,3 +9,4 @@ build*/
 help/*.qhc
 3rd-party/*/download
 !3rd-party/*/download/README.txt
+packaging/android/Mapper

3rd-party/clipper/CMakeLists.txt

@@ -120,6 +120,6 @@ set_source_files_properties(${CLIPPER_SOURCES} PROPERTIES GENERATED TRUE)
 
 add_library(polyclipping STATIC ${CLIPPER_SOURCES})
 
-target_include_directories(polyclipping  PUBLIC ${SOURCE_DIR}/cpp)
+target_include_directories(polyclipping SYSTEM PUBLIC ${SOURCE_DIR}/cpp)
 
 add_dependencies(polyclipping Clipper)

3rd-party/qtsingleapplication/CMakeLists.txt

@@ -34,6 +34,7 @@ add_library(QtSingleApplication STATIC
 )
 
 target_include_directories(QtSingleApplication
+  SYSTEM
   INTERFACE "${CMAKE_CURRENT_SOURCE_DIR}/src"
 )
 

CMakeLists.txt

@@ -1,6 +1,6 @@
 #
 #    Copyright 2012, 2013, 2014 Thomas Schöps
-#    Copyright 2012-2018 Kai Pastor
+#    Copyright 2012-2019 Kai Pastor
 #    
 #    This file is part of OpenOrienteering.
 # 
@@ -29,7 +29,9 @@ endif()
 
 # Project declaration
 
-project(Mapper VERSION 0.8.4 LANGUAGES CXX C)
+project(Mapper VERSION 0.9.0 LANGUAGES CXX C)
+
+math(EXPR Mapper_VERSION_CODE "${Mapper_VERSION_MAJOR} * 10000 + ${Mapper_VERSION_MINOR} * 100 + ${Mapper_VERSION_PATCH} * 2 + ${CMAKE_SIZEOF_VOID_P} / 4 - 1")
 
 if(Mapper_VERSION_DISPLAY)
 	message(STATUS "Custom version display string: \"${Mapper_VERSION_DISPLAY}\"")
@@ -41,16 +43,6 @@ endif()
 
 set(Mapper_COPYRIGHT "(C) 2012-2018 The OpenOrienteering developers")
 
-set(android_manifest "${PROJECT_SOURCE_DIR}/android/AndroidManifest.xml")
-file(READ "${android_manifest}" current)
-if(NOT current MATCHES " android:versionName=.${Mapper_VERSION_MAJOR}\\.${Mapper_VERSION_MINOR}\\.${Mapper_VERSION_PATCH}. ")
-	set(android_version_name "${Mapper_VERSION_MAJOR}.${Mapper_VERSION_MINOR}.${Mapper_VERSION_PATCH}")
-	math(EXPR android_version_int "${Mapper_VERSION_MAJOR} * 10000 + ${Mapper_VERSION_MINOR} * 100 + ${Mapper_VERSION_PATCH}")
-	string(REGEX REPLACE "( android:versionName=.)[0-9]*\\.[0-9]*\\.[0-9]*(. )" "\\1${android_version_name}\\2" output "${current}")
-	string(REGEX REPLACE "( android:versionCode=.)[0-9]*(. )" "\\1${android_version_int}\\2" output "${output}")
-	file(WRITE "${android_manifest}" "${output}")
-endif()
-
 if(${CMAKE_CURRENT_BINARY_DIR} STREQUAL ${PROJECT_SOURCE_DIR})
 	message(AUTHOR_WARNING "In-source builds are discouraged for development.")
 endif()
@@ -109,17 +101,6 @@ option(Mapper_PACKAGE_ASSISTANT "Include Qt Assistant in the packages"
 mark_as_advanced(Mapper_PACKAGE_PROJ Mapper_PACKAGE_GDAL Mapper_PACKAGE_QT Mapper_PACKAGE_ASSISTANT)
 
 
-# Migration of legacy configurations (before 0.7, affects developers)
-
-if(Mapper_BUILD_DOXYGEN)
-	unset(DOXYGEN_EXECUTABLE CACHE)
-endif()
-unset(Mapper_BUILD_DOXYGEN CACHE)
-unset(Mapper_BUILD_GDAL CACHE)
-unset(Mapper_BUILD_PROJ CACHE)
-unset(Mapper_BUILD_QT CACHE)
-
-
 # Installation configuration
 
 set(Mapper_PACKAGE_NAME "openorienteering-mapper" CACHE STRING
@@ -162,6 +143,8 @@ endif()
 
 # Build definitons
 
+include(CTest)
+
 set(CMAKE_CXX_STANDARD 14)
 set(CMAKE_CXX_STANDARD_REQUIRED TRUE)
 
@@ -196,11 +179,23 @@ if(NOT TARGET PROJ4::proj)
 	set(PROJ4_FOUND false)
 	find_package(PROJ4 MODULE REQUIRED)
 endif()
+if(NOT PROJ4_VERSION OR PROJ4_VERSION VERSION_LESS 6.1)
+	# New PROJ API missing or incomplete.
+	# (proj_normalize_for_visualization() came in 6.1.)
+	add_definitions(-DACCEPT_USE_OF_DEPRECATED_PROJ_API_H)
+endif()
 
 if(Mapper_USE_GDAL)
-	find_package(GDAL REQUIRED)
+	find_package(GDAL 2 REQUIRED)
 endif()
 
+find_package(Qt5Core 5.5 REQUIRED)
+add_definitions(-DQT_DISABLE_DEPRECATED_BEFORE=0x050500)
+if (ANDROID AND "${Qt5Core_VERSION}" VERSION_LESS 5.12.1)
+	message(FATAL_ERROR "At least Qt 5.12.1 is required to build for Android")
+elseif ("${Qt5Core_VERSION}" VERSION_LESS 5.8.0)
+	add_definitions("-D'Q_FALLTHROUGH()=(void)0'")
+endif()
 
 include("TestBigEndian")
 test_big_endian(big_endian)
@@ -209,10 +204,6 @@ if(big_endian)
 endif()
 
 
-if(ANDROID OR big_endian)
-	add_definitions(-DNO_NATIVE_FILE_FORMAT)
-endif()
-
 if(UNIX AND NOT APPLE)
 #	set(CMAKE_INSTALL_RPATH "\$ORIGIN/../lib/${Mapper_PACKAGE_NAME}/lib")
 	set(CMAKE_INSTALL_RPATH "${MAPPER_LIBRARY_DESTINATION}/lib")
@@ -229,6 +220,30 @@ else()
 	add_definitions(-DQT_NO_DEBUG -DQT_NO_DEBUG_OUTPUT -DQT_NO_WARNING_OUTPUT -DNDEBUG)
 endif()
 
+
+# Build-time code checks
+
+if(NOT CMAKE_CXX_CLANG_TIDY)
+	set(min_version 8)
+	find_package(ClangTidy ${min_version})
+	if(ClangTidy_FOUND)
+		set(CMAKE_CXX_CLANG_TIDY "${PROJECT_SOURCE_DIR}/code-check-wrapper.sh;${ClangTidy_EXECUTABLE}")
+	else()
+		message(AUTHOR_WARNING "Install clang-tidy >= ${min_version} for code checks during build")
+	endif()
+endif()
+
+if(NOT CMAKE_CXX_INCLUDE_WHAT_YOU_USE)
+	set(min_version 0.12)
+	find_package(IWYU ${min_version})
+	if(IWYU_FOUND)
+		set(CMAKE_CXX_INCLUDE_WHAT_YOU_USE "${PROJECT_SOURCE_DIR}/code-check-wrapper.sh;${IWYU_EXECUTABLE}")
+	else()
+		message(AUTHOR_WARNING "Install include-what-you-use >= ${min_version} for code checks during build")
+	endif()
+endif()
+
+
 # Subdirectories
 
 add_subdirectory("doc/manual")
@@ -246,6 +261,7 @@ add_subdirectory("src/libocad")
 if(NOT ANDROID)
 	add_subdirectory("src/printsupport")
 endif()
+add_subdirectory("src/sensors")
 add_subdirectory("src")
 add_subdirectory("packaging")
 add_subdirectory("doc/licensing")
@@ -262,7 +278,28 @@ endif()
 add_subdirectory("doc/api")
 add_subdirectory("packaging/src")
 
-feature_summary(WHAT ALL)
+# Auxiliary targets
+
+set(ci
+  ci/azure-pipelines.yml
+  ci/build.yml
+  ci/codespell.yml
+  ci/filter-stderr.sed
+  ci/publish.yml
+  ci/publish-coverage.yml
+  ci/setup-common.yml
+  ci/setup-macos.yml
+  ci/setup-msys2.yml
+  ci/setup-ubuntu.yml
+  ci/shell.sh
+  ci/openorienteering-mapper-ci.cmake
+)
+
+add_custom_target(CI SOURCES ${ci})
+
+# Configuration report
+
+feature_summary(INCLUDE_QUIET_PACKAGES WHAT ALL)
 
 string(TOUPPER "${CMAKE_BUILD_TYPE}" type)
 foreach(lang CXX C)

INSTALL.md

@@ -4,23 +4,23 @@ This document is about building OpenOrienteering Mapper from source code.
 
 The general build process prerequisites are:
  - A supported platform: 
-   - Linux. Ubuntu 16.04 is known to work.
-     Linux is also used to cross-compile for Windows and Android.
-   - OS X Yosemite (10.10). OS X Mountain Lion (10.8) or newer may work.
-     (Qt supports Mac OS X Lion (10.7) for deployment only until Qt 5.6.)
+   - Linux. Ubuntu 18.04 is known to work.
+     Linux is also used to cross-compile for Android.
+   - macOS: 10.13 is known to work.
+   - Windows: MSYS2 (MinGW subsystem).
  - CMake >= 3.1.
    CMake is available from https://cmake.org/.
  - A supported C++ compiler toolchain. C++14 is mandatory.
 
 Mapper has a number of direct and indirect dependencies on third-party
 components. Direct dependencies are:
- - Qt >=5.3
+ - Qt >=5.5
    https://www.qt.io/download-open-source/
- - Clipper library (aka libpolyclipping) >= 6.1.3.a
+ - Clipper library (aka libpolyclipping) >= 6.1.3a
    http://www.angusj.com/delphi/clipper.php
- - PROJ.4 Cartographic Projections Library >= 4.8
+ - PROJ Cartographic Projections Library >= 4.9
    https://proj4.org/
- - GDAL Geospatial Data Abstraction Library
+ - GDAL Geospatial Data Abstraction Library >= 2
    https://www.gdal.org/
  - ZLib Compression Library
    https://zlib.net/
@@ -32,7 +32,7 @@ For target systems other than desktop Linux, the recommended way to deal
 with the dependencies is to use the OpenOrienteering superbuild project
 (https://github.com/OpenOrienteering/superbuild). See below for details.
 
-The recommented integrated development environment (IDE) is Qt Creator
+The recommended integrated development environment (IDE) is Qt Creator
 which is available from https://www.qt.io/download-open-source/.
 
 
@@ -52,7 +52,7 @@ git clone https://github.com/OpenOrienteering/mapper.git
 
 ## Compiling for Linux (without OpenOrienteering superbuild)
 
-The standard g++ (>= 4.9) compiler from a recent distribution should work. Make
+The standard g++ (>= 5.0) compiler from a recent distribution should work. Make
 sure that the required development and tool packages are installed. For a Ubuntu
 or Debian system, install:
 ```
@@ -125,8 +125,7 @@ In addition to the general build process prerequisites, you need:
 The OpenOrienteering superbuild project will download and install this software
 when it creates an android toolchain.
 
-Qt 5.6 requires at least API Level 9 to work. Apps built for the armeabi-v7a
-ABI require at least an emulator image of API level 14.
+Qt 5.12 requires at least API Level 16 to work.
 
 The build of OpenOrienteering Mapper for Android is done by CMake, too.
 However, the cmake-generated build creates a qmake project in
@@ -135,7 +134,7 @@ deployment settings generated by qmake for this project, you this project is
 suitable for convenient deplyoing and debugging Mapper in Qt Creator.
 
 Note that release APKs need to be signed, and the signing key cannot change for
-replacing an installed app without loosing the data (maps) stored for this app.
+replacing an installed app without losing the data (maps) stored for this app.
 To facilitate development, debug builds of Mapper use a different namespace and
 name.
 
@@ -156,4 +155,4 @@ available together with the release binaries.
 Packages for macOS and Windows are built using CPack which comes with CMake.
 Android APKs are build in the same way, although not using a CPack generator.
 These packages bundle all 3rd-party components (Qt binaries and translations,
-PROJ.4 and GDAL binaries and data, etc.). 
+PROJ and GDAL binaries and data, etc.). 

README.md

@@ -4,7 +4,7 @@
 
 OpenOrienteering Mapper is an orienteering mapmaking program and provides
 a free and open source alternative to existing commercial software.
-OpenOrienteering Mapper runs on Android, Windows, Mac OS X and Linux.
+OpenOrienteering Mapper runs on Android, Windows, macOS and Linux.
 
  - [Mapper Homepage](https://www.openorienteering.org/apps/mapper/)
  - [Manual](https://www.openorienteering.org/mapper-manual/)