diff --git a/.gitignore b/.gitignore
index bdb9474bb..9f2b009c6 100644
--- a/.gitignore
+++ b/.gitignore
@@ -36,6 +36,9 @@ build/tools
build/plugins
build/depends
build/install_manifest.txt
+build/README.html
+build/LUA_API.html
+build/COMPILE.html
#ignore Kdevelop stuff
.kdev4
diff --git a/CMake/Modules/FindDocutils.cmake b/CMake/Modules/FindDocutils.cmake
new file mode 100644
index 000000000..8103628df
--- /dev/null
+++ b/CMake/Modules/FindDocutils.cmake
@@ -0,0 +1,3 @@
+FIND_PROGRAM(RST2HTML_EXECUTABLE NAMES rst2html rst2html.py)
+INCLUDE(FindPackageHandleStandardArgs)
+FIND_PACKAGE_HANDLE_STANDARD_ARGS(Docutils DEFAULT_MSG RST2HTML_EXECUTABLE)
\ No newline at end of file
diff --git a/CMakeLists.txt b/CMakeLists.txt
index dfb13cd5d..14436dcff 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -63,7 +63,7 @@ set(DF_VERSION_MINOR "34")
set(DF_VERSION_PATCH "11")
set(DF_VERSION "${DF_VERSION_MAJOR}.${DF_VERSION_MINOR}.${DF_VERSION_PATCH}")
-SET(DFHACK_RELEASE "r1" CACHE STRING "Current release revision.")
+SET(DFHACK_RELEASE "r2" CACHE STRING "Current release revision.")
set(DFHACK_VERSION "${DF_VERSION_MAJOR}.${DF_VERSION_MINOR}.${DF_VERSION_PATCH}-${DFHACK_RELEASE}")
add_definitions(-DDFHACK_VERSION="${DFHACK_VERSION}")
@@ -145,12 +145,33 @@ include_directories(depends/clsocket/src)
add_subdirectory(depends)
+find_package(Docutils)
+
+#set (RST_FILES
+#"Readme"
+#"Compile"
+#"LUA Api"
+#"Contributors"
+#)
+
+#set (RST_PROCESSED_FILES "")
+#IF(RST2HTML_EXECUTABLE)
+# foreach(F ${RST_FILES})
+# add_custom_command(
+# OUTPUT "${dfhack_BINARY_DIR}/${F}.html"
+# COMMAND ${RST2HTML_EXECUTABLE} "${dfhack_SOURCE_DIR}/${F}.rst" "${dfhack_BINARY_DIR}/${F}.html"
+# COMMENT "Translating ${F} to html"
+# DEPENDS "${dfhack_SOURCE_DIR}/${F}.rst")
+# list (APPEND RST_PROCESSED_FILES "${dfhack_BINARY_DIR}/${F}.html")
+# endforeach()
+# add_custom_target(HTML_DOCS ALL DEPENDS ${RST_PROCESSED_FILES})
+#ENDIF()
# build the lib itself
IF(BUILD_LIBRARY)
add_subdirectory (library)
## install the default documentation files
- install(FILES LICENSE Readme.html Compile.html Lua\ API.html DESTINATION ${DFHACK_USERDOC_DESTINATION})
+ install(FILES LICENSE "Lua API.html" Readme.html Compile.html Contributors.html DESTINATION ${DFHACK_USERDOC_DESTINATION})
endif()
#build the plugins
diff --git a/Compile.html b/Compile.html
index e17e57e22..e5f6ca679 100644
--- a/Compile.html
+++ b/Compile.html
@@ -3,13 +3,13 @@
-
+
Building DFHACK
+
+
+
+
Contributors
+
+
If you belong here and are missing, please add yourself and send me (peterix) a pull request :-)
+
The following is a list of people who have contributed to DFHack.
+
+
And those are the cool people who made stonesense.
+
+