Commit Graph

206 Commits (a60e525a5c6ebc148bed1880e0b4bf7a0d5ea84f)

Author SHA1 Message Date
PeridexisErrant a4708d07a1 Allow Sphinx-doc to work with or without cmake
This mainly involved tweaking a few filenames and configuration paths to
allow consistency in all scenarios.  It cleared up a few errors in the
process too!

I also clarified the placement of the LICENSE file, and finished
configuring the Alabaster style.  This required moving some stuff out of
the CMake system to conf.py to avoid later breakage.
2015-10-23 12:34:54 +11:00
lethosor 8a3e0a47dc Require MSVC 2010 on Windows 2015-10-13 16:25:38 -04:00
lethosor f874fac500 Consolidate licenses of other dependencies 2015-10-03 13:42:03 -04:00
expwnent 466c26f093 BUILD_DOCS should be an option. 2015-09-27 04:53:18 -04:00
expwnent e95aea90e0 Fix CMake warning over INTERFACE_LINK_LIBRARIES / policy CMP0022. 2015-09-27 04:30:46 -04:00
expwnent 1bc9b74530 An attempt to make Sphinx recognize all lua dependencies that still doesn't work. 2015-09-27 02:56:37 -04:00
lethosor 6cc399561b CMake: Only run Sphinx when necessary 2015-09-26 17:52:06 -04:00
lethosor 441afcced5 Fix issues with detecting Sphinx 2015-09-26 13:28:06 -04:00
lethosor 9c6611dfc3 Clean up CMakeLists.txt 2015-09-26 13:16:05 -04:00
lethosor f2696cfd3d Show all missing submodule errors 2015-09-26 10:51:29 -04:00
lethosor 2bcf74d74c Merge branch 'develop' of https://github.com/dfhack/dfhack into develop 2015-09-26 10:46:45 -04:00
lethosor ec17685041 CMake: Add compiler checks and GCC version checks 2015-09-26 10:46:29 -04:00
expwnent 5352d37967 BUILD_DOCS should be a visible CMake option. 2015-09-25 19:43:40 -04:00
expwnent 9b07ebbf97 Install documentation. 2015-09-25 18:53:46 -04:00
expwnent cc752a582e Initial CMake version of Sphinx stuff. 2015-09-24 02:09:23 -04:00
lethosor 418d2831ef Add a framework for including 3rd-party script repos
Repos need to include a CMakeLists.txt file with calls to the
DFHACK_SCRIPTS macro, which functions similarly to DFHACK_PLUGIN.

The `open-legends` script from lethosor/dfhack-scripts is included
as an example.
2015-08-06 21:50:01 -04:00
lethosor d02e67267a Replace jsonxx with jsoncpp 2015-07-29 15:50:33 -04:00
lethosor 524593a3d3 Locate git with find_package 2015-06-25 11:43:54 -04:00
lethosor 5bb5d87ad8 Install default dfhack-config files
Files from the "dfhack-config" source directory are now installed to
"dfhack-config/default" and copied to "dfhack-config" on startup if
they don't already exist. Previously, config files weren't available
at all unless they were manually installed (93c9a41).
2015-06-18 08:59:01 -04:00
lethosor 93c9a41a3a Reimplement dwarfmonitor widgets in Lua (and improve customizability)
Widget positions and a few other options (e.g. date formats) can be
specified in dfhack-config/dwarfmonitor.json on a per-instance basis.

Related changes:
* Fixed an issue loading JSON files from Lua
* JSON files in dfhack-config (only dwarfmonitor.json currently) are
  no longer copied into the DF directory when building DFHack. This
  keeps developers' personal settings intact, but will require
  copying over changes made to DFHack's copies manually.
