Skip to content

Conversation

hebasto
Copy link
Member

@hebasto hebasto commented Dec 16, 2020

Rather than using cd to jump all over the place, perform all (q)make commands from the top level directory.

Looking at bash like cd ../../../.. gives me a headache.

Credits to fanquake.

This PR is an alternative to #20504 that works without any additional non-trivial hack.

hebasto and others added 2 commits December 16, 2020 15:21
This change makes the next commit possible without exporting the PATH
variable.
This change gets rid of multiple `../` that makes reasoning about the
script and its maintaining much easier.

Co-authored-by: fanquake <fanquake@gmail.com>
@practicalswift
Copy link
Contributor

Concept ACK: more readable and thus easier to reason about :)

@DrahtBot
Copy link
Contributor

DrahtBot commented Dec 16, 2020

The following sections might be updated with supplementary metadata relevant to reviewers and maintainers.

Conflicts

Reviewers, this pull request conflicts with the following ones:

If you consider this pull request important, please also help to review the conflicting pull requests. Ideally, start with the one that should be merged first.

Copy link
Contributor

@promag promag left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Tested ACK 87fe104.

This is a nice change that makes it more readable.

@DrahtBot
Copy link
Contributor

Gitian builds

File commit 816314e
(master)
commit 4f2a214
(master and this pull)
*-aarch64-linux-gnu-debug.tar.gz 92c094a57f28b2fe... 13eb6fe06cc07a31...
*-aarch64-linux-gnu.tar.gz 6406c70036869155... e9cb723da468ea3e...
*-arm-linux-gnueabihf-debug.tar.gz fa1dcb7738417481... 47d6c441fac2a4f9...
*-arm-linux-gnueabihf.tar.gz ba0552af3463d066... 625531f86b641ae8...
*-osx-unsigned.dmg b38904a51c9c12d5... 70f1e4f96666e764...
*-osx64.tar.gz 81c94a20c6fe25d9... 32bd4332c35b3b26...
*-riscv64-linux-gnu-debug.tar.gz 5199aceb15600fb9... b7918af69a938c8f...
*-riscv64-linux-gnu.tar.gz 79881c3a59eecd00... 88dbfa827533c1b0...
*-win64-debug.zip 9f6dc265cf93e377... 236585ef42498c7d...
*-win64-setup-unsigned.exe 4f64508a4629cde1... 324848f486ceb7f3...
*-win64.zip 85b0b7372d64928b... 2a6cfceceb04d5d9...
*-x86_64-linux-gnu-debug.tar.gz db8b3d3f3967dbb4... c8479c8879e6cb85...
*-x86_64-linux-gnu.tar.gz 10c06c92f10e4d8d... 829e42137597610e...
*.tar.gz b47efbff1aff7eeb... 4ba8a00baaa9e572...
bitcoin-core-linux-22-res.yml 6b70a61e243f8979... 89bb09a06e010cd5...
bitcoin-core-osx-22-res.yml c492c16c3445ba68... 66114c73b168a25a...
bitcoin-core-win-22-res.yml a4afeb86eac5227b... 9908252e63632e0e...
linux-build.log 6e3648941ec583a8... b348f867e8b049cb...
osx-build.log 951cd893b8181a69... e732a7c415cb5b06...
win-build.log 09e44a321a721c70... dd169d897d81dd53...
bitcoin-core-linux-22-res.yml.diff 0ab47ec0f5e3bb72...
bitcoin-core-osx-22-res.yml.diff 43bc5d00eddf36ee...
bitcoin-core-win-22-res.yml.diff 691f1b3fb832002f...
linux-build.log.diff 94c1760dabc53856...
osx-build.log.diff 41028b358ed0e143...
win-build.log.diff 5a247ba5ec134f85...

@DrahtBot
Copy link
Contributor

Guix builds

