gitian: Various improvements for Windows descriptor#17029
Merged
laanwj merged 5 commits intobitcoin:masterfrom Oct 9, 2019
Merged
gitian: Various improvements for Windows descriptor#17029laanwj merged 5 commits intobitcoin:masterfrom
laanwj merged 5 commits intobitcoin:masterfrom
Conversation
Contributor
|
utACK e1c60900d56cdc6a34da3e4556a759ce7185ce07 |
Member
|
Concept ACK |
1 similar comment
Member
|
Concept ACK |
maflcko
reviewed
Oct 7, 2019
Linux: The README was originally added in 8550f1f, but included the README under the docs directory, which has a bunch of internal links that won't make sense in a release tarball. In this patch, we include the root level README instead, which makes more sense. Windows: .md files are inconvenient to open on windows and the line endings differ, so we use README_windows.txt instead.
dongcarl
force-pushed
the
2019-10-gitian-win-improvements
branch
from
ee69d93 to
9d1f971
Compare
Contributor
Author
|
Addressed all comments. |
Member
|
See also #17077 (slightly related) |
Member
Contributor
Author
|
I know I'm kinda asking for it because of naming of the PR, but could we resolve #17077 in another PR? 😬 |
Contributor
|
Gitian builds for commit e173d58 (master):
Gitian builds for commit 531a3dc2206a80564b2a4bbb4865ae8066e9a0ca (master and this pull):
|
Member
|
I think that can very well be addressed separately. ACK 9d1f971 |
laanwj
added a commit
that referenced
this pull request
Oct 9, 2019
9d1f971 gitian: Put things in the right place to begin with (Carl Dong) 71949a9 gitian: Eliminate rename dependency (Carl Dong) 999a9a5 gitian: Smaller diff with gitian-linux.yml (Carl Dong) c4a3c25 gitian: Fix README inclusion in archives (Carl Dong) 93cb974 gitian: Use split-debug.sh for Win builds (Carl Dong) Pull request description: It would seem that our `gitian-win.yml` has not been keeping up with `gitian-linux.yml`, this PR: 1. Minimizes the diff size between `gitian-{win,linux}.yml` 2. Eliminates the `rename` dependency ACKs for top commit: laanwj: ACK 9d1f971 Tree-SHA512: 84ed47c685e12d0064c02811907ae3d0fd3c47db8773d497dcc38f0defbfb3040fd82899fb026cf355f229b906d05a1c8038a95642bb90d044afbc2e0b239af2
maflcko
reviewed
Oct 9, 2019
| ( | ||
| SETUP_EXE="$(basename "$(echo ./*-setup.exe)")" | ||
| cp -f "$SETUP_EXE" "${OUTDIR}/${SETUP_EXE/%-setup.exe/-setup-unsigned.exe}" | ||
| ) |
Member
There was a problem hiding this comment.
Any thoughts on removing this?
diff --git a/contrib/gitian-descriptors/gitian-win.yml b/contrib/gitian-descriptors/gitian-win.yml
index d5f2c1ad35..2d613fca9d 100644
--- a/contrib/gitian-descriptors/gitian-win.yml
+++ b/contrib/gitian-descriptors/gitian-win.yml
@@ -153,10 +153,6 @@ script: |
make ${MAKEOPTS} -C src check-security
make deploy
make install DESTDIR=${INSTALLPATH}
- (
- SETUP_EXE="$(basename "$(echo ./*-setup.exe)")"
- cp -f "$SETUP_EXE" "${OUTDIR}/${SETUP_EXE/%-setup.exe/-setup-unsigned.exe}"
- )
cd installed
mv ${DISTNAME}/bin/*.dll ${DISTNAME}/lib/
find . -name "lib*.la" -delete
diff --git a/share/setup.nsi.in b/share/setup.nsi.in
index e9aa1f2b73..649483c732 100644
--- a/share/setup.nsi.in
+++ b/share/setup.nsi.in
@@ -48,7 +48,7 @@ Var StartMenuGroup
!insertmacro MUI_LANGUAGE English
# Installer attributes
-OutFile @abs_top_srcdir@/@PACKAGE_TARNAME@-@PACKAGE_VERSION@-win@[email protected]
+OutFile @abs_top_srcdir@/@PACKAGE_TARNAME@-@PACKAGE_VERSION@-win@[email protected]
!if "@WINDOWS_BITS@" == "64"
InstallDir $PROGRAMFILES64\Bitcoin
!else
laanwj
added a commit
that referenced
this pull request
Oct 31, 2019
3b3b931 nsis: Write to correct filename in first place (Carl Dong) Pull request description: Per MarcoFalke's suggestion here #17029 (comment) ACKs for top commit: MarcoFalke: unsigned ACK 3b3b931, makes sense to name it that way because it will raise the "unsinged" error in Windows Tree-SHA512: da72aae438505e162d0b3cd27d873b7ad8176178bb459a738e61b6e2ad0fa739d905b3109fab641bb1a3950fe59ad526c5568d12cf48a305166cdb7db6686543
sidhujag
pushed a commit
to syscoin/syscoin
that referenced
this pull request
Oct 31, 2019
3b3b931 nsis: Write to correct filename in first place (Carl Dong) Pull request description: Per MarcoFalke's suggestion here bitcoin#17029 (comment) ACKs for top commit: MarcoFalke: unsigned ACK 3b3b931, makes sense to name it that way because it will raise the "unsinged" error in Windows Tree-SHA512: da72aae438505e162d0b3cd27d873b7ad8176178bb459a738e61b6e2ad0fa739d905b3109fab641bb1a3950fe59ad526c5568d12cf48a305166cdb7db6686543
MarkLTZ
added a commit
to litecoinz-core/litecoinz
that referenced
this pull request
Apr 10, 2020
sidhujag
pushed a commit
to syscoin-core/syscoin
that referenced
this pull request
Nov 10, 2020
3b3b931 nsis: Write to correct filename in first place (Carl Dong) Pull request description: Per MarcoFalke's suggestion here bitcoin#17029 (comment) ACKs for top commit: MarcoFalke: unsigned ACK 3b3b931, makes sense to name it that way because it will raise the "unsinged" error in Windows Tree-SHA512: da72aae438505e162d0b3cd27d873b7ad8176178bb459a738e61b6e2ad0fa739d905b3109fab641bb1a3950fe59ad526c5568d12cf48a305166cdb7db6686543
random-zebra
added a commit
to random-zebra/PIVX
that referenced
this pull request
Jul 19, 2021
…scriptors a7dbb27 build: add missing attributes to Win installer (Fuzzbawls) 13d0b48 nsis: Don't duplicate URL string (Fuzzbawls) 56563e5 build: remove WINDOWS_BITS from build system (fanquake) 0cb37c8 nsis: Write to correct filename in first place (Carl Dong) 7aa2823 gitian: Put things in the right place to begin with (Carl Dong) 0dcf6e6 gitian: Eliminate rename dependency (Carl Dong) ba579b9 gitian: Smaller diff with gitian-linux.yml (Carl Dong) 3b9d5e8 gitian: Fix README inclusion in archives (Carl Dong) 07c27d2 gitian: Use split-debug.sh for Win builds (Carl Dong) 9f19095 build: Add README.md to DIST target (MarcoFalke) ce80c76 build: remove mingw linker workaround from win gitian descriptor (fanquake) 37441b0 scripted-diff: gitian: Use REFERENCE_DATETIME directly. (Fuzzbawls) 966fe9a depends: remove usage of TAR_OPTIONS (fanquake) 12fd641 build: remove export GZIP from gitian descriptors (fanquake) Pull request description: This is a collection of upstream PRs focused on cleaning up the gitian descriptors (un-needed or duplicate code bits, standardizing similar actions across the descriptors, etc), and minor cleanups to supporting build system files. Included are the following upstream PRs: * bitcoin#16141 * bitcoin#16184 * bitcoin#16667 * bitcoin#17097 * bitcoin#17029 * bitcoin#17308 * bitcoin#17756 * bitcoin#18059 ACKs for top commit: furszy: Tested ACK a7dbb27 random-zebra: ACK a7dbb27 and merging... Tree-SHA512: 409d4f51adfb1c90aa8bc572fe6610596dea1293a8ca795f9071bb88bd583bd7678359ee19e34440bb0d117075ebd27f9a622247ee3dfd0cd9088e6da306a4d5
UdjinM6
pushed a commit
to UdjinM6/dash
that referenced
this pull request
Oct 23, 2021
9d1f971 gitian: Put things in the right place to begin with (Carl Dong) 71949a9 gitian: Eliminate rename dependency (Carl Dong) 999a9a5 gitian: Smaller diff with gitian-linux.yml (Carl Dong) c4a3c25 gitian: Fix README inclusion in archives (Carl Dong) 93cb974 gitian: Use split-debug.sh for Win builds (Carl Dong) Pull request description: It would seem that our `gitian-win.yml` has not been keeping up with `gitian-linux.yml`, this PR: 1. Minimizes the diff size between `gitian-{win,linux}.yml` 2. Eliminates the `rename` dependency ACKs for top commit: laanwj: ACK 9d1f971 Tree-SHA512: 84ed47c685e12d0064c02811907ae3d0fd3c47db8773d497dcc38f0defbfb3040fd82899fb026cf355f229b906d05a1c8038a95642bb90d044afbc2e0b239af2
UdjinM6
pushed a commit
to UdjinM6/dash
that referenced
this pull request
Oct 23, 2021
3b3b931 nsis: Write to correct filename in first place (Carl Dong) Pull request description: Per MarcoFalke's suggestion here bitcoin#17029 (comment) ACKs for top commit: MarcoFalke: unsigned ACK 3b3b931, makes sense to name it that way because it will raise the "unsinged" error in Windows Tree-SHA512: da72aae438505e162d0b3cd27d873b7ad8176178bb459a738e61b6e2ad0fa739d905b3109fab641bb1a3950fe59ad526c5568d12cf48a305166cdb7db6686543
UdjinM6
pushed a commit
to UdjinM6/dash
that referenced
this pull request
Dec 4, 2021
9d1f971 gitian: Put things in the right place to begin with (Carl Dong) 71949a9 gitian: Eliminate rename dependency (Carl Dong) 999a9a5 gitian: Smaller diff with gitian-linux.yml (Carl Dong) c4a3c25 gitian: Fix README inclusion in archives (Carl Dong) 93cb974 gitian: Use split-debug.sh for Win builds (Carl Dong) Pull request description: It would seem that our `gitian-win.yml` has not been keeping up with `gitian-linux.yml`, this PR: 1. Minimizes the diff size between `gitian-{win,linux}.yml` 2. Eliminates the `rename` dependency ACKs for top commit: laanwj: ACK 9d1f971 Tree-SHA512: 84ed47c685e12d0064c02811907ae3d0fd3c47db8773d497dcc38f0defbfb3040fd82899fb026cf355f229b906d05a1c8038a95642bb90d044afbc2e0b239af2
UdjinM6
pushed a commit
to UdjinM6/dash
that referenced
this pull request
Dec 4, 2021
3b3b931 nsis: Write to correct filename in first place (Carl Dong) Pull request description: Per MarcoFalke's suggestion here bitcoin#17029 (comment) ACKs for top commit: MarcoFalke: unsigned ACK 3b3b931, makes sense to name it that way because it will raise the "unsinged" error in Windows Tree-SHA512: da72aae438505e162d0b3cd27d873b7ad8176178bb459a738e61b6e2ad0fa739d905b3109fab641bb1a3950fe59ad526c5568d12cf48a305166cdb7db6686543
UdjinM6
added a commit
to dashpay/dash
that referenced
this pull request
Dec 5, 2021
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
7 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
It would seem that our
gitian-win.ymlhas not been keeping up withgitian-linux.yml, this PR:gitian-{win,linux}.ymlrenamedependency