diff options
| author | Petr Mrázek | 2012-09-30 23:29:13 +0200 |
|---|---|---|
| committer | Petr Mrázek | 2012-09-30 23:29:13 +0200 |
| commit | ba5b8638a917d2ad0284418ff0c86bb0eac4f765 (patch) | |
| tree | 7a9e331c7cebc65c7c81b20f57cd79416f09d019 | |
| parent | 67adf2dde3c505fa57b10463c19bda2b4780b5ac (diff) | |
| parent | 4de245d6911cf0e53c01d89aed3a18b285ce2168 (diff) | |
| download | dfhack-ba5b8638a917d2ad0284418ff0c86bb0eac4f765.tar.gz dfhack-ba5b8638a917d2ad0284418ff0c86bb0eac4f765.tar.bz2 dfhack-ba5b8638a917d2ad0284418ff0c86bb0eac4f765.tar.xz | |
Merge https://github.com/jjyg/dfhack
Conflicts:
fixTexts.sh
| -rwxr-xr-x | fixTexts.sh | 20 | ||||
| m--------- | library/xml | 0 | ||||
| -rw-r--r-- | plugins/ruby/CMakeLists.txt | 4 |
3 files changed, 18 insertions, 6 deletions
diff --git a/fixTexts.sh b/fixTexts.sh index d58fe997..ff277338 100755 --- a/fixTexts.sh +++ b/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 -rst2html --no-generator --no-datestamp Lua\ API.rst Lua\ API.html -rst2html --no-generator --no-datestamp Contributors.rst Contributors.html + +cd `dirname $0` + +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 + diff --git a/library/xml b/library/xml -Subproject 98d7ebf6a7995a0150b4320adfe8d7131f8174c +Subproject 2f76de54dacd32af567b177adfb9d037fdf62d9 diff --git a/plugins/ruby/CMakeLists.txt b/plugins/ruby/CMakeLists.txt index b8c90d13..9d821f94 100644 --- a/plugins/ruby/CMakeLists.txt +++ b/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) |
