Commit Graph

502 Commits (c797e5b2d21e7090f031b8998101f3d1614d1d8f)

Author SHA1 Message Date
Myk Taylor b8fdc985ec
bump version and changelog to 50.07-alpha2 2023-02-24 15:41:54 -08:00
PopnROFL 7901fdf6ec Update CMakeLists.txt
N++ defaulted to tabs. Fixing.
2023-02-22 07:26:00 -06:00
PopnROFL 15b00587a0 Update CMakeLists.txt
Increased MSVC version to the latest, and updated the error messaging so you know what version you have (if it's installed at all)
2023-02-22 07:26:00 -06:00
Myk Taylor 5100a7ea40
bump to 50.07-alpha1 2023-02-10 10:26:37 -08:00
lethosor 468e9875e5
Update DFHack version to 50.07-alpha0, update xml 2023-02-08 00:00:31 -05:00
Myk Taylor 71deeb7a48
bump version to 50.05-alpha3.1 2023-02-03 15:48:09 -08:00
Myk Taylor 4a21b0843f
bump to 50.05-alpha3 2023-02-03 14:28:17 -08:00
Myk Taylor bb16009f49
bump version to 50.05-alpha2 2023-01-20 17:13:28 -08:00
Kelly Kinkade 27ba25cdbb remove compatibility with msvc express
because it's not 2017 anymore
2023-01-17 12:37:42 -06:00
Myk Taylor 3958d37684
update changelog and submodules for 50.05-alpha1 2023-01-16 16:56:31 -08:00
Kelly Kinkade 9de09ac779
bump version to 50.05 2023-01-06 08:50:10 -06:00
Myk Taylor c70c4131bd
don't include dfhack-config/ in release tarball
create it at runtime
move files around so no dfhack-owned files are in there
2023-01-04 19:41:58 -08:00
Myk Taylor 4789637625
implement new dfhooks API 2022-12-25 18:15:55 -08:00
lethosor c4b31c6fc9
Bump project version to 50.04, try removing leading 0. 2022-12-23 00:01:46 -05:00
Kelly Kinkade 57e599a4d9 comment out barracks reference
barracks appears to have gone away in 50.03
2022-12-17 13:07:37 -06:00
Kelly Kinkade 48ca5eb66d makefile changes 2022-12-15 03:42:23 -06:00
Myk Taylor 2ebd38e400
don't stick compiler options in the definitions 2022-12-11 09:42:25 +00:00
Myk Taylor 2ef36b9ccc
clarify logic for selecting 32 vs 64 bit 2022-12-10 18:13:19 -08:00
Myk Taylor e5f0668afd
fix error message for VS version requirement 2022-12-10 18:11:32 -08:00
Myk Taylor 96e56c3676
make tree minimally compatible with VS2022 2022-12-10 07:09:48 +00:00
myk002 fed9f763c9
update version string in CMake and changelog 2022-12-02 10:18:26 -08:00
Myk Taylor cf24fc7829
ugh unit tests don't work on our OSX build either 2022-11-30 06:57:11 -08:00
Myk Taylor 5d08a0f765
skip unit tests on windows until build env updated
otherwise we get fatal error C1902: Program database manager mismatch; please check your installation

revert this commit once windows is updated
2022-11-30 05:34:39 -08:00
Myk Taylor cf8bcbd424
remove unnecessary warning message 2022-11-30 05:08:53 -08:00
myk002 d0a6a3e930
remove unnecessary target modifications 2022-11-28 17:43:55 -08:00
myk002 ae035d5836
simplify unit testing setup 2022-11-28 17:16:48 -08:00
Josh Cooper 72ad7a1b01 Adds googletest/include for test targets only 2022-11-25 09:43:04 -08:00
Josh Cooper b11b1c3d5f Updates build.yml & moves TEST variable setup 2022-11-25 09:43:04 -08:00
Josh Cooper 25f87306b4 Removes separated unit test executables 2022-11-25 09:43:04 -08:00
Josh Cooper 79551f7ef0 Updates CMake TESTING vars 2022-11-25 09:43:04 -08:00
Josh Cooper 268719ed1f Integrates googletest 2022-11-25 09:43:04 -08:00
Tim Siegel 8e18d610f5 cmake: Add SDL dep for Linux dfhack; deprecate BUILD_TESTS
On Linux, libdfhack.so depends on libSDL.so, but that was not marked
inside CMake. As it's only used via LD_PRELOAD, there was no problem.
But when linking unit tests against it, this becomes necessary. It may
be wise to add a find_package(SDL) to provide the user with more
control, but just a hard-coded "SDL" should work for most installs.

The CTest module creates a BUILD_TESTING option, which clashes
(thematically, not in code) with the existing BUILD_TESTS option.
Resolve it thus:
- Deprecate BUILD_TESTS; it still works, but is marked as an advanced
  option so it doesn't show in the CMake UI by default.
- Add a new BUILD_TEST_SCRIPTS that does what BUILD_TESTS used to do,
  but is a "dependent" option so it goes away if BUILD_TESTING=OFF.

The up-shot is that, by default, the C++ unit tests will be built
(BUILD_TESTING=ON) and the Lua integration tests are not installed
(BUILD_TEST_SCRIPTS=OFF).
2022-11-25 09:43:04 -08:00
Tim Siegel c5be87e381 unit tests: Add CTest support, and a trivial first unit test
If BUILD_TESTS=ON:
- Adds a 'test' target for ninja
- Adds a library/MiscUtils.test unit test executable
2022-11-25 09:43:04 -08:00
Kelly Kinkade b6ffaebeda refine comments 2022-11-18 15:29:02 -06:00
Kelly Kinkade a16aca0f03 up MSVC warning level to /W3 /WX
This makes MSVC warn at a level comparable to what we use on gcc for Linux builds
2022-11-18 15:09:50 -06:00
myk002 3f6e92eda4
finalize 0.47.05-r7 release 2022-09-30 11:58:22 -07:00
myk002 a080872a0a
include other doc build types in ninja clean 2022-08-26 13:37:58 -07:00
lethosor 340b524348
Invoke build.py with cmake-found python
In the Buildmaster GCC 4.8 image, `/usr/bin/env python3` appears to find the
system Python (3.4) as opposed to the newer Python (3.6) we install separately.
2022-08-15 17:49:44 -04:00
myk002 488fd67742
output version of found sphinx and python 2022-08-14 23:01:20 -07:00
myk002 f1f207b45b
don't include rst sources in html output 2022-08-13 21:51:36 -07:00
pre-commit-ci[bot] 8f332c5925 [pre-commit.ci] auto fixes from pre-commit.com hooks
for more information, see https://pre-commit.ci
2022-08-08 06:39:12 +00:00
myk002 7274a8cd2a
use docs/build.py to do the docs build
and add sphinx extension python files to the build deps
2022-08-07 23:35:00 -07:00
pre-commit-ci[bot] 02a8f63ffc [pre-commit.ci] auto fixes from pre-commit.com hooks
for more information, see https://pre-commit.ci
2022-08-06 05:38:20 +00:00
myk002 d04beb0e4a
remove -E for sphinx-build. ninja clean can do it. 2022-08-05 22:21:14 -07:00
myk002 3e30b435fd
clean up docs build deps 2022-08-05 22:20:58 -07:00
myk002 b3a2a10caa
clean up generate doc dirs with ninja clean 2022-08-05 22:05:52 -07:00
myk002 8173f6dd02
Merge remote-tracking branch 'upstream/develop' into docs 2022-07-18 10:59:00 -07:00
myk002 fdd406b722
ensure all files are reread on every docs build
this fixes the issue where the Stonesense docs were getting ignored
2022-07-10 20:19:12 -07:00
myk002 8d99b7e6e1
prepare for plugin doc split 2022-07-10 20:19:09 -07:00
Myk f1cb9b9a83
Build and install text help alongside html (#2236)
* build text docs alongside html

also:
- capture more doc dependencies that should cause rebuilds
- move intermediate build output (doctree data) into build dir
- allow sphinx build to multitask more for faster completion times

* install text help alongside html help

* update settings in docs build action
2022-07-10 20:14:20 -07:00
lethosor 739871bc0f
Remove Hooks-egg.cpp and related code and configuration options 2022-06-29 23:35:14 -04:00
myk002 88ae50b9ae
update version and changelog to 0.47.05-r6 2022-06-17 15:42:23 -07:00
myk002 585888c2d3
update version, changelog, modules for 0.47.05-r5 2022-05-04 17:21:31 -07:00
Josh Cooper 69ca0d8a28
Improves support for dfhack as a sub-project (#2058)
Replaces CMAKE_SOURCE_DIR with dfhack_SOURCE_DIR so it can be included in other cmake projects that have a different top-level CMAKE_SOURCE_DIR
2022-03-29 10:28:52 -07:00
myk002 cf54b84fd6 Bump to 0.47.05-r4 2022-03-09 14:27:20 -08:00
lethosor e7754ea890
Enable -Wunused-variable and fix most errors 2021-09-07 01:16:21 -04:00
lethosor 8d551c7a7c
GCC: enable -Wall and -Werror for all build types
Also make protobuf flags consistent across build types so that release builds
pass
2021-09-06 22:56:55 -04:00
lethosor 1295633722
Bump to 0.47.05-r3 2021-09-04 14:00:31 -04:00
lethosor dde589967a
Bump to 0.47.05-r2, update changelog 2021-07-09 21:21:36 -04:00
myk002 5f00183177
move test harness out of test dir
and install to test.lua in top-level scripts directory instead of test/main.lua
2021-03-22 10:15:32 -07:00
lethosor 89e11b56f2
Merge remote-tracking branch 'myk002/myk_no_test_scripts' into develop 2021-03-14 14:42:51 -04:00
lethosor 795bd27d92
Add checks for scripts and luacov submodules 2021-03-10 00:21:46 -05:00
myk002 f7ce441a3f
ensure test/scripts does not exist in dfhack repo 2021-03-07 08:21:14 -08:00
lethosor 032cd64c10
Bump to r1, update submodules and changelog 2021-03-06 13:30:16 -05:00
lethosor 2bb4dbccc6
Replace installed hack/changelog.txt with stub
This was incomplete, but people were still referencing it.

Closes #1775
2021-03-06 12:43:31 -05:00
Ben Lubar 95e2582219
add include directory for lodepng 2021-02-24 18:23:15 -06:00
lethosor 49b6e814db
Bump to beta1, update submodules 2021-02-10 21:08:45 -05:00
lethosor 233925ec75
Bump to 0.47.05-alpha0, update xml 2021-01-31 12:10:00 -05:00
lethosor d2f3ec6076
Bump to 0.47.04-r5, adjust changelog 2021-01-30 21:23:44 -05:00
lethosor eb6957a167
Bump to 0.47.04-r4 and update submodules 2020-12-24 13:32:44 -05:00
lethosor b343d00800
Update to 0.47.04-r3 (authors, changelog, and submodules) 2020-10-10 17:31:30 -04:00
Myk Taylor 3e2dd2a396 quickfort docs: dreamfort case study 2020-10-07 14:01:22 -07:00
lethosor 64b1202119
Fix some CMake warnings and extraneous output 2020-09-19 01:17:25 -04:00
lethosor b85759620f
Switch libzip and xlsxio to be included with add_subdirectory(), disable xlsxio installation 2020-09-18 00:33:41 -04:00
Myk Taylor 1e068ef247 output useful error if new deps are not found 2020-08-15 22:34:43 -07:00
Myk Taylor a41f7c0998 convert XlsxReader module to xlsxreader plugin 2020-08-09 08:54:42 -07:00
Myk Taylor 8913d43d6f ensure xlsxio_project gets built before dfhack 2020-08-09 02:59:22 -07:00
Myk Taylor 79415cf097 clean up dep lib vars 2020-08-09 02:24:05 -07:00
Myk Taylor 8753f9feaf use correct lib dir on 32-bit 2020-08-08 20:42:03 -07:00
Myk Taylor 8a05f09cd6 add libexpat to the build 2020-08-08 20:18:43 -07:00
Myk Taylor 28eaf0ae8b add libzip to the build 2020-08-08 20:04:46 -07:00
Myk Taylor 18f4786458 Merge remote-tracking branch 'upstream/develop' into quickfort_xlsxio 2020-08-08 17:17:45 -07:00
Myk Taylor 89a6309788 build xlsxio and link it into dfhack, add lua api 2020-08-08 15:24:12 -07:00
lethosor f2b0f012c9
Bump to 0.47.04-r2 2020-08-08 14:53:24 -04:00
Myk Taylor 88dffd6474 quickfort files and docs 2020-07-18 08:54:24 -07:00
Ben Lubar 1058e40cb0
Enable /bigobj globally on MSVC.
This changes the intermediate format used for compiled files from one
that can hold up to 65279 (slightly less than 2^16) addressable sections
to one that can hold 4294967296 (2^32).

Code that uses templates, such as... C++ code... can easily run up
against the smaller limit. This does not affect the finished executable,
only the intermediate object files.
2020-05-09 18:23:18 -05:00
lethosor 6bdbf5b0dd Update to 0.47.04-r1, update xml, scripts, changelog version 2020-04-25 21:33:02 -04:00
lethosor d3a007489c Fix ZLIB_ROOT in newer CMake versions 2020-04-19 12:16:48 -04:00
lethosor c8a0ac146c Update submodules, changelog, CMakeLists, Authors 2020-04-04 01:36:52 -04:00
lethosor 91fad90167 Make test base folder customizable, clean up, stop always installing test folder 2020-04-01 00:26:51 -04:00
lethosor 666b35f1f6 Add "bit" suffix to package architecture (hopefully reduces confusion) 2020-03-21 02:42:12 -04:00
lethosor 7d6594bfe8 Add BUILD_TESTS CMake option 2020-03-21 02:39:00 -04:00
Ben Lubar fe2ea17880
change DF version
add -maxerrors and -failfast to check-structures-sanity
2020-03-01 12:15:26 -06:00
lethosor fb6dd691d7 Update changelog + CMakeLists for 0.47.03-beta1 2020-02-27 19:56:37 -05:00
Ben Lubar b033a215bd
update for Dwarf Fortress 0.47.03 2020-02-16 18:48:27 -06:00
lethosor f54c361718 Add an implementation of mifki's sizecheck library (tested on Linux) 2020-02-08 21:18:29 -05:00
Ben Lubar b375586b67
Update to DF 0.47.02 2020-02-07 16:00:53 -06:00
Ben Lubar 62e3802d26
Update to DF 0.47.01 2020-01-29 14:51:48 -06:00
lethosor 163971ec56 Bump version to 0.44.12-r3 2020-01-19 00:05:43 -05:00
lethosor 8a07426643 Merge branch 'develop' into cmake-cleanup 2019-07-20 15:15:39 -04:00