Skip to content
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

build: use full version string in setup.exe #15548

Merged
merged 1 commit into from Mar 12, 2019

Conversation

Projects
None yet
4 participants
@MarcoFalke
Copy link
Member

commented Mar 6, 2019

Fixes: #15546

@laanwj

This comment has been minimized.

Copy link
Member

commented Mar 7, 2019

Concept ACK.
this would leave one file to be manually renamed before uploading the binaries

mv ${SOURCEDIR}/bitcoin-osx-signed.dmg ${DESTDIR}/bitcoin-${VERSIONTO}-osx.dmg
@laanwj

This comment has been minimized.

Copy link
Member

commented Mar 7, 2019

One concern: how does this interact with the gitian-win-signer.yml? My memory isn't entirely clear on how it works, but would it need to be modified to expect the new name?

@MarcoFalke

This comment has been minimized.

Copy link
Member Author

commented Mar 7, 2019

I think it signs anything that ends with *-unsigned.exe

@MarcoFalke MarcoFalke force-pushed the MarcoFalke:1903-winVer branch from fa0ba0e to fa55104 Mar 7, 2019

@bitcoin bitcoin deleted a comment from DrahtBot Mar 7, 2019

@laanwj laanwj added this to the 0.18.0 milestone Mar 8, 2019

@DrahtBot

This comment has been minimized.

Copy link
Contributor

commented Mar 9, 2019

Gitian builds for commit d211edb (master):

Gitian builds for commit ccc2958 (master and this pull):

@promag
Copy link
Member

left a comment

utACK fa55104.

I agree it is better to use PACKAGE_VERSION and remove define VERSION ...

@@ -59,12 +58,12 @@ CRCCheck on
XPStyle on
BrandingText " "
ShowInstDetails show
VIProductVersion ${VERSION}.@CLIENT_VERSION_BUILD@
VIProductVersion @CLIENT_VERSION_MAJOR@.@CLIENT_VERSION_MINOR@.@CLIENT_VERSION_REVISION@.@CLIENT_VERSION_BUILD@

This comment has been minimized.

Copy link
@promag

promag Mar 11, 2019

Member

There are other places where this is done, like

#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)?

This comment has been minimized.

Copy link
@MarcoFalke

MarcoFalke Mar 11, 2019

Author Member

Yeah, other PR. The goal of this one is really only to change the OutFile

laanwj added a commit that referenced this pull request Mar 12, 2019

build: use full version string in setup.exe
Github-Pull: #15548
Rebased-From: fa55104
Tree-SHA512: 195d9d459431ae879a27e26d01962f020ddbbf648da26e52121c4fa7eb3438330f1ce34de431757e5079bf248f7129539e1d1a83c9c795ab57dc8c51545384bb

@laanwj laanwj merged commit fa55104 into bitcoin:master Mar 12, 2019

2 checks passed

continuous-integration/appveyor/pr AppVeyor build succeeded
Details
continuous-integration/travis-ci/pr The Travis CI build passed
Details

laanwj added a commit that referenced this pull request Mar 12, 2019

Merge #15548: build: use full version string in setup.exe
fa55104 build: use full version string in setup.exe (MarcoFalke)

Pull request description:

  Fixes: #15546

Tree-SHA512: a8ccbfef6b9fdd10bd0facadb25019b9296579eee6c8f7b4e5298cc4df52bba61864135ab8f46b900f7a3888fbcc921e039412d5a8127e44d8f2dd2c8fc56f86

HashUnlimited pushed a commit to HashUnlimited/chaincoin that referenced this pull request Mar 12, 2019

build: use full version string in setup.exe
Github-Pull: bitcoin#15548
Rebased-From: fa55104
Tree-SHA512: 195d9d459431ae879a27e26d01962f020ddbbf648da26e52121c4fa7eb3438330f1ce34de431757e5079bf248f7129539e1d1a83c9c795ab57dc8c51545384bb

@MarcoFalke MarcoFalke deleted the MarcoFalke:1903-winVer branch Mar 12, 2019

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
You can’t perform that action at this time.