-
Notifications
You must be signed in to change notification settings - Fork 38.7k
build: use full version string in setup.exe #15548
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Conversation
|
Concept ACK. mv ${SOURCEDIR}/bitcoin-osx-signed.dmg ${DESTDIR}/bitcoin-${VERSIONTO}-osx.dmg |
|
One concern: how does this interact with the |
|
I think it signs anything that ends with |
|
Gitian builds for commit d211edb (master):
Gitian builds for commit ccc2958ac8ebd3a706590dc6b96770abf4485b6b (master and this pull):
|
promag
left a comment
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
utACK fa55104.
I agree it is better to use PACKAGE_VERSION and remove define VERSION ...
| BrandingText " " | ||
| ShowInstDetails show | ||
| VIProductVersion ${VERSION}.@CLIENT_VERSION_BUILD@ | ||
| VIProductVersion @CLIENT_VERSION_MAJOR@.@CLIENT_VERSION_MINOR@.@CLIENT_VERSION_REVISION@.@CLIENT_VERSION_BUILD@ |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
There are other places where this is done, like
bitcoin/src/bitcoin-cli-res.rc
Line 5 in 257f750
| #define VER_PRODUCTVERSION_STR STRINGIZE(CLIENT_VERSION_MAJOR) "." STRINGIZE(CLIENT_VERSION_MINOR) "." STRINGIZE(CLIENT_VERSION_REVISION) "." STRINGIZE(CLIENT_VERSION_BUILD) |
Makes sense to define this in configure.ac (other PR)?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Yeah, other PR. The goal of this one is really only to change the OutFile
Github-Pull: bitcoin#15548 Rebased-From: fa55104 Tree-SHA512: 195d9d459431ae879a27e26d01962f020ddbbf648da26e52121c4fa7eb3438330f1ce34de431757e5079bf248f7129539e1d1a83c9c795ab57dc8c51545384bb
298528c build: Add CLIENT_VERSION_BUILD to CFBundleGetInfoString (fanquake) 04f5d5b build: use full version string in setup.exe (MarcoFalke) c787618 Update release-process.md to include RC version bumping (Andrew Chow) 32a69da build: include rc number in version number (Andrew Chow) 8c2b28b build: if VERSION_BUILD is non-zero, include it in the package version (Andrew Chow) Pull request description: This is a backport of the following 3 upstream PRs that result in more precise file names in gitian outputs and in macOS app version info; namely that they are no longer limited to only 3 levels deep (`3.4.0` for example) and will now include the 4th level and/or the RC version if needed (`4.0.0rc1` or `4.0.0.1` for example). bitcoin#14612 bitcoin#14701 bitcoin#15548 Top commit has no ACKs. Tree-SHA512: 1195e9c0af92f4d6c2f7546530d1d5c1046f9139c8f9a03d2d8e092bbbcf5e5c5d046523e8a3712bde3d84bf81252dcc8dbb1ac3f1cdaaa863b1d14c3251fe95
fa55104 build: use full version string in setup.exe (MarcoFalke) Pull request description: Fixes: bitcoin#15546 Tree-SHA512: a8ccbfef6b9fdd10bd0facadb25019b9296579eee6c8f7b4e5298cc4df52bba61864135ab8f46b900f7a3888fbcc921e039412d5a8127e44d8f2dd2c8fc56f86
fa55104 build: use full version string in setup.exe (MarcoFalke) Pull request description: Fixes: bitcoin#15546 Tree-SHA512: a8ccbfef6b9fdd10bd0facadb25019b9296579eee6c8f7b4e5298cc4df52bba61864135ab8f46b900f7a3888fbcc921e039412d5a8127e44d8f2dd2c8fc56f86
Fixes: #15546