[pve-devel] r6483 - pve-cluster/trunk/data/PVE

svn-commits at proxmox.com svn-commits at proxmox.com
Wed Aug 17 11:43:55 CEST 2011


Author: dietmar
Date: 2011-08-17 11:43:55 +0200 (Wed, 17 Aug 2011)
New Revision: 6483

Modified:
   pve-cluster/trunk/data/PVE/Cluster.pm
   pve-cluster/trunk/data/PVE/Makefile.am
   pve-cluster/trunk/data/PVE/Makefile.in
   pve-cluster/trunk/data/PVE/pvecm
Log:
generate datacenter.cfg man page


Modified: pve-cluster/trunk/data/PVE/Cluster.pm
===================================================================
--- pve-cluster/trunk/data/PVE/Cluster.pm	2011-08-17 09:39:59 UTC (rev 6482)
+++ pve-cluster/trunk/data/PVE/Cluster.pm	2011-08-17 09:43:55 UTC (rev 6483)
@@ -1135,6 +1135,9 @@
     },
 };
 
+# make schema accessible from outside (for documentation)
+sub get_datacenter_schema { return $datacenter_schema };
+
 sub parse_datacenter_config {
     my ($filename, $raw) = @_;
 

Modified: pve-cluster/trunk/data/PVE/Makefile.am
===================================================================
--- pve-cluster/trunk/data/PVE/Makefile.am	2011-08-17 09:39:59 UTC (rev 6482)
+++ pve-cluster/trunk/data/PVE/Makefile.am	2011-08-17 09:43:55 UTC (rev 6483)
@@ -10,10 +10,27 @@
 perlbin_PROGRAMS = IPCC.so
 perlbindir = /usr/lib/perl5/auto/PVE/IPCC/
 
-%.1.gz: %
-	perl -I.. ./$* printmanpod|pod2man -n $* -s 1 -r ${VERSION} -c "Proxmox Documentation"|gzip -c9 >$@
+%.1.gz: %.1.pod
+	cat $<|pod2man -n $* -s 1 -r ${VERSION} -c "Proxmox Documentation"|gzip -c9 >$@
 
+%.5.gz: %.5.pod
+	cat $<|pod2man -n $* -s 5 -r ${VERSION} -c "Proxmox Documentation"|gzip -c9 >$@
+
+%.1.pod: %
+	perl -I.. ./$* printmanpod > $@
+
+datacenter.cfg.5.pod: Cluster.pm gen-datacenter-pod.pl
+	perl -I.. ./gen-datacenter-pod.pl > $@
+
+#datacenter.cfg.5.gz: Cluster.pm gen-datacenter-pod.pl
+#	./gen-datacenter-pod.pl|pod2man -n datacenter.cfg -s 5 -r ${VERSION} -c #"Proxmox Documentation"|gzip -c9 >$@
+
+
+pod_DATA = pvecm.1.pod datacenter.cfg.5.pod
+poddir = /usr/share/doc/pve-cluster/pod
+
 man1_MANS = pvecm.1.gz
+man5_MANS = datacenter.cfg.5.gz
 
 IPCC_so_SOURCES = IPCC.c ppport.h
 
@@ -23,4 +40,4 @@
 install-exec-hook:
 	perl -I.. ./pvecm verifyapi
 
-CLEANFILES = IPCC.c *~ *.1.gz
+CLEANFILES = IPCC.c *~ *.1.gz *.pod

Modified: pve-cluster/trunk/data/PVE/Makefile.in
===================================================================
--- pve-cluster/trunk/data/PVE/Makefile.in	2011-08-17 09:39:59 UTC (rev 6482)
+++ pve-cluster/trunk/data/PVE/Makefile.in	2011-08-17 09:43:55 UTC (rev 6483)
@@ -46,7 +46,8 @@
 CONFIG_CLEAN_FILES =
 CONFIG_CLEAN_VPATH_FILES =
 am__installdirs = "$(DESTDIR)$(perlbindir)" "$(DESTDIR)$(bindir)" \
-	"$(DESTDIR)$(man1dir)" "$(DESTDIR)$(pvelibdir)"
+	"$(DESTDIR)$(man1dir)" "$(DESTDIR)$(man5dir)" \
+	"$(DESTDIR)$(poddir)" "$(DESTDIR)$(pvelibdir)"
 PROGRAMS = $(perlbin_PROGRAMS)
 am_IPCC_so_OBJECTS = IPCC.$(OBJEXT)
 IPCC_so_OBJECTS = $(am_IPCC_so_OBJECTS)
@@ -86,9 +87,10 @@
 SOURCES = $(IPCC_so_SOURCES)
 DIST_SOURCES = $(IPCC_so_SOURCES)
 man1dir = $(mandir)/man1
+man5dir = $(mandir)/man5
 NROFF = nroff
-MANS = $(man1_MANS)
-DATA = $(pvelib_DATA)
+MANS = $(man1_MANS) $(man5_MANS)
+DATA = $(pod_DATA) $(pvelib_DATA)
 ETAGS = etags
 CTAGS = ctags
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
@@ -200,11 +202,17 @@
 bin_SCRIPTS = pvecm
 LDADD = $(QB_LIBS)
 perlbindir = /usr/lib/perl5/auto/PVE/IPCC/
+
+#datacenter.cfg.5.gz: Cluster.pm gen-datacenter-pod.pl
+#	./gen-datacenter-pod.pl|pod2man -n datacenter.cfg -s 5 -r ${VERSION} -c #"Proxmox Documentation"|gzip -c9 >$@
+pod_DATA = pvecm.1.pod datacenter.cfg.5.pod
+poddir = /usr/share/doc/pve-cluster/pod
 man1_MANS = pvecm.1.gz
+man5_MANS = datacenter.cfg.5.gz
 IPCC_so_SOURCES = IPCC.c ppport.h
 pvelib_DATA = IPCC.pm Cluster.pm
 pvelibdir = /usr/share/perl5/PVE
-CLEANFILES = IPCC.c *~ *.1.gz
+CLEANFILES = IPCC.c *~ *.1.gz *.pod
 all: all-am
 
 .SUFFIXES:
@@ -369,6 +377,60 @@
 	test -z "$$files" || { \
 	  echo " ( cd '$(DESTDIR)$(man1dir)' && rm -f" $$files ")"; \
 	  cd "$(DESTDIR)$(man1dir)" && rm -f $$files; }
+install-man5: $(man5_MANS)
+	@$(NORMAL_INSTALL)
+	test -z "$(man5dir)" || $(MKDIR_P) "$(DESTDIR)$(man5dir)"
+	@list='$(man5_MANS)'; test -n "$(man5dir)" || exit 0; \
+	{ for i in $$list; do echo "$$i"; done; \
+	} | while read p; do \
+	  if test -f $$p; then d=; else d="$(srcdir)/"; fi; \
+	  echo "$$d$$p"; echo "$$p"; \
+	done | \
+	sed -e 'n;s,.*/,,;p;h;s,.*\.,,;s,^[^5][0-9a-z]*$$,5,;x' \
+	      -e 's,\.[0-9a-z]*$$,,;$(transform);G;s,\n,.,' | \
+	sed 'N;N;s,\n, ,g' | { \
+	list=; while read file base inst; do \
+	  if test "$$base" = "$$inst"; then list="$$list $$file"; else \
+	    echo " $(INSTALL_DATA) '$$file' '$(DESTDIR)$(man5dir)/$$inst'"; \
+	    $(INSTALL_DATA) "$$file" "$(DESTDIR)$(man5dir)/$$inst" || exit $$?; \
+	  fi; \
+	done; \
+	for i in $$list; do echo "$$i"; done | $(am__base_list) | \
+	while read files; do \
+	  test -z "$$files" || { \
+	    echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(man5dir)'"; \
+	    $(INSTALL_DATA) $$files "$(DESTDIR)$(man5dir)" || exit $$?; }; \
+	done; }
+
+uninstall-man5:
+	@$(NORMAL_UNINSTALL)
+	@list='$(man5_MANS)'; test -n "$(man5dir)" || exit 0; \
+	files=`{ for i in $$list; do echo "$$i"; done; \
+	} | sed -e 's,.*/,,;h;s,.*\.,,;s,^[^5][0-9a-z]*$$,5,;x' \
+	      -e 's,\.[0-9a-z]*$$,,;$(transform);G;s,\n,.,'`; \
+	test -z "$$files" || { \
+	  echo " ( cd '$(DESTDIR)$(man5dir)' && rm -f" $$files ")"; \
+	  cd "$(DESTDIR)$(man5dir)" && rm -f $$files; }
+install-podDATA: $(pod_DATA)
+	@$(NORMAL_INSTALL)
+	test -z "$(poddir)" || $(MKDIR_P) "$(DESTDIR)$(poddir)"
+	@list='$(pod_DATA)'; test -n "$(poddir)" || list=; \
+	for p in $$list; do \
+	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+	  echo "$$d$$p"; \
+	done | $(am__base_list) | \
+	while read files; do \
+	  echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(poddir)'"; \
+	  $(INSTALL_DATA) $$files "$(DESTDIR)$(poddir)" || exit $$?; \
+	done
+
+uninstall-podDATA:
+	@$(NORMAL_UNINSTALL)
+	@list='$(pod_DATA)'; test -n "$(poddir)" || list=; \
+	files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
+	test -n "$$files" || exit 0; \
+	echo " ( cd '$(DESTDIR)$(poddir)' && rm -f" $$files ")"; \
+	cd "$(DESTDIR)$(poddir)" && rm -f $$files
 install-pvelibDATA: $(pvelib_DATA)
 	@$(NORMAL_INSTALL)
 	test -z "$(pvelibdir)" || $(MKDIR_P) "$(DESTDIR)$(pvelibdir)"
@@ -489,7 +551,7 @@
 check: check-am
 all-am: Makefile $(PROGRAMS) $(SCRIPTS) $(MANS) $(DATA)
 installdirs:
-	for dir in "$(DESTDIR)$(perlbindir)" "$(DESTDIR)$(bindir)" "$(DESTDIR)$(man1dir)" "$(DESTDIR)$(pvelibdir)"; do \
+	for dir in "$(DESTDIR)$(perlbindir)" "$(DESTDIR)$(bindir)" "$(DESTDIR)$(man1dir)" "$(DESTDIR)$(man5dir)" "$(DESTDIR)$(poddir)" "$(DESTDIR)$(pvelibdir)"; do \
 	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
 	done
 install: install-am
@@ -540,7 +602,7 @@
 
 info-am:
 
-install-data-am: install-man install-perlbinPROGRAMS \
+install-data-am: install-man install-perlbinPROGRAMS install-podDATA \
 	install-pvelibDATA
 
 install-dvi: install-dvi-am
@@ -558,7 +620,7 @@
 
 install-info-am:
 
-install-man: install-man1
+install-man: install-man1 install-man5
 
 install-pdf: install-pdf-am
 
@@ -588,9 +650,10 @@
 ps-am:
 
 uninstall-am: uninstall-binSCRIPTS uninstall-man \
-	uninstall-perlbinPROGRAMS uninstall-pvelibDATA
+	uninstall-perlbinPROGRAMS uninstall-podDATA \
+	uninstall-pvelibDATA
 
-uninstall-man: uninstall-man1
+uninstall-man: uninstall-man1 uninstall-man5
 
 .MAKE: install-am install-exec-am install-strip
 
@@ -601,13 +664,14 @@
 	install-data install-data-am install-dvi install-dvi-am \
 	install-exec install-exec-am install-exec-hook install-html \
 	install-html-am install-info install-info-am install-man \
-	install-man1 install-pdf install-pdf-am \
-	install-perlbinPROGRAMS install-ps install-ps-am \
-	install-pvelibDATA install-strip installcheck installcheck-am \
-	installdirs maintainer-clean maintainer-clean-generic \
-	mostlyclean mostlyclean-compile mostlyclean-generic pdf pdf-am \
-	ps ps-am tags uninstall uninstall-am uninstall-binSCRIPTS \
-	uninstall-man uninstall-man1 uninstall-perlbinPROGRAMS \
+	install-man1 install-man5 install-pdf install-pdf-am \
+	install-perlbinPROGRAMS install-podDATA install-ps \
+	install-ps-am install-pvelibDATA install-strip installcheck \
+	installcheck-am installdirs maintainer-clean \
+	maintainer-clean-generic mostlyclean mostlyclean-compile \
+	mostlyclean-generic pdf pdf-am ps ps-am tags uninstall \
+	uninstall-am uninstall-binSCRIPTS uninstall-man uninstall-man1 \
+	uninstall-man5 uninstall-perlbinPROGRAMS uninstall-podDATA \
 	uninstall-pvelibDATA
 
 
@@ -615,9 +679,18 @@
 	xsubpp IPCC.xs > IPCC.xsc
 	mv IPCC.xsc IPCC.c
 
-%.1.gz: %
-	perl -I.. ./$* printmanpod|pod2man -n $* -s 1 -r ${VERSION} -c "Proxmox Documentation"|gzip -c9 >$@
+%.1.gz: %.1.pod
+	cat $<|pod2man -n $* -s 1 -r ${VERSION} -c "Proxmox Documentation"|gzip -c9 >$@
 
+%.5.gz: %.5.pod
+	cat $<|pod2man -n $* -s 1 -r ${VERSION} -c "Proxmox Documentation"|gzip -c9 >$@
+
+%.1.pod: %
+	perl -I.. ./$* printmanpod > $@
+
+datacenter.cfg.5.pod: Cluster.pm gen-datacenter-pod.pl
+	./gen-datacenter-pod.pl > $@
+
 install-exec-hook:
 	perl -I.. ./pvecm verifyapi
 

Modified: pve-cluster/trunk/data/PVE/pvecm
===================================================================
--- pve-cluster/trunk/data/PVE/pvecm	2011-08-17 09:39:59 UTC (rev 6482)
+++ pve-cluster/trunk/data/PVE/pvecm	2011-08-17 09:43:55 UTC (rev 6483)
@@ -643,10 +643,14 @@
 
 =head1 SYNOPSIS
 
+=include synopsis
+
 =head1 DESCRIPTION
 
 pvecm is a program to manage the cluster configuration. It can be used
 to create a new cluster, join nodes to a cluster, leave the cluster,
 get status information and do various other cluster related tasks.
 
+=include pve_copyright
 
+



More information about the pve-devel mailing list