Skip to content

Commit 2db5640

Browse files
committed
doc: add manual page for modulecmd(1) command
Signed-off-by: Xavier Delaruelle <xavier.delaruelle@cea.fr>
1 parent f8e2a9e commit 2db5640

File tree

14 files changed

+95
-17
lines changed

14 files changed

+95
-17
lines changed

Makefile

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -836,7 +836,8 @@ dist-tar: ChangeLog.gz share/rpm/environment-modules.spec pkgdoc
836836
doc/build/MIGRATING.txt doc/build/changes.txt doc/build/INSTALL.txt \
837837
doc/build/INSTALL-win.txt doc/build/NEWS.txt doc/build/CONTRIBUTING.txt \
838838
doc/build/module.1.in doc/build/ml.1 doc/build/envml.1 \
839-
doc/build/modulefile.5 share/rpm/environment-modules.spec
839+
doc/build/modulecmd.1 doc/build/modulefile.5 \
840+
share/rpm/environment-modules.spec
840841

841842
dist-gzip: dist-tar
842843
$(ECHO_GEN2) $(DIST_PREFIX).tar.gz

NEWS.rst

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -47,6 +47,7 @@ Modules 5.7.0 (not yet released)
4747
variable. (fix issue #595 with contribution from Achim Gsell)
4848
* Install: reorder the options in the :file:`configure` script help message
4949
alphabetically.
50+
* Doc: add manual page for :ref:`modulecmd(1)` command.
5051

5152

5253
.. _5.6 release notes:

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -103,7 +103,7 @@ type:
103103

104104
The following man pages are provided:
105105

106-
module(1), ml(1), envml(1), modulefile(5)
106+
module(1), ml(1), modulecmd(1), envml(1), modulefile(5)
107107

108108

109109
Test suite

configure

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1034,7 +1034,7 @@ if [ -e "${builddocdir}/changes.txt" ] && [ -e "${builddocdir}/MIGRATING.txt" ]
10341034
&& [ -e "${builddocdir}/NEWS.txt" ] && [ -e "${builddocdir}/CONTRIBUTING.txt" ] \
10351035
&& [ -e "${builddocdir}/module.1.in" ] && [ -e "${builddocdir}/ml.1" ] \
10361036
&& [ -e "${builddocdir}/envml.1" ] && [ -e "${builddocdir}/modulefile.5" ] \
1037-
&& [ "$oldbuilddoc" != 'y' ]; then
1037+
&& [ -e "${builddocdir}/modulecmd.1" ] && [ "$oldbuilddoc" != 'y' ]; then
10381038
builddoc=p
10391039
# test sphinx availability otherwise
10401040
else

doc/Makefile

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ ALL_RST := $(filter-out $(SOURCE_DIR)/latex_index.rst, $(wildcard $(SOURCE_DIR)/
3838
ALL_TXT := $(patsubst $(SOURCE_DIR)/%,$(BUILD_DIR)/%,$(patsubst %.rst,%.txt,$(ALL_RST)))
3939
ALL_HTML := $(patsubst $(SOURCE_DIR)/%,$(BUILD_DIR)/%,$(patsubst %.rst,%.html,$(ALL_RST)))
4040
ALL_MAN := $(BUILD_DIR)/module.1 $(BUILD_DIR)/ml.1 $(BUILD_DIR)/envml.1\
41-
$(BUILD_DIR)/modulefile.5
41+
$(BUILD_DIR)/modulecmd.1 $(BUILD_DIR)/modulefile.5
4242
ALL_TEX := $(BUILD_DIR)/latex/modules.tex
4343
ALL_PDF := $(BUILD_DIR)/latex/modules.pdf
4444

@@ -105,7 +105,8 @@ $(BUILD_DIR)/%.txt: $(SOURCE_DIR)/%.rst $(SOURCE_DIR)/version.py
105105
$(ECHO_GEN2) $(ECHO_DIR_PREFIX)$(BUILD_DIR)/*.txt
106106
$(SPHINXBUILD) $(SPHINXOPTS) -b text "$(SOURCE_DIR)" "$(BUILD_DIR)"
107107

108-
$(BUILD_DIR)/module.1.in $(BUILD_DIR)/modulefile.5 $(BUILD_DIR)/ml.1 $(BUILD_DIR)/envml.1: $(ALL_RST) $(SOURCE_DIR)/version.py
108+
$(BUILD_DIR)/module.1.in $(BUILD_DIR)/modulefile.5 $(BUILD_DIR)/ml.1 $(BUILD_DIR)/modulecmd.1 $(BUILD_DIR)/envml.1: $(ALL_RST) $(SOURCE_DIR)/version.py
109+
$(ECHO_GEN2) $(ECHO_DIR_PREFIX)$(BUILD_DIR)/modulecmd.1
109110
$(ECHO_GEN2) $(ECHO_DIR_PREFIX)$(BUILD_DIR)/envml.1
110111
$(ECHO_GEN2) $(ECHO_DIR_PREFIX)$(BUILD_DIR)/ml.1
111112
$(ECHO_GEN2) $(ECHO_DIR_PREFIX)$(BUILD_DIR)/module.1.in
@@ -138,6 +139,7 @@ ifeq ($(docinstall),y)
138139
endif
139140
$(INSTALL_DATA) $(BUILD_DIR)/module.1 '$(DESTDIR)$(mandir)/man1/'
140141
$(INSTALL_DATA) $(BUILD_DIR)/ml.1 '$(DESTDIR)$(mandir)/man1/'
142+
$(INSTALL_DATA) $(BUILD_DIR)/modulecmd.1 '$(DESTDIR)$(mandir)/man1/'
141143
$(INSTALL_DATA) $(BUILD_DIR)/envml.1 '$(DESTDIR)$(mandir)/man1/'
142144
$(INSTALL_DATA) $(BUILD_DIR)/modulefile.5 '$(DESTDIR)$(mandir)/man5/'
143145

@@ -153,6 +155,7 @@ ifeq ($(docinstall),y)
153155
endif
154156
rm -f '$(DESTDIR)$(mandir)/man1/module.1'
155157
rm -f '$(DESTDIR)$(mandir)/man1/ml.1'
158+
rm -f '$(DESTDIR)$(mandir)/man1/modulecmd.1'
156159
rm -f '$(DESTDIR)$(mandir)/man1/envml.1'
157160
rm -f '$(DESTDIR)$(mandir)/man5/modulefile.5'
158161
rmdir '$(DESTDIR)$(mandir)/man1' '$(DESTDIR)$(mandir)/man5'

doc/source/conf.py

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -233,6 +233,7 @@ def get_version_release_from_git():
233233
rst_epilog += '.. |emph libexecdir| replace:: *%s*\n' % libexecdir
234234
rst_epilog += '.. |bold libexecdir| replace:: **%s**\n' % libexecdir
235235
rst_epilog += '.. |file libexecdir| replace:: :file:`%s`\n' % libexecdir
236+
rst_epilog += '.. |file bindir_modulecmd| replace:: :file:`%s/modulecmd`\n' % bindir
236237
rst_epilog += '.. |file libexecdir_modulecmd| replace:: :file:`%s/modulecmd.tcl`\n' % libexecdir
237238
rst_epilog += '.. |etcdir| replace:: %s\n' % etcdir
238239
rst_epilog += '.. |emph etcdir| replace:: *%s*\n' % etcdir
@@ -295,6 +296,7 @@ def get_version_release_from_git():
295296
('module', 'module', u'command interface to the Modules package', [], 1),
296297
('ml', 'ml', u'handy command interface to the Modules package', [], 1),
297298
('modulefile', 'modulefile', u'files containing Tcl code for the Modules package', [], 5),
299+
('modulecmd', 'modulecmd', u'generic wrapper pointing to Modules execution engine', [], 1),
298300
('envml', 'envml', u'run a command in an environment setting up by Modules', [], 1)
299301
]
300302

doc/source/envml.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -99,4 +99,4 @@ shell function), :command:`envml` will print an error and exit.
9999
SEE ALSO
100100
--------
101101

102-
:ref:`module(1)`, :ref:`ml(1)`, :ref:`modulefile(5)`
102+
:ref:`module(1)`, :ref:`modulecmd(1)`, :ref:`ml(1)`, :ref:`modulefile(5)`

doc/source/index.rst

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -202,6 +202,7 @@ or (at your option) any later version (`GPL-2.0-or-later`).
202202
ml
203203
module
204204
modulefile
205+
modulecmd
205206
envml
206207

207208
.. toctree::

doc/source/latex_index.rst

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@ Introduction
1414
.. include:: module.rst
1515
.. include:: modulefile.rst
1616
.. include:: ml.rst
17+
.. include:: modulecmd.rst
1718
.. include:: envml.rst
1819
.. include:: MIGRATING.rst
1920
.. include:: NEWS.rst

doc/source/ml.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -93,5 +93,5 @@ the list of supported environment variables.
9393
SEE ALSO
9494
--------
9595

96-
:ref:`module(1)`, :ref:`modulefile(5)`, :ref:`envml(1)`
96+
:ref:`envml(1)`, :ref:`module(1)`, :ref:`modulecmd(1)`, :ref:`modulefile(5)`
9797

0 commit comments

Comments
 (0)