MetzNet
/
dfhack
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

don't include dfhack-config/ in release tarball 

create it at runtime
move files around so no dfhack-owned files are in there
develop
Myk Taylor 2023-01-04 11:35:50 -08:00
parent d0fff7692e
commit c70c4131bd
No known key found for this signature in database
5 changed files with 38 additions and 48 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CMakeLists.txt
Unescape Escape View File

@ -448,8 +448,6 @@ endif()
file(WRITE "${CMAKE_BINARY_DIR}/dfhack_setarch.txt" ${DFHACK_SETARCH}) file(WRITE "${CMAKE_BINARY_DIR}/dfhack_setarch.txt" ${DFHACK_SETARCH})
install(FILES "${CMAKE_BINARY_DIR}/dfhack_setarch.txt" DESTINATION "${DFHACK_DATA_DESTINATION}") install(FILES "${CMAKE_BINARY_DIR}/dfhack_setarch.txt" DESTINATION "${DFHACK_DATA_DESTINATION}")
install(DIRECTORY dfhack-config/ DESTINATION dfhack-config/default)
# build the plugins # build the plugins
if(BUILD_PLUGINS) if(BUILD_PLUGINS)
add_subdirectory(plugins) add_subdirectory(plugins)

12
data/CMakeLists.txt
Unescape Escape View File

