mirror of
https://github.com/dashpay/dash.git
synced 2024-12-25 03:52:49 +01:00
Merge pull request #4817 from UdjinM6/drop_0
build: switch to classical `major.minor.patch` semver
This commit is contained in:
parent
72d53af11a
commit
1d2c9da931
@ -1,14 +1,13 @@
|
|||||||
AC_PREREQ([2.69])
|
AC_PREREQ([2.69])
|
||||||
define(_CLIENT_VERSION_MAJOR, 18)
|
define(_CLIENT_VERSION_MAJOR, 18)
|
||||||
define(_CLIENT_VERSION_MINOR, 0)
|
define(_CLIENT_VERSION_MINOR, 0)
|
||||||
define(_CLIENT_VERSION_REVISION, 0)
|
|
||||||
define(_CLIENT_VERSION_BUILD, 0)
|
define(_CLIENT_VERSION_BUILD, 0)
|
||||||
define(_CLIENT_VERSION_RC, 3)
|
define(_CLIENT_VERSION_RC, 3)
|
||||||
define(_CLIENT_VERSION_IS_RELEASE, false)
|
define(_CLIENT_VERSION_IS_RELEASE, false)
|
||||||
define(_COPYRIGHT_YEAR, 2021)
|
define(_COPYRIGHT_YEAR, 2021)
|
||||||
define(_COPYRIGHT_HOLDERS,[The %s developers])
|
define(_COPYRIGHT_HOLDERS,[The %s developers])
|
||||||
define(_COPYRIGHT_HOLDERS_SUBSTITUTION,[[Dash Core]])
|
define(_COPYRIGHT_HOLDERS_SUBSTITUTION,[[Dash Core]])
|
||||||
AC_INIT([Dash Core],m4_join([.], _CLIENT_VERSION_MAJOR, _CLIENT_VERSION_MINOR, _CLIENT_VERSION_REVISION, m4_if(_CLIENT_VERSION_BUILD, [0], [], _CLIENT_VERSION_BUILD))m4_if(_CLIENT_VERSION_RC, [0], [], [rc]_CLIENT_VERSION_RC),[https://github.com/dashpay/dash/issues],[dashcore],[https://dash.org/])
|
AC_INIT([Dash Core],m4_join([.], _CLIENT_VERSION_MAJOR, _CLIENT_VERSION_MINOR, _CLIENT_VERSION_BUILD)m4_if(_CLIENT_VERSION_RC, [0], [], [rc]_CLIENT_VERSION_RC),[https://github.com/dashpay/dash/issues],[dashcore],[https://dash.org/])
|
||||||
AC_CONFIG_SRCDIR([src/validation.cpp])
|
AC_CONFIG_SRCDIR([src/validation.cpp])
|
||||||
AC_CONFIG_HEADERS([src/config/dash-config.h])
|
AC_CONFIG_HEADERS([src/config/dash-config.h])
|
||||||
AC_CONFIG_AUX_DIR([build-aux])
|
AC_CONFIG_AUX_DIR([build-aux])
|
||||||
@ -1827,7 +1826,6 @@ AM_CONDITIONAL([WORDS_BIGENDIAN],[test x$ac_cv_c_bigendian = xyes])
|
|||||||
|
|
||||||
AC_DEFINE(CLIENT_VERSION_MAJOR, _CLIENT_VERSION_MAJOR, [Major version])
|
AC_DEFINE(CLIENT_VERSION_MAJOR, _CLIENT_VERSION_MAJOR, [Major version])
|
||||||
AC_DEFINE(CLIENT_VERSION_MINOR, _CLIENT_VERSION_MINOR, [Minor version])
|
AC_DEFINE(CLIENT_VERSION_MINOR, _CLIENT_VERSION_MINOR, [Minor version])
|
||||||
AC_DEFINE(CLIENT_VERSION_REVISION, _CLIENT_VERSION_REVISION, [Build revision])
|
|
||||||
AC_DEFINE(CLIENT_VERSION_BUILD, _CLIENT_VERSION_BUILD, [Version Build])
|
AC_DEFINE(CLIENT_VERSION_BUILD, _CLIENT_VERSION_BUILD, [Version Build])
|
||||||
AC_DEFINE(CLIENT_VERSION_IS_RELEASE, _CLIENT_VERSION_IS_RELEASE, [Version is release])
|
AC_DEFINE(CLIENT_VERSION_IS_RELEASE, _CLIENT_VERSION_IS_RELEASE, [Version is release])
|
||||||
AC_DEFINE(COPYRIGHT_YEAR, _COPYRIGHT_YEAR, [Copyright year])
|
AC_DEFINE(COPYRIGHT_YEAR, _COPYRIGHT_YEAR, [Copyright year])
|
||||||
@ -1837,7 +1835,6 @@ define(_COPYRIGHT_HOLDERS_FINAL, [patsubst(_COPYRIGHT_HOLDERS, [%s], [_COPYRIGHT
|
|||||||
AC_DEFINE(COPYRIGHT_HOLDERS_FINAL, "_COPYRIGHT_HOLDERS_FINAL", [Copyright holder(s)])
|
AC_DEFINE(COPYRIGHT_HOLDERS_FINAL, "_COPYRIGHT_HOLDERS_FINAL", [Copyright holder(s)])
|
||||||
AC_SUBST(CLIENT_VERSION_MAJOR, _CLIENT_VERSION_MAJOR)
|
AC_SUBST(CLIENT_VERSION_MAJOR, _CLIENT_VERSION_MAJOR)
|
||||||
AC_SUBST(CLIENT_VERSION_MINOR, _CLIENT_VERSION_MINOR)
|
AC_SUBST(CLIENT_VERSION_MINOR, _CLIENT_VERSION_MINOR)
|
||||||
AC_SUBST(CLIENT_VERSION_REVISION, _CLIENT_VERSION_REVISION)
|
|
||||||
AC_SUBST(CLIENT_VERSION_BUILD, _CLIENT_VERSION_BUILD)
|
AC_SUBST(CLIENT_VERSION_BUILD, _CLIENT_VERSION_BUILD)
|
||||||
AC_SUBST(CLIENT_VERSION_IS_RELEASE, _CLIENT_VERSION_IS_RELEASE)
|
AC_SUBST(CLIENT_VERSION_IS_RELEASE, _CLIENT_VERSION_IS_RELEASE)
|
||||||
AC_SUBST(COPYRIGHT_YEAR, _COPYRIGHT_YEAR)
|
AC_SUBST(COPYRIGHT_YEAR, _COPYRIGHT_YEAR)
|
||||||
|
@ -1,5 +1,5 @@
|
|||||||
---
|
---
|
||||||
name: "dash-linux-18.0"
|
name: "dash-linux-18"
|
||||||
enable_cache: true
|
enable_cache: true
|
||||||
distro: "ubuntu"
|
distro: "ubuntu"
|
||||||
suites:
|
suites:
|
||||||
|
@ -1,5 +1,5 @@
|
|||||||
---
|
---
|
||||||
name: "dash-osx-18.0"
|
name: "dash-osx-18"
|
||||||
enable_cache: true
|
enable_cache: true
|
||||||
distro: "ubuntu"
|
distro: "ubuntu"
|
||||||
suites:
|
suites:
|
||||||
|
@ -1,5 +1,5 @@
|
|||||||
---
|
---
|
||||||
name: "dash-win-18.0"
|
name: "dash-win-18"
|
||||||
enable_cache: true
|
enable_cache: true
|
||||||
distro: "ubuntu"
|
distro: "ubuntu"
|
||||||
suites:
|
suites:
|
||||||
|
@ -17,10 +17,10 @@
|
|||||||
<string>APPL</string>
|
<string>APPL</string>
|
||||||
|
|
||||||
<key>CFBundleShortVersionString</key>
|
<key>CFBundleShortVersionString</key>
|
||||||
<string>@CLIENT_VERSION_MAJOR@.@CLIENT_VERSION_MINOR@.@CLIENT_VERSION_REVISION@.@CLIENT_VERSION_BUILD@</string>
|
<string>@CLIENT_VERSION_MAJOR@.@CLIENT_VERSION_MINOR@.@CLIENT_VERSION_BUILD@</string>
|
||||||
|
|
||||||
<key>CFBundleVersion</key>
|
<key>CFBundleVersion</key>
|
||||||
<string>@CLIENT_VERSION_MAJOR@.@CLIENT_VERSION_MINOR@.@CLIENT_VERSION_REVISION@.@CLIENT_VERSION_BUILD@</string>
|
<string>@CLIENT_VERSION_MAJOR@.@CLIENT_VERSION_MINOR@.@CLIENT_VERSION_BUILD@</string>
|
||||||
|
|
||||||
<key>CFBundleSignature</key>
|
<key>CFBundleSignature</key>
|
||||||
<string>????</string>
|
<string>????</string>
|
||||||
|
@ -51,7 +51,7 @@ CRCCheck on
|
|||||||
XPStyle on
|
XPStyle on
|
||||||
BrandingText " "
|
BrandingText " "
|
||||||
ShowInstDetails show
|
ShowInstDetails show
|
||||||
VIProductVersion @CLIENT_VERSION_MAJOR@.@CLIENT_VERSION_MINOR@.@CLIENT_VERSION_REVISION@.@CLIENT_VERSION_BUILD@
|
VIProductVersion @CLIENT_VERSION_MAJOR@.@CLIENT_VERSION_MINOR@.@CLIENT_VERSION_BUILD@.0
|
||||||
VIAddVersionKey ProductName "@PACKAGE_NAME@"
|
VIAddVersionKey ProductName "@PACKAGE_NAME@"
|
||||||
VIAddVersionKey ProductVersion "@PACKAGE_VERSION@"
|
VIAddVersionKey ProductVersion "@PACKAGE_VERSION@"
|
||||||
VIAddVersionKey CompanyName "${COMPANY}"
|
VIAddVersionKey CompanyName "${COMPANY}"
|
||||||
|
@ -30,8 +30,7 @@ const std::string CLIENT_NAME("Dash Core");
|
|||||||
#define BUILD_DESC BUILD_GIT_TAG
|
#define BUILD_DESC BUILD_GIT_TAG
|
||||||
#define BUILD_SUFFIX ""
|
#define BUILD_SUFFIX ""
|
||||||
#else
|
#else
|
||||||
#define BUILD_DESC "v" STRINGIZE(CLIENT_VERSION_MAJOR) "." STRINGIZE(CLIENT_VERSION_MINOR) \
|
#define BUILD_DESC "v" STRINGIZE(CLIENT_VERSION_MAJOR) "." STRINGIZE(CLIENT_VERSION_MINOR) "." STRINGIZE(CLIENT_VERSION_BUILD)
|
||||||
"." STRINGIZE(CLIENT_VERSION_REVISION) "." STRINGIZE(CLIENT_VERSION_BUILD)
|
|
||||||
#ifdef BUILD_GIT_COMMIT
|
#ifdef BUILD_GIT_COMMIT
|
||||||
#define BUILD_SUFFIX "-" BUILD_GIT_COMMIT
|
#define BUILD_SUFFIX "-" BUILD_GIT_COMMIT
|
||||||
#elif defined(GIT_COMMIT_ID)
|
#elif defined(GIT_COMMIT_ID)
|
||||||
@ -45,7 +44,7 @@ const std::string CLIENT_BUILD(BUILD_DESC BUILD_SUFFIX);
|
|||||||
|
|
||||||
std::string FormatVersion(int nVersion)
|
std::string FormatVersion(int nVersion)
|
||||||
{
|
{
|
||||||
return strprintf("%d.%d.%d.%d", nVersion / 1000000, (nVersion / 10000) % 100, (nVersion / 100) % 100, nVersion % 100);
|
return strprintf("%d.%d.%d", nVersion / 10000, (nVersion / 100) % 100, nVersion % 100);
|
||||||
}
|
}
|
||||||
|
|
||||||
std::string FormatFullVersion()
|
std::string FormatFullVersion()
|
||||||
|
@ -10,7 +10,7 @@
|
|||||||
#endif //HAVE_CONFIG_H
|
#endif //HAVE_CONFIG_H
|
||||||
|
|
||||||
// Check that required client information is defined
|
// Check that required client information is defined
|
||||||
#if !defined(CLIENT_VERSION_MAJOR) || !defined(CLIENT_VERSION_MINOR) || !defined(CLIENT_VERSION_REVISION) || !defined(CLIENT_VERSION_BUILD) || !defined(CLIENT_VERSION_IS_RELEASE) || !defined(COPYRIGHT_YEAR)
|
#if !defined(CLIENT_VERSION_MAJOR) || !defined(CLIENT_VERSION_MINOR) || !defined(CLIENT_VERSION_BUILD) || !defined(CLIENT_VERSION_IS_RELEASE) || !defined(COPYRIGHT_YEAR)
|
||||||
#error Client version information missing: version is not defined by dash-config.h or in any other way
|
#error Client version information missing: version is not defined by dash-config.h or in any other way
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
@ -36,9 +36,8 @@
|
|||||||
#include <vector>
|
#include <vector>
|
||||||
|
|
||||||
static const int CLIENT_VERSION =
|
static const int CLIENT_VERSION =
|
||||||
1000000 * CLIENT_VERSION_MAJOR
|
10000 * CLIENT_VERSION_MAJOR
|
||||||
+ 10000 * CLIENT_VERSION_MINOR
|
+ 100 * CLIENT_VERSION_MINOR
|
||||||
+ 100 * CLIENT_VERSION_REVISION
|
|
||||||
+ 1 * CLIENT_VERSION_BUILD;
|
+ 1 * CLIENT_VERSION_BUILD;
|
||||||
|
|
||||||
extern const std::string CLIENT_NAME;
|
extern const std::string CLIENT_NAME;
|
||||||
|
@ -1,8 +1,8 @@
|
|||||||
#include <windows.h> // needed for VERSIONINFO
|
#include <windows.h> // needed for VERSIONINFO
|
||||||
#include "clientversion.h" // holds the needed client version information
|
#include "clientversion.h" // holds the needed client version information
|
||||||
|
|
||||||
#define VER_PRODUCTVERSION CLIENT_VERSION_MAJOR,CLIENT_VERSION_MINOR,CLIENT_VERSION_REVISION,CLIENT_VERSION_BUILD
|
#define VER_PRODUCTVERSION CLIENT_VERSION_MAJOR,CLIENT_VERSION_MINOR,CLIENT_VERSION_BUILD
|
||||||
#define VER_PRODUCTVERSION_STR STRINGIZE(CLIENT_VERSION_MAJOR) "." STRINGIZE(CLIENT_VERSION_MINOR) "." STRINGIZE(CLIENT_VERSION_REVISION) "." STRINGIZE(CLIENT_VERSION_BUILD)
|
#define VER_PRODUCTVERSION_STR STRINGIZE(CLIENT_VERSION_MAJOR) "." STRINGIZE(CLIENT_VERSION_MINOR) "." STRINGIZE(CLIENT_VERSION_BUILD)
|
||||||
#define VER_FILEVERSION VER_PRODUCTVERSION
|
#define VER_FILEVERSION VER_PRODUCTVERSION
|
||||||
#define VER_FILEVERSION_STR VER_PRODUCTVERSION_STR
|
#define VER_FILEVERSION_STR VER_PRODUCTVERSION_STR
|
||||||
|
|
||||||
|
@ -1,8 +1,8 @@
|
|||||||
#include <windows.h> // needed for VERSIONINFO
|
#include <windows.h> // needed for VERSIONINFO
|
||||||
#include "clientversion.h" // holds the needed client version information
|
#include "clientversion.h" // holds the needed client version information
|
||||||
|
|
||||||
#define VER_PRODUCTVERSION CLIENT_VERSION_MAJOR,CLIENT_VERSION_MINOR,CLIENT_VERSION_REVISION,CLIENT_VERSION_BUILD
|
#define VER_PRODUCTVERSION CLIENT_VERSION_MAJOR,CLIENT_VERSION_MINOR,CLIENT_VERSION_BUILD
|
||||||
#define VER_PRODUCTVERSION_STR STRINGIZE(CLIENT_VERSION_MAJOR) "." STRINGIZE(CLIENT_VERSION_MINOR) "." STRINGIZE(CLIENT_VERSION_REVISION) "." STRINGIZE(CLIENT_VERSION_BUILD)
|
#define VER_PRODUCTVERSION_STR STRINGIZE(CLIENT_VERSION_MAJOR) "." STRINGIZE(CLIENT_VERSION_MINOR) "." STRINGIZE(CLIENT_VERSION_BUILD)
|
||||||
#define VER_FILEVERSION VER_PRODUCTVERSION
|
#define VER_FILEVERSION VER_PRODUCTVERSION
|
||||||
#define VER_FILEVERSION_STR VER_PRODUCTVERSION_STR
|
#define VER_FILEVERSION_STR VER_PRODUCTVERSION_STR
|
||||||
|
|
||||||
|
@ -1,8 +1,8 @@
|
|||||||
#include <windows.h> // needed for VERSIONINFO
|
#include <windows.h> // needed for VERSIONINFO
|
||||||
#include "clientversion.h" // holds the needed client version information
|
#include "clientversion.h" // holds the needed client version information
|
||||||
|
|
||||||
#define VER_PRODUCTVERSION CLIENT_VERSION_MAJOR,CLIENT_VERSION_MINOR,CLIENT_VERSION_REVISION,CLIENT_VERSION_BUILD
|
#define VER_PRODUCTVERSION CLIENT_VERSION_MAJOR,CLIENT_VERSION_MINOR,CLIENT_VERSION_BUILD
|
||||||
#define VER_PRODUCTVERSION_STR STRINGIZE(CLIENT_VERSION_MAJOR) "." STRINGIZE(CLIENT_VERSION_MINOR) "." STRINGIZE(CLIENT_VERSION_REVISION) "." STRINGIZE(CLIENT_VERSION_BUILD)
|
#define VER_PRODUCTVERSION_STR STRINGIZE(CLIENT_VERSION_MAJOR) "." STRINGIZE(CLIENT_VERSION_MINOR) "." STRINGIZE(CLIENT_VERSION_BUILD)
|
||||||
#define VER_FILEVERSION VER_PRODUCTVERSION
|
#define VER_FILEVERSION VER_PRODUCTVERSION
|
||||||
#define VER_FILEVERSION_STR VER_PRODUCTVERSION_STR
|
#define VER_FILEVERSION_STR VER_PRODUCTVERSION_STR
|
||||||
|
|
||||||
|
@ -1,8 +1,8 @@
|
|||||||
#include <windows.h> // needed for VERSIONINFO
|
#include <windows.h> // needed for VERSIONINFO
|
||||||
#include "clientversion.h" // holds the needed client version information
|
#include "clientversion.h" // holds the needed client version information
|
||||||
|
|
||||||
#define VER_PRODUCTVERSION CLIENT_VERSION_MAJOR,CLIENT_VERSION_MINOR,CLIENT_VERSION_REVISION,CLIENT_VERSION_BUILD
|
#define VER_PRODUCTVERSION CLIENT_VERSION_MAJOR,CLIENT_VERSION_MINOR,CLIENT_VERSION_BUILD
|
||||||
#define VER_PRODUCTVERSION_STR STRINGIZE(CLIENT_VERSION_MAJOR) "." STRINGIZE(CLIENT_VERSION_MINOR) "." STRINGIZE(CLIENT_VERSION_REVISION) "." STRINGIZE(CLIENT_VERSION_BUILD)
|
#define VER_PRODUCTVERSION_STR STRINGIZE(CLIENT_VERSION_MAJOR) "." STRINGIZE(CLIENT_VERSION_MINOR) "." STRINGIZE(CLIENT_VERSION_BUILD)
|
||||||
#define VER_FILEVERSION VER_PRODUCTVERSION
|
#define VER_FILEVERSION VER_PRODUCTVERSION
|
||||||
#define VER_FILEVERSION_STR VER_PRODUCTVERSION_STR
|
#define VER_FILEVERSION_STR VER_PRODUCTVERSION_STR
|
||||||
|
|
||||||
|
@ -4,8 +4,8 @@ IDI_ICON2 ICON DISCARDABLE "icons/dash_testnet.ico"
|
|||||||
#include <windows.h> // needed for VERSIONINFO
|
#include <windows.h> // needed for VERSIONINFO
|
||||||
#include "../../clientversion.h" // holds the needed client version information
|
#include "../../clientversion.h" // holds the needed client version information
|
||||||
|
|
||||||
#define VER_PRODUCTVERSION CLIENT_VERSION_MAJOR,CLIENT_VERSION_MINOR,CLIENT_VERSION_REVISION,CLIENT_VERSION_BUILD
|
#define VER_PRODUCTVERSION CLIENT_VERSION_MAJOR,CLIENT_VERSION_MINOR,CLIENT_VERSION_BUILD
|
||||||
#define VER_PRODUCTVERSION_STR STRINGIZE(CLIENT_VERSION_MAJOR) "." STRINGIZE(CLIENT_VERSION_MINOR) "." STRINGIZE(CLIENT_VERSION_REVISION) "." STRINGIZE(CLIENT_VERSION_BUILD)
|
#define VER_PRODUCTVERSION_STR STRINGIZE(CLIENT_VERSION_MAJOR) "." STRINGIZE(CLIENT_VERSION_MINOR) "." STRINGIZE(CLIENT_VERSION_BUILD)
|
||||||
#define VER_FILEVERSION VER_PRODUCTVERSION
|
#define VER_FILEVERSION VER_PRODUCTVERSION
|
||||||
#define VER_FILEVERSION_STR VER_PRODUCTVERSION_STR
|
#define VER_FILEVERSION_STR VER_PRODUCTVERSION_STR
|
||||||
|
|
||||||
|
@ -1089,9 +1089,9 @@ BOOST_AUTO_TEST_CASE(test_FormatSubVersion)
|
|||||||
std::vector<std::string> comments2;
|
std::vector<std::string> comments2;
|
||||||
comments2.push_back(std::string("comment1"));
|
comments2.push_back(std::string("comment1"));
|
||||||
comments2.push_back(SanitizeString(std::string("Comment2; .,_?@-; !\"#$%&'()*+/<=>[]\\^`{|}~"), SAFE_CHARS_UA_COMMENT)); // Semicolon is discouraged but not forbidden by BIP-0014
|
comments2.push_back(SanitizeString(std::string("Comment2; .,_?@-; !\"#$%&'()*+/<=>[]\\^`{|}~"), SAFE_CHARS_UA_COMMENT)); // Semicolon is discouraged but not forbidden by BIP-0014
|
||||||
BOOST_CHECK_EQUAL(FormatSubVersion("Test", 99900, std::vector<std::string>()),std::string("/Test:0.9.99.0/"));
|
BOOST_CHECK_EQUAL(FormatSubVersion("Test", 99900, std::vector<std::string>()),std::string("/Test:9.99.0/"));
|
||||||
BOOST_CHECK_EQUAL(FormatSubVersion("Test", 99900, comments),std::string("/Test:0.9.99.0(comment1)/"));
|
BOOST_CHECK_EQUAL(FormatSubVersion("Test", 99900, comments),std::string("/Test:9.99.0(comment1)/"));
|
||||||
BOOST_CHECK_EQUAL(FormatSubVersion("Test", 99900, comments2),std::string("/Test:0.9.99.0(comment1; Comment2; .,_?@-; )/"));
|
BOOST_CHECK_EQUAL(FormatSubVersion("Test", 99900, comments2),std::string("/Test:9.99.0(comment1; Comment2; .,_?@-; )/"));
|
||||||
}
|
}
|
||||||
|
|
||||||
BOOST_AUTO_TEST_CASE(test_ParseFixedPoint)
|
BOOST_AUTO_TEST_CASE(test_ParseFixedPoint)
|
||||||
|
@ -66,7 +66,7 @@ function join_array {
|
|||||||
ENABLED_CHECKS_REGEXP=$(join_array "|" "${ENABLED_CHECKS[@]}")
|
ENABLED_CHECKS_REGEXP=$(join_array "|" "${ENABLED_CHECKS[@]}")
|
||||||
IGNORED_WARNINGS_REGEXP=$(join_array "|" "${IGNORED_WARNINGS[@]}")
|
IGNORED_WARNINGS_REGEXP=$(join_array "|" "${IGNORED_WARNINGS[@]}")
|
||||||
WARNINGS=$(git ls-files -- "*.cpp" "*.h" ":(exclude)src/leveldb/" ":(exclude)src/secp256k1/" ":(exclude)src/univalue/" | \
|
WARNINGS=$(git ls-files -- "*.cpp" "*.h" ":(exclude)src/leveldb/" ":(exclude)src/secp256k1/" ":(exclude)src/univalue/" | \
|
||||||
xargs cppcheck --enable=all -j "$(getconf _NPROCESSORS_ONLN)" --language=c++ --std=c++11 --template=gcc -D__cplusplus -DCLIENT_VERSION_BUILD -DCLIENT_VERSION_IS_RELEASE -DCLIENT_VERSION_MAJOR -DCLIENT_VERSION_MINOR -DCLIENT_VERSION_REVISION -DCOPYRIGHT_YEAR -DDEBUG -DHAVE_WORKING_BOOST_SLEEP_FOR -I src/ -q 2>&1 | sort -u | \
|
xargs cppcheck --enable=all -j "$(getconf _NPROCESSORS_ONLN)" --language=c++ --std=c++11 --template=gcc -D__cplusplus -DCLIENT_VERSION_BUILD -DCLIENT_VERSION_IS_RELEASE -DCLIENT_VERSION_MAJOR -DCLIENT_VERSION_MINOR -DCOPYRIGHT_YEAR -DDEBUG -DHAVE_WORKING_BOOST_SLEEP_FOR -I src/ -q 2>&1 | sort -u | \
|
||||||
grep -E "${ENABLED_CHECKS_REGEXP}" | \
|
grep -E "${ENABLED_CHECKS_REGEXP}" | \
|
||||||
grep -vE "${IGNORED_WARNINGS_REGEXP}")
|
grep -vE "${IGNORED_WARNINGS_REGEXP}")
|
||||||
if [[ ${WARNINGS} != "" ]]; then
|
if [[ ${WARNINGS} != "" ]]; then
|
||||||
|
@ -109,7 +109,7 @@ ENABLED_CHECKS_REGEXP=$(join_array "|" "${ENABLED_CHECKS[@]}")
|
|||||||
IGNORED_WARNINGS_REGEXP=$(join_array "|" "${IGNORED_WARNINGS[@]}")
|
IGNORED_WARNINGS_REGEXP=$(join_array "|" "${IGNORED_WARNINGS[@]}")
|
||||||
FILES_REGEXP=$(join_array "|" "${FILES[@]}")
|
FILES_REGEXP=$(join_array "|" "${FILES[@]}")
|
||||||
WARNINGS=$(echo "${FILES}" | \
|
WARNINGS=$(echo "${FILES}" | \
|
||||||
xargs cppcheck --enable=all -j "$(getconf _NPROCESSORS_ONLN)" --language=c++ --std=c++17 --template=gcc -D__cplusplus -DENABLE_WALLET -DCLIENT_VERSION_BUILD -DCLIENT_VERSION_IS_RELEASE -DCLIENT_VERSION_MAJOR -DCLIENT_VERSION_MINOR -DCLIENT_VERSION_REVISION -DCOPYRIGHT_YEAR -DDEBUG -DHAVE_WORKING_BOOST_SLEEP_FOR -DCHAR_BIT=8 -I src/ -q 2>&1 | sort -u | \
|
xargs cppcheck --enable=all -j "$(getconf _NPROCESSORS_ONLN)" --language=c++ --std=c++17 --template=gcc -D__cplusplus -DENABLE_WALLET -DCLIENT_VERSION_BUILD -DCLIENT_VERSION_IS_RELEASE -DCLIENT_VERSION_MAJOR -DCLIENT_VERSION_MINOR -DCOPYRIGHT_YEAR -DDEBUG -DHAVE_WORKING_BOOST_SLEEP_FOR -DCHAR_BIT=8 -I src/ -q 2>&1 | sort -u | \
|
||||||
grep -E "${ENABLED_CHECKS_REGEXP}" | \
|
grep -E "${ENABLED_CHECKS_REGEXP}" | \
|
||||||
grep -vE "${IGNORED_WARNINGS_REGEXP}" | \
|
grep -vE "${IGNORED_WARNINGS_REGEXP}" | \
|
||||||
grep -E "${FILES_REGEXP}")
|
grep -E "${FILES_REGEXP}")
|
||||||
|
Loading…
Reference in New Issue
Block a user