diff --git a/sources/queued-daemon/src/main.cpp b/sources/queued-daemon/src/main.cpp index c9fcdea..f77e135 100644 --- a/sources/queued-daemon/src/main.cpp +++ b/sources/queued-daemon/src/main.cpp @@ -88,15 +88,15 @@ int main(int argc, char *argv[]) // show info and exit if (parser.isSet(infoOption)) { - QueuedDebug::enableDebug(); auto metadata = QueuedDebug::getBuildData(); for (auto &string : metadata) - qCInfo(LOG_APP) << string; + QDebug(QtMsgType::QtInfoMsg).noquote() << string; + return 1; } // check if exists if (existingSessionOperation(QString("Active"))) { - qCWarning(LOG_APP) << "Another session is active"; + qWarning() << "Another session is active"; return 1; } diff --git a/sources/queued/src/QueuedDebug.cpp b/sources/queued/src/QueuedDebug.cpp index 48e8519..44bf1be 100644 --- a/sources/queued/src/QueuedDebug.cpp +++ b/sources/queued/src/QueuedDebug.cpp @@ -50,5 +50,81 @@ QStringList QueuedDebug::getBuildData() { QStringList metadata; + // general information + metadata += "Build details"; + metadata += QString("\tVERSION: %1").arg(VERSION); + metadata += QString("\tCOMMIT_SHA: %1").arg(COMMIT_SHA); + metadata += QString("\tBUILD_DATE: %1").arg(BUILD_DATE); + + // api + metadata += "API"; + metadata += QString("\tDATABASE_VERSION: %1") + .arg(QueuedConfig::DATABASE_VERSION); + metadata += QString("\tPLUGIN_INTERFACE: %1") + .arg(QueuedConfig::PLUGIN_INTERFACE); + + // paths + metadata += "Paths"; + metadata + += QString("\tBIN_INSTALL_DIR: %1").arg(QueuedConfig::BIN_INSTALL_DIR); + metadata += QString("\tDATA_INSTALL_DIR: %1") + .arg(QueuedConfig::DATA_INSTALL_DIR); + metadata += QString("\tINCLUDE_INSTALL_DIR: %1") + .arg(QueuedConfig::INCLUDE_INSTALL_DIR); + metadata + += QString("\tLIB_INSTALL_DIR: %1").arg(QueuedConfig::LIB_INSTALL_DIR); + metadata += QString("\tROOT_INSTALL_DIR: %1") + .arg(QueuedConfig::ROOT_INSTALL_DIR); + metadata += QString("\tHOME_PATH: %1").arg(QueuedConfig::HOME_PATH); + metadata += QString("\tPLUGIN_PATH: %1").arg(QueuedConfig::PLUGIN_PATH); + + // dbus + metadata += "DBus"; + metadata += QString("\tDBUS_SERVICE: %1").arg(QueuedConfig::DBUS_SERVICE); + metadata += QString("\tDBUS_APPLICATION_PATH: %1") + .arg(QueuedConfig::DBUS_APPLICATION_PATH); + metadata += QString("\tDBUS_OBJECT_PATH: %1") + .arg(QueuedConfig::DBUS_OBJECT_PATH); + metadata += QString("\tDBUS_PROPERTY_PATH: %1") + .arg(QueuedConfig::DBUS_PROPERTY_PATH); + + // cmake build information + metadata += "Cmake properties"; + metadata += QString("\tCMAKE_BUILD_TYPE: %1").arg(CMAKE_BUILD_TYPE); + metadata += QString("\tCMAKE_CXX_COMPILER: %1").arg(CMAKE_CXX_COMPILER); + metadata += QString("\tCMAKE_CXX_FLAGS: %1").arg(CMAKE_CXX_FLAGS); + metadata + += QString("\tCMAKE_CXX_FLAGS_DEBUG: %1").arg(CMAKE_CXX_FLAGS_DEBUG); + metadata += QString("\tCMAKE_CXX_FLAGS_RELEASE: %1") + .arg(CMAKE_CXX_FLAGS_RELEASE); + metadata += QString("\tCMAKE_CXX_FLAGS_OPTIMIZATION: %1") + .arg(CMAKE_CXX_FLAGS_OPTIMIZATION); + metadata += QString("\tCMAKE_DEFINITIONS: %1").arg(CMAKE_DEFINITIONS); + metadata += QString("\tCMAKE_INSTALL_PREFIX: %1").arg(CMAKE_INSTALL_PREFIX); + metadata += QString("\tCMAKE_MODULE_LINKER_FLAGS: %1") + .arg(CMAKE_MODULE_LINKER_FLAGS); + metadata += QString("\tCMAKE_SHARED_LINKER_FLAGS: %1") + .arg(CMAKE_SHARED_LINKER_FLAGS); + + // components + metadata += "Components"; + metadata += QString("\tBUILD_DEB_PACKAGE: %1").arg(BUILD_DEB_PACKAGE); + metadata += QString("\tBUILD_RPM_PACKAGE: %1").arg(BUILD_RPM_PACKAGE); + metadata + += QString("\tCLANGFORMAT_EXECUTABLE: %1").arg(CLANGFORMAT_EXECUTABLE); + metadata += QString("\tCOVERITY_COMMENT: %1").arg(COVERITY_COMMENT); + metadata += QString("\tCOVERITY_DIRECTORY: %1").arg(COVERITY_DIRECTORY); + metadata += QString("\tCOVERITY_EMAIL: %1").arg(COVERITY_EMAIL); + metadata += QString("\tCOVERITY_EXECUTABLE: %1").arg(COVERITY_EXECUTABLE); + metadata += QString("\tCOVERITY_URL: %1").arg(COVERITY_URL); + metadata += QString("\tCPPCHECK_EXECUTABLE: %1").arg(CPPCHECK_EXECUTABLE); + + // additional properties + metadata += "Additional properties"; + metadata += QString("\tPROP_DOCS: %1").arg(PROP_DOCS); + metadata += QString("\tPROP_FUTURE: %1").arg(PROP_FUTURE); + metadata += QString("\tPROP_LOAD: %1").arg(PROP_LOAD); + metadata += QString("\tPROP_TEST: %1").arg(PROP_TEST); + return metadata; } diff --git a/sources/version.h.in b/sources/version.h.in index 726b76b..cedf0e2 100644 --- a/sources/version.h.in +++ b/sources/version.h.in @@ -19,13 +19,6 @@ const char SPECIAL_THANKS[] = ""; #cmakedefine BUILD_LOAD #cmakedefine BUILD_TESTING -// paths -const char BIN_INSTALL_DIR[] = "@BIN_INSTALL_DIR@"; -const char DATA_INSTALL_DIR[] = "@DATA_INSTALL_DIR@"; -const char INCLUDE_INSTALL_DIR[] = "@INCLUDE_INSTALL_DIR@"; -const char LIB_INSTALL_DIR[] = "@LIB_INSTALL_DIR@"; -const char ROOT_INSTALL_DIR[] = "@CMAKE_INSTALL_PREFIX@"; - // links const char HOMEPAGE[] = "https://arcanis.me/projects/queued"; const char REPOSITORY[] = "https://github.com/arcan1s/queued"; @@ -37,7 +30,6 @@ const char BUGTRACKER_API[] = "https://arcanis.me/repos/arcan1s/queued/issues"; // build information const char BUILD_DATE[] = "@CURRENT_DATE@"; -const char DATE[] = "2013-@CURRENT_YEAR@"; // cmake properties const char CMAKE_BUILD_TYPE[] = "@CMAKE_BUILD_TYPE@";