lethosor
33302251c3
Update version to r5
2015-11-27 16:45:39 -05:00
lethosor
036c30fa68
Set BUILD_DOCS to OFF by default
...
See #738
2015-11-26 17:09:53 -05:00
lethosor
9c62ff1d7f
Blacklist GCC 5 on Linux again
...
GCC 5 mangles some symbols, such as "plugin_globals" ->
"plugin_globals[abi:c++11]" (or "_Z14plugin_globalsB5cxx11"), even
when declared with 'extern "C"'. This breaks plugins, in particular.
2015-11-10 18:51:29 -05:00
lethosor
07839c511a
Update CMakeLists.txt
...
* Require Git
* Only complain about Sphinx if BUILD_DOCS is enabled
* Just issue a warning for GCC >= 5.x on Linux
2015-11-10 17:00:49 -05:00
lethosor
7b483a4461
Update version to r4
...
Ref #737
2015-11-07 20:28:37 -05:00
lethosor
1e42f97e76
Add GCC version to OS X package names and remove trailing newlines
2015-11-07 20:27:48 -05:00
lethosor
178811af43
Add GCC version to package filename on Linux
2015-11-07 18:07:48 -05:00
lethosor
91d5b74c3b
sphinx: Depend on CMakeLists.txt
2015-11-07 18:07:12 -05:00
lethosor
e176c3ea05
Merge remote-tracking branch 'PeridexisErrant/docs-again' into develop
2015-11-07 15:50:11 -05:00
PeridexisErrant
5826b49d09
Move index.rst to docs directory
...
Having the docs index in the repo root was a holdover from when it was
the README file. Now that it's not much use without being built, it's
better to leave the root to README, NEWS, and LICENSE - especially when
one is a html shortcut to the docs index.
2015-11-06 17:09:56 +11:00
lethosor
29533f1f08
Minor sphinx fixes
...
* Exclude build directories (rst files are copied into them by CPack)
* Fix CMake dependency path to conf.py
* Build in parallel
2015-11-05 22:57:09 -05:00
lethosor
8a0f54aef3
Only install HTML docs
2015-11-05 19:37:37 -05:00
lethosor
481d00433d
Only search scripts directory with GLOB_RECURSE
2015-11-04 19:54:41 -05:00
PeridexisErrant
9b1d277ef5
Finish updating sphinx-build changes
...
Completes 5643119
.
2015-10-31 15:39:00 +11:00
PeridexisErrant
5efea525e0
Split GitHub README from Sphinx index
...
The root of the documentation tree has a different function to the short
readme we want to display on GitHub, which now links to the main docs
(or Bay12 thread, or IRC). It also renders properly on GitHub, and can
use live-updating status badges because we don't expect it to work
offline.
2015-10-28 10:06:28 +11:00
PeridexisErrant
413a61423a
Tweak docs building
...
Trying to save the warnings to a file only works if the directory
exists. Also fix digfort docs error.
2015-10-25 10:14:09 +11:00
PeridexisErrant
a3803d340e
Build docs in place; copy inputs so users can build
...
Building the docs now works the same way, no matter when it happens - in
a cloned repo or distributed version.
This means all the relative links keep working; and that users or
downstream distributors can rebuild the docs with extra scripts or .rst
files in place.
Finally, it eliminates a large number of potential bugs which only occur
in one build environment and are difficult to reproduce.
Also add headings and this work to future news.
2015-10-24 22:19:52 +11:00
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
Alexander Gavrilov
b0e1b51d2a
Change version to v0.40.08
2014-08-11 23:49:24 +04:00
Alexander Gavrilov
002bd5240b
Bump version to v0.40.07 and update find-offsets to new pressure plate UI.
2014-08-11 14:14:42 +04:00
Alexander Gavrilov
1c409975de
Update the version to v0.40.05
2014-07-28 08:15:03 +04:00
Quietust
97de21357c
First pass for 0.40 compatibility; still lots left to do, but this will at least build
2014-07-21 13:18:29 -05:00
expwnent
f68279f87d
Bump version to r5, update documents, include more documentation.
2014-06-20 02:48:12 -04:00
expwnent
c7e34c1e5a
Update CMakeLists to r4.
2013-10-19 20:40:31 -04:00
Alexander Gavrilov
599af0a4d9
Fix linux and windows build issues.
...
- Linux makefile overrides and removes the optimization flags.
- Old linux gcc doesn't understand lambdas.
- MSVC doesn't like extern and explicit instantiation in same file.
2013-09-30 22:51:29 +04:00
Anuradha Dissanayake
b961cb6a09
Merge branch 'master' of https://github.com/peterix/dfhack
2013-03-16 12:51:31 +13:00
Petr Mrázek
e7c102646c
Change cmakelists to r3
2013-03-14 06:59:31 +01:00
Anuradha Dissanayake
62ee18ad06
Disable optimization in MSVC RelWithDebugInfo to make debugging easier.
2013-01-19 12:21:57 +13:00
Anuradha Dissanayake
35f4984b5f
Enable multi-processor compilation on MSVC
2013-01-19 11:05:41 +13:00
Quietust
7c1fb39ec0
No need for these to be separate variables
2013-01-09 10:19:43 -06:00
Alexander Gavrilov
fb8532ad84
Add some screenshots to the readme document.
...
Using the standard 800x600 tileset as the common
denominator (and it results in smaller images too).
2012-11-20 13:07:27 +04:00
Quietust
e2b9b703a0
Get rid of tabs
2012-11-16 15:33:36 -06:00
Quietust
2d83b4fa39
We don't need docutils
2012-10-24 14:07:46 -05:00
Petr Mrázek
bb39b2e45b
Lua API, not LUA Api.
2012-09-30 06:55:52 +02:00
Petr Mrázek
e2d810ddc2
Put HTML back.
2012-09-30 06:44:00 +02:00
Petr Mrázek
dd9be6cc7c
The usual derp with files not added: Contributors.rst
2012-09-30 04:16:54 +02:00
Petr Mrázek
8812238bf6
Update license, add contributors file, bump release number
2012-09-30 04:03:37 +02:00
Petr Mrázek
38f2ae399a
Generate html documentation as part of the normal build.
2012-09-29 03:30:38 +02:00
Petr Mrázek
09ddccea6c
Purge html files, add docutils cmake module
2012-09-29 03:06:39 +02:00
Alexander Gavrilov
236ffd578b
Add experimental support for interposing vmethods of known classes.
...
The hairiest bit is the abuse of compiler-specific pointer-to-member
internals in order to provide more or less transparent API.
2012-08-17 22:40:53 +04:00
Timothy Collett
f2a30c1a92
Remove build-time dependency on SDL
2012-06-14 13:42:40 -04:00
Petr Mrázek
eaac32c765
Version bump and text updates.
2012-06-14 00:29:01 +02:00
Timothy Collett
6d65683b02
Adjust packaging for Mac
2012-05-29 16:12:35 -04:00
Timothy Collett
7e88631698
Trying a different method now (with install_name_tool)
2012-05-24 15:02:53 -04:00
Timothy Collett
24d221052b
Initial changes to get dfhack building on the Mac
2012-05-24 11:31:20 -04:00
Petr Mrázek
20794ebf19
Bump version to 0.34.10-r1
2012-05-21 21:40:51 +02:00
Alexander Gavrilov
0a6982f404
Enable warnings correctly on linux and fix a lot of them.
2012-04-20 13:30:37 +04:00
Petr Mrázek
b1c5621123
Bump release to r2
2012-04-17 23:24:43 +02:00
Petr Mrázek
a19d25f532
Merge https://github.com/warmist/dfhack
2012-04-15 01:27:09 +02:00
Warmist
f235d8f371
Orbital nuking was bit excessive...
2012-04-15 01:27:02 +03:00
Warmist
e686b1c8e2
Orbital nuking of C4819 (code-page warning)
2012-04-15 01:20:59 +03:00
Petr Mrázek
c6c6c51766
The 'r' in release string is now also tweakable.
2012-04-14 23:38:29 +02:00
Petr Mrázek
610a23252e
Make release string tweakable.
2012-04-14 23:36:45 +02:00
Petr Mrázek
7fa4ffeb9e
Add a html version of the LUA API doc, package it.
2012-04-05 02:39:38 +02:00
Alexander Gavrilov
0f41608ed4
Pull console output support and REPL out of dfusion into core lib.
2012-03-31 15:40:54 +04:00
Petr Mrázek
543f3970db
Tweak readme, bump version to 0.34.07
2012-03-31 01:13:21 +02:00
Petr Mrázek
dd33c80324
Another revision number...
2012-03-29 22:01:37 +02:00
Petr Mrázek
b847a026e3
Increment revision due to DERP.
2012-03-29 19:17:48 +02:00
Petr Mrázek
6ea0d810bb
Merge https://github.com/mikestewart/dfhack
2012-03-28 19:52:36 +02:00
Petr Mrázek
4b2837dc39
Bump version to 0.34.06-1
2012-03-28 11:56:46 +02:00
Mike Stewart
b57ab1493c
Look for df-structures instead of protobuf in the submodule check.
2012-03-27 08:42:49 -07:00
Mike Stewart
92bae9d652
Removed dead check...
2012-03-26 16:39:16 -07:00
Mike Stewart
4ed6953bb6
Added a test for submodules that prints out a helpful error message.
2012-03-26 16:37:37 -07:00
Petr Mrázek
f549f4e545
Merge https://github.com/warmist/dfhack
2012-03-23 22:59:28 +01:00
Petr Mrázek
1311f4fbf9
bump version
2012-03-21 17:55:49 +01:00
Alexander Gavrilov
dbbd9acfad
Export the type tree with enum keys to lua.
2012-03-19 20:12:27 +04:00
Alexander Gavrilov
e7851f5abd
Improve support for void RPC functions, dfhack-run, etc.
2012-03-15 11:07:43 +04:00
Alexander Gavrilov
560e977f05
Implement trivial RPC interface for dfhack via TCP & protobufs.
...
Use it to make an executable capable of calling commands remotely.
2012-03-14 19:57:29 +04:00
Petr Mrázek
2725fe5568
More tweaking.
2012-03-13 15:36:44 -05:00
Petr Mrázek
36e3aada8e
More tweaks to MSVC solution folders.
2012-03-13 15:36:44 -05:00
Petr Mrázek
778a1cd6bb
Fix problem with solution folders being generated for MSVC Express
...
Uses MFC header availability to detect Express versions.
2012-03-13 15:36:43 -05:00
Petr Mrázek
9079ffa4ff
Add clsocket as a dependency for dfhack lib.
2012-03-13 17:10:46 +01:00
Petr Mrázek
eb4757043b
Move depends out of main library, make them (static) libraries.
2012-03-13 14:46:48 +01:00
Petr Mrázek
b3f6bccdf6
Merge branch 'cleanups' of https://github.com/plaes/dfhack
2012-03-12 15:05:44 +01:00
Petr Mrázek
003a0f9eb8
Merge https://github.com/angavrilov/dfhack
2012-03-10 15:51:45 +01:00
Petr Mrázek
50b7db982f
Fix zlib, protobuf.
...
Zlib is now found using CMake on linux and set to harcoded paths
on windows, yet uniform in use throughout the build system.
protobuf-lite now compiles under MSVC properly.
2012-03-10 15:31:46 +01:00
Alexander Gavrilov
8cc82d5876
Make plugins accept explicit output stream references.
...
This is an incompatible change to the plugin ABI.
The Console is not thread-safe unless used indirectly
via color_ostream_proxy, so everything should use their
per-thread stream.
2012-03-10 15:55:42 +04:00
Petr Mrázek
c260aca3f1
Merge https://github.com/angavrilov/dfhack
2012-03-10 02:15:34 +01:00
Alexander Gavrilov
edf77cf270
Link protobuf to dfhack core as a shared library.
...
- Change protobuf libraries to build as DLLs.
- Move some stream features to the lite library.
- Install the lite library and use it from dfhack.
Note that:
- A couple of protobuf headers had to be tweaked.
- The lite library is used because the full one is
absolutely incompatible with reloading plugins.
- Shutting down protobuf also can't be allowed.
2012-03-09 19:46:21 +04:00
Petr Mrázek
c64919a1bb
Bump version to 0.34.05
2012-03-08 00:07:35 +01:00
Petr Mrázek
c0164c02bd
Bump version to 0.34.04-r1
2012-02-29 17:46:05 +01:00
Petr Mrázek
26c15a1d51
Nuke wagons, move regrass to devel, bump to a dev version.
2012-02-28 23:33:02 +01:00
Petr Mrázek
f0fc0d4428
Bump version to 0.34.03-r1, update docs to list new plugins.
2012-02-28 22:30:55 +01:00
Petr Mrázek
731472a478
Add eggy hooks (linux only for now)
2012-02-28 03:37:56 +01:00
Petr Mrázek
f8721c88b5
dev version. update structures, stonesense
2012-02-27 20:10:31 +01:00
Priit Laes
1299b0d4c6
Don't compile Lua on UNIX
2012-02-23 13:49:07 +02:00
Petr Mrázek
2cd2ee9b0c
New plugin interface
2012-02-21 18:19:17 +01:00
Quietust
0d5c85ac04
Properly remove Debug (and MinSizeRel) build configurations
2012-02-16 08:07:10 -06:00
Petr Mrázek
f600928ec1
Move catsplosion, tweak for build targets under MSVC.
2012-02-13 17:43:41 +01:00
Petr Mrázek
1ae1549513
Tag 31.25-r9b
2012-02-06 10:30:09 +01:00
Petr Mrázek
8f1a2ebf7f
Added missing keybinding mention to 'ls', DFusion hotfix.
2012-02-06 04:47:13 +01:00
Petr Mrázek
e751f9a3eb
Update stonesense, safe-ish CXXFLAGS for linux.
2012-02-02 05:43:43 +01:00
Petr Mrázek
57b5ed8fa7
Made invalid tile types really invalid, license and unused depends cleanup.
2011-11-25 18:54:50 +01:00
Petr Mrázek
2c27119d85
Set CXXFLAGS properly to ensure compatibility with i686 systems.
2011-11-06 21:16:16 +01:00
Petr Mrázek
f4ebd77c47
Bump revision to 8
2011-11-06 01:31:23 +01:00
Petr Mrázek
af46b262b5
More init hardening.
2011-11-04 09:08:29 +01:00
Petr Mrázek
550cde83f3
Bump revision number.
2011-11-03 02:42:05 +01:00
Petr Mrázek
4df380eb91
Bump revision to 7c.
2011-11-02 01:16:17 +01:00
Petr Mrázek
f0417e12dd
Hardening.
2011-11-01 13:06:27 +01:00
Petr Mrázek
13ca2e608f
Added df2mc (TroZ) and drybuckets (Quietust) plugins
2011-10-30 02:50:29 +01:00
Petr Mrázek
e9a04dfa65
Circle designator uses diameter instead of radius, has no overdraw.
2011-08-27 05:50:14 +02:00