X-Git-Url: https://git.proxmox.com/?p=pve-docs.git;a=blobdiff_plain;f=Makefile;h=2d5255ea2a53483893c17c27aee3dcc205ac2af7;hp=6bdefd7f72e109e119953474b00c5f94729d4b20;hb=9b4799ab53514589a741a14856e6e4aa5751052f;hpb=bef0c1b49710bbb4c0e19055994ed7111c8fd670

diff --git a/Makefile b/Makefile
index 6bdefd7..2d5255e 100644
--- a/Makefile
+++ b/Makefile
@@ -7,6 +7,8 @@ PACKAGE=pve-doc-generator
 # also update debian/changelog
 PKGREL=1
 
+GITVERSION:=$(shell cat .git/refs/heads/master)
+
 DEB=${PACKAGE}_${DOCRELEASE}-${PKGREL}_amd64.deb
 
 
@@ -14,33 +16,43 @@ DEB_SOURCES=			\
 	pve-doc-generator.mk	\
 	attributes.txt		\
 	pvesm.adoc		\
+	pve-storage-dir.adoc 	\
+	pve-storage-glusterfs.adoc	\
+	pve-storage-iscsi.adoc		\
+	pve-storage-iscsidirect.adoc	\
+	pve-storage-lvm.adoc		\
+	pve-storage-nfs.adoc		\
+	pve-storage-rbd.adoc		\
+	pve-storage-zfspool.adoc	\
+	pvecm.adoc			\
 	pveum.adoc		\
 	vzdump.adoc		\
 	pve-firewall.adoc	\
 	qm.adoc			\
+	qmrestore.adoc		\
+	qm.conf.adoc		\
 	pct.adoc		\
+	pct.conf.adoc		\
+	datacenter.cfg.adoc	\
 	pveam.adoc		\
 	ha-manager.adoc		\
+	pve-ha-crm.adoc		\
+	pve-ha-lrm.adoc		\
 	pve-copyright.adoc	\
 	docinfo.xml
 
 GEN_SCRIPTS=					\
-	gen-datacenter-cfg-opts-adoc.pl		\
-	gen-pct-conf-opts-adoc.pl		\
+	gen-datacenter.cfg.5-opts.pl		\
+	gen-pct.conf.5-opts.pl			\
+	gen-qm.conf.5-opts.pl			\
 	gen-pve-firewall-cluster-opts.pl	\
 	gen-pve-firewall-host-opts.pl		\
 	gen-pve-firewall-macros-adoc.pl		\
 	gen-pve-firewall-rules-opts.pl		\
-	gen-pve-firewall-vm-opts.pl		\
-	gen-vm-conf-opts-adoc.pl
+	gen-pve-firewall-vm-opts.pl
 
-PVESM_SOURCES=attributes.txt pvesm.adoc pvesm.1-synopsis.adoc $(shell ls pve-storage-*.adoc)
-PVEUM_SOURCES=attributes.txt pveum.adoc pveum.1-synopsis.adoc
 VZDUMP_SOURCES=attributes.txt vzdump.adoc vzdump.1-synopsis.adoc
-QM_SOURCES=attributes.txt qm.adoc qm.1-synopsis.adoc
-PCT_SOURCES=attributes.txt pct.adoc pct.1-synopsis.adoc
 PVEAM_SOURCES=attributes.txt pveam.adoc pveam.1-synopsis.adoc
-HA_SOURCES=attributes.txt ha-manager.1-synopsis.adoc ha-manager.adoc
 
 SYSADMIN_SOURCES=			\
 	getting-help.adoc		\
@@ -62,13 +74,17 @@ PVE_ADMIN_GUIDE_SOURCES=		\
 	pmxcfs.adoc 			\
 	pve-faq.adoc			\
 	${PVE_FIREWALL_MAN8_SOURCES}	\
