click_package/tests/: Propagate DEFAULT_ROOT name as defined by configure script
click_package/tests/: Propagate DEFAULT_ROOT name is defined by configure script over to unit tests.
This addresses #2.
CI status: https://ci.ubports.com/blue/organizations/jenkins/UBportsCore%2Fclick/activity?branch=MR-4
Merge request reports
Activity
added DistroBase: 20.04 label
We are very sorry that this MR has been stale for so long. @sunweaver would you be so kind to take a quick look and comment here whether this change still applicable? If so we will assign a core developer to review this in due time. Thank you for your help.
requested review from @mariogrip, @gberh, and @peat-psuwit
CI is currently failing.
https://ci.ubports.com/blue/organizations/jenkins/UBportsCore%2Fclick/detail/MR-4/9/pipeline/
dh_installman -O--buildsystem=autoconf dh_installman: error: Cannot find (any matches for) "doc/_build/man/click.1" (tried in .) dh_installman: error: Aborting due to earlier errorI think nothing calls the
substrule in thedoc/Makefile?
added 23 commits
-
7ead027b...e41fec1f - 21 commits from branch
ubports/development/core:main - 5978543e - click_package/tests/: Propagate DEFAULT_ROOT name as defined by configure...
- f4545ecd - doc/: Provide means to override default package path (DEFAULT_ROOT).
-
7ead027b...e41fec1f - 21 commits from branch
added 5 commits
-
f4545ecd...89338f9a - 3 commits from branch
ubports/development/core:main - 1fb471a8 - click_package/tests/: Propagate DEFAULT_ROOT name as defined by configure...
- 3cb8ba05 - doc/: Provide means to override default package path (DEFAULT_ROOT).
-
f4545ecd...89338f9a - 3 commits from branch
assigned to @sunweaver and unassigned @dobey
27 27 28 28 override_dh_auto_build: 29 29 dh_auto_build 30 $(MAKE) -C doc subst DEFAULT_ROOT=/opt/click.ubuntu.com This was the least invasive approach, so we don't divert from the sphinx build Makefile template as little as possible.
I can, of course add subst as a requirement for nearly all other targets and add subst-clean as requirement for the clean target.
Edited by Mike Gabrielchanged this line in version 7 of the diff
@peat-psuwit I have adjusted the doc/Makefile.am now as proposed. Let's see if CI succeeds. I have three more MRs (patches I ship in click in Debian) pending that depend on this MR.
Edited by Mike Gabriel-
I see. If the goal is to minimize changes in other parts of the Makefile, I guess the dependency could be specified right after
substrule and not necessarily at its own rule. Alternatively, I guess a pattern rule like this would also work:%.rst: %.rst.in Makefile sed -e "s,[@]DEFAULT_ROOT[@],$(DEFAULT_ROOT),g" $< > $@But then
clean: subst-cleanhas to still be specified.
added 1 commit
- 50e15b1d - doc/: Provide means to override default package path (DEFAULT_ROOT).
7 7 PAPER = 8 8 BUILDDIR = _build 9 9 10 # click-specific variable 11 DEFAULT_ROOT = /opt/click.ubuntu.com 12 13 # click-specific targets 14 subst: SHELL:=/bin/bash 15 subst: 16 for file in *.rst.in; do sed -e "s,[@]DEFAULT_ROOT[@],$(DEFAULT_ROOT),g" > $${file/.rst.in/.rst} < $${file}; done - Comment on lines +14 to +16
The for loop and replacement could be made a bit more robust, also there is no need for bash:
14 subst: SHELL:=/bin/bash 15 subst: 16 for file in *.rst.in; do sed -e "s,[@]DEFAULT_ROOT[@],$(DEFAULT_ROOT),g" > $${file/.rst.in/.rst} < $${file}; done 14 subst: 15 for file in ./*.rst.in; do [ -f "${file}" ] && sed -e "s,[@]DEFAULT_ROOT[@],$(DEFAULT_ROOT),g" > "$${file%.in}" < "$${file}"; done
7 7 PAPER = 8 8 BUILDDIR = _build 9 9 10 # click-specific variable 11 DEFAULT_ROOT = /opt/click.ubuntu.com 12 13 # click-specific targets 14 subst: SHELL:=/bin/bash 15 subst: 16 for file in *.rst.in; do sed -e "s,[@]DEFAULT_ROOT[@],$(DEFAULT_ROOT),g" > $${file/.rst.in/.rst} < $${file}; done 17 18 subst-clean: SHELL:=/bin/bash 19 subst-clean: 20 for file in *.rst.in; do rm -f $${file/.rst.in/.rst}; done added 44 commits
-
50e15b1d...6ab48930 - 42 commits from branch
ubports/development/core:main - ab810ecc - click_package/tests/: Propagate DEFAULT_ROOT name as defined by configure...
- 1342f50b - doc/: Provide means to override default package path (DEFAULT_ROOT).
-
50e15b1d...6ab48930 - 42 commits from branch
