Win32 version info #3015

pull theuni wants to merge 4 commits into bitcoin:master from theuni:win32-version-info changing 8 files +59 −14

theuni commented at 9:18 PM on September 18, 2013: member

Requested in #1846

This fleshed out a few build problems that were fixed up here as well.

Note that icons are currently missing.

autotools: fix subdir m4 check, never let it return -I

If BDB_CPPFLAGS returns only "-I", the next argument sent to the preprocessor
is treated as a path. There are 2 fixes here:

1. Check in CPPFLAGS, as a user might have manually passed a path to check.
2. Ensure the value is not empty before setting BDB_CPPFLAGS to "-I value"

c546dc05bb

autotools: fix the Makefile.include to be safely included anywhere.
This way we can reuse rules rather than duplicating them.
7a3df1cd94
jgarzik commented at 9:20 PM on September 18, 2013: contributor

untested ACK
theuni commented at 9:43 PM on September 18, 2013: member

Fixed cosmetics and added a change to fail if windres isn't found for win32 build, since it's needed for bitcoind.exe now.

in src/bitcoin-res.rc:None in 49cefd88d9 outdated

   0 | @@ -0,0 +1,36 @@
   1 | +#include <windows.h>             // needed for VERSIONINFO
   2 | +#include "clientversion.h"	 // holds the needed client version information

Diapolo commented at 9:46 PM on September 18, 2013:

Indentation still :)

in src/bitcoin-res.rc:None in 49cefd88d9 outdated

  22 | +            VALUE "FileVersion",        VER_FILEVERSION_STR
  23 | +            VALUE "InternalName",       "bitcoind"
  24 | +            VALUE "LegalCopyright",     COPYRIGHT_STR
  25 | +            VALUE "LegalTrademarks1",   "Distributed under the MIT/X11 software license, see the accompanying file COPYING or http://www.opensource.org/licenses/mit-license.php."
  26 | +            VALUE "OriginalFilename",   "bitcoind.exe"
  27 | +            VALUE "ProductName",        "Bitcoin"

Diapolo commented at 9:47 PM on September 18, 2013:

Bitcoind here, Bitcoin-Qt for Qt AFAIK.

Diapolo commented at 9:47 PM on September 18, 2013: none

Untested ACK, but I prefer if you could fix my nits ;).
win32: add version info to bitcoind.exe
TODO: Add icon info
dee632cc25
win32: only check for windres for win32, and fail if missing 5ceb9c9637
theuni commented at 10:09 PM on September 18, 2013: member

Nits fixed, last time I hope :)

Uploaded here if you'd like to verify, I have no win32 machine: http://coryfields.com/bitcoind-versioninfo.exe
Diapolo commented at 7:51 AM on September 19, 2013: none

ACK to the Win32 version info change. @theuni I verified the executable, looks great, thanks.
BitcoinPullTester commented at 6:07 AM on September 20, 2013: none

Automatic sanity-testing: PASSED, see http://jenkins.bluematt.me/pull-tester/5ceb9c963700d4639fb3210b98aa028113e2a9c4 for binaries and test log. This test script verifies pulls every time they are updated. It, however, dies sometimes and fails to test properly. If you are waiting on a test, please check timestamps to verify that the test.log is moving at http://jenkins.bluematt.me/pull-tester/current/ Contact BlueMatt on freenode if something looks broken.
laanwj commented at 6:30 AM on September 20, 2013: member

ACK
Diapolo commented at 8:55 AM on September 20, 2013: none

ACK
sipa referenced this in commit 6865127551 on Sep 29, 2013
sipa merged this on Sep 29, 2013
sipa closed this on Sep 29, 2013
Bushstar referenced this in commit bdec34c949 on Apr 8, 2020
DrahtBot locked this on Sep 8, 2021

Contributors

Linked (view graph)

#1846 Add version info to bitcoind.exe?