Merge https://github.com/jjyg/dfhack

Conflicts:
	fixTexts.sh

fixTexts.sh

@@ -1,6 +1,18 @@
 #!/bin/bash
 # regenerate documentation after editing the .rst files. Requires python and docutils.
-rst2html --no-generator --no-datestamp Readme.rst Readme.html
+
-rst2html --no-generator --no-datestamp Compile.rst Compile.html
+cd `dirname $0`
-rst2html --no-generator --no-datestamp Lua\ API.rst Lua\ API.html
+
-rst2html --no-generator --no-datestamp Contributors.rst Contributors.html
+function process() {
+    if [ "$1" -nt "$2" ]; then
+        rst2html --no-generator --no-datestamp "$1" "$2"
+    else
+        echo "$2 - up to date."
+    fi
+}
+
+process Readme.rst Readme.html
+process Compile.rst Compile.html
+process Lua\ API.rst Lua\ API.html
+process Contributors.rst Contributors.html
+

library/xml

@@ -1 +1 @@
-Subproject commit 98d7ebf6a7995a0150b4320adfe8d7131f8174cf
+Subproject commit 2f76de54dacd32af567b177adfb9d037fdf62d9b

plugins/ruby/CMakeLists.txt

@@ -34,8 +34,8 @@ ADD_DEPENDENCIES(ruby ruby-autogen-rb)
 
 INSTALL(FILES ${RUBYLIB} DESTINATION ${DFHACK_LIBRARY_DESTINATION})
 
-INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/ruby-autogen.rb DESTINATION hack/ruby)
-
 INSTALL(DIRECTORY .
         DESTINATION hack/ruby
         FILES_MATCHING PATTERN "*.rb")
+
+INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/ruby-autogen.rb DESTINATION hack/ruby)