lukechilds
/
lightning
mirror of https://github.com/lukechilds/lightning.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
Browse Source

build: exclude dualopend from non-experimental builds

bump-pyln-proto
niftynei 4 years ago
committed by Rusty Russell
parent
303263d381
commit
5cd06227d7
19 changed files with 63 additions and 26 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 8
      Makefile
  2. 5
      channeld/Makefile
  3. 5
      closingd/Makefile
  4. 11
      common/Makefile
  5. 5
      common/test/Makefile
  6. 0
      common/test/exp-run-psbt_diff.c
  7. 5
      connectd/Makefile
  8. 5
      devtools/Makefile
  9. 5
      gossipd/Makefile
  10. 4
      hsmd/Makefile
  11. 12
      lightningd/Makefile
  12. 2
      lightningd/dual_open_control.c
  13. 1
      lightningd/test/run-find_my_abspath.c
  14. 1
      lightningd/test/run-invoice-select-inchan.c
  15. 1
      lightningd/test/run-jsonrpc.c
  16. 1
      lightningd/test/run-log-pruning.c
  17. 5
      onchaind/Makefile
  18. 12
      openingd/Makefile
  19. 1
      wallet/reservation.c

8
Makefile
View File

@ -580,8 +580,12 @@ PKGLIBEXEC_PROGRAMS = \
lightningd/lightning_gossipd \
lightningd/lightning_hsmd \
lightningd/lightning_onchaind \
lightningd/lightning_openingd \
lightningd/lightning_dualopend
lightningd/lightning_openingd
# Only build dualopend if experimental features is on
ifeq ($(EXPERIMENTAL_FEATURES),1)
PKGLIBEXEC_PROGRAMS += lightningd/lightning_dualopend
endif
# $(PLUGINS) is defined in plugins/Makefile.

5
channeld/Makefile
View File

@ -70,7 +70,6 @@ CHANNELD_COMMON_OBJS := \
common/per_peer_state.o \
common/permute_tx.o \
common/ping.o \
common/psbt_open.o \
common/pseudorand.o \
common/read_peer_msg.o \
common/setup.o \
@ -90,6 +89,10 @@ CHANNELD_COMMON_OBJS := \
wire/fromwire.o \
wire/towire.o
ifeq ($(EXPERIMENTAL_FEATURES),1)
CHANNELD_COMMON_OBJS += common/psbt_open.o
endif
channeld/gen_full_channel_error_names.h: channeld/full_channel_error.h ccan/ccan/cdump/tools/cdump-enumstr
ccan/ccan/cdump/tools/cdump-enumstr channeld/full_channel_error.h > $@

5
closingd/Makefile
View File

@ -46,7 +46,6 @@ CLOSINGD_COMMON_OBJS := \
common/peer_failed.o \
common/per_peer_state.o \
common/permute_tx.o \
common/psbt_open.o \
common/pseudorand.o \
common/read_peer_msg.o \
common/setup.o \
@ -62,6 +61,10 @@ CLOSINGD_COMMON_OBJS := \
common/wireaddr.o \
gossipd/gossipd_peerd_wiregen.o
ifeq ($(EXPERIMENTAL_FEATURES),1)
CLOSINGD_COMMON_OBJS += common/psbt_open.o
endif
lightningd/lightning_closingd: $(CLOSINGD_OBJS) $(WIRE_ONION_OBJS) $(CLOSINGD_COMMON_OBJS) $(WIRE_OBJS) $(BITCOIN_OBJS) $(HSMD_CLIENT_OBJS)
-include closingd/test/Makefile

11
common/Makefile
View File

