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
Merged

Conversation

@MarcoFalke
Copy link
Member

@MarcoFalke MarcoFalke commented Mar 6, 2019

Fixes: #15546

@laanwj
Copy link
Member

@laanwj laanwj 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
Copy link
Member

@laanwj laanwj 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
Copy link
Member Author

@MarcoFalke MarcoFalke commented Mar 7, 2019

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

@DrahtBot
Copy link
Contributor

@DrahtBot DrahtBot commented Mar 9, 2019

Gitian builds for commit d211edb (master):

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

Copy link
Member

@promag promag 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@
Copy link
Member

@promag promag Mar 11, 2019

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

Copy link
Member Author

@MarcoFalke MarcoFalke Mar 11, 2019

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

laanwj added a commit that referenced this issue Mar 12, 2019
Github-Pull: #15548
Rebased-From: fa55104
Tree-SHA512: 195d9d459431ae879a27e26d01962f020ddbbf648da26e52121c4fa7eb3438330f1ce34de431757e5079bf248f7129539e1d1a83c9c795ab57dc8c51545384bb
@laanwj laanwj merged commit fa55104 into bitcoin:master Mar 12, 2019
2 checks passed
laanwj added a commit that referenced this issue Mar 12, 2019
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 issue Mar 12, 2019
Github-Pull: bitcoin#15548
Rebased-From: fa55104
Tree-SHA512: 195d9d459431ae879a27e26d01962f020ddbbf648da26e52121c4fa7eb3438330f1ce34de431757e5079bf248f7129539e1d1a83c9c795ab57dc8c51545384bb
@MarcoFalke MarcoFalke deleted the 1903-winVer branch Mar 12, 2019
random-zebra added a commit to PIVX-Project/PIVX that referenced this issue Nov 25, 2019
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
PastaPastaPasta added a commit to PastaPastaPasta/dash that referenced this issue Jun 27, 2021
fa55104 build: use full version string in setup.exe (MarcoFalke)

Pull request description:

  Fixes: bitcoin#15546

Tree-SHA512: a8ccbfef6b9fdd10bd0facadb25019b9296579eee6c8f7b4e5298cc4df52bba61864135ab8f46b900f7a3888fbcc921e039412d5a8127e44d8f2dd2c8fc56f86
PastaPastaPasta added a commit to PastaPastaPasta/dash that referenced this issue Jun 28, 2021
fa55104 build: use full version string in setup.exe (MarcoFalke)

Pull request description:

  Fixes: bitcoin#15546

Tree-SHA512: a8ccbfef6b9fdd10bd0facadb25019b9296579eee6c8f7b4e5298cc4df52bba61864135ab8f46b900f7a3888fbcc921e039412d5a8127e44d8f2dd2c8fc56f86
PastaPastaPasta added a commit to PastaPastaPasta/dash that referenced this issue Jun 29, 2021
fa55104 build: use full version string in setup.exe (MarcoFalke)

Pull request description:

  Fixes: bitcoin#15546

Tree-SHA512: a8ccbfef6b9fdd10bd0facadb25019b9296579eee6c8f7b4e5298cc4df52bba61864135ab8f46b900f7a3888fbcc921e039412d5a8127e44d8f2dd2c8fc56f86
PastaPastaPasta added a commit to PastaPastaPasta/dash that referenced this issue Jul 1, 2021
fa55104 build: use full version string in setup.exe (MarcoFalke)

Pull request description:

  Fixes: bitcoin#15546

Tree-SHA512: a8ccbfef6b9fdd10bd0facadb25019b9296579eee6c8f7b4e5298cc4df52bba61864135ab8f46b900f7a3888fbcc921e039412d5a8127e44d8f2dd2c8fc56f86
PastaPastaPasta added a commit to PastaPastaPasta/dash that referenced this issue Jul 1, 2021
fa55104 build: use full version string in setup.exe (MarcoFalke)

Pull request description:

  Fixes: bitcoin#15546

Tree-SHA512: a8ccbfef6b9fdd10bd0facadb25019b9296579eee6c8f7b4e5298cc4df52bba61864135ab8f46b900f7a3888fbcc921e039412d5a8127e44d8f2dd2c8fc56f86
PastaPastaPasta added a commit to PastaPastaPasta/dash that referenced this issue Jul 8, 2021
fa55104 build: use full version string in setup.exe (MarcoFalke)

Pull request description:

  Fixes: bitcoin#15546

Tree-SHA512: a8ccbfef6b9fdd10bd0facadb25019b9296579eee6c8f7b4e5298cc4df52bba61864135ab8f46b900f7a3888fbcc921e039412d5a8127e44d8f2dd2c8fc56f86
PastaPastaPasta added a commit to PastaPastaPasta/dash that referenced this issue Jul 10, 2021
fa55104 build: use full version string in setup.exe (MarcoFalke)

Pull request description:

  Fixes: bitcoin#15546

Tree-SHA512: a8ccbfef6b9fdd10bd0facadb25019b9296579eee6c8f7b4e5298cc4df52bba61864135ab8f46b900f7a3888fbcc921e039412d5a8127e44d8f2dd2c8fc56f86
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Linked issues

Successfully merging this pull request may close these issues.

None yet

4 participants