scripted-diff: Rename UPnP stuff
ClosedPublic
Actions

Authored by PiRK on Sep 27 2022, 13:00.

Details

Reviewers

Fabien

Group Reviewers

Restricted Project

Commits

rABCd3de3962eef2: scripted-diff: Rename UPnP stuff

Summary

-BEGIN VERIFY SCRIPT-
sed -i 's/g_upnp_interrupt/g_mapport_interrupt/' src/mapport.cpp
sed -i 's/if(g_upnp_thread/if (g_mapport_thread/' src/mapport.cpp
sed -i 's/g_upnp_thread/g_mapport_thread/' src/mapport.cpp
sed -i 's/LOCAL_UPNP/LOCAL_MAPPED/' src/mapport.cpp
sed -i 's/\bupnp\b/mapport/' src/mapport.cpp
sed -i 's/LOCAL_UPNP,  /LOCAL_MAPPED,/' src/net.h
arc lint
-END VERIFY SCRIPT-

This is a backport of core#18077 [5/13]
https://github.com/bitcoin/bitcoin/pull/18077/commits/cf151cc68c95a8943e43e3fa4061e176262779e7

Depends on D12071

Test Plan

ninja all check-all

Diff Detail

Repository

rABC Bitcoin ABC

Lint

Lint Not Applicable

Unit

Tests Not Applicable

Event Timeline

PiRK created this revision.Sep 27 2022, 13:00

Herald added a reviewer: Restricted Project. · View Herald TranscriptSep 27 2022, 13:00

PiRK requested review of this revision.Sep 27 2022, 13:00

teamcity edited the summary of this revision. (Show Details)Sep 27 2022, 13:01

PiRK added a child revision: D12074: gui: Apply port mapping changes on dialog exit.Sep 27 2022, 13:01

Harbormaster completed remote builds in B20198: Diff 35212.Sep 27 2022, 13:14

Build Bitcoin ABC Diffs / Diff Testing (build-clang-tidy) failed.

Tail of the build log:

