|
From: Tyrel D. <ty...@us...> - 2012-10-27 01:08:34
|
Update of /cvsroot/sblim/gather
In directory vz-cvs-3.sog:/tmp/cvs-serv3513
Modified Files:
Makefile.am NEWS configure.ac
Log Message:
Fixed 3019058: add man pages/help for gatherd and reposd
Index: NEWS
===================================================================
RCS file: /cvsroot/sblim/gather/NEWS,v
retrieving revision 1.135
retrieving revision 1.136
diff -u -d -r1.135 -r1.136
--- NEWS 25 Oct 2012 23:13:51 -0000 1.135
+++ NEWS 27 Oct 2012 01:08:30 -0000 1.136
@@ -7,6 +7,9 @@
3573315 thread cleanup segv if gather libs unloaded
3580235 use setProperty for instance keys under Pegasus
+Features added:
+- 3019058 add man pages/help for gatherd and reposd
+
Changes in Version 2.2.6
========================
Index: configure.ac
===================================================================
RCS file: /cvsroot/sblim/gather/configure.ac,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -d -r1.44 -r1.45
--- configure.ac 15 Aug 2012 03:02:14 -0000 1.44
+++ configure.ac 27 Oct 2012 01:08:31 -0000 1.45
@@ -24,6 +24,8 @@
AC_PROG_LIBTOOL
AM_PROG_CC_C_O
+AC_CHECK_PROG(enable_man,xmlto,"yes","no")
+
# Features
AC_ARG_ENABLE(base,
[AS_HELP_STRING([--disable-base],
@@ -166,7 +168,10 @@
CHECK_TESTSUITE
AC_CONFIG_FILES([Makefile sblim-gather.spec gatherer.init-suse
- gatherer.init-redhat gatherer.init-none])
+ gatherer.init-redhat gatherer.init-none
+ man/gatherd.8.xml.pre man/gatherctl.8.xml.pre
+ man/gatherd.conf.5.xml.pre man/reposd.8.xml.pre
+ man/reposctl.8.xml.pre man/reposd.conf.5.xml.pre])
AC_SUBST(ARCHDEF)
@@ -174,6 +179,7 @@
AM_CONDITIONAL(VIRT_METRICS, [test "$enable_virt" == "yes"])
AM_CONDITIONAL(Z_METRICS, [test "$enable_z" == "yes"])
AM_CONDITIONAL(PROVIDER,[test "$enable_provider" == "yes"])
+AM_CONDITIONAL(GENMAN,[test "$enable_man" == "yes"])
if test "$enable_debug" == "yes"
then
@@ -196,6 +202,8 @@
echo "Enable Provider: " $enable_provider
echo "Enable Debug: " $enable_debug
echo ""
+echo "Build manpages (requires xmlto): " $enable_man
+echo ""
if test $enable_provider == yes
then
echo "CIMSERVER: " $CIMSERVER
Index: Makefile.am
===================================================================
RCS file: /cvsroot/sblim/gather/Makefile.am,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -d -r1.27 -r1.28
--- Makefile.am 1 Oct 2012 02:15:35 -0000 1.27
+++ Makefile.am 27 Oct 2012 01:08:30 -0000 1.28
@@ -45,6 +45,9 @@
#
doc_DATA=README AUTHORS COPYING README.TEST reposd2csv.pl
+MANFILES=man/gatherd.8 man/gatherctl.8 man/gatherd.conf.5 \
+ man/reposd.8 man/reposctl.8 man/reposd.conf.5
+
if BASE_METRICS
BASE_DOC=plugin/metricIPProtocolEndpoint.readme \
plugin/metricNetworkPort.readme \
@@ -383,6 +386,9 @@
# Gather init scripts
EXTRA_DIST += gatherer.init-suse.in gatherer.init-redhat.in \
gatherer.init-none.in
+if GENMAN
+man_MANS=$(MANFILES)
+endif
init_SCRIPTS=gatherer
@@ -390,6 +396,18 @@
sed -e s?$$\{prefix\}?$(prefix)?g \
-e s?$$\{exec_prefix\}?$(prefix)?g $< > $@
+SUFFIXES = .xml .xml.pre .5.xml .8.xml .5 .8
+
+.xml.pre.xml:
+ sed -e s?$$\{prefix\}?$(prefix)?g \
+ -e s?$$\{exec_prefix\}?$(prefix)?g $< > $@
+
+.5.xml.5:
+ xmlto -o man man $<
+
+.8.xml.8:
+ xmlto -o man man $<
+
# Gather config files
sysconf_DATA = gatherd.conf reposd.conf
EXTRA_DIST += $(sysconf_DATA)
@@ -409,7 +427,8 @@
$(MAKE) -C $(PROVIDER_SUBDIR) preuninstall
clean-local:
- rm -f gatherer gatherer.init-redhat gatherer.init-suse gatherer.init-none
+ rm -f gatherer gatherer.init-redhat gatherer.init-suse gatherer.init-none \
+ man/*.8 man/*.5
dist-hook:
test -d "$(distdir)" && rm -rf `find $(distdir) -type d -name CVS`
|