diff options
| -rw-r--r-- | ctor.cc | 40 | ||||
| m--------- | libctor | 0 |
2 files changed, 21 insertions, 19 deletions
@@ -1,23 +1,25 @@ // -*- c++ -*- -#include <libctor.h> +#include <ctor.h> #include <filesystem> #include <iostream> #include <string> #include <vector> -int execute(const std::string& command, - const std::vector<std::string>& args, - bool verbose = true); +int execute(const ctor::settings& settings, + const std::string& command, + const std::vector<std::string>& args = {}, + const std::map<std::string, std::string>& env = {}, + bool terminate = false); namespace { -BuildConfigurations myConfigs(const Settings& settings) +ctor::build_configurations myConfigs(const ctor::settings& settings) { // // Qookie main application // - BuildConfiguration qookie = + ctor::build_configuration qookie = { .target = "qookie", // output filename .sources = { @@ -29,9 +31,9 @@ BuildConfigurations myConfigs(const Settings& settings) "src/mainwindow.cc", "src/viewer.cc", "src/client.cc", - settings.builddir + "/moc_mainwindow.cc", - settings.builddir + "/moc_viewer.cc", - settings.builddir + "/moc_client.cc", + {settings.builddir + "/moc_mainwindow.cc"}, + {settings.builddir + "/moc_viewer.cc"}, + {settings.builddir + "/moc_client.cc"}, }, .flags = { .cxxflags = { @@ -47,7 +49,7 @@ BuildConfigurations myConfigs(const Settings& settings) // // Moc generation for all configurations // - BuildConfiguration mocs = + ctor::build_configuration mocs = { .sources = { { "src/mainwindow.h", "moc_mainwindow.cc"}, @@ -57,23 +59,23 @@ BuildConfigurations myConfigs(const Settings& settings) }, .function = [](const std::string& input, const std::string& output, - const BuildConfiguration& config, - const Settings& settings) + const ctor::build_configuration& config, + const ctor::settings& settings) { - return execute("/usr/bin/moc", {"-I../src", "-o", output, input}, - settings.verbose > 0); + return execute(settings, "/usr/bin/moc", + {"-I../src", "-o", output, input}); } }; // // Qookie-cast client // - BuildConfiguration qookie_cast_client = + ctor::build_configuration qookie_cast_client = { .target = "qookie-cast-client", // output filename .sources = { "src/qookie-cast-client.cc", - settings.builddir + "/moc_qookie-cast-client.cc", + {settings.builddir + "/moc_qookie-cast-client.cc"}, }, .flags = { .cxxflags = { @@ -89,13 +91,13 @@ BuildConfigurations myConfigs(const Settings& settings) return { qookie, mocs, qookie_cast_client }; } -ExternalConfigurations ctorExtConfigs(const Settings& settings) +ctor::external_configurations ctorExtConfigs(const ctor::settings& settings) { return { { .name = "qt", - .external = ExternalManual{ + .external = ctor::external_manual{ .flags = { .cxxflags = { "-I/usr/include/qt5", @@ -111,7 +113,7 @@ ExternalConfigurations ctorExtConfigs(const Settings& settings) }, { .name = "sqlite", - .external = ExternalManual{ + .external = ctor::external_manual{ .flags = { .ldflags = { "-lsqlite3", diff --git a/libctor b/libctor -Subproject 7a16146600384272baf7fb2fc0fc64f59b17ffe +Subproject f4b6372c1fe8d48aceb853272e0b822b967a56d |