From d379873443d0f8b6f4be05c7468fab966a9c39b5 Mon Sep 17 00:00:00 2001 From: Igor Ivanov Date: Mon, 5 Oct 2015 15:41:28 +0300 Subject: [PATCH] oshmem: Add man.1 pages for oshmem tools This changes add man pages for oshrun, oshcc and oshfort as well as depricated shmemrun, shmemcc and shmemfort. --- orte/tools/orterun/orterun.1in | 4 ++- oshmem/tools/wrappers/Makefile.am | 43 +++++++++++++++++++++++++++++++ 2 files changed, 46 insertions(+), 1 deletion(-) diff --git a/orte/tools/orterun/orterun.1in b/orte/tools/orterun/orterun.1in index dd379a1774..a7cc26d791 100644 --- a/orte/tools/orterun/orterun.1in +++ b/orte/tools/orterun/orterun.1in @@ -13,10 +13,12 @@ .SH NAME . orterun, mpirun, mpiexec \- Execute serial and parallel jobs in Open MPI. +oshrun, shmemrun \- Execute serial and parallel jobs in Open SHMEM. .B Note: \fImpirun\fP, \fImpiexec\fP, and \fIorterun\fP are all synonyms for each -other. Using any of the names will produce the same behavior. +other as well as \fIoshrun\fP, \fIshmemrun\fP in case Open SHMEM is installed. +Using any of the names will produce the same behavior. . .\" ************************** .\" Synopsis Section diff --git a/oshmem/tools/wrappers/Makefile.am b/oshmem/tools/wrappers/Makefile.am index 0f1da6a845..80868d22f2 100644 --- a/oshmem/tools/wrappers/Makefile.am +++ b/oshmem/tools/wrappers/Makefile.am @@ -10,7 +10,13 @@ # # $HEADER$ +include $(top_srcdir)/Makefile.ompi-rules + +man_pages = oshcc.1 shmemcc.1 oshfort.1 shmemfort.1 oshrun.1 shmemrun.1 + if PROJECT_OSHMEM +man_MANS = $(man_pages) + nodist_oshmemdata_DATA = \ shmemcc-wrapper-data.txt \ shmemfort-wrapper-data.txt @@ -49,4 +55,41 @@ uninstall-local: $(DESTDIR)$(bindir)/oshjavac \ $(DESTDIR)$(bindir)/shmemjavac + +######################################################## +# +# Man page generation / handling +# +######################################################## +distclean-local: + rm -f $(man_pages) + +$(top_builddir)/opal/tools/wrappers/generic_wrapper.1: + (cd $(top_builddir)/opal/tools/wrappers && $(MAKE) $(AM_MAKEFLAGS) generic_wrapper.1) + +oshcc.1: $(top_builddir)/opal/tools/wrappers/generic_wrapper.1 + rm -f oshcc.1 + sed -e 's/#COMMAND#/oshcc/g' -e 's/#PROJECT#/Open SHMEM/g' -e 's/#PROJECT_SHORT#/OSHMEM/g' -e 's/#LANGUAGE#/C/g' < $(top_builddir)/opal/tools/wrappers/generic_wrapper.1 > oshcc.1 + +shmemcc.1: $(top_builddir)/opal/tools/wrappers/generic_wrapper.1 + rm -f shmemcc.1 + sed -e 's/#COMMAND#/shmemcc/g' -e 's/#PROJECT#/Open SHMEM/g' -e 's/#PROJECT_SHORT#/OSHMEM/g' -e 's/#LANGUAGE#/C/g' < $(top_builddir)/opal/tools/wrappers/generic_wrapper.1 > shmemcc.1 + +oshfort.1: $(top_builddir)/opal/tools/wrappers/generic_wrapper.1 + rm -f oshfort.1 + sed -e 's/#COMMAND#/oshfort/g' -e 's/#PROJECT#/Open SHMEM/g' -e 's/#PROJECT_SHORT#/OSHMEM/g' -e 's/#LANGUAGE#/Fortran/g' < $(top_builddir)/opal/tools/wrappers/generic_wrapper.1 > oshfort.1 + +shmemfort.1: $(top_builddir)/opal/tools/wrappers/generic_wrapper.1 + rm -f shmemfort.1 + sed -e 's/#COMMAND#/shmemfort/g' -e 's/#PROJECT#/Open SHMEM/g' -e 's/#PROJECT_SHORT#/OSHMEM/g' -e 's/#LANGUAGE#/Fortran/g' < $(top_builddir)/opal/tools/wrappers/generic_wrapper.1 > shmemfort.1 + +$(top_builddir)/orte/tools/orterun/orterun.1: + (cd $(top_builddir)/orte/tools/orterun && $(MAKE) $(AM_MAKEFLAGS) orterun.1) + +oshrun.1: $(top_builddir)/orte/tools/orterun/orterun.1 + cp -f $(top_builddir)/orte/tools/orterun/orterun.1 oshrun.1 + +shmemrun.1: $(top_builddir)/orte/tools/orterun/orterun.1 + cp -f $(top_builddir)/orte/tools/orterun/orterun.1 shmemrun.1 + endif # PROJECT_OSHMEM