Moved manual generation from batch file into cmake.

Signed-off-by: Alexander Wenzel <Alexander.AW.Wenzel@bmw.de>

3 files changed, 35 insertions, 33 deletions

diff --git a/doc/CMakeLists.txt b/doc/CMakeLists.txt
index 63091e8..49939ec 100644
--- a/doc/CMakeLists.txt
+++ b/doc/CMakeLists.txt
@@ -24,12 +24,42 @@ if(WITH_DOC)
   		WORKING_DIRECTORY ${CMAKE_BINARY_DIR}/doc
 	)
 	
-	add_custom_target (doc-extended-network-trace ALL 
+	add_custom_target (doc-extended-network-trace ALL
   		COMMAND ${DOXYGEN_EXECUTABLE} ${CMAKE_BINARY_DIR}/doc/extended_network_trace_doxygen.cfg
   		WORKING_DIRECTORY ${CMAKE_BINARY_DIR}/doc
 	)
-	
 
+	add_custom_target (doc-manuals ALL
+		COMMAND mkdir -p ${CMAKE_BINARY_DIR}/doc/manuals 
+		COMMAND mkdir -p ${CMAKE_BINARY_DIR}/doc/manuals/images 
+		COMMAND cp ${CMAKE_SOURCE_DIR}/doc/images/* ${CMAKE_BINARY_DIR}/doc/manuals/images 
+  		COMMAND asciidoc -a TOC1 -o ${CMAKE_BINARY_DIR}/doc/manuals/INSTALL.html ${CMAKE_SOURCE_DIR}/INSTALL.txt 
+  		COMMAND asciidoc -a TOC1 -o ${CMAKE_BINARY_DIR}/doc/manuals/README.html ${CMAKE_SOURCE_DIR}/README.txt 
+  		COMMAND asciidoc -a TOC1 -o ${CMAKE_BINARY_DIR}/doc/manuals/ReleaseNotes.html ${CMAKE_SOURCE_DIR}/ReleaseNotes.txt 
+  		COMMAND asciidoc -a TOC1 -o ${CMAKE_BINARY_DIR}/doc/manuals/dlt_user_manual.html ${CMAKE_SOURCE_DIR}/doc/dlt_user_manual.txt 
+  		COMMAND asciidoc -a TOC1 -o ${CMAKE_BINARY_DIR}/doc/manuals/dlt_cheatsheet.html ${CMAKE_SOURCE_DIR}/doc/dlt_cheatsheet.txt 
+  		COMMAND asciidoc -a TOC1 -o ${CMAKE_BINARY_DIR}/doc/manuals/dlt_design_specification.html ${CMAKE_SOURCE_DIR}/doc/dlt_design_specification.txt 
+  		COMMAND asciidoc -a TOC1 -o ${CMAKE_BINARY_DIR}/doc/manuals/dlt_filetransfer.html ${CMAKE_SOURCE_DIR}/doc/dlt_filetransfer.txt 
+  		COMMAND asciidoc -a TOC1 -o ${CMAKE_BINARY_DIR}/doc/manuals/dlt-daemon.1.html ${CMAKE_SOURCE_DIR}/doc/dlt-daemon.1.txt 
+  		COMMAND asciidoc -a TOC1 -o ${CMAKE_BINARY_DIR}/doc/manuals/dlt-system.1.html ${CMAKE_SOURCE_DIR}/doc/dlt-system.1.txt 
+  		COMMAND asciidoc -a TOC1 -o ${CMAKE_BINARY_DIR}/doc/manuals/dlt-receive.1.html ${CMAKE_SOURCE_DIR}/doc/dlt-receive.1.txt 
+  		COMMAND asciidoc -a TOC1 -o ${CMAKE_BINARY_DIR}/doc/manuals/dlt-convert.1.html ${CMAKE_SOURCE_DIR}/doc/dlt-convert.1.txt 
+  		COMMAND asciidoc -a TOC1 -o ${CMAKE_BINARY_DIR}/doc/manuals/dlt.conf.5.html ${CMAKE_SOURCE_DIR}/doc/dlt.conf.5.txt 
+  		COMMAND asciidoc -a TOC1 -o ${CMAKE_BINARY_DIR}/doc/manuals/dlt-system.conf.5.html ${CMAKE_SOURCE_DIR}/doc/dlt-system.conf.5.txt 
+  		COMMAND asciidoc -a TOC1 -o ${CMAKE_BINARY_DIR}/doc/manuals/dlt_book.html ${CMAKE_SOURCE_DIR}/doc/dlt_book.txt 
+  		WORKING_DIRECTORY ${CMAKE_BINARY_DIR}/doc
+	)
+
+	add_custom_target (doc-man
+  		WORKING_DIRECTORY ${CMAKE_BINARY_DIR}/doc
+		COMMAND a2x --doctype manpage --format manpage ${CMAKE_SOURCE_DIR}/doc/dlt-daemon.1.txt
+		COMMAND a2x --doctype manpage --format manpage ${CMAKE_SOURCE_DIR}/doc/dlt-system.1.txt
+		COMMAND a2x --doctype manpage --format manpage ${CMAKE_SOURCE_DIR}/doc/dlt-receive.1.txt
+		COMMAND a2x --doctype manpage --format manpage ${CMAKE_SOURCE_DIR}/doc/dlt-convert.1.txt 
+		COMMAND a2x --doctype manpage --format manpage ${CMAKE_SOURCE_DIR}/doc/dlt.conf.5.txt
+		COMMAND a2x --doctype manpage --format manpage ${CMAKE_SOURCE_DIR}/doc/dlt-system.conf.5.txt
+	)
+	
 endif(WITH_DOC)
 
 if(WITH_MAN)
diff --git a/doc/create_doc.sh b/doc/create_doc.sh
deleted file mode 100755
index 10ba183..0000000
--- a/doc/create_doc.sh
+++ /dev/null
@@ -1,28 +0,0 @@
-#!/bin/bash
-
-asciidoc -a toc2 dlt_user_manual.txt
-asciidoc -a toc2 dlt_design_specification.txt
-asciidoc -a toc2 dlt_cheatsheet.txt
-asciidoc -a toc2 dlt_filetransfer.txt
-
-asciidoc -a toc2 dlt-daemon.1.txt
-a2x --doctype manpage --format manpage dlt-daemon.1.txt
-asciidoc -a toc2 dlt.conf.5.txt
-a2x --doctype manpage --format manpage dlt.conf.5.txt
-asciidoc -a toc2 dlt-convert.1.txt
-a2x --doctype manpage --format manpage dlt-convert.1.txt
-asciidoc -a toc2 dlt-receive.1.txt
-a2x --doctype manpage --format manpage dlt-receive.1.txt
-asciidoc -a toc2 dlt-system.1.txt
-a2x --doctype manpage --format manpage dlt-system.1.txt
-asciidoc -a toc2 dlt-system.conf.5.txt
-a2x --doctype manpage --format manpage dlt-system.conf.5.txt
-
-asciidoc -a toc2 dlt_book.txt
-
-cd ..
-
-asciidoc -a toc2 README.txt
-asciidoc -a toc2 INSTALL.txt
-asciidoc -a toc2 ReleaseNotes.txt
-
diff --git a/doc/dlt_book.txt b/doc/dlt_book.txt
index 3a114f5..ecbf744 100644
--- a/doc/dlt_book.txt
+++ b/doc/dlt_book.txt
@@ -12,7 +12,7 @@ This document combines all DLT documents into a single document.
 Information
 -----------
 
-:leveloffset: 2
+:leveloffset: 1
 
 include::../README.txt[]
 include::../INSTALL.txt[]
@@ -23,7 +23,7 @@ include::../ReleaseNotes.txt[]
 Manpages
 --------
 
-:leveloffset: 2
+:leveloffset: 1
 
 include::dlt-daemon.1.txt[]
 include::dlt.conf.5.txt[]
@@ -37,7 +37,7 @@ include::dlt-receive.1.txt[]
 Manuals
 -------
 
-:leveloffset: 2
+:leveloffset: 1
 
 include::dlt_user_manual.txt[]
 include::dlt_cheatsheet.txt[]