-	${QM_SOURCES}			\
-	${PCT_SOURCES}			\
+	${PVESM_MAN1_SOURCES}		\
+	${PCT_MAN1_SOURCES}		\
+	${PVECM_MAN1_SOURCES}		\
+	${PVEUM_MAN1_SOURCES}		\
+	${QM_MAN1_SOURCES}		\
+	${QMRESTORE_MAN1_SOURCES}	\
+	${HA_MANAGER_MAN1_SOURCES}	\
+	${PVE_HA_CRM_MAN8_SOURCES}	\
+	${PVE_HA_LRM_MAN8_SOURCES}	\
 	${PVEAM_SOURCES}		\
-	${PVEUM_SOURCES}		\
-	${PVESM_SOURCES}		\
 	${VZDUMP_SOURCES}		\
-	${HA_SOURCES}			\
 	images/cluster-nwdiag.svg	\
 	images/node-nwdiag.svg		\
 	pve-bibliography.adoc		\
@@ -108,17 +124,13 @@ all: pve-admin-guide.html
 	asciidoc ${ADOC_MAN8_HTML_ARGS} -o $@ $*.adoc
 	test -n "$${NOVIEW}" || $(BROWSER) $@ &
 
-%.5: %.adoc %.5-opts.adoc docinfo.xml
-	a2x -a docinfo1 -a "manvolnum=5" -a "manversion=Release ${DOCRELEASE}" -f manpage $*.adoc
-	test -n "$${NOVIEW}" || man -l $@
-
 %.5.html: %.adoc %.5-opts.adoc docinfo.xml
 	asciidoc ${ADOC_MAN5_HTML_ARGS} -o $@ $*.adoc
 	test -n "$${NOVIEW}" || $(BROWSER) $@ &
 
 index.html: index.adoc ${PVE_ADMIN_GUIDE_SOURCES}
 	$(MAKE) NOVIEW=1 pve-admin-guide.pdf pve-admin-guide.html pve-admin-guide.epub
-	$(MAKE) NOVIEW=1 qm.1.html pct.1.html pveam.1.html pvesm.1.html pveum.1.html vzdump.1.html pve-firewall.8.html ha-manager.1.html datacenter.cfg.5.html vm.conf.5.html pct.conf.5.html
+	$(MAKE) NOVIEW=1 pvecm.1.html qm.1.html qmrestore.1.html pct.1.html pveam.1.html pvesm.1.html pveum.1.html vzdump.1.html pve-firewall.8.html ha-manager.1.html pve-ha-crm.8.html pve-ha-lrm.8.html datacenter.cfg.5.html vm.conf.5.html pct.conf.5.html
 	asciidoc -a "date=$(shell date)" -a "revnumber=${DOCRELEASE}" index.adoc
 	test -n "$${NOVIEW}" || $(BROWSER) index.html &
 
@@ -145,11 +157,22 @@ ${DEB} deb:
 	mkdir build
 	rsync -a debian/ build/debian
 	mkdir -p build/usr/share/${PACKAGE}
+	mkdir -p build/usr/share/doc/${PACKAGE}
+	echo "git clone git://git.proxmox.com/git/pve-docs.git\\ngit checkout ${GITVERSION}" > build/usr/share/doc/${PACKAGE}/SOURCE
 	install -m 0644 ${DEB_SOURCES} build/usr/share/${PACKAGE}
 	install -m 0755 ${GEN_SCRIPTS} build/usr/share/${PACKAGE}
 	cd build; dpkg-buildpackage -rfakeroot -b -us -uc
 	lintian ${DEB}
 
+.PHONY: upload
+upload: ${DEB}
+	umount /pve/${DOCRELEASE}; mount /pve/${DOCRELEASE} -o rw
+	mkdir -p /pve/${DOCRELEASE}/extra
+	rm -f /pve/${DOCRELEASE}/extra/${PACKAGE}_*.deb
+	rm -f /pve/${DOCRELEASE}/extra/Packages*
+	cp ${DEB} /pve/${DOCRELEASE}/extra
+	cd /pve/${DOCRELEASE}/extra; dpkg-scanpackages . /dev/null > Packages; gzip -9c Packages > Packages.gz
+	umount /pve/${DOCRELEASE}; mount /pve/${DOCRELEASE} -o ro
 
 update: clean
 	rm -f *.5-opts.adoc .1-synopsis.adoc .8-synopsis.adoc