@ -56,7 +56,6 @@ COMMON_SRC_NOGEN := \
common/peer_failed.c \
common/permute_tx.c \
common/ping.c \
common/psbt_open.c \
common/pseudorand.c \
common/random_select.c \
common/read_peer_msg.c \
@ -76,6 +75,11 @@ COMMON_SRC_NOGEN := \
common/wireaddr.c \
common/wire_error.c
ifeq ($(EXPERIMENTAL_FEATURES),1)
COMMON_SRC_NOGEN += common/psbt_open.c
endif
COMMON_SRC_GEN := common/status_wiregen.c common/peer_status_wiregen.c
COMMON_HEADERS_NOGEN := $(COMMON_SRC_NOGEN:.c=.h) \
@ -109,11 +113,6 @@ common/gen_htlc_state_names.h: common/htlc_state.h ccan/ccan/cdump/tools/cdump-e
common/gossip_store.o: gossipd/gossip_store_wiregen.h
check-makefile: check-common-makefile
check-common-makefile:
if [ x"`LC_ALL=C ls common/*.h | grep -v ^common/gen_ | grep -v '^common/.*wiregen'`" != x"`echo $(COMMON_HEADERS_NOGEN) | tr ' ' '\n' | LC_ALL=C sort`" ]; then echo COMMON_HEADERS_NOGEN incorrect; exit 1; fi
check-source-bolt: $(COMMON_SRC_NOGEN:%=bolt-check/%) $(COMMON_HEADERS:%=bolt-check/%)
check-whitespace: $(COMMON_SRC_NOGEN:%=check-whitespace/%) $(COMMON_HEADERS:%=check-whitespace/%)

5
common/test/Makefile
View File

@ -1,4 +1,9 @@
COMMON_TEST_SRC := $(wildcard common/test/run-*.c)
ifeq ($(EXPERIMENTAL_FEATURES),1)
COMMON_TEST_SRC += $(wildcard common/test/exp-run-*.c)
endif
COMMON_TEST_OBJS := $(COMMON_TEST_SRC:.c=.o)
COMMON_TEST_PROGRAMS := $(COMMON_TEST_OBJS:.o=)

0
common/test/run-psbt_diff.c → common/test/exp-run-psbt_diff.c
View File

5
connectd/Makefile
View File

@ -49,7 +49,6 @@ CONNECTD_COMMON_OBJS := \
common/node_id.o \
common/onionreply.o \
common/per_peer_state.o \
common/psbt_open.o \
common/pseudorand.o \
common/setup.o \
common/status.o \
@ -66,6 +65,10 @@ CONNECTD_COMMON_OBJS := \
lightningd/gossip_msg.o \
wire/onion$(EXP)_wiregen.o
ifeq ($(EXPERIMENTAL_FEATURES),1)
CONNECTD_COMMON_OBJS += common/psbt_open.o
endif
lightningd/lightning_connectd: $(CONNECTD_OBJS) $(CONNECTD_COMMON_OBJS) $(BITCOIN_OBJS) $(WIRE_OBJS) $(HSMD_CLIENT_OBJS)
include connectd/test/Makefile

5
devtools/Makefile
View File

@ -33,7 +33,6 @@ DEVTOOLS_COMMON_OBJS := \
common/memleak.o \
common/node_id.o \
common/per_peer_state.o \
common/psbt_open.o \
common/pseudorand.o \
common/json.o \
common/json_helpers.o \
@ -45,6 +44,10 @@ DEVTOOLS_COMMON_OBJS := \
wire/onion$(EXP)_wiregen.o \
wire/peer$(EXP)_wiregen.o
ifeq ($(EXPERIMENTAL_FEATURES),1)
DEVTOOLS_COMMON_OBJS += common/psbt_open.o
endif
devtools/bolt11-cli: $(DEVTOOLS_COMMON_OBJS) $(JSMN_OBJS) $(CCAN_OBJS) $(BITCOIN_OBJS) wire/fromwire.o wire/towire.o devtools/bolt11-cli.o
devtools/decodemsg: $(DEVTOOLS_COMMON_OBJS) $(JSMN_OBJS) $(CCAN_OBJS) $(BITCOIN_OBJS) $(WIRE_PRINT_OBJS) wire/fromwire.o wire/towire.o devtools/print_wire.o devtools/decodemsg.o