@ -1,23 +1,23 @@
install(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/dfhack-config/
DESTINATION "${DFHACK_DATA_DESTINATION}/data/dfhack-config-defaults")
install(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/init/ install(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/init/
DESTINATION "${DFHACK_DATA_DESTINATION}/init") DESTINATION "${DFHACK_DATA_DESTINATION}/init")
install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/base_command_counts.json install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/base_command_counts.json
DESTINATION "${DFHACK_DATA_DESTINATION}/data/base_command_counts.json") DESTINATION "${DFHACK_DATA_DESTINATION}/data")
install(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/quickfort/ install(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/quickfort/
DESTINATION "${DFHACK_DATA_DESTINATION}/data/quickfort") DESTINATION "${DFHACK_DATA_DESTINATION}/data/quickfort")
install(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/orders/ install(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/orders/
DESTINATION dfhack-config/orders/library) DESTINATION "${DFHACK_DATA_DESTINATION}/data/orders")
install(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/art/ install(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/art/
DESTINATION "${DFHACK_DATA_DESTINATION}/data/art") DESTINATION "${DFHACK_DATA_DESTINATION}/data/art")
install(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/examples/
DESTINATION "${DFHACK_DATA_DESTINATION}/examples")
install(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/professions/ install(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/professions/
DESTINATION dfhack-config/professions/library) DESTINATION "${DFHACK_DATA_DESTINATION}/data/professions")
install(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/blueprints/ install(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/blueprints/
DESTINATION blueprints DESTINATION blueprints

0
data/examples/init/onMapLoad_dreamfort.init → data/dfhack-config/init/examples/onMapLoad_dreamfort.init
Unescape Escape View File

9
data/examples/README.md
Unescape Escape View File

@ -1,9 +0,0 @@
# The DFHack Example Configuration File Library
This folder contains ready-to-use examples of various DFHack configuration
files. You can use them by copying them to appropriate folders where DFHack
and its plugins can find them. You can use them unmodified, or you can
customize them to better suit your preferences.
For information on each of the files in this library, see the
[DFHack Example Configuration File Guide](https://docs.dfhack.org/en/stable/docs/guides/examples-guide.html).

63
library/Core.cpp
Unescape Escape View File

@ -106,6 +106,9 @@ namespace DFHack {
DBG_DECLARE(core,keybinding,DebugCategory::LINFO); DBG_DECLARE(core,keybinding,DebugCategory::LINFO);
DBG_DECLARE(core,script,DebugCategory::LINFO); DBG_DECLARE(core,script,DebugCategory::LINFO);
static const std::string CONFIG_PATH = "dfhack-config/";
static const std::string CONFIG_DEFAULTS_PATH = "hack/data/dfhack-config-defaults/";
class MainThread { class MainThread {
public: public:
//! MainThread::suspend keeps the main DF thread suspended from Core::Init to //! MainThread::suspend keeps the main DF thread suspended from Core::Init to
@ -486,10 +489,10 @@ void Core::getScriptPaths(std::vector<std::string> *dest)
{ {
lock_guard<mutex> lock(script_path_mutex); lock_guard<mutex> lock(script_path_mutex);
dest->clear(); dest->clear();
string df_path = this->p->getPath(); string df_path = this->p->getPath() + "/";
for (auto it = script_paths[0].begin(); it != script_paths[0].end(); ++it) for (auto it = script_paths[0].begin(); it != script_paths[0].end(); ++it)
dest->push_back(*it); dest->push_back(*it);
dest->push_back(df_path + "/dfhack-config/scripts"); dest->push_back(df_path + CONFIG_PATH + "scripts");
if (df::global::world && isWorldLoaded()) { if (df::global::world && isWorldLoaded()) {
string save = World::ReadWorldFolder(); string save = World::ReadWorldFolder();
if (save.size()) if (save.size())
@ -518,7 +521,7 @@ string Core::findScript(string name)
bool loadScriptPaths(color_ostream &out, bool silent = false) bool loadScriptPaths(color_ostream &out, bool silent = false)
{ {
using namespace std; using namespace std;
string filename("dfhack-config/script-paths.txt"); string filename(CONFIG_PATH + "script-paths.txt");
ifstream file(filename); ifstream file(filename);
if (!file) if (!file)
{ {
@ -1311,11 +1314,11 @@ static void run_dfhack_init(color_ostream &out, Core *core)
} }
// load baseline defaults // load baseline defaults
core->loadScriptFile(out, "dfhack-config/init/default.dfhack.init", false); core->loadScriptFile(out, CONFIG_PATH + "init/default.dfhack.init", false);
// load user overrides // load user overrides
std::vector<std::string> prefixes(1, "dfhack"); std::vector<std::string> prefixes(1, "dfhack");
loadScriptFiles(core, out, prefixes, "dfhack-config/init"); loadScriptFiles(core, out, prefixes, CONFIG_PATH + "init");
} }
// Load dfhack.init in a dedicated thread (non-interactive console mode) // Load dfhack.init in a dedicated thread (non-interactive console mode)
@ -1331,14 +1334,14 @@ void fInitthread(void * iodata)
// A thread function... for the interactive console. // A thread function... for the interactive console.
void fIOthread(void * iodata) void fIOthread(void * iodata)
{ {
static const char * HISTORY_FILE = "dfhack-config/dfhack.history"; static const std::string HISTORY_FILE = CONFIG_PATH + "dfhack.history";
IODATA * iod = ((IODATA*) iodata); IODATA * iod = ((IODATA*) iodata);
Core * core = iod->core; Core * core = iod->core;
PluginManager * plug_mgr = ((IODATA*) iodata)->plug_mgr; PluginManager * plug_mgr = ((IODATA*) iodata)->plug_mgr;
CommandHistory main_history; CommandHistory main_history;
main_history.load(HISTORY_FILE); main_history.load(HISTORY_FILE.c_str());
Console & con = core->getConsole(); Console & con = core->getConsole();
if (plug_mgr == 0) if (plug_mgr == 0)
@ -1379,7 +1382,7 @@ void fIOthread(void * iodata)
{ {
// a proper, non-empty command was entered // a proper, non-empty command was entered
main_history.add(command); main_history.add(command);
main_history.save(HISTORY_FILE); main_history.save(HISTORY_FILE.c_str());
} }
auto rv = core->runCommand(con, command); auto rv = core->runCommand(con, command);
@ -1614,46 +1617,44 @@ bool Core::Init()
// initialize data defs // initialize data defs
virtual_identity::Init(this); virtual_identity::Init(this);
// create config directory if it doesn't already exist
if (!Filesystem::mkdir_recursive(CONFIG_PATH))
con.printerr("Failed to create config directory: '%s'\n", CONFIG_PATH.c_str());
// copy over default config files if necessary // copy over default config files if necessary
std::map<std::string, bool> config_files; std::map<std::string, bool> config_files;
std::map<std::string, bool> default_config_files; std::map<std::string, bool> default_config_files;
if (Filesystem::listdir_recursive("dfhack-config", config_files, 10, false) != 0) if (Filesystem::listdir_recursive(CONFIG_PATH, config_files, 10, false) != 0)
con.printerr("Failed to list directory: dfhack-config"); con.printerr("Failed to list directory: '%s'\n", CONFIG_PATH.c_str());
else if (Filesystem::listdir_recursive("dfhack-config/default", default_config_files, 10, false) != 0) else if (Filesystem::listdir_recursive(CONFIG_DEFAULTS_PATH, default_config_files, 10, false) != 0)
con.printerr("Failed to list directory: dfhack-config/default"); con.printerr("Failed to list directory: '%s'\n", CONFIG_DEFAULTS_PATH.c_str());
else else
{ {
// ensure all config file directories exist before we start copying files // ensure all config file directories exist before we start copying files
for (auto it = default_config_files.begin(); it != default_config_files.end(); ++it) for (auto &entry : default_config_files) {
{
// skip over files // skip over files
if (!it->second) if (!entry.second)
continue; continue;
std::string dirname = "dfhack-config/" + it->first; std::string dirname = CONFIG_PATH + entry.first;
if (!Filesystem::mkdir_recursive(dirname)) if (!Filesystem::mkdir_recursive(dirname))
{
con.printerr("Failed to create config directory: '%s'\n", dirname.c_str()); con.printerr("Failed to create config directory: '%s'\n", dirname.c_str());
} }
}
// copy files from the default tree that don't already exist in the config tree // copy files from the default tree that don't already exist in the config tree
for (auto it = default_config_files.begin(); it != default_config_files.end(); ++it) for (auto &entry : default_config_files) {
{
// skip over directories // skip over directories
if (it->second) if (entry.second)
continue; continue;
std::string filename = it->first; std::string filename = entry.first;
if (config_files.find(filename) == config_files.end()) if (!config_files.count(filename)) {
{ std::string src_file = CONFIG_DEFAULTS_PATH + filename;
std::string src_file = std::string("dfhack-config/default/") + filename;
if (!Filesystem::isfile(src_file)) if (!Filesystem::isfile(src_file))
continue; continue;
std::string dest_file = std::string("dfhack-config/") + filename; std::string dest_file = CONFIG_PATH + filename;
std::ifstream src(src_file, std::ios::binary); std::ifstream src(src_file, std::ios::binary);
std::ofstream dest(dest_file, std::ios::binary); std::ofstream dest(dest_file, std::ios::binary);
if (!src.good() || !dest.good()) if (!src.good() || !dest.good()) {
{ con.printerr("Copy failed: '%s'\n", filename.c_str());
con.printerr("Copy failed: %s\n", filename.c_str());
continue; continue;
} }
dest << src.rdbuf(); dest << src.rdbuf();
@ -2090,9 +2091,9 @@ void Core::handleLoadAndUnloadScripts(color_ostream& out, state_change_event eve
const std::vector<std::string>& set = i->second; const std::vector<std::string>& set = i->second;
// load baseline defaults // load baseline defaults
this->loadScriptFile(out, "dfhack-config/init/default." + set[0] + ".init", false); this->loadScriptFile(out, CONFIG_PATH + "init/default." + set[0] + ".init", false);
loadScriptFiles(this, out, set, "dfhack-config/init"); loadScriptFiles(this, out, set, CONFIG_PATH + "init");
loadScriptFiles(this, out, set, rawFolder); loadScriptFiles(this, out, set, rawFolder);
loadScriptFiles(this, out, set, rawFolder + "objects/"); loadScriptFiles(this, out, set, rawFolder + "objects/");
} }