From 74ccb4d28b58d18b838b6b099ba6f7e5cb1de988 Mon Sep 17 00:00:00 2001 From: dalto Date: Sat, 2 Mar 2024 14:21:58 -0600 Subject: [PATCH 1/3] [calamares] Add Qt version to debug log --- src/calamares/CalamaresApplication.cpp | 1 + 1 file changed, 1 insertion(+) diff --git a/src/calamares/CalamaresApplication.cpp b/src/calamares/CalamaresApplication.cpp index c31979ce9..592bef57c 100644 --- a/src/calamares/CalamaresApplication.cpp +++ b/src/calamares/CalamaresApplication.cpp @@ -66,6 +66,7 @@ CalamaresApplication::init() { Logger::setupLogfile(); cDebug() << "Calamares version:" << CALAMARES_VERSION; + cDebug() << Logger::SubEntry << "Using Qt version:" << qVersion(); cDebug() << Logger::SubEntry << "Using settings:" << Calamares::Settings::instance()->path(); cDebug() << Logger::SubEntry << "Using log file:" << Logger::logFile(); cDebug() << Logger::SubEntry << "languages:" << Calamares::Locale::availableLanguages(); From 7fd9d48a20b2c0b251eefbea5198d53fcc60c329 Mon Sep 17 00:00:00 2001 From: dalto Date: Sat, 2 Mar 2024 14:52:16 -0600 Subject: [PATCH 2/3] [calamares] Add python integration type and build type to log --- src/calamares/CalamaresApplication.cpp | 8 +++++++- src/libcalamares/CalamaresConfig.h.in | 1 + 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/src/calamares/CalamaresApplication.cpp b/src/calamares/CalamaresApplication.cpp index 592bef57c..24edce555 100644 --- a/src/calamares/CalamaresApplication.cpp +++ b/src/calamares/CalamaresApplication.cpp @@ -67,9 +67,15 @@ CalamaresApplication::init() Logger::setupLogfile(); cDebug() << "Calamares version:" << CALAMARES_VERSION; cDebug() << Logger::SubEntry << "Using Qt version:" << qVersion(); + cDebug() << Logger::SubEntry << "Build type:" << CMAKE_BUILD_TYPE; +#ifdef WITH_PYBIND11 + cDebug() << Logger::SubEntry << "Using PyBind11"; +#elif WITH_BOOST_PYTHON + cDebug() << Logger::SubEntry << "Using Boost Python"; +#endif cDebug() << Logger::SubEntry << "Using settings:" << Calamares::Settings::instance()->path(); cDebug() << Logger::SubEntry << "Using log file:" << Logger::logFile(); - cDebug() << Logger::SubEntry << "languages:" << Calamares::Locale::availableLanguages(); + cDebug() << Logger::SubEntry << "Languages:" << Calamares::Locale::availableLanguages(); if ( !Calamares::Settings::instance() ) { diff --git a/src/libcalamares/CalamaresConfig.h.in b/src/libcalamares/CalamaresConfig.h.in index a1471f243..65a0354a8 100644 --- a/src/libcalamares/CalamaresConfig.h.in +++ b/src/libcalamares/CalamaresConfig.h.in @@ -15,6 +15,7 @@ #define CMAKE_INSTALL_FULL_LIBDIR "${CMAKE_INSTALL_FULL_LIBDIR}" #define CMAKE_INSTALL_FULL_DATADIR "${CMAKE_INSTALL_FULL_DATADIR}/calamares" #define CMAKE_INSTALL_FULL_SYSCONFDIR "${CMAKE_INSTALL_FULL_SYSCONFDIR}" +#define CMAKE_BUILD_TYPE "${CMAKE_BUILD_TYPE}" /* * These are feature-settings that affect consumers of Calamares From 9992cf25076bfe23d8cded00791dd0ba48d6a627 Mon Sep 17 00:00:00 2001 From: dalto Date: Sat, 2 Mar 2024 15:04:44 -0600 Subject: [PATCH 3/3] [calamares] Fir preprocessor directives --- src/calamares/CalamaresApplication.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/calamares/CalamaresApplication.cpp b/src/calamares/CalamaresApplication.cpp index 24edce555..09d3bfc7b 100644 --- a/src/calamares/CalamaresApplication.cpp +++ b/src/calamares/CalamaresApplication.cpp @@ -70,7 +70,8 @@ CalamaresApplication::init() cDebug() << Logger::SubEntry << "Build type:" << CMAKE_BUILD_TYPE; #ifdef WITH_PYBIND11 cDebug() << Logger::SubEntry << "Using PyBind11"; -#elif WITH_BOOST_PYTHON +#endif +#ifdef WITH_BOOST_PYTHON cDebug() << Logger::SubEntry << "Using Boost Python"; #endif cDebug() << Logger::SubEntry << "Using settings:" << Calamares::Settings::instance()->path();