5
gossipd/Makefile
View File

@ -51,7 +51,6 @@ GOSSIPD_COMMON_OBJS := \
common/onionreply.o \
common/per_peer_state.o \
common/ping.o \
common/psbt_open.o \
common/pseudorand.o \
common/random_select.o \
common/setup.o \
@ -69,6 +68,10 @@ GOSSIPD_COMMON_OBJS := \
lightningd/gossip_msg.o \
wire/onion$(EXP)_wiregen.o
ifeq ($(EXPERIMENTAL_FEATURES),1)
GOSSIPD_COMMON_OBJS += common/psbt_open.o
endif
lightningd/lightning_gossipd: $(GOSSIPD_OBJS) $(GOSSIPD_COMMON_OBJS) $(BITCOIN_OBJS) $(WIRE_OBJS) $(HSMD_CLIENT_OBJS)
include gossipd/test/Makefile

4
hsmd/Makefile
View File

@ -31,7 +31,6 @@ HSMD_COMMON_OBJS := \
common/msg_queue.o \
common/node_id.o \
common/permute_tx.o \
common/psbt_open.o \
common/setup.o \
common/status.o \
common/status_wire.o \
@ -41,6 +40,9 @@ HSMD_COMMON_OBJS := \
common/utxo.o \
common/version.o
ifeq ($(EXPERIMENTAL_FEATURES),1)
HSMD_COMMON_OBJS += common/psbt_open.o
endif
lightningd/lightning_hsmd: $(HSMD_OBJS) $(HSMD_COMMON_OBJS) $(BITCOIN_OBJS) $(WIRE_OBJS)

12
lightningd/Makefile
View File

@ -8,7 +8,6 @@ LIGHTNINGD_SRC := \
lightningd/closing_control.c \
lightningd/coin_mvts.c \
lightningd/connect_control.c \
lightningd/dual_open_control.c \
lightningd/onion_message.c \
lightningd/gossip_control.c \
lightningd/gossip_msg.c \
@ -39,6 +38,12 @@ LIGHTNINGD_SRC := \
lightningd/subd.c \
lightningd/watch.c
# Only build dualopend if experimental features is on
ifeq ($(EXPERIMENTAL_FEATURES),1)
LIGHTNINGD_SRC += lightningd/dual_open_control.c
endif
LIGHTNINGD_SRC_NOHDR := \
lightningd/signmessage.c
@ -101,7 +106,6 @@ LIGHTNINGD_COMMON_OBJS := \
common/penalty_base.o \
common/per_peer_state.o \
common/permute_tx.o \
common/psbt_open.o \
common/pseudorand.o \
common/random_select.o \
common/setup.o \
@ -116,6 +120,10 @@ LIGHTNINGD_COMMON_OBJS := \
common/wire_error.o \
common/wireaddr.o \
ifeq ($(EXPERIMENTAL_FEATURES),1)
LIGHTNINGD_COMMON_OBJS += common/psbt_open.o
endif
include wallet/Makefile
# All together in one convenient var

2
lightningd/dual_open_control.c
View File

@ -30,7 +30,6 @@
#include <wire/common_wiregen.h>
#include <wire/peer_wire.h>
#if EXPERIMENTAL_FEATURES
struct commit_rcvd {
struct channel *channel;
struct channel_id cid;
@ -1016,4 +1015,3 @@ void peer_start_dualopend(struct peer *peer,
send_msg);
subd_send_msg(uc->open_daemon, take(msg));
}
#endif /* EXPERIMENTAL_FEATURES */

1
lightningd/test/run-find_my_abspath.c
View File

@ -6,7 +6,6 @@ int unused_main(int argc, char *argv[]);
#include "../lightningd.c"
#include "../subd.c"
#include <common/amount.h>
#include <common/psbt_open.h>
/* AUTOGENERATED MOCKS START */
/* Generated stub for activate_peers */

1
lightningd/test/run-invoice-select-inchan.c
View File

