Merge branch 'release-0.6.0' into release

Author: dg0yt

CMakeLists.txt

@@ -32,10 +32,10 @@ set(Mapper_COPYRIGHT "(C) 2012-2015 OpenOrienteering developers")
 # All version components must be integers.
 # We use Mapper_VERSION_PATCH >= 99 to mark development builds.
 set(Mapper_VERSION_MAJOR 0)
-set(Mapper_VERSION_MINOR 5)
+set(Mapper_VERSION_MINOR 6)
 if(NOT Mapper_VERSION_PATCH)
 	# This can be configured when running cmake
-	set(Mapper_VERSION_PATCH 97)
+	set(Mapper_VERSION_PATCH 0)
 endif()
 
 set(MAPPER_VERSION_PRI "${PROJECT_SOURCE_DIR}/oo-mapper-version.pri")

android/AndroidManifest.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android" android:versionName="0.5.97" android:versionCode="2" package="org.openorienteering.mapper" android:installLocation="auto">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android" android:versionName="0.6.0" android:versionCode="2" package="org.openorienteering.mapper" android:installLocation="auto">
     <application android:name="org.qtproject.qt5.android.bindings.QtApplication" android:label="@string/long_app_name" android:icon="@drawable/icon">
         <activity android:configChanges="orientation|uiMode|screenLayout|screenSize|smallestScreenSize|locale|fontScale|keyboard|keyboardHidden|navigation"
                   android:name="org.openorienteering.mapper.MapperActivity"

doc/man/Mapper.1

@@ -1,4 +1,4 @@
-.TH MAPPER 1 2014-04-27 OpenOrienteering
+.TH MAPPER 1 2015-12-13 OpenOrienteering
 
 .SH NAME
 Mapper \- orienteering map drawing software
@@ -22,10 +22,10 @@ This manual page was written by Kai Pastor <[email protected]>.
 .SH "REPORTING BUGS"
 Report bugs in the OpenOrienteering ticket system:
 .br
-<http://sourceforge.net/p/oorienteering/tickets/>
+<https://github.com/OpenOrienteering/mapper/issues>
 
 .SH COPYRIGHT
-Copyright \(co 2014 The OpenOrienteering developers
+Copyright \(co 2015 The OpenOrienteering developers
 .br
 License GPLv3: GNU GPL version 3 <http://gnu.org/licenses/gpl.html>.
 .br
@@ -35,7 +35,6 @@ There is NO WARRANTY, to the extent permitted by law.
 .SH "SEE ALSO"
 Extended documentation for
 .B Mapper
-is available from the program's help menu and also online in the
-OpenOrienteering user wiki:
+is available from the program's help menu and also online at:
 .br
-<http://sourceforge.net/p/oorienteering/wiki/Home/>
+<http://openorienteering.github.io/mapper-manual/>

doc/manual/CMakeLists.txt

@@ -85,6 +85,21 @@ else()
 	  COMMAND   ${CMAKE_COMMAND} -P preprocess-markdown.cmake
 	)
 
+	if(NOT MANUAL_SECTIONS)
+		if(APPLE)
+			set(MANUAL_SECTIONS_DEFAULT OSX)
+		elseif(UNIX)
+			set(MANUAL_SECTIONS_DEFAULT LINUX)
+		elseif(WIN32)
+			set(MANUAL_SECTIONS_DEFAULT WINDOWS)
+		else()
+			set(MANUAL_SECTIONS_DEFAULT OTHER)
+		endif()
+		set(MANUAL_SECTIONS "${MANUAL_SECTIONS_DEFAULT}"
+		    CACHE STRING "Conditional manual sections to be enabled")
+	endif()
+	message(STATUS "Conditional manual sections: ${MANUAL_SECTIONS}")
+
 	configure_file(Doxyfile.in Doxyfile @ONLY)
 
 	configure_file(postprocess-qhp.cmake.in postprocess-qhp.cmake @ONLY)

doc/manual/Doxyfile.in

@@ -23,9 +23,9 @@ PROJECT_LOGO           = "@CMAKE_CURRENT_SOURCE_DIR@/../openorienteering.png"
 
 QUIET                  = YES
 
-INPUT                  = "@CMAKE_CURRENT_BINARY_DIR@/docs"
-STRIP_FROM_PATH        = "@CMAKE_CURRENT_BINARY_DIR@/docs"
-IMAGE_PATH             = "@CMAKE_CURRENT_SOURCE_DIR@/docs/images"
+INPUT                  = "@CMAKE_CURRENT_BINARY_DIR@/pages-tmp"
+STRIP_FROM_PATH        = "@CMAKE_CURRENT_BINARY_DIR@/pages-tmp"
+IMAGE_PATH             = "@CMAKE_CURRENT_SOURCE_DIR@/pages/images"
 IMAGE_PATH            += "@CMAKE_CURRENT_SOURCE_DIR@/../../images"
 ENABLE_PREPROCESSING   = NO
 USE_MATHJAX            = NO
@@ -38,12 +38,14 @@ SEARCHENGINE           = NO
 HTML_HEADER            = "@CMAKE_CURRENT_SOURCE_DIR@/header.html"
 HTML_FOOTER            = "@CMAKE_CURRENT_SOURCE_DIR@/footer.html"
 HTML_STYLESHEET        = "@CMAKE_CURRENT_SOURCE_DIR@/style.css"
-HTML_EXTRA_FILES       = "@CMAKE_CURRENT_SOURCE_DIR@/docs/attachment/scribble_1024.png"
-HTML_EXTRA_FILES      += "@CMAKE_CURRENT_SOURCE_DIR@/docs/attachment/scribble_2048.png"
+HTML_EXTRA_FILES       = "@CMAKE_CURRENT_SOURCE_DIR@/pages/attachment/scribble_1024.png"
+HTML_EXTRA_FILES      += "@CMAKE_CURRENT_SOURCE_DIR@/pages/attachment/scribble_2048.png"
 
 GENERATE_QHP           = YES
 QCH_FILE               = "../Mapper ${Mapper_VERSION_DISPLAY}.qch"
 QHP_NAMESPACE          = "@Mapper_HELP_NAMESPACE@"
 QHP_VIRTUAL_FOLDER     = manual
 
 GENERATE_LATEX         = NO
+
+ENABLED_SECTIONS       = @MANUAL_SECTIONS@