From 8cce005fd534a316ae0dabdf01187a6040cc096c Mon Sep 17 00:00:00 2001 From: Andreas Suter Date: Fri, 21 May 2021 07:44:50 +0200 Subject: [PATCH] add info on how musrfit is compiled Debug or Release. --- cmake/config.h.in | 1 + src/any2many.cpp | 2 +- src/dump_header.cpp | 2 +- src/msr2data.cpp | 2 +- src/musrFT.cpp | 2 +- src/musrRootValidation.cpp | 2 +- src/musredit_qt5/musredit/PMusrEditAbout.cpp | 2 +- src/musredit_qt6/musredit/PMusrEditAbout.cpp | 2 +- src/musrfit.cpp | 2 +- src/musrt0.cpp | 2 +- src/musrview.cpp | 2 +- src/write_musrRoot_runHeader.cpp | 4 ++-- 12 files changed, 13 insertions(+), 12 deletions(-) diff --git a/cmake/config.h.in b/cmake/config.h.in index a7ec8219..1998b37f 100644 --- a/cmake/config.h.in +++ b/cmake/config.h.in @@ -2,6 +2,7 @@ #define PACKAGE_VERSION "@PROJECT_VERSION@" #define ROOT_VERSION_USED "@ROOT_VERSION@" +#define BUILD_TYPE "@CMAKE_BUILD_TYPE@" // define to 1 if minor ROOT6 version is >= 24 #define ROOT_GRTEQ_24 @ROOT_GRTEQ_24@ diff --git a/src/any2many.cpp b/src/any2many.cpp index 71a7ed6d..a0e80ae2 100644 --- a/src/any2many.cpp +++ b/src/any2many.cpp @@ -197,7 +197,7 @@ int main(int argc, char *argv[]) any2many_syntax(); else if (strstr(argv[1], "--v")) { #ifdef HAVE_CONFIG_H - std::cout << std::endl << "any2many version: " << PACKAGE_VERSION << ", git-branch: " << GIT_BRANCH << ", git-rev: " << GIT_CURRENT_SHA1 << ", ROOT version: " << ROOT_VERSION_USED << std::endl << std::endl; + std::cout << std::endl << "any2many version: " << PACKAGE_VERSION << ", git-branch: " << GIT_BRANCH << ", git-rev: " << GIT_CURRENT_SHA1 << " (" << BUILD_TYPE << "), ROOT version: " << ROOT_VERSION_USED << std::endl << std::endl; #else std::cout << std::endl << "any2many git-branch: " << GIT_BRANCH << ", git-rev: " << GIT_CURRENT_SHA1 << std::endl << std::endl; #endif diff --git a/src/dump_header.cpp b/src/dump_header.cpp index f106f46d..2fb7d1a2 100644 --- a/src/dump_header.cpp +++ b/src/dump_header.cpp @@ -776,7 +776,7 @@ int main(int argc, char *argv[]) return 0; } else if (!strcmp(argv[i], "--version") || !strcmp(argv[i], "-v")) { #ifdef HAVE_CONFIG_H - std::cout << std::endl << "dump_header version: " << PACKAGE_VERSION << ", git-branch: " << GIT_BRANCH << ", git-rev: " << GIT_CURRENT_SHA1 << ", ROOT version: " << ROOT_VERSION_USED << std::endl << std::endl; + std::cout << std::endl << "dump_header version: " << PACKAGE_VERSION << ", git-branch: " << GIT_BRANCH << ", git-rev: " << GIT_CURRENT_SHA1 << " (" << BUILD_TYPE << "), ROOT version: " << ROOT_VERSION_USED << std::endl << std::endl; #else std::cout << std::endl << "dump_header git-branch: " << GIT_BRANCH << ", git-rev: " << GIT_CURRENT_SHA1 << std::endl << std::endl; #endif diff --git a/src/msr2data.cpp b/src/msr2data.cpp index 0bc8ba60..04a653c3 100644 --- a/src/msr2data.cpp +++ b/src/msr2data.cpp @@ -512,7 +512,7 @@ int main(int argc, char *argv[]) return 0; } else if (!strcmp(argv[1], "--version")) { #ifdef HAVE_CONFIG_H - std::cout << std::endl << "msr2data version: " << PACKAGE_VERSION << ", git-branch: " << GIT_BRANCH << ", git-rev: " << GIT_CURRENT_SHA1 << ", ROOT version: " << ROOT_VERSION_USED << std::endl << std::endl; + std::cout << std::endl << "msr2data version: " << PACKAGE_VERSION << ", git-branch: " << GIT_BRANCH << ", git-rev: " << GIT_CURRENT_SHA1 << " (" << BUILD_TYPE << "), ROOT version: " << ROOT_VERSION_USED << std::endl << std::endl; #else std::cout << std::endl << "msr2data git-branch: " << GIT_BRANCH << ", git-rev: " << GIT_CURRENT_SHA1 << std::endl << std::endl; #endif diff --git a/src/musrFT.cpp b/src/musrFT.cpp index 83fd70e7..d716be70 100644 --- a/src/musrFT.cpp +++ b/src/musrFT.cpp @@ -297,7 +297,7 @@ Int_t musrFT_parse_options(Int_t argc, Char_t *argv[], musrFT_startup_param &sta tstr = argv[i]; if (tstr.BeginsWith("--version")) { #ifdef HAVE_CONFIG_H - std::cout << std::endl << "musrFT version: " << PACKAGE_VERSION << ", git-branch: " << GIT_BRANCH << ", git-rev: " << GIT_CURRENT_SHA1 << ", ROOT version: " << ROOT_VERSION_USED << std::endl << std::endl; + std::cout << std::endl << "musrFT version: " << PACKAGE_VERSION << ", git-branch: " << GIT_BRANCH << ", git-rev: " << GIT_CURRENT_SHA1 << " (" << BUILD_TYPE << "), ROOT version: " << ROOT_VERSION_USED << std::endl << std::endl; #else std::cout << std::endl << "musrFT git-branch: " << GIT_BRANCH << ", git-rev: " << GIT_CURRENT_SHA1 << std::endl << std::endl; #endif diff --git a/src/musrRootValidation.cpp b/src/musrRootValidation.cpp index cdd169fb..a7bc5ecb 100644 --- a/src/musrRootValidation.cpp +++ b/src/musrRootValidation.cpp @@ -574,7 +574,7 @@ int main(int argc, char *argv[]) } else if (argc==2) { if (!strcmp(argv[1], "--version")) { #ifdef HAVE_CONFIG_H - std::cout << std::endl << "musrRootValidation version: " << PACKAGE_VERSION << ", git-branch: " << GIT_BRANCH << ", git-rev: " << GIT_CURRENT_SHA1 << std::endl << std::endl; + std::cout << std::endl << "musrRootValidation version: " << PACKAGE_VERSION << ", git-branch: " << GIT_BRANCH << ", git-rev: " << GIT_CURRENT_SHA1 << " (" << BUILD_TYPE << "), ROOT version: " << ROOT_VERSION_USED << std::endl << std::endl; #else std::cout << std::endl << "musrRootValidation git-branch: " << GIT_BRANCH << ", git-rev: " << GIT_CURRENT_SHA1 << std::endl << std::endl; #endif diff --git a/src/musredit_qt5/musredit/PMusrEditAbout.cpp b/src/musredit_qt5/musredit/PMusrEditAbout.cpp index 831289dd..3f3718b1 100644 --- a/src/musredit_qt5/musredit/PMusrEditAbout.cpp +++ b/src/musredit_qt5/musredit/PMusrEditAbout.cpp @@ -41,7 +41,7 @@ PMusrEditAbout::PMusrEditAbout(QWidget *parent) : QDialog(parent) fGitBranch_label->setText(QString("git-branch: %1").arg(GIT_BRANCH)); fGitRev_label->setText(QString("git-rev: %1").arg(GIT_CURRENT_SHA1)); - fMusrfitVersion_label->setText(QString("musrfit-version: %1").arg(PACKAGE_VERSION)); + fMusrfitVersion_label->setText(QString("musrfit-version: %1 (%2)").arg(PACKAGE_VERSION).arg(BUILD_TYPE)); fRootVersion_label->setText(QString("ROOT-version: %1").arg(ROOT_VERSION_USED)); setModal(true); diff --git a/src/musredit_qt6/musredit/PMusrEditAbout.cpp b/src/musredit_qt6/musredit/PMusrEditAbout.cpp index 831289dd..3f3718b1 100644 --- a/src/musredit_qt6/musredit/PMusrEditAbout.cpp +++ b/src/musredit_qt6/musredit/PMusrEditAbout.cpp @@ -41,7 +41,7 @@ PMusrEditAbout::PMusrEditAbout(QWidget *parent) : QDialog(parent) fGitBranch_label->setText(QString("git-branch: %1").arg(GIT_BRANCH)); fGitRev_label->setText(QString("git-rev: %1").arg(GIT_CURRENT_SHA1)); - fMusrfitVersion_label->setText(QString("musrfit-version: %1").arg(PACKAGE_VERSION)); + fMusrfitVersion_label->setText(QString("musrfit-version: %1 (%2)").arg(PACKAGE_VERSION).arg(BUILD_TYPE)); fRootVersion_label->setText(QString("ROOT-version: %1").arg(ROOT_VERSION_USED)); setModal(true); diff --git a/src/musrfit.cpp b/src/musrfit.cpp index e082b403..6f861087 100644 --- a/src/musrfit.cpp +++ b/src/musrfit.cpp @@ -464,7 +464,7 @@ int main(int argc, char *argv[]) if (argc == 2) { if (!strcmp(argv[1], "--version")) { #ifdef HAVE_CONFIG_H - std::cout << std::endl << "musrfit version: " << PACKAGE_VERSION << ", git-branch: " << GIT_BRANCH << ", git-rev: " << GIT_CURRENT_SHA1 << ", ROOT version: " << ROOT_VERSION_USED << std::endl << std::endl; + std::cout << std::endl << "musrfit version: " << PACKAGE_VERSION << ", git-branch: " << GIT_BRANCH << ", git-rev: " << GIT_CURRENT_SHA1 << " (" << BUILD_TYPE << "), ROOT version: " << ROOT_VERSION_USED << std::endl << std::endl; #else std::cout << std::endl << "musrfit git-branch: " << GIT_BRANCH << ", git-rev: " << GIT_CURRENT_SHA1 << std::endl << std::endl; #endif diff --git a/src/musrt0.cpp b/src/musrt0.cpp index 81525c70..48529a98 100644 --- a/src/musrt0.cpp +++ b/src/musrt0.cpp @@ -237,7 +237,7 @@ Int_t main(Int_t argc, Char_t *argv[]) for (int i=1; i