File commit f1dbf92
(master)
commit f7d771d
(master and this pull)
*-aarch64-linux-gnu-debug.tar.gz 3515438da57735d7... 79e5129049bccccd...
*-aarch64-linux-gnu.tar.gz 05a5abb8dc19b763... 6febd6aa71103303...
*-arm-linux-gnueabihf-debug.tar.gz a304544b9e0a6c6c... d07b79211658f24f...
*-arm-linux-gnueabihf.tar.gz 0a0aeaa4824539bf... ac798e6224cd2261...
*-riscv64-linux-gnu-debug.tar.gz 8dd000bbc84bcbae... 94eaefd512ccbce2...
*-riscv64-linux-gnu.tar.gz dd378f951a7bd9f3... a333a17de3361ab3...
*-win-unsigned.tar.gz dfc0adc44d8ff510... 6a379c179c229129...
*-win64-debug.zip 5998a6b080a1f045... ec00f7d55736d34d...
*-win64-setup-unsigned.exe 10bdc93641d087bd... 377ecab01d135c2a...
*-win64.zip e333c73783a2ce08... c12d24d8261f0151...
*-x86_64-linux-gnu-debug.tar.gz ed787b28fac37978... 6db938fc7038af2c...
*-x86_64-linux-gnu.tar.gz f9d97bcb271450ec... 1afc8ec7a3595c95...
*.tar.gz 1c0afb594835e558... 918d848feb18e32d...
guix_build.log 8a0c986f6840886d... 96f70db05fe972e9...
guix_build.log.diff 0489221554d7d83d...

Copy link
Member

@fanquake fanquake left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

ACK 87fe104

@fanquake fanquake merged commit 1b31695 into bitcoin:master Dec 25, 2020
sidhujag pushed a commit to syscoin/syscoin that referenced this pull request Dec 25, 2020
…ackage

87fe104 depends: Use more legible qmake commands in qt package (Hennadii Stepanov)
bf35a8d depends: Do not set build_subdir for qt package (Hennadii Stepanov)

Pull request description:

  Rather than using `cd` to jump all over the place, perform all `(q)make` commands from the top level directory.

  Looking at bash like `cd ../../../..` gives me a headache.

  Credits to **fanquake**.

  This PR is an alternative to bitcoin#20504 that works without any additional [non-trivial hack](bitcoin#20504 (comment)).

ACKs for top commit:
  promag:
    Tested ACK 87fe104.
  fanquake:
    ACK 87fe104

Tree-SHA512: 1d2a13b5358fc7406c5363ddd62fd363dbc0ec5ace68946e4d3e6e8620419afaa64ef2837488aaed226174e01e8897495085540f7126b80f8b2372d21b5b29f9
@hebasto hebasto deleted the 201216-subdir branch December 25, 2020 08:45
PastaPastaPasta pushed a commit to PastaPastaPasta/dash that referenced this pull request Jun 27, 2021
…ackage

87fe104 depends: Use more legible qmake commands in qt package (Hennadii Stepanov)
bf35a8d depends: Do not set build_subdir for qt package (Hennadii Stepanov)

Pull request description:

  Rather than using `cd` to jump all over the place, perform all `(q)make` commands from the top level directory.

  Looking at bash like `cd ../../../..` gives me a headache.

  Credits to **fanquake**.

  This PR is an alternative to bitcoin#20504 that works without any additional [non-trivial hack](bitcoin#20504 (comment)).

ACKs for top commit:
  promag:
    Tested ACK 87fe104.
  fanquake:
    ACK 87fe104

Tree-SHA512: 1d2a13b5358fc7406c5363ddd62fd363dbc0ec5ace68946e4d3e6e8620419afaa64ef2837488aaed226174e01e8897495085540f7126b80f8b2372d21b5b29f9
PastaPastaPasta pushed a commit to PastaPastaPasta/dash that referenced this pull request Jun 28, 2021
…ackage

87fe104 depends: Use more legible qmake commands in qt package (Hennadii Stepanov)
bf35a8d depends: Do not set build_subdir for qt package (Hennadii Stepanov)

Pull request description:

  Rather than using `cd` to jump all over the place, perform all `(q)make` commands from the top level directory.

  Looking at bash like `cd ../../../..` gives me a headache.

  Credits to **fanquake**.

  This PR is an alternative to bitcoin#20504 that works without any additional [non-trivial hack](bitcoin#20504 (comment)).

ACKs for top commit:
  promag:
    Tested ACK 87fe104.
  fanquake:
    ACK 87fe104

Tree-SHA512: 1d2a13b5358fc7406c5363ddd62fd363dbc0ec5ace68946e4d3e6e8620419afaa64ef2837488aaed226174e01e8897495085540f7126b80f8b2372d21b5b29f9
PastaPastaPasta pushed a commit to PastaPastaPasta/dash that referenced this pull request Jun 29, 2021
…ackage

87fe104 depends: Use more legible qmake commands in qt package (Hennadii Stepanov)
bf35a8d depends: Do not set build_subdir for qt package (Hennadii Stepanov)

Pull request description:

  Rather than using `cd` to jump all over the place, perform all `(q)make` commands from the top level directory.

  Looking at bash like `cd ../../../..` gives me a headache.

  Credits to **fanquake**.

  This PR is an alternative to bitcoin#20504 that works without any additional [non-trivial hack](bitcoin#20504 (comment)).

