From 70340650c39efa3391ebf38df5be250a4272d5bb Mon Sep 17 00:00:00 2001 From: Marius Tolzmann Date: Mon, 10 Aug 2015 22:12:51 +0200 Subject: [PATCH 1/2] Makefile: Add rules for manpages --- Makefile | 23 +++++++++++++++++++++-- 1 file changed, 21 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index bb385ba..64cec49 100644 --- a/Makefile +++ b/Makefile @@ -113,6 +113,18 @@ quiet-installforuser = $(call quiet-command,install -m ${1} -o ${2} -g ${3} ${4} ######################################################################## +.SECONDARY: + +MAN1DIR := ${MANDIR}/man1 + +manpages/%: manpages/%.xml + $(call quiet-command,xmlto --stringparam man.output.quietly=1 man $^ -o manpages, " XMLTO $@") + +%: manpages/% Makefile + $(call quiet-command,sed -e "s/@MXQ_VERSION@/${MXQ_VERSION}/" $< >$@, " GEN $@") + +######################################################################## + .PHONY: all .PHONY: build @@ -129,8 +141,11 @@ test: ######################################################################## +.PHONY: mrproper +mrproper: clean + .PHONY: clean -clean: +mrproper clean: @for i in $(CLEAN) ; do \ if [ -e "$$i" ] ; then \ if [ "$(V)" = 1 ] ; then \ @@ -146,7 +161,7 @@ clean: .PHONY: fix fix: - @for i in *.c *.h Makefile mysql/create_tables mxqdctl-hostconfig.sh ; do \ + @for i in *.c *.h Makefile mysql/create_tables mxqdctl-hostconfig.sh manpages/*.xml ; do \ if grep -q -m 1 -E '\s+$$' $$i ; then \ echo "FIX $$i" ; \ sed -i $$i -e 's/\s*$$//g' ; \ @@ -156,10 +171,14 @@ fix: ######################################################################## .PHONY: install + install:: build + +install:: $(call quiet-installdir,0755,${DESTDIR}${BINDIR}) $(call quiet-installdir,0755,${DESTDIR}${SBINDIR}) $(call quiet-installdir,0755,${DESTDIR}${SYSCONFDIR}/mxq) + $(call quiet-installdir,0755,${DESTDIR}${MAN1DIR}) ######################################################################## From cdfdb3a013db9bb90bfe59e2ef5d47186c7a2f08 Mon Sep 17 00:00:00 2001 From: Marius Tolzmann Date: Mon, 10 Aug 2015 22:15:58 +0200 Subject: [PATCH 2/2] manpages: Add mxqsub.1 --- .gitignore | 1 + Makefile | 9 ++++ manpages/mxqsub.1.xml | 97 +++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 107 insertions(+) create mode 100644 manpages/mxqsub.1.xml diff --git a/.gitignore b/.gitignore index 2791531..ae66896 100644 --- a/.gitignore +++ b/.gitignore @@ -15,6 +15,7 @@ mxq_log.o mx_mysql.o mxqsub +/mxqsub.1 mxqdump mxqkill mxqd diff --git a/Makefile b/Makefile index 64cec49..6e7e26f 100644 --- a/Makefile +++ b/Makefile @@ -410,6 +410,15 @@ install:: mxqdctl-hostconfig.sh ######################################################################## +build: mxqsub.1 + +mrproper: CLEAN += manpages/mxqsub.1 +clean: CLEAN += mxqsub.1 +#install:: mxqsub.1 +# $(call quiet-install,0644,mxqsub.1,${DESTDIR}${MAN1DIR}/mxqsub.1) + +######################################################################## + test_mx_util.o: $(mx_util.h) clean: CLEAN += test_mx_util.o diff --git a/manpages/mxqsub.1.xml b/manpages/mxqsub.1.xml new file mode 100644 index 0000000..81a5503 --- /dev/null +++ b/manpages/mxqsub.1.xml @@ -0,0 +1,97 @@ + + + + + + + + MXQ - mariux64 queueing system + MXQ @MXQ_VERSION@ + + + + Developer + Marius + Tolzmann + tolzmann@molgen.mpg.de + + + + + + mxqsub + 1 + + + + mxqsub + Submit a job + + + + + mxqsub + options + <command> + arguments + + + + + Description + + + mxqsub is used to + queue a job to be executed on a cluster node. + <command> [arguments] will be executed on a node that offers + enough resources to run the job. The [options] can + influence the job environment and the scheduling decisions made + by the cluster + + + + + Options + + + + + + + specify the estimated runtime. + + + + + + Environment + + + + + default for --mysql-default-file + + + + + + Bugs + + Please report bugs to helpdesk@molgen.mpg.de or directly to the author. + + + + + See Also + + MXQ1, + + +