[342/520] Building C object src/secp256k1/CMakeFiles/internal-bench.dir/src/bench_internal.c.o
[343/520] Building CXX object src/CMakeFiles/script.dir/script/descriptor.cpp.o
[344/520] Building CXX object src/CMakeFiles/bitcoin-wallet.dir/bitcoin-wallet.cpp.o
[345/520] Building CXX object src/CMakeFiles/script.dir/script/standard.cpp.o
[346/520] Building CXX object src/CMakeFiles/bitcoinconsensus.dir/consensus/tx_check.cpp.o
[347/520] Building CXX object src/CMakeFiles/bitcoin-cli.dir/bitcoin-cli.cpp.o
[348/520] Building C object src/secp256k1/CMakeFiles/secp256k1.dir/src/secp256k1.c.o
[349/520] Building CXX object src/CMakeFiles/script.dir/script/signingprovider.cpp.o
[350/520] Linking C static library src/secp256k1/libsecp256k1.a
[351/520] Linking CXX static library src/libbitcoinconsensus.a
[352/520] Building CXX object src/test/CMakeFiles/testutil.dir/util/str.cpp.o
[353/520] Linking CXX static library src/libscript.a
[354/520] Linking C executable src/secp256k1/ecmult-bench
[355/520] Linking C executable src/secp256k1/internal-bench
[356/520] Linking CXX static library src/libcommon.a
[357/520] Linking C executable src/secp256k1/sign-bench
[358/520] Linking CXX shared library src/libbitcoinconsensus.so.0.26.3
[359/520] Creating library symlink src/libbitcoinconsensus.so.0 src/libbitcoinconsensus.so
[360/520] Linking CXX executable src/bitcoin-cli
[361/520] Linking C executable src/secp256k1/verify-bench
[362/520] Linking C executable src/secp256k1/recover-bench
[363/520] Building CXX object src/test/CMakeFiles/testutil.dir/util/logging.cpp.o
[364/520] Building CXX object src/CMakeFiles/bitcoin-tx.dir/bitcoin-tx.cpp.o
[365/520] Linking CXX executable src/bitcoin-tx
[366/520] Building CXX object src/wallet/CMakeFiles/wallet.dir/context.cpp.o
[367/520] Building CXX object src/test/CMakeFiles/testutil.dir/util/transaction_utils.cpp.o
[368/520] Building CXX object src/test/CMakeFiles/testutil.dir/util/blockfilter.cpp.o
[369/520] Building CXX object src/wallet/CMakeFiles/wallet.dir/coinselection.cpp.o
[370/520] Building CXX object src/test/CMakeFiles/testutil.dir/util/mining.cpp.o
[371/520] Building CXX object src/wallet/CMakeFiles/wallet.dir/bdb.cpp.o
[372/520] Building CXX object src/wallet/CMakeFiles/wallet.dir/db.cpp.o
[373/520] Building CXX object src/wallet/CMakeFiles/wallet.dir/coincontrol.cpp.o
[374/520] Building CXX object src/wallet/CMakeFiles/wallet.dir/crypter.cpp.o
[375/520] Building CXX object src/test/CMakeFiles/testutil.dir/util/wallet.cpp.o
[376/520] Building CXX object src/wallet/CMakeFiles/wallet-tool.dir/wallettool.cpp.o
[377/520] Building CXX object src/wallet/CMakeFiles/wallet.dir/__/interfaces/wallet.cpp.o
[378/520] Building CXX object src/CMakeFiles/server.dir/net_processing.cpp.o
[379/520] Building CXX object src/wallet/CMakeFiles/wallet.dir/sqlite.cpp.o
[380/520] Building CXX object src/wallet/CMakeFiles/wallet.dir/fees.cpp.o
[381/520] Building CXX object src/test/CMakeFiles/testutil.dir/util/net.cpp.o
[382/520] Building CXX object src/seeder/CMakeFiles/seeder-base.dir/dns.cpp.o
[383/520] Building CXX object src/wallet/CMakeFiles/wallet.dir/load.cpp.o
[384/520] Building CXX object src/wallet/CMakeFiles/wallet.dir/walletutil.cpp.o
[385/520] Building CXX object src/wallet/CMakeFiles/wallet.dir/salvage.cpp.o
[386/520] Building CXX object src/wallet/CMakeFiles/wallet.dir/rpcdump.cpp.o
[387/520] Building CXX object src/seeder/CMakeFiles/seeder-base.dir/db.cpp.o
[388/520] Building CXX object src/wallet/CMakeFiles/wallet.dir/scriptpubkeyman.cpp.o
[389/520] Building CXX object src/wallet/CMakeFiles/wallet.dir/rpcwallet.cpp.o
[390/520] Building CXX object src/wallet/CMakeFiles/wallet.dir/walletdb.cpp.o
[391/520] Building CXX object src/seeder/CMakeFiles/seeder-base.dir/options.cpp.o
[392/520] Building CXX object src/seeder/CMakeFiles/bitcoin-seeder.dir/main.cpp.o
[393/520] Building CXX object src/wallet/CMakeFiles/wallet.dir/wallet.cpp.o
[394/520] Building CXX object src/CMakeFiles/server.dir/validation.cpp.o
[395/520] Linking CXX static library src/wallet/libwallet.a
[396/520] Building CXX object src/test/CMakeFiles/testutil.dir/util/setup_common.cpp.o
[397/520] Linking CXX static library src/wallet/libwallet-tool.a
[398/520] Linking CXX executable src/bitcoin-wallet
[399/520] Building CXX object src/seeder/CMakeFiles/seeder-base.dir/bitcoin.cpp.o
ninja: build stopped: cannot make progress due to previous errors.
Build build-clang-tidy failed with exit code 1