Commit Graph

440 Commits (9da6bff011ca9ef6f6e22f022f968660cb9ab4a9)

Author SHA1 Message Date
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