diff options
| author | 2018-11-17 09:17:47 +0100 | |
|---|---|---|
| committer | 2018-11-24 23:21:03 +0000 | |
| commit | 7e4dccb26d06f3890a1afc512fb2386dfe25ddf2 (patch) | |
| tree | 4fdb82b380c8cde8164dda606d3c222c450dd307 | |
| parent | KVS away: Do not require connection for all-networks switch (diff) | |
| download | KVIrc-7e4dccb26d06f3890a1afc512fb2386dfe25ddf2.tar.gz KVIrc-7e4dccb26d06f3890a1afc512fb2386dfe25ddf2.tar.bz2 KVIrc-7e4dccb26d06f3890a1afc512fb2386dfe25ddf2.zip | |
Do not track Linux kernel version
of build system to make reproducible builds easier.
See https://reproducible-builds.org/ for why this is good.
| -rw-r--r-- | CMakeLists.txt | 2 | ||||
| -rw-r--r-- | cmake/kvi_sysbuildinfo.h.cmake | 2 | ||||
| -rw-r--r-- | src/kvilib/config/KviBuildInfo.cpp | 14 | ||||
| -rw-r--r-- | src/kvilib/config/KviBuildInfo.h | 16 | ||||
| -rw-r--r-- | src/modules/about/AboutDialog.cpp | 4 |
5 files changed, 0 insertions, 38 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index e39db3387..37dedf5c1 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -62,9 +62,7 @@ set(CMAKE_KVIRC_VERSION_RELEASE ${VERSION_RELEASE}) set(CMAKE_KVIRC_VERSION_CODENAME ${VERSION_CODENAME}) set(CMAKE_KVIRC_BUILD_COMMAND ${CMAKE_COMMAND}) set(CMAKE_KVIRC_BUILD_FLAGS) -set(CMAKE_KVIRC_BUILD_SYSTEM ${CMAKE_SYSTEM}) set(CMAKE_KVIRC_BUILD_SYSTEM_NAME ${CMAKE_SYSTEM_NAME}) -set(CMAKE_KVIRC_BUILD_SYSTEM_VERSION ${CMAKE_SYSTEM_VERSION}) set(CMAKE_KVIRC_BUILD_CPU ${CMAKE_SYSTEM_PROCESSOR}) set(CMAKE_KVIRC_BUILD_COMPILER ${CMAKE_CXX_COMPILER}) set(CMAKE_KVIRC_BUILD_COMPILER_FLAGS ${CMAKE_CXX_FLAGS}) diff --git a/cmake/kvi_sysbuildinfo.h.cmake b/cmake/kvi_sysbuildinfo.h.cmake index fbb68ba09..899413cbe 100644 --- a/cmake/kvi_sysbuildinfo.h.cmake +++ b/cmake/kvi_sysbuildinfo.h.cmake @@ -10,9 +10,7 @@ #define KVIRC_BUILD_DATE "${CMAKE_KVIRC_BUILD_DATE}" #define KVIRC_BUILD_COMMAND "${CMAKE_KVIRC_BUILD_COMMAND}" #define KVIRC_BUILD_FLAGS "${CMAKE_KVIRC_BUILD_FLAGS}" -#define KVIRC_BUILD_SYSTEM "${CMAKE_KVIRC_BUILD_SYSTEM}" #define KVIRC_BUILD_SYSTEM_NAME "${CMAKE_KVIRC_BUILD_SYSTEM_NAME}" -#define KVIRC_BUILD_SYSTEM_VERSION "${CMAKE_KVIRC_BUILD_SYSTEM_VERSION}" #define KVIRC_BUILD_CPU "${CMAKE_KVIRC_BUILD_CPU}" #define KVIRC_BUILD_COMPILER "${CMAKE_KVIRC_BUILD_COMPILER}" #define KVIRC_BUILD_COMPILER_FLAGS "${CMAKE_KVIRC_BUILD_COMPILER_FLAGS}" diff --git a/src/kvilib/config/KviBuildInfo.cpp b/src/kvilib/config/KviBuildInfo.cpp index f6aecc120..9c89961ce 100644 --- a/src/kvilib/config/KviBuildInfo.cpp +++ b/src/kvilib/config/KviBuildInfo.cpp @@ -118,11 +118,6 @@ namespace KviBuildInfo return QString(KVIRC_BUILD_FLAGS); } - QString buildSystem() - { - return QString(KVIRC_BUILD_SYSTEM); - } - QString buildSystemName() { #ifdef COMPILE_ON_WINDOWS @@ -132,15 +127,6 @@ namespace KviBuildInfo #endif } - QString buildSystemVersion() - { -#ifdef COMPILE_ON_WINDOWS - return QString(); -#else - return QString(KVIRC_BUILD_SYSTEM_VERSION); -#endif - } - QString buildCPU() { return QString(KVIRC_BUILD_CPU); diff --git a/src/kvilib/config/KviBuildInfo.h b/src/kvilib/config/KviBuildInfo.h index ceb3fbdd0..d6d2e4ea1 100644 --- a/src/kvilib/config/KviBuildInfo.h +++ b/src/kvilib/config/KviBuildInfo.h @@ -77,14 +77,6 @@ namespace KviBuildInfo extern KVILIB_API QString buildFlags(); /** - * \brief Returns a description of the system - * - * The system refers to the one used to build the KVIrc executable. - * \return QString - */ - extern KVILIB_API QString buildSystem(); - - /** * \brief Returns the name part of the system * * The system name refers to the one used to build the KVIrc executable. @@ -93,14 +85,6 @@ namespace KviBuildInfo extern KVILIB_API QString buildSystemName(); /** - * \brief Returns the version part of the system - * - * The system version refers to the one used to build the KVIrc executable. - * \return QString - */ - extern KVILIB_API QString buildSystemVersion(); - - /** * \brief Returns a description of the CPU * * The CPU refers to the one used to build the KVIrc executable. diff --git a/src/modules/about/AboutDialog.cpp b/src/modules/about/AboutDialog.cpp index 9eb1074dd..c1d33bd34 100644 --- a/src/modules/about/AboutDialog.cpp +++ b/src/modules/about/AboutDialog.cpp @@ -163,10 +163,6 @@ AboutDialog::AboutDialog() infoString += ": "; infoString += KviBuildInfo::buildRevision(); infoString += "<br>"; - infoString += __tr2qs_ctx("System name", "about"); - infoString += ": "; - infoString += KviBuildInfo::buildSystem(); - infoString += "<br>"; infoString += __tr2qs_ctx("CPU name", "about"); infoString += ": "; infoString += KviBuildInfo::buildCPU(); |
