Skip to content

Commit

Permalink
Condense common parameters in Makefile.am
Browse files Browse the repository at this point in the history
Signed-off-by: codewithvk <[email protected]>
Change-Id: Ie3027c63cc31eea2dea2cb0a997d296a24476581
  • Loading branch information
codewithvk authored and mmeeks committed Jun 3, 2023
1 parent 9010d01 commit 71039cb
Showing 1 changed file with 15 additions and 18 deletions.
33 changes: 15 additions & 18 deletions Makefile.am
Original file line number Diff line number Diff line change
Expand Up @@ -460,28 +460,25 @@ setup-wsd: all @JAILS_PATH@
@cp $(abs_top_srcdir)/test/data/hello.odp $(abs_top_srcdir)/test/data/hello-world.odp
@echo

COMMON_PARAMS = \
--o:sys_template_path="@SYSTEMPLATE_PATH@" \
--o:security.capabilities="$(CAPABILITIES)" \
--o:child_root_path="@JAILS_PATH@" --o:storage.filesystem[@allow]=true \
--o:ssl.cert_file_path="$(abs_top_srcdir)/etc/cert.pem" \
--o:ssl.key_file_path="$(abs_top_srcdir)/etc/key.pem" \
--o:ssl.ca_file_path="$(abs_top_srcdir)/etc/ca-chain.cert.pem" \
--o:admin_console.username=admin --o:admin_console.password=admin

run: setup-wsd
./coolwsd --o:sys_template_path="@SYSTEMPLATE_PATH@" \
--o:security.capabilities="$(CAPABILITIES)" \
--o:child_root_path="@JAILS_PATH@" --o:storage.filesystem[@allow]=true \
--o:ssl.cert_file_path="$(abs_top_srcdir)/etc/cert.pem" \
--o:ssl.key_file_path="$(abs_top_srcdir)/etc/key.pem" \
--o:ssl.ca_file_path="$(abs_top_srcdir)/etc/ca-chain.cert.pem" \
--o:admin_console.username=admin --o:admin_console.password=admin \
--o:logging.file[@enable]=${OUTPUT_TO_FILE} --o:logging.level=trace \
--o:trace_event[@enable]=true
./coolwsd $(COMMON_PARAMS) \
--o:logging.file[@enable]=${OUTPUT_TO_FILE} --o:logging.level=trace \
--o:trace_event[@enable]=true

if ENABLE_DEBUG
run-one: setup-wsd
./coolwsd --o:sys_template_path="@SYSTEMPLATE_PATH@" \
--o:security.capabilities="$(CAPABILITIES)" \
--o:child_root_path="@JAILS_PATH@" --o:storage.filesystem[@allow]=true \
--o:ssl.cert_file_path="$(abs_top_srcdir)/etc/cert.pem" \
--o:ssl.key_file_path="$(abs_top_srcdir)/etc/key.pem" \
--o:ssl.ca_file_path="$(abs_top_srcdir)/etc/ca-chain.cert.pem" \
--o:admin_console.username=admin --o:admin_console.password=admin \
--o:logging.file[@enable]=true --o:logging.level=trace \
--singlekit
./coolwsd $(COMMON_PARAMS) \
--o:logging.file[@enable]=true --o:logging.level=trace \
--singlekit
endif

sync-writer:
Expand Down

0 comments on commit 71039cb

Please sign in to comment.