Skip to content

Commit 9201ce8

Browse files
committed
Merge #8181: build: Get rid of CLIENT_DATE
d096d22 build: Get rid of `CLIENT_DATE` (Wladimir J. van der Laan)
2 parents 32b7294 + d096d22 commit 9201ce8

File tree

5 files changed

+2
-19
lines changed

5 files changed

+2
-19
lines changed

share/genbuild.sh

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,6 @@ fi
1515

1616
DESC=""
1717
SUFFIX=""
18-
LAST_COMMIT_DATE=""
1918
if [ -e "$(which git 2>/dev/null)" -a "$(git rev-parse --is-inside-work-tree 2>/dev/null)" = "true" ]; then
2019
# clean 'dirty' status of touched files that haven't been modified
2120
git diff >/dev/null 2>/dev/null
@@ -29,9 +28,6 @@ if [ -e "$(which git 2>/dev/null)" -a "$(git rev-parse --is-inside-work-tree 2>/
2928
# otherwise generate suffix from git, i.e. string like "59887e8-dirty"
3029
SUFFIX=$(git rev-parse --short HEAD)
3130
git diff-index --quiet HEAD -- || SUFFIX="$SUFFIX-dirty"
32-
33-
# get a string like "2012-04-10 16:27:19 +0200"
34-
LAST_COMMIT_DATE="$(git log -n 1 --format="%ci")"
3531
fi
3632

3733
if [ -n "$DESC" ]; then
@@ -45,7 +41,4 @@ fi
4541
# only update build.h if necessary
4642
if [ "$INFO" != "$NEWINFO" ]; then
4743
echo "$NEWINFO" >"$FILE"
48-
if [ -n "$LAST_COMMIT_DATE" ]; then
49-
echo "#define BUILD_DATE \"$LAST_COMMIT_DATE\"" >> "$FILE"
50-
fi
5144
fi

src/clientversion.cpp

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -67,16 +67,7 @@ const std::string CLIENT_NAME("Satoshi");
6767
#endif
6868
#endif
6969

70-
#ifndef BUILD_DATE
71-
#ifdef GIT_COMMIT_DATE
72-
#define BUILD_DATE GIT_COMMIT_DATE
73-
#else
74-
#define BUILD_DATE __DATE__ ", " __TIME__
75-
#endif
76-
#endif
77-
7870
const std::string CLIENT_BUILD(BUILD_DESC CLIENT_VERSION_SUFFIX);
79-
const std::string CLIENT_DATE(BUILD_DATE);
8071

8172
static std::string FormatVersion(int nVersion)
8273
{

src/clientversion.h

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,6 @@ static const int CLIENT_VERSION =
5959

6060
extern const std::string CLIENT_NAME;
6161
extern const std::string CLIENT_BUILD;
62-
extern const std::string CLIENT_DATE;
6362

6463

6564
std::string FormatFullVersion();

src/init.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -748,7 +748,7 @@ void InitLogging()
748748
fLogIPs = GetBoolArg("-logips", DEFAULT_LOGIPS);
749749

750750
LogPrintf("\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n");
751-
LogPrintf("Bitcoin version %s (%s)\n", FormatFullVersion(), CLIENT_DATE);
751+
LogPrintf("Bitcoin version %s\n", FormatFullVersion());
752752
}
753753

754754
/** Initialize bitcoin.

src/wallet/rpcdump.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -590,7 +590,7 @@ UniValue dumpwallet(const UniValue& params, bool fHelp)
590590
std::sort(vKeyBirth.begin(), vKeyBirth.end());
591591

592592
// produce output
593-
file << strprintf("# Wallet dump created by Bitcoin %s (%s)\n", CLIENT_BUILD, CLIENT_DATE);
593+
file << strprintf("# Wallet dump created by Bitcoin %s\n", CLIENT_BUILD);
594594
file << strprintf("# * Created on %s\n", EncodeDumpTime(GetTime()));
595595
file << strprintf("# * Best block at time of backup was %i (%s),\n", chainActive.Height(), chainActive.Tip()->GetBlockHash().ToString());
596596
file << strprintf("# mined on %s\n", EncodeDumpTime(chainActive.Tip()->GetBlockTime()));

0 commit comments

Comments
 (0)