Page MenuHomePhabricator
Differential D7450

[CMAKE] Fix NSIS installing failing to find the man pages
ClosedPublic
Actions

Authored by Fabien on Sep 15 2020, 21:31.

Details

Reviewers
deadalnix
Group Reviewers
Restricted Project
Commits
rABCaa8d0038de08: [CMAKE] Fix NSIS installing failing to find the man pages
Summary

This diff adds back the manpages to the packages (they are no longer part of the default install target) but removes them from the windows packages. The man pages
generation will fail for bitcoin-qt.exe on the windows build because
it does not output the help to stdout but creates a window instead.
Since the man pages are not really usable on windows anyway, they are
just removed from the installation package.

Test Plan
cmake -GNinja .. \
  -DCMAKE_TOOLCHAIN_FILE=../cmake/platforms/Win64.cmake \
  -DBUILD_BITCOIN_SEEDER=OFF
ninja package

Diff Detail

Repository
rABC Bitcoin ABC
Lint
Lint Not Applicable
Unit
Tests Not Applicable

Event Timeline

Fabien created this revision.Sep 15 2020, 21:31
Herald added a reviewer: Restricted Project. · View Herald TranscriptSep 15 2020, 21:31
Fabien requested review of this revision.Sep 15 2020, 21:31
Harbormaster completed remote builds in B12742: Diff 23503.Sep 15 2020, 21:45
teamcity added a comment.Sep 15 2020, 21:45
Build Bitcoin ABC Diffs / Diff Testing (build-diff) failed.

Snippet of first build failure:

rpc_getchaintips.py                     | ✓ Passed  | 3 s
rpc_help.py                             | ✓ Passed  | 1 s
rpc_invalidateblock.py                  | ✓ Passed  | 6 s
rpc_misc.py                             | ✓ Passed  | 1 s
rpc_named_arguments.py                  | ✓ Passed  | 1 s
rpc_net.py                              | ✓ Passed  | 1 s
rpc_preciousblock.py                    | ✓ Passed  | 1 s
rpc_psbt.py                             | ✓ Passed  | 19 s
rpc_rawtransaction.py                   | ✓ Passed  | 35 s
rpc_scantxoutset.py                     | ✓ Passed  | 5 s
rpc_setban.py                           | ✓ Passed  | 2 s
rpc_signmessage.py                      | ✓ Passed  | 1 s
rpc_signrawtransaction.py               | ✓ Passed  | 2 s
rpc_txoutproof.py                       | ✓ Passed  | 2 s
rpc_uptime.py                           | ✓ Passed  | 1 s
rpc_users.py                            | ✓ Passed  | 2 s
rpc_whitelist.py                        | ✓ Passed  | 1 s
tool_wallet.py                          | ✓ Passed  | 3 s
wallet_abandonconflict.py               | ✓ Passed  | 16 s
wallet_address_types.py                 | ✓ Passed  | 15 s
wallet_avoidreuse.py                    | ✓ Passed  | 3 s
wallet_backup.py                        | ✓ Passed  | 53 s
wallet_balance.py                       | ✓ Passed  | 14 s
wallet_basic.py                         | ✓ Passed  | 29 s
wallet_coinbase_category.py             | ✓ Passed  | 1 s
wallet_create_tx.py                     | ✓ Passed  | 5 s
wallet_createwallet.py                  | ✓ Passed  | 2 s
wallet_createwallet.py --usecli         | ✓ Passed  | 3 s
wallet_disable.py                       | ✓ Passed  | 0 s
wallet_dump.py                          | ✓ Passed  | 3 s
wallet_encryption.py                    | ✓ Passed  | 5 s
wallet_groups.py                        | ✓ Passed  | 14 s
wallet_hd.py                            | ✓ Passed  | 5 s
wallet_import_rescan.py                 | ✓ Passed  | 4 s
wallet_import_with_label.py             | ✓ Passed  | 1 s
wallet_importmulti.py                   | ✓ Passed  | 3 s
wallet_importprunedfunds.py             | ✓ Passed  | 2 s
wallet_keypool.py                       | ✓ Passed  | 3 s
wallet_keypool_topup.py                 | ✓ Passed  | 3 s
wallet_labels.py                        | ✓ Passed  | 1 s
wallet_listreceivedby.py                | ✓ Passed  | 13 s
wallet_listsinceblock.py                | ✓ Passed  | 3 s
wallet_listtransactions.py              | ✓ Passed  | 14 s
wallet_multiwallet.py                   | ✓ Passed  | 14 s
wallet_multiwallet.py --usecli          | ✓ Passed  | 17 s
wallet_reorgsrestore.py                 | ✓ Passed  | 3 s
wallet_resendwallettransactions.py      | ✓ Passed  | 29 s
wallet_txn_clone.py                     | ✓ Passed  | 2 s
wallet_txn_clone.py --mineblock         | ✓ Passed  | 3 s
wallet_txn_doublespend.py               | ✓ Passed  | 1 s
wallet_txn_doublespend.py --mineblock   | ✓ Passed  | 3 s
wallet_watchonly.py                     | ✓ Passed  | 1 s
wallet_watchonly.py --usecli            | ✓ Passed  | 1 s
wallet_zapwallettxes.py                 | ✓ Passed  | 5 s

ALL                                     | ✓ Passed  | 838 s (accumulated) 
Runtime: 168 s

ninja: build stopped: cannot make progress due to previous errors.
Build build-diff failed with exit code 1

Each failure log is accessible here:
Bitcoin ABC functional tests: rpc_psbt.py

Fabien edited the summary of this revision. (Show Details)Sep 15 2020, 22:14
deadalnix accepted this revision.Sep 15 2020, 22:48
deadalnix added a subscriber: deadalnix.

You probably want to make the makepage generated via the build instead of being committed in source control.

This revision is now accepted and ready to land.Sep 15 2020, 22:48
Fabien planned changes to this revision.Sep 16 2020, 11:01
Fabien edited the summary of this revision. (Show Details)Sep 16 2020, 13:00
Fabien updated this revision to Diff 23508.Sep 16 2020, 13:01
Fabien edited the summary of this revision. (Show Details)

Remove the man pages from the package, since they are generated.

This revision is now accepted and ready to land.Sep 16 2020, 13:01
Harbormaster completed remote builds in B12745: Diff 23508.Sep 16 2020, 13:15
Closed by commit rABCaa8d0038de08: [CMAKE] Fix NSIS installing failing to find the man pages (authored by Fabien). · Explain WhySep 16 2020, 15:46
This revision was automatically updated to reflect the committed changes.
Fabien added a commit: rABCaa8d0038de08: [CMAKE] Fix NSIS installing failing to find the man pages.

Revision Contents
Changeset List

PathSize
cmake/
modules/
1 line

Diff 23512

View Options

cmake/modules/NSIS.template.in

Loading...