Fix help generation for darcs-kompare and darcs-meld.
Warning, cannot access the index:
_darcs/index: opening of '_darcs/index' failed: permission denied (Permission denied)
diff -rN -u old-bii_scripts/Makefile new-bii_scripts/Makefile
--- old-bii_scripts/Makefile 2022-12-09 20:18:54.576358258 +0100
+++ new-bii_scripts/Makefile 2022-12-09 20:18:54.576358258 +0100
@@ -44,6 +44,10 @@
# help when called with "-h" as the only parameter
# add scriptname to the PLAINTXT_H_SCRIPT_LIST variable
+# for scripts with name * (no file extension) that generate
+# help when called with "--help" as the only parameter
+# add scriptname to the PLAINTXT_HELP_SCRIPT_LIST variable
+
# for scripts with name * (no file extension) that generate
# reStructuredText when called with "--doc" as the only parameter
# add scriptname to the RST_DOC_SCRIPT_LIST variable
@@ -279,8 +283,6 @@
db2dot \
dbdiff \
darcs-compare-repos \
- darcs-kompare \
- darcs-meld \
darcs-sig \
hg-kompare \
hg-meld \
@@ -294,6 +296,12 @@
psh \
substdiff\
csv2plot
+
+# scripts with no embedded documentation
+# create online help by executing "(script --help 2>&1; true)
+PLAINTXT_HELP_SCRIPT_LIST= \
+ darcs-kompare \
+ darcs-meld
# scripts with no embedded documentation
# create online help by executing "(script.p -h 2>&1; true)
@@ -490,6 +498,9 @@
_HTML_PLAINTXT_H_SCRIPT_BUILD_LIST=\
$(addprefix $(SCRIPT_HTML_BUILD_DIR)/,$(call force_extension_list,html,$(PLAINTXT_H_SCRIPT_LIST)))
+_HTML_PLAINTXT_HELP_SCRIPT_BUILD_LIST=\
+ $(addprefix $(SCRIPT_HTML_BUILD_DIR)/,$(call force_extension_list,html,$(PLAINTXT_HELP_SCRIPT_LIST)))
+
_HTML_PLAINTXT_H_P_SCRIPT_BUILD_LIST=\
$(addprefix $(SCRIPT_HTML_BUILD_DIR)/,$(call force_extension_list,html,$(PLAINTXT_H_P_SCRIPT_LIST)))
@@ -741,6 +752,7 @@
build_html_script_plaintxt: $(_HTML_PLAINTXT_SCRIPT_BUILD_LIST) \
$(_HTML_PLAINTXT_H_SCRIPT_BUILD_LIST) \
+ $(_HTML_PLAINTXT_HELP_SCRIPT_BUILD_LIST) \
$(_HTML_PLAINTXT_H_P_SCRIPT_BUILD_LIST) \
$(_HTML_PLAINTXT_H_PL_SCRIPT_BUILD_LIST) \
$(_HTML_PLAINTXT_H_PY_SCRIPT_BUILD_LIST) \
@@ -756,6 +768,11 @@
(. $(SETENV) && $< -h 2>&1; true) >> $@
@echo "</PRE>" >> $@
+$(_HTML_PLAINTXT_HELP_SCRIPT_BUILD_LIST): $(SCRIPT_HTML_BUILD_DIR)/%.html: $(SCRIPT_SRC_DIR)/% $(SETENV) | $(SCRIPT_HTML_BUILD_DIR)
+ @echo "<PRE>" > $@
+ (. $(SETENV) && $< --help 2>&1; true) >> $@
+ @echo "</PRE>" >> $@
+
$(_HTML_PLAINTXT_H_P_SCRIPT_BUILD_LIST): $(SCRIPT_HTML_BUILD_DIR)/%.html: $(SCRIPT_SRC_DIR)/%.p $(SETENV) | $(SCRIPT_HTML_BUILD_DIR)
@echo "<PRE>" > $@
(. $(SETENV) && $< -h 2>&1; true) >> $@
patch ec0a1e768d7eec2dc3c9062d8e6b42777742f358
Author: Goetz.Pfeiffer@helmholtz-berlin.de
Date: Fri Jun 11 00:19:57 CEST 2021
* Fix help generation for darcs-kompare and darcs-meld.
In darcs-meld, option "-h" does not generate online help, you have to use
"--help" instead. Now the makefile contains an extra rule for such files.
Since darcs-kompare will probably at some point in the future also handle "-h"
that way, it is now also called with "--help" instead