Merge remote-tracking branch 'myk002/internal_scripts' into develop

develop
lethosor 2020-07-25 13:46:12 -04:00
commit 8137b43e57
No known key found for this signature in database
GPG Key ID: 76A269552F4F58C1
3 changed files with 5 additions and 2 deletions

@ -56,6 +56,7 @@ changelog.txt uses a syntax similar to RST, with a few special sequences:
## Lua
- Added a ``ref_target`` field to primitive field references, corresponding to the ``ref-target`` XML attribute
- Support for splitting scripts into multiple files without polluting the output of ``#DFHack ls``. Scripts can now add internal files to an ``scripts/internal`` folder.
## Ruby
- Updated ``item_find`` and ``building_find`` to use centralized logic that works on more screens

@ -317,7 +317,7 @@ static void listScripts(PluginManager *plug_mgr, std::map<string,string> &pset,
pset[key] = help;
}
}
else if (all && !files[i].empty() && files[i][0] != '.')
else if (all && !files[i].empty() && files[i][0] != '.' && files[i] != "internal")
{
listScripts(plug_mgr, pset, path+files[i]+"/", all, prefix+files[i]+"/");
}

@ -81,7 +81,9 @@ def check_file(fname):
def main():
"""Check that all DFHack scripts include documentation"""
err = 0
for root, _, files in os.walk(SCRIPT_PATH):
exclude = set(['internal'])
for root, dirs, files in os.walk(SCRIPT_PATH, topdown=True):
dirs[:] = [d for d in dirs if d not in exclude]
for f in files:
if f[-3:] in {'.rb', 'lua'}:
err += check_file(join(root, f))