ACKs for top commit:
  promag:
    Tested ACK 87fe104.
  fanquake:
    ACK 87fe104

Tree-SHA512: 1d2a13b5358fc7406c5363ddd62fd363dbc0ec5ace68946e4d3e6e8620419afaa64ef2837488aaed226174e01e8897495085540f7126b80f8b2372d21b5b29f9
PastaPastaPasta pushed a commit to PastaPastaPasta/dash that referenced this pull request Jul 1, 2021
…ackage

87fe104 depends: Use more legible qmake commands in qt package (Hennadii Stepanov)
bf35a8d depends: Do not set build_subdir for qt package (Hennadii Stepanov)

Pull request description:

  Rather than using `cd` to jump all over the place, perform all `(q)make` commands from the top level directory.

  Looking at bash like `cd ../../../..` gives me a headache.

  Credits to **fanquake**.

  This PR is an alternative to bitcoin#20504 that works without any additional [non-trivial hack](bitcoin#20504 (comment)).

ACKs for top commit:
  promag:
    Tested ACK 87fe104.
  fanquake:
    ACK 87fe104

Tree-SHA512: 1d2a13b5358fc7406c5363ddd62fd363dbc0ec5ace68946e4d3e6e8620419afaa64ef2837488aaed226174e01e8897495085540f7126b80f8b2372d21b5b29f9
PastaPastaPasta pushed a commit to PastaPastaPasta/dash that referenced this pull request Jul 1, 2021
…ackage

87fe104 depends: Use more legible qmake commands in qt package (Hennadii Stepanov)
bf35a8d depends: Do not set build_subdir for qt package (Hennadii Stepanov)

Pull request description:

  Rather than using `cd` to jump all over the place, perform all `(q)make` commands from the top level directory.

  Looking at bash like `cd ../../../..` gives me a headache.

  Credits to **fanquake**.

  This PR is an alternative to bitcoin#20504 that works without any additional [non-trivial hack](bitcoin#20504 (comment)).

ACKs for top commit:
  promag:
    Tested ACK 87fe104.
  fanquake:
    ACK 87fe104

Tree-SHA512: 1d2a13b5358fc7406c5363ddd62fd363dbc0ec5ace68946e4d3e6e8620419afaa64ef2837488aaed226174e01e8897495085540f7126b80f8b2372d21b5b29f9
PastaPastaPasta pushed a commit to PastaPastaPasta/dash that referenced this pull request Jul 15, 2021
…ackage

87fe104 depends: Use more legible qmake commands in qt package (Hennadii Stepanov)
bf35a8d depends: Do not set build_subdir for qt package (Hennadii Stepanov)

Pull request description:

  Rather than using `cd` to jump all over the place, perform all `(q)make` commands from the top level directory.

  Looking at bash like `cd ../../../..` gives me a headache.

  Credits to **fanquake**.

  This PR is an alternative to bitcoin#20504 that works without any additional [non-trivial hack](bitcoin#20504 (comment)).

ACKs for top commit:
  promag:
    Tested ACK 87fe104.
  fanquake:
    ACK 87fe104

Tree-SHA512: 1d2a13b5358fc7406c5363ddd62fd363dbc0ec5ace68946e4d3e6e8620419afaa64ef2837488aaed226174e01e8897495085540f7126b80f8b2372d21b5b29f9
PastaPastaPasta pushed a commit to PastaPastaPasta/dash that referenced this pull request Jul 16, 2021
…ackage

87fe104 depends: Use more legible qmake commands in qt package (Hennadii Stepanov)
bf35a8d depends: Do not set build_subdir for qt package (Hennadii Stepanov)

Pull request description:

  Rather than using `cd` to jump all over the place, perform all `(q)make` commands from the top level directory.

  Looking at bash like `cd ../../../..` gives me a headache.

  Credits to **fanquake**.

  This PR is an alternative to bitcoin#20504 that works without any additional [non-trivial hack](bitcoin#20504 (comment)).

ACKs for top commit:
  promag:
    Tested ACK 87fe104.
  fanquake:
    ACK 87fe104

Tree-SHA512: 1d2a13b5358fc7406c5363ddd62fd363dbc0ec5ace68946e4d3e6e8620419afaa64ef2837488aaed226174e01e8897495085540f7126b80f8b2372d21b5b29f9
@bitcoin bitcoin locked as resolved and limited conversation to collaborators Feb 15, 2022
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

6 participants