@ -3,7 +3,6 @@
#include "../routehint.c"
#include <ccan/alignof/alignof.h>
#include <common/errcode.h>
#include <common/psbt_open.h>
bool deprecated_apis = false;

1
lightningd/test/run-jsonrpc.c
View File

@ -1,7 +1,6 @@
#include "../../common/json_stream.c"
#include "../jsonrpc.c"
#include "../json.c"
#include <common/psbt_open.h>
/* AUTOGENERATED MOCKS START */
/* Generated stub for db_begin_transaction_ */

1
lightningd/test/run-log-pruning.c
View File

@ -1,5 +1,4 @@
#include "../log.c"
#include <common/psbt_open.h>
#include <common/wireaddr.h>
/* AUTOGENERATED MOCKS START */

5
onchaind/Makefile
View File

@ -53,7 +53,6 @@ ONCHAIND_COMMON_OBJS := \
common/onionreply.o \
common/peer_billboard.o \
common/permute_tx.o \
common/psbt_open.o \
common/setup.o \
common/status.o \
common/status_wire.o \
@ -64,6 +63,10 @@ ONCHAIND_COMMON_OBJS := \
common/version.o \
common/wallet.o
ifeq ($(EXPERIMENTAL_FEATURES),1)
ONCHAIND_COMMON_OBJS += common/psbt_open.o
endif
lightningd/lightning_onchaind: $(ONCHAIND_OBJS) $(WIRE_ONION_OBJS) $(ONCHAIND_COMMON_OBJS) $(WIRE_OBJS) $(BITCOIN_OBJS) $(HSMD_CLIENT_OBJS)
include onchaind/test/Makefile

12
openingd/Makefile
View File

@ -23,7 +23,12 @@ $(DUALOPEND_OBJS): $(DUALOPEND_HEADERS)
# Make sure these depend on everything.
ALL_C_SOURCES += $(OPENINGD_SRC) $(DUALOPEND_SRC)
ALL_C_HEADERS += $(OPENINGD_HEADERS) $(DUALOPEND_HEADERS)
ALL_PROGRAMS += lightningd/lightning_openingd lightningd/lightning_dualopend
ALL_PROGRAMS += lightningd/lightning_openingd
# Only build dualopend if experimental features is on
ifeq ($(EXPERIMENTAL_FEATURES),1)
ALL_PROGRAMS += lightningd/lightning_dualopend
endif
# Here's what lightningd depends on
LIGHTNINGD_CONTROL_HEADERS += openingd/openingd_wiregen.h openingd/dualopend_wiregen.h
@ -65,7 +70,6 @@ OPENINGD_COMMON_OBJS := \
common/peer_billboard.o \
common/peer_failed.o \
common/permute_tx.o \
common/psbt_open.o \
common/pseudorand.o \
common/read_peer_msg.o \
common/setup.o \
@ -81,6 +85,10 @@ OPENINGD_COMMON_OBJS := \
gossipd/gossipd_peerd_wiregen.o \
lightningd/gossip_msg.o
ifeq ($(EXPERIMENTAL_FEATURES),1)
OPENINGD_COMMON_OBJS += common/psbt_open.o
endif
lightningd/lightning_openingd: $(OPENINGD_OBJS) $(OPENINGD_COMMON_OBJS) $(WIRE_OBJS) $(BITCOIN_OBJS) $(HSMD_CLIENT_OBJS)
lightningd/lightning_dualopend: $(DUALOPEND_OBJS) $(OPENINGD_COMMON_OBJS) $(WIRE_OBJS) $(BITCOIN_OBJS) $(HSMD_CLIENT_OBJS)

1
wallet/reservation.c
View File

@ -6,7 +6,6 @@
#include <common/json_helpers.h>
#include <common/jsonrpc_errors.h>
#include <common/key_derive.h>
#include <common/psbt_open.h>
#include <lightningd/jsonrpc.h>
#include <lightningd/lightningd.h>
#include <wallet/wallet.h>

Write Preview
Loading…
Cancel
Save