* Fixed incorrect config path in dwarfmonitor help
2015-06-13 21:15:43 -04:00
lethosor 9b8b95e145 Check for jsonxx submodule in CMakeLists.txt
Addresses #603
2015-05-09 19:44:26 -04:00
lethosor 6eb929b306 Move JSON files out of hack/ folder 2015-05-09 16:04:15 -04:00
Lethosor 6c72a0850d Set MACOSX_RPATH to 1
This allows plugins with vmethod hooks to be reloaded on OS X by making paths
embedded in shared libraries use @rpath instead of embedding the build 
directory, which avoids the need to change them them later. Modifying paths in
libdfhack.dylib caused it to be reloaded, which prevented hooks from working.
2015-04-18 11:40:20 -04:00
lethosor 3ca00f85d0 Merge remote-tracking branch 'lethosor/json' into develop 2015-04-08 20:18:13 -04:00
expwnent f9b431b54d Version bump and update NEWS. 2015-03-30 12:38:56 -04:00
lethosor f3508f82c1 Add jsonxx to depends/ 2015-03-20 15:45:38 -04:00
lethosor 0f77a1a578 Move DFHack version to a separate (static) library
This allows the DFHack version to be changed without recompiling
everything
2015-02-19 12:08:23 -05:00
expwnent e006eb21e8 Bump version and update NEWS. 2015-01-31 23:22:42 -05:00
expwnent 08110312ff No more caching DFHACK_RELEASE in CMake stuff. 2015-01-25 14:21:00 -05:00
lethosor 4d194da530 Merge remote-tracking branch 'origin/develop' into 0.40.24-dev 2015-01-17 08:53:49 -05:00
lethosor 43d7f59e0b Bump version to 0.40.24-r0 and update xml 2015-01-14 15:09:23 -05:00
lethosor 4999086846 Use "OSX" in package names on OS X instead of "Darwin" 2015-01-07 16:03:24 -05:00
lethosor dd9cb70ad3 Update CMakeLists to 0.40.23-r1 2015-01-05 15:56:22 -05:00
expwnent 10fa55570e Update release version. 2014-12-05 00:10:59 -05:00
Alexander Gavrilov 760acf017b Update version to v0.40.19 2014-12-02 13:51:44 +03:00
expwnent 56fb63ae6d Update version to 0.40.16-r1. 2014-11-20 00:04:12 -05:00
expwnent 0f5efb47ae Update to 0.40.15. 2014-11-09 01:30:43 -05:00
expwnent d35e422511 Update NEWS and CMakeLists for release. 2014-11-05 21:30:31 -05:00
Alexander Gavrilov 04ec2c9932 Update version to v0.40.14 and hack things so they compile.
Also make the find-offsets script less likely to crash if the
unit structure is misaligned and add more integrity checks.
2014-10-26 16:40:39 +03:00
Alexander Gavrilov e6901a87d3 Update to 0.40.13 structures and fix compilation. 2014-09-19 00:05:15 +04:00
expwnent 1983a05fb5 Merge remote-tracking branch 'lethosor/update-news' 2014-09-16 18:04:42 -04:00
expwnent d223655dc7 Bump version to 0.40.12-r1. 2014-09-16 16:53:19 -04:00
lethosor 20df0511a1 Update NEWS
Add unlisted changes in 0.40.11-r1

Also include NEWS in installation directory
2014-09-09 22:51:44 -04:00
expwnent 36a6e26e2f Merge pull request #319 from eswald/releasing
Linux Release Improvements: package format.
2014-09-08 13:13:45 -04:00
Quietust cf06dc3503 Update to 0.40.11, fix a few devel plugins to build again 2014-09-04 08:26:45 -05:00
Eric Wald 6a2d65c6d7 Switching to bzip2 for Linux packages.
The resulting packages tend to be about 10% smaller than gzip.
2014-08-29 18:55:17 -06:00
Quietust 1de9405ef3 Update some stuff to 0.40.10 2014-08-28 14:07:03 -05:00
Quietust 4da333fca1 Fix Buildings module to work with ui.tax_collection.rooms change 2014-08-18 16:33:12 -05:00
expwnent b6be4fa236 Update to r2. 2014-08-15 09:25:45 -04:00
expwnent 9887d4a2e8 Bump version. 2014-08-15 02:30:04 -04:00