[mpich-commits] [mpich] MPICH primary repository branch, master, updated. v3.1rc2-27-g4a22099

mysql vizuser noreply at mpich.org
Wed Dec 4 12:59:27 CST 2013 

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "MPICH primary repository".

The branch, master has been updated
       via  4a2209907bfa636ada5aa7ef62c0605b17f09c9c (commit)
       via  607795a57482083fb5ad974e8d7ba0029f53cdd2 (commit)
      from  7b870da0cabc2e2c16e4fd6c5d7e84076886ca95 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
http://git.mpich.org/mpich.git/commitdiff/4a2209907bfa636ada5aa7ef62c0605b17f09c9c

commit 4a2209907bfa636ada5aa7ef62c0605b17f09c9c
Author: Wesley Bland <wbland at mcs.anl.gov>
Date:   Tue Dec 3 13:31:39 2013 -0600

    Add man page for missing hydra executables
    
    Fixes #1897. This adds a simple man page for hydra_nameserver, hydra_persist,
    and hydra_pmi_proxy. None of these man pages have any real information in them
    as users shouldn't be using these executables directly.
    
    Signed-off-by: Ken Raffenetti <raffenet at mcs.anl.gov>

diff --git a/src/pm/hydra/pm/pmiserv/Makefile.mk b/src/pm/hydra/pm/pmiserv/Makefile.mk
index 157b4e9..5dd1b7d 100644
--- a/src/pm/hydra/pm/pmiserv/Makefile.mk
+++ b/src/pm/hydra/pm/pmiserv/Makefile.mk
@@ -37,3 +37,5 @@ libpm_la_SOURCES += pm/pmiserv/pmiserv_pmi.c \
 	pm/pmiserv/pmiserv_utils.c \
 	pm/pmiserv/common.c \
 	pm/pmiserv/pmi_v2_common.c
+
+doc1_src_txt += pm/pmiserv/hydra_pmi_proxy.txt
diff --git a/src/pm/hydra/pm/pmiserv/hydra_pmi_proxy.txt b/src/pm/hydra/pm/pmiserv/hydra_pmi_proxy.txt
new file mode 100644
index 0000000..5390e18
--- /dev/null
+++ b/src/pm/hydra/pm/pmiserv/hydra_pmi_proxy.txt
@@ -0,0 +1,8 @@
+/*D hydra_pmi_proxy - Internal exectuable used by Hydra
+
+   Description:
+    This executable is designed to not be run directly by users, but to
+    support the Hydra process manager. As such, no documentation will be
+    provided here.
+
+D*/
diff --git a/src/pm/hydra/tools/bootstrap/persist/Makefile.mk b/src/pm/hydra/tools/bootstrap/persist/Makefile.mk
index 564c36f..3adf3c3 100644
--- a/src/pm/hydra/tools/bootstrap/persist/Makefile.mk
+++ b/src/pm/hydra/tools/bootstrap/persist/Makefile.mk
@@ -20,3 +20,5 @@ noinst_HEADERS +=                            \
 libhydra_la_SOURCES += tools/bootstrap/persist/persist_init.c \
 	tools/bootstrap/persist/persist_launch.c \
 	tools/bootstrap/persist/persist_wait.c
+
+doc1_src_txt += tools/bootstrap/persist/hydra_persist.txt
diff --git a/src/pm/hydra/tools/bootstrap/persist/hydra_persist.txt b/src/pm/hydra/tools/bootstrap/persist/hydra_persist.txt
new file mode 100644
index 0000000..2f63bed
--- /dev/null
+++ b/src/pm/hydra/tools/bootstrap/persist/hydra_persist.txt
@@ -0,0 +1,8 @@
+/*D hydra_persist - Internal executable used by Hydra
+
+   Description:
+    This executable is designed to not be run directly by users, but to
+    support the Hydra process manager. As such, no documentation will be
+    provided here.
+
+D*/
diff --git a/src/pm/hydra/tools/nameserver/Makefile.mk b/src/pm/hydra/tools/nameserver/Makefile.mk
index e8a19fb..f173024 100644
--- a/src/pm/hydra/tools/nameserver/Makefile.mk
+++ b/src/pm/hydra/tools/nameserver/Makefile.mk
@@ -11,3 +11,5 @@ hydra_nameserver_CFLAGS = $(AM_CFLAGS)
 hydra_nameserver_LDFLAGS = $(external_ldflags) 
 hydra_nameserver_LDADD = -lhydra $(external_libs)
 hydra_nameserver_DEPENDENCIES = libhydra.la
