fef7919c08
bump version to 50.08-beta4
2023-04-26 16:19:26 -07:00
b1ae39764b
Merge branch '5008-beta1' into myk_nosdlreal
2023-04-26 15:48:13 -07:00
e4d84e50e8
Merge branch 'develop' into 5008-beta1
2023-04-24 15:43:32 -07:00
54ea391b1d
bump to 50.07-r2rc3
2023-04-24 15:26:33 -07:00
eaf2efee05
update dfhack version
2023-04-18 23:32:54 -05:00
93aaa5d19f
bump beta version to 50.07-r2rc2
2023-04-18 21:01:49 -07:00
337c5eea2a
changes to build process for dflaunch
...
only build dflaunch on steam-specific builds
only download steamworks SDK when building dflaunch
get steam account from environment when downloading steamworks SDK
2023-04-18 22:27:49 -05:00
f336771284
launchdf rewrite
...
this rewrites launchdf so that the dfhack launcher attempts to linger while df is running
2023-04-18 22:27:49 -05:00
150708f21d
build lanchdf with steam sdk
2023-04-18 22:27:49 -05:00
2dbfa37f54
set version number for feedback release
2023-04-16 22:33:24 -07:00
b9d95c5a0b
bump version to 50.08-rc1
2023-04-13 18:53:11 -07:00
f13548a47d
continue to ship SDL.dll until DF moves to SDL2
2023-04-13 01:16:22 -07:00
21784568bd
migrate from SDL interposing to the hooks API
2023-04-12 21:34:16 -07:00
f7e3973da8
bump to 50.07-r1, scrub changelog
2023-04-12 01:45:42 -07:00
6c1740e2ca
re-version to rc1
2023-04-11 17:13:56 -07:00
49d55b2f07
bump version for beta
2023-04-11 12:31:27 -07:00
38d4eea7ac
bump to 50.07-beta2
2023-03-31 05:02:02 -07:00
779b9bfb6a
bump to 50.07-beta1
2023-03-17 10:08:16 -07:00
a5de0fef3e
bump to 50.07-alpha3
2023-03-11 13:56:55 -08:00
f974ac043f
add launchdf binary so steam has an exe to launch
2023-03-07 22:13:08 -08:00
b8fdc985ec
bump version and changelog to 50.07-alpha2
2023-02-24 15:41:54 -08:00
7901fdf6ec
Update CMakeLists.txt
...
N++ defaulted to tabs. Fixing.
2023-02-22 07:26:00 -06:00
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
5100a7ea40
bump to 50.07-alpha1
2023-02-10 10:26:37 -08:00
468e9875e5
Update DFHack version to 50.07-alpha0, update xml
2023-02-08 00:00:31 -05:00
71deeb7a48
bump version to 50.05-alpha3.1
2023-02-03 15:48:09 -08:00
4a21b0843f
bump to 50.05-alpha3
2023-02-03 14:28:17 -08:00
bb16009f49
bump version to 50.05-alpha2
2023-01-20 17:13:28 -08:00
27ba25cdbb
remove compatibility with msvc express
...
because it's not 2017 anymore
2023-01-17 12:37:42 -06:00
3958d37684
update changelog and submodules for 50.05-alpha1
2023-01-16 16:56:31 -08:00
9de09ac779
bump version to 50.05
2023-01-06 08:50:10 -06:00
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
3327ba174b
don't build on 32-bit windows
2023-01-05 13:43:06 +11:00
42117bb165
nix the downloaded win32-i386 libs
2023-01-05 13:43:06 +11:00
4789637625
implement new dfhooks API
2022-12-25 18:15:55 -08:00
c4b31c6fc9
Bump project version to 50.04, try removing leading 0.
2022-12-23 00:01:46 -05:00
57e599a4d9
comment out barracks reference
...
barracks appears to have gone away in 50.03
2022-12-17 13:07:37 -06:00
48ca5eb66d
makefile changes
2022-12-15 03:42:23 -06:00
2ebd38e400
don't stick compiler options in the definitions
2022-12-11 09:42:25 +00:00
2ef36b9ccc
clarify logic for selecting 32 vs 64 bit
2022-12-10 18:13:19 -08:00
e5f0668afd
fix error message for VS version requirement
2022-12-10 18:11:32 -08:00
96e56c3676
make tree minimally compatible with VS2022
2022-12-10 07:09:48 +00:00
fed9f763c9
update version string in CMake and changelog
2022-12-02 10:18:26 -08:00
cf24fc7829
ugh unit tests don't work on our OSX build either
2022-11-30 06:57:11 -08:00
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
cf8bcbd424
remove unnecessary warning message
2022-11-30 05:08:53 -08:00
d0a6a3e930
remove unnecessary target modifications
2022-11-28 17:43:55 -08:00
ae035d5836
simplify unit testing setup
2022-11-28 17:16:48 -08:00
72ad7a1b01
Adds googletest/include for test targets only
2022-11-25 09:43:04 -08:00
b11b1c3d5f
Updates build.yml & moves TEST variable setup
2022-11-25 09:43:04 -08:00
25f87306b4
Removes separated unit test executables
2022-11-25 09:43:04 -08:00
79551f7ef0
Updates CMake TESTING vars
2022-11-25 09:43:04 -08:00
268719ed1f
Integrates googletest
2022-11-25 09:43:04 -08:00
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
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
b6ffaebeda
refine comments
2022-11-18 15:29:02 -06:00
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
3f6e92eda4
finalize 0.47.05-r7 release
2022-09-30 11:58:22 -07:00
a080872a0a
include other doc build types in ninja clean
2022-08-26 13:37:58 -07:00
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
488fd67742
output version of found sphinx and python
2022-08-14 23:01:20 -07:00
f1f207b45b
don't include rst sources in html output
2022-08-13 21:51:36 -07:00
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
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
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
d04beb0e4a
remove -E for sphinx-build. ninja clean can do it.
2022-08-05 22:21:14 -07:00
3e30b435fd
clean up docs build deps
2022-08-05 22:20:58 -07:00
b3a2a10caa
clean up generate doc dirs with ninja clean
2022-08-05 22:05:52 -07:00
8173f6dd02
Merge remote-tracking branch 'upstream/develop' into docs
2022-07-18 10:59:00 -07:00
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
8d99b7e6e1
prepare for plugin doc split
2022-07-10 20:19:09 -07:00
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
739871bc0f
Remove Hooks-egg.cpp and related code and configuration options
2022-06-29 23:35:14 -04:00
88ae50b9ae
update version and changelog to 0.47.05-r6
2022-06-17 15:42:23 -07:00
585888c2d3
update version, changelog, modules for 0.47.05-r5
2022-05-04 17:21:31 -07:00
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
cf54b84fd6
Bump to 0.47.05-r4
2022-03-09 14:27:20 -08:00
e7754ea890
Enable -Wunused-variable and fix most errors
2021-09-07 01:16:21 -04:00
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
1295633722
Bump to 0.47.05-r3
2021-09-04 14:00:31 -04:00
dde589967a
Bump to 0.47.05-r2, update changelog
2021-07-09 21:21:36 -04:00
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
89e11b56f2
Merge remote-tracking branch 'myk002/myk_no_test_scripts' into develop
2021-03-14 14:42:51 -04:00
795bd27d92
Add checks for scripts and luacov submodules
2021-03-10 00:21:46 -05:00
f7ce441a3f
ensure test/scripts does not exist in dfhack repo
2021-03-07 08:21:14 -08:00
032cd64c10
Bump to r1, update submodules and changelog
2021-03-06 13:30:16 -05:00
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
95e2582219
add include directory for lodepng
2021-02-24 18:23:15 -06:00
49b6e814db
Bump to beta1, update submodules
2021-02-10 21:08:45 -05:00
233925ec75
Bump to 0.47.05-alpha0, update xml
2021-01-31 12:10:00 -05:00
d2f3ec6076
Bump to 0.47.04-r5, adjust changelog
2021-01-30 21:23:44 -05:00
eb6957a167
Bump to 0.47.04-r4 and update submodules
2020-12-24 13:32:44 -05:00
b343d00800
Update to 0.47.04-r3 (authors, changelog, and submodules)
2020-10-10 17:31:30 -04:00
3e2dd2a396
quickfort docs: dreamfort case study
2020-10-07 14:01:22 -07:00
64b1202119
Fix some CMake warnings and extraneous output
2020-09-19 01:17:25 -04:00
b85759620f
Switch libzip and xlsxio to be included with add_subdirectory(), disable xlsxio installation
2020-09-18 00:33:41 -04:00
1e068ef247
output useful error if new deps are not found
2020-08-15 22:34:43 -07:00
a41f7c0998
convert XlsxReader module to xlsxreader plugin
2020-08-09 08:54:42 -07:00
8913d43d6f
ensure xlsxio_project gets built before dfhack
2020-08-09 02:59:22 -07:00
79415cf097
clean up dep lib vars
2020-08-09 02:24:05 -07:00
Myk Taylor
Myk
Kelly Kinkade
PopnROFL
lethosor
Amber Brown
Josh Cooper
Tim Siegel
pre-commit-ci[bot]
Josh Cooper
Ben Lubar