From 77c1f107d052e5666be0728c2a6b92c8b3a1cc54 Mon Sep 17 00:00:00 2001 From: Nicholas McDaniel Date: Sun, 5 Jan 2025 23:12:27 -0500 Subject: [PATCH 1/6] Fix rst syntax which was breaking pdf builds --- docs/plugins/stonesense.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/plugins/stonesense.rst b/docs/plugins/stonesense.rst index ba8ba8478b..69b305261d 100644 --- a/docs/plugins/stonesense.rst +++ b/docs/plugins/stonesense.rst @@ -82,7 +82,7 @@ Useful links ------------ - Report issues on `Github `_ - `support` -- :forums:`Official Stonesense thread <106497>`` +- :forums:`Official Stonesense thread <106497>` - :forums:`Screenshots thread <48172>` - :wiki:`Main wiki page ` - :wiki:`How to add content ` From 685975885607f4a57691fb93e68bfba51b571050 Mon Sep 17 00:00:00 2001 From: Nicholas McDaniel Date: Sun, 5 Jan 2025 23:13:58 -0500 Subject: [PATCH 2/6] Reenable pdf builds for readthedocs --- .readthedocs.yml | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/.readthedocs.yml b/.readthedocs.yml index 3d9bf46411..bf71c46b78 100644 --- a/.readthedocs.yml +++ b/.readthedocs.yml @@ -15,9 +15,7 @@ submodules: sphinx: configuration: conf.py -formats: - - epub - - htmlzip +formats: all python: install: From f77a7d51887582f265da6b925e488227b9cf3e29 Mon Sep 17 00:00:00 2001 From: Myk Date: Mon, 6 Jan 2025 00:55:46 -0800 Subject: [PATCH 3/6] Revert "fix mysterious new errors in CI" --- docs/dev/Lua API.rst | 19 ++++++++----------- docs/guides/modding-guide.rst | 4 ---- 2 files changed, 8 insertions(+), 15 deletions(-) diff --git a/docs/dev/Lua API.rst b/docs/dev/Lua API.rst index 6f1fff5de2..64bea03c3a 100644 --- a/docs/dev/Lua API.rst +++ b/docs/dev/Lua API.rst @@ -3155,14 +3155,15 @@ unless otherwise noted. * ``dfhack.filesystem.listdir_recursive(path [, depth = 10[, include_prefix = true]])`` - Lists all files/directories in a directory and its subdirectories. All - directories are listed before their contents. Returns a table with subtables - of the format: ``{path: 'path to file', isdir: true|false}`` + Lists all files/directories in a directory and its subdirectories. All directories + are listed before their contents. Returns a table with subtables of the format:: - Note that ``listdir()`` returns only the base name of each directory entry, - while ``listdir_recursive()`` returns the initial path and all components - following it for each entry. Set ``include_prefix`` to false if you don't - want the ``path`` string prepended to the returned filenames. + {path: 'path to file', isdir: true|false} + + Note that ``listdir()`` returns only the base name of each directory entry, while + ``listdir_recursive()`` returns the initial path and all components following it + for each entry. Set ``include_prefix`` to false if you don't want the ``path`` + string prepended to the returned filenames. Console API ----------- @@ -3702,8 +3703,6 @@ functions. These are invoked just like standard string functions, e.g.:: script-manager ============== -.. highlight:: none - This module contains functions useful for mods that contain DFHack scripts to retrieve source and state paths. The value to pass as ``mod_id`` must be the same as the mod ID in the mod's :file:`info.txt` metadata file. The returned @@ -3742,8 +3741,6 @@ paths will be relative to the top level game directory and will end in a slash utils ===== -.. highlight:: lua - * ``utils.compare(a,b)`` Comparator function; returns *-1* if ab, *0* otherwise. diff --git a/docs/guides/modding-guide.rst b/docs/guides/modding-guide.rst index 5906c75208..e93051d41a 100644 --- a/docs/guides/modding-guide.rst +++ b/docs/guides/modding-guide.rst @@ -238,8 +238,6 @@ immensely, and you can always ask for help in the `right places `. Reading and writing files and other persistent state ---------------------------------------------------- -.. highlight:: none - There are several locations and APIs that a mod might need to read or store data: @@ -256,8 +254,6 @@ for reading and writing JSON data. For example:: -- modify state in the config.data table and persist it when it changes with -- config:write() -.. highlight:: lua - State that should be saved with a world or a specific fort within that world should use `persistent-api` API. You can attach a state change hook for new world loaded where you can load the state, which often includes whether the mod From 020e5b4dafb6b4f6756ceff4528e937379662b92 Mon Sep 17 00:00:00 2001 From: Myk Taylor Date: Mon, 6 Jan 2025 02:18:31 -0800 Subject: [PATCH 4/6] don't fail if some output dirs don't exist e.g. when building just xml-dump-type-sizes --- build/build-win64-from-linux.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/build-win64-from-linux.sh b/build/build-win64-from-linux.sh index 7f878ef1c6..4a0988c2e3 100755 --- a/build/build-win64-from-linux.sh +++ b/build/build-win64-from-linux.sh @@ -44,7 +44,7 @@ if ! docker run --rm -i -v "$srcdir":/src -v "$srcdir/build/win64-cross/":/src/b -e steam_password \ --name dfhack-win \ ghcr.io/dfhack/build-env:master \ - bash -c "cd /src/build && dfhack-configure windows 64 Release -DCMAKE_INSTALL_PREFIX=/src/build/output -DBUILD_DOCS=1 $CMAKE_EXTRA_ARGS && dfhack-make -j$jobs install && find depends library plugins -iname '*.pdb' -exec cp '{}' pdb/ \;" \ + bash -c "cd /src/build && dfhack-configure windows 64 Release -DCMAKE_INSTALL_PREFIX=/src/build/output -DBUILD_DOCS=1 $CMAKE_EXTRA_ARGS && dfhack-make -j$jobs install && find $(find -name depends -o -name library -o -name plugins) -iname '*.pdb' -exec cp '{}' pdb/ \;" \ ; then echo echo "Build failed" From 22da764093b480c2ff3678cc6938fa505101ad70 Mon Sep 17 00:00:00 2001 From: Myk Taylor Date: Mon, 6 Jan 2025 19:13:59 -0800 Subject: [PATCH 5/6] keep the listdir_recursive doc changes --- docs/dev/Lua API.rst | 17 ++++++++--------- 1 file changed, 8 insertions(+), 9 deletions(-) diff --git a/docs/dev/Lua API.rst b/docs/dev/Lua API.rst index 64bea03c3a..a3c94550f8 100644 --- a/docs/dev/Lua API.rst +++ b/docs/dev/Lua API.rst @@ -3155,15 +3155,14 @@ unless otherwise noted. * ``dfhack.filesystem.listdir_recursive(path [, depth = 10[, include_prefix = true]])`` - Lists all files/directories in a directory and its subdirectories. All directories - are listed before their contents. Returns a table with subtables of the format:: - - {path: 'path to file', isdir: true|false} - - Note that ``listdir()`` returns only the base name of each directory entry, while - ``listdir_recursive()`` returns the initial path and all components following it - for each entry. Set ``include_prefix`` to false if you don't want the ``path`` - string prepended to the returned filenames. + Lists all files/directories in a directory and its subdirectories. All + directories are listed before their contents. Returns a table with subtables + of the format: ``{path: 'path to file', isdir: true|false}`` + + Note that ``listdir()`` returns only the base name of each directory entry, + while ``listdir_recursive()`` returns the initial path and all components + following it for each entry. Set ``include_prefix`` to false if you don't + want the ``path`` string prepended to the returned filenames. Console API ----------- From 9dd1ce762818f6433580833e84193e06af74b573 Mon Sep 17 00:00:00 2001 From: DFHack-Urist via GitHub Actions <63161697+DFHack-Urist@users.noreply.github.com> Date: Tue, 7 Jan 2025 03:29:37 +0000 Subject: [PATCH 6/6] Auto-update submodules library/xml: master --- library/xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/library/xml b/library/xml index ffdf5771ea..50521daf0e 160000 --- a/library/xml +++ b/library/xml @@ -1 +1 @@ -Subproject commit ffdf5771ea23e3b35f5f46624f773a555e1c450f +Subproject commit 50521daf0e6c01583532fa52452ab21acfb787e2