+
+doc1_src_txt += tools/nameserver/hydra_nameserver.txt
diff --git a/src/pm/hydra/tools/nameserver/hydra_nameserver.txt b/src/pm/hydra/tools/nameserver/hydra_nameserver.txt
new file mode 100644
index 0000000..38e1bae
--- /dev/null
+++ b/src/pm/hydra/tools/nameserver/hydra_nameserver.txt
@@ -0,0 +1,8 @@
+/*D hydra_nameserver - Internal executable used by Hydra
+
+   Description:
+    This executable is designed to not be run directly by users, but to
+    support the Hydra process manager. As such, no documentation will be
+    provided here.
+
+D*/

http://git.mpich.org/mpich.git/commitdiff/607795a57482083fb5ad974e8d7ba0029f53cdd2

commit 607795a57482083fb5ad974e8d7ba0029f53cdd2
Author: Wesley Bland <wbland at mcs.anl.gov>
Date:   Tue Dec 3 13:30:11 2013 -0600

    Add doctext to hydra build system.
    
    This adds the framework to add doctext docs to hydra. To add a .txt file, just
    add it to the doc1_src_txt autogen variable.
    
    Signed-off-by: Ken Raffenetti <raffenet at mcs.anl.gov>

diff --git a/src/pm/Makefile.mk b/src/pm/Makefile.mk
index 4f03b82..15bcc7a 100644
--- a/src/pm/Makefile.mk
+++ b/src/pm/Makefile.mk
@@ -29,6 +29,7 @@ include $(top_srcdir)/src/pm/remshell/Makefile.mk
 if BUILD_PM_HYDRA
 SUBDIRS += src/pm/hydra
 DIST_SUBDIRS += src/pm/hydra
+MANDOC_SUBDIRS += src/pm/hydra
 endif BUILD_PM_HYDRA
 
 # uses a separate Makefile.sm, not Makefile.mk
diff --git a/src/pm/hydra/Makefile.am b/src/pm/hydra/Makefile.am
index 450877f..a4626f5 100644
--- a/src/pm/hydra/Makefile.am
+++ b/src/pm/hydra/Makefile.am
@@ -12,6 +12,9 @@ external_libs = -lmpl
 bin_PROGRAMS =
 noinst_HEADERS =
 DISTCLEANFILES =
+EXTRA_DIST =
+SUFFIXES =
+doc1_src_txt =
 
 ACLOCAL_AMFLAGS = -I confdb
 AM_CPPFLAGS = -I$(top_srcdir)/include -I$(top_srcdir)/@mpl_srcdir@/include \
@@ -19,7 +22,7 @@ AM_CPPFLAGS = -I$(top_srcdir)/include -I$(top_srcdir)/@mpl_srcdir@/include \
 
 noinst_HEADERS += include/hydra.h include/hydra_server.h
 
-EXTRA_DIST = autogen.sh
+EXTRA_DIST += autogen.sh
 
 noinst_LTLIBRARIES = libhydra.la
 libhydra_la_SOURCES =
@@ -52,8 +55,54 @@ install-alt: $(bin_PROGRAMS)
 uninstall-local:
 	rm -f ${DESTDIR}${bindir}/@MPIRUN_NAME@ ${DESTDIR}${bindir}/@MPIEXEC_NAME@
 
