[osmium-tool] 08/13: Move boilerplate variable settings in man pages to CMake scripts.

[Sebastiaan Couwenberg]

This is an automated email from the git hooks/post-receive script.

sebastic pushed a commit to tag v1.0.1
in repository osmium-tool.

commit 9b049f3b09ee64c607c45e86530446d76228cfda
Author: Jochen Topf <jochen at topf.org>
Date:   Tue Mar 31 11:40:00 2015 +0200

    Move boilerplate variable settings in man pages to CMake scripts.
---
 CMakeLists.txt              | 19 +++++++++++++++++--
 man/osmium-apply-changes.md |  2 --
 man/osmium-cat.md           |  2 --
 man/osmium-file-formats.md  |  2 --
 man/osmium-fileinfo.md      |  2 --
 man/osmium-merge-changes.md |  2 --
 man/osmium-time-filter.md   |  2 --
 man/osmium.md               |  2 --
 8 files changed, 17 insertions(+), 16 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 1cc181d..86732e9 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -31,6 +31,8 @@ set(OSMIUM_VERSION ${OSMIUM_VERSION_MAJOR}.${OSMIUM_VERSION_MINOR}.${OSMIUM_VERS
 
 add_definitions(-DOSMIUM_VERSION="${OSMIUM_VERSION}")
 
+set(AUTHOR "Jochen Topf <jochen at topf.org>")
+
 
 #-----------------------------------------------------------------------------
 #
@@ -80,8 +82,14 @@ function(add_man_page _section _name)
     set(_output_file ${CMAKE_BINARY_DIR}/man/man${_section}/${_name}.${_section})
     set(_source_file ${CMAKE_SOURCE_DIR}/man/${_name}.md)
     set(_install_dir "share/man/man{$_section}")
+    string(TOUPPER ${_name} _name_upcase)
     add_custom_command(OUTPUT ${_output_file}
-        COMMAND ${PANDOC} ${PANDOC_MAN_OPTIONS} -o ${_output_file} ${_source_file}
+        COMMAND ${PANDOC}
+            ${PANDOC_MAN_OPTIONS}
+            --variable "title=${_name_upcase}"
+            --variable "section=${_section}"
+            -o ${_output_file}
+            ${_source_file}
         DEPENDS ${_source_file}
         WORKING_DIRECTORY ${CMAKE_BINARY_DIR}
         COMMENT "Building manpage ${_name}.${_section}"
@@ -94,7 +102,14 @@ if(PANDOC)
     message(STATUS "Looking for pandoc - found")
     message(STATUS "  Manual pages will be built")
     execute_process(COMMAND date "+%Y-%m-%d" OUTPUT_VARIABLE PUBDATE OUTPUT_STRIP_TRAILING_WHITESPACE)
-    set(PANDOC_MAN_OPTIONS -s -t man --template ${CMAKE_CURRENT_SOURCE_DIR}/man/manpage.template --variable "description=osmium/${OSMIUM_VERSION}" --variable "date=${PUBDATE}")
+        set(PANDOC_MAN_OPTIONS
+        -s
+        -t man
+        --template ${CMAKE_CURRENT_SOURCE_DIR}/man/manpage.template
+        --variable "description=osmium/${OSMIUM_VERSION}"
+        --variable "date=${PUBDATE}"
+        --variable "author=${AUTHOR}"
+    )
     set(PANDOC_HTML_OPTIONS -s -t html)
 
     add_man_page(1 osmium)
diff --git a/man/osmium-apply-changes.md b/man/osmium-apply-changes.md
index 0e7657f..a8eacda 100644
--- a/man/osmium-apply-changes.md
+++ b/man/osmium-apply-changes.md
@@ -1,5 +1,3 @@
-% OSMIUM-APPLY-CHANGES(1)
-% Jochen Topf <jochen at topf.org>
 
 # NAME
 
diff --git a/man/osmium-cat.md b/man/osmium-cat.md
index ca16d5b..67dd19a 100644
--- a/man/osmium-cat.md
+++ b/man/osmium-cat.md
@@ -1,5 +1,3 @@
-% OSMIUM-CAT(1)
-% Jochen Topf <jochen at topf.org>
 
 # NAME
 
diff --git a/man/osmium-file-formats.md b/man/osmium-file-formats.md
index 1d49718..6df7bb1 100644
--- a/man/osmium-file-formats.md
+++ b/man/osmium-file-formats.md
@@ -1,5 +1,3 @@
-% OSMIUM-FILE-FORMATS(5)
-% Jochen Topf <jochen at topf.org>
 
 # NAME
 
diff --git a/man/osmium-fileinfo.md b/man/osmium-fileinfo.md
index d758bd5..ecf1b26 100644
--- a/man/osmium-fileinfo.md
+++ b/man/osmium-fileinfo.md
@@ -1,5 +1,3 @@
-% OSMIUM-FILEINFO(1)
-% Jochen Topf <jochen at topf.org>
 
 # NAME
 
diff --git a/man/osmium-merge-changes.md b/man/osmium-merge-changes.md
index 79bc24c..fc17a55 100644
--- a/man/osmium-merge-changes.md
+++ b/man/osmium-merge-changes.md
@@ -1,5 +1,3 @@
-% OSMIUM-MERGE-CHANGES(1)
-% Jochen Topf <jochen at topf.org>
 
 # NAME
 
diff --git a/man/osmium-time-filter.md b/man/osmium-time-filter.md
index 1cb428b..b704552 100644
--- a/man/osmium-time-filter.md
+++ b/man/osmium-time-filter.md
@@ -1,5 +1,3 @@
-% OSMIUM-TIME-FILTER(1)
-% Jochen Topf <jochen at topf.org>
 
 # NAME
 
diff --git a/man/osmium.md b/man/osmium.md
index c3371fc..2393f9e 100644
--- a/man/osmium.md
+++ b/man/osmium.md
@@ -1,5 +1,3 @@
-% OSMIUM(1)
-% Jochen Topf <jochen at topf.org>
 
 # NAME
 osmium - multipurpose tool for working with OpenStreetMap data

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/osmium-tool.git