+# --------------------------------------------------------------------------
+#.PHONY: mandoc mandoc-local htmldoc htmldoc-local
+SUFFIXES += .man-phony .html-phony .man1-phony .html1-phony .txt
+
+# "make V=1" support for our documentation recipes
+doctextman_verbose = $(doctextman_verbose_$(V))
+doctextman_verbose_ = $(doctextman_verbose_$(AM_DEFAULT_VERBOSITY))
+doctextman_verbose_0 = @echo "   DOCTEXTMAN  " $@;
+doctexthtml_verbose = $(doctexthtml_verbose_$(V))
+doctexthtml_verbose_ = $(doctexthtml_verbose_$(AM_DEFAULT_VERBOSITY))
+doctexthtml_verbose_0 = @echo "   DOCTEXTHTML  " $@;
+
+# Build dir paths where the man pages will be created. Will usually be
+# overridden by MPICH make.
+mandoc_path1=${DESTDIR}${sharedir}/man/man1
+mandoc_path3=${DESTDIR}${sharedir}/man/man3
+htmldoc_path1=${DESTDIR}${sharedir}/www/www1
+htmldoc_path3=${DESTDIR}${sharedir}/www/www3
+doctext_docnotes=
+
+.c.man-phony:
+	$(doctextman_verbose)$(DOCTEXT) -man -mpath $(mandoc_path3) -ext 3 \
+	    -heading HYDRA -quotefmt $(doctext_docnotes) $<
+.c.html-phony:
+	$(doctexthtml_verbose)$(DOCTEXT) -html -mpath $(htmldoc_path3) \
+	    -heading HYDRA -quotefmt $(doctext_docnotes) $<
+
+.txt.man1-phony:
+	$(doctextman_verbose)$(DOCTEXT) -man -mpath $(mandoc_path1) -ext 1 \
+	    -heading HYDRA -quotefmt $(doctext_docnotes) $<
+.txt.html1-phony:
+	$(doctexthtml_verbose)$(DOCTEXT) -html -mpath $(htmldoc_path1) \
+	    -heading HYDRA -quotefmt $(doctext_docnotes) $<
+
+# use mandoc-local target to force directory creation before running DOCTEXT
+mandoc:
+	test -d $(mandoc_path1) || $(MKDIR_P) $(mandoc_path1)
+	test -d $(mandoc_path3) || $(MKDIR_P) $(mandoc_path3)
+	$(MAKE) $(AM_MAKEFLAGS) mandoc-local
+mandoc-local: $(doc1_src_txt:.txt=.man1-phony)
+
+# use htmldoc-local target to force directory creation before running DOCTEXT
 htmldoc:
 	if test "@DOXYGEN@" != "" ; then @DOXYGEN@ hydra-doxygen.cfg ; fi
+	test -d $(top_builddir)/www/www1 || $(MKDIR_P) $(top_builddir)/www/www1
+	test -d $(top_builddir)/www/www3 || $(MKDIR_P) $(top_builddir)/www/www3
+	$(MAKE) $(AM_MAKEFLAGS) htmldoc-local
+htmldoc-local: $(doc1_src_txt:.txt=.man1-phony)
 
 # created by confdb/aclocal_cache.m4
 DISTCLEANFILES += config.system
diff --git a/src/pm/hydra/configure.ac b/src/pm/hydra/configure.ac
index e0fa208..4d545d0 100644
--- a/src/pm/hydra/configure.ac
+++ b/src/pm/hydra/configure.ac
@@ -33,7 +33,7 @@ AS_CASE([$host],
 )
 
 
-AM_INIT_AUTOMAKE([-Wall -Werror foreign 1.12.3 subdir-objects])
+AM_INIT_AUTOMAKE([-Wall -Wno-portability-recursive -Werror foreign 1.12.3 subdir-objects])
 
 AM_PROG_AR
 
@@ -48,6 +48,13 @@ PAC_RESET_LINK_FLAGS()
 
 PAC_ARG_STRICT
 
+# In case the documentation targets are used, find doctext and attempt to find
+# the source for the doctext LaTex style files. Use "false" if doctext is not
+# found
+AC_PATH_PROG(DOCTEXT,doctext,false)
+export DOCTEXT
+AC_SUBST(DOCTEXT)
+
 AC_C_CONST
 AC_C_VOLATILE
 AC_C_RESTRICT

-----------------------------------------------------------------------

Summary of changes:
 src/pm/Makefile.mk                                 |    1 +
 src/pm/hydra/Makefile.am                           |   51 +++++++++++++++++++-
 src/pm/hydra/configure.ac                          |    9 +++-
 src/pm/hydra/pm/pmiserv/Makefile.mk                |    2 +
 src/pm/hydra/pm/pmiserv/hydra_pmi_proxy.txt        |    8 +++
 src/pm/hydra/tools/bootstrap/persist/Makefile.mk   |    2 +
 .../tools/bootstrap/persist/hydra_persist.txt      |    8 +++
 src/pm/hydra/tools/nameserver/Makefile.mk          |    2 +
 src/pm/hydra/tools/nameserver/hydra_nameserver.txt |    8 +++
 9 files changed, 89 insertions(+), 2 deletions(-)
 create mode 100644 src/pm/hydra/pm/pmiserv/hydra_pmi_proxy.txt
 create mode 100644 src/pm/hydra/tools/bootstrap/persist/hydra_persist.txt
 create mode 100644 src/pm/hydra/tools/nameserver/hydra_nameserver.txt


hooks/post-receive
-- 
MPICH primary repository

More information about the commits mailing list