From: Richard W.M. Jones <rjones@redhat.com> <"Richard W.M. Jones <rjones@redhat.com>">
Date: Thu, 20 Sep 2007 10:09:32 +0000 (+0100)
Subject: 	* Makefile.in: Disable virt-df in this release until I have
X-Git-Tag: 1.0.4~129
X-Git-Url: http://git.annexia.org/?p=virt-top.git;a=commitdiff_plain;h=83d02ef50a87d1c62147aaf7c2b9ab688d093f16

	* Makefile.in: Disable virt-df in this release until I have
	  time to fix it properly.
	* Makefile.in: Fix 'check-manifest' rule.  Added 'make release'.
	* MANIFEST: Updated MANIFEST.
---

diff --git a/ChangeLog b/ChangeLog
index 4c877b5..0fe5499 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -2,6 +2,8 @@
 
 	* Makefile.in: Disable virt-df in this release until I have
 	  time to fix it properly.
+	* Makefile.in: Fix 'check-manifest' rule.  Added 'make release'.
+	* MANIFEST: Updated MANIFEST.
 
 2007-09-19  Richard Jones  <rjones@redhat.com>
 
diff --git a/MANIFEST b/MANIFEST
index fde3b73..da2c7ec 100644
--- a/MANIFEST
+++ b/MANIFEST
@@ -1,15 +1,14 @@
 aclocal.m4
+ChangeLog
 config.h.in
 configure.ac
 COPYING
 COPYING.LIB
-.cvsignore
-examples/.cvsignore
 examples/.depend
 examples/list_domains.ml
 examples/Makefile.in
+.hgignore
 install-sh
-libvirt/.cvsignore
 libvirt/.depend
 libvirt/libvirt_c.c
 libvirt/libvirt.ml
@@ -21,11 +20,9 @@ Makefile.in
 Make.rules
 MANIFEST
 META.in
-mlvirsh/.cvsignore
 mlvirsh/.depend
 mlvirsh/Makefile.in
 mlvirsh/mlvirsh.ml
-mlvirtmanager/.cvsignore
 mlvirtmanager/.depend
 mlvirtmanager/Makefile.in
 mlvirtmanager/mlvirtmanager_connections.ml
@@ -40,7 +37,8 @@ mlvirtmanager/mlvirtmanager.ml
 README
 TODO.libvirt
 TODO.virt-top
-virt-top/.cvsignore
+virt-df/Makefile.in
+virt-df/virt_df.ml
 virt-top/.depend
 virt-top/Makefile.in
 virt-top/README
diff --git a/Makefile.in b/Makefile.in
index 319b25f..789eaae 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -45,6 +45,23 @@ distclean:
 	rm -rf autom4te.cache
 	rm -f Makefile
 
+# Developer documentation (in html/ subdirectory).
+
+doc:
+	rm -rf html
+	mkdir html
+	-cd libvirt; \
+	ocamlfind ocamldoc $(OCAMLDOCFLAGS) -d ../html \
+	  libvirt.{ml,mli} libvirt_version.{ml,mli}
+
+# Update configure and rerun.
+
+configure: force
+	autoreconf
+	CFLAGS=-g \
+	  ./configure \
+	  --enable-debug=yes --with-libvirt=/home/rjones/local
+
 # Distribution.
 
 dist:
@@ -58,22 +75,32 @@ dist:
 	ls -l $(PACKAGE)-$(VERSION).tar.gz
 
 check-manifest:
-	@for d in `find -type d -name CVS | grep -v '^\./debian/'`; \
-	do \
-	b=`dirname $$d`/; \
-	awk -F/ '$$1 != "D" {print $$2}' $$d/Entries | \
-	sed -e "s|^|$$b|" -e "s|^\./||"; \
-	done | sort > .check-manifest; \
+	hg manifest | sort > .check-manifest; \
 	sort MANIFEST > .orig-manifest; \
 	diff -u .orig-manifest .check-manifest; rv=$$?; \
 	rm -f .orig-manifest .check-manifest; \
 	exit $$rv
 
-# Developer documentation (in html/ subdirectory).
+# Do a release (update the website).
 
-doc:
-	rm -rf html
-	mkdir html
-	-cd libvirt; \
-	ocamlfind ocamldoc $(OCAMLDOCFLAGS) -d ../html \
-	  libvirt.{ml,mli} libvirt_version.{ml,mli}
+release: configure
+	$(MAKE) release_stage_2
+
+release_stage_2: clean all opt doc dist
+	$(MAKE) release_stage_3
+
+WEBSITE	= ../redhat/et-website
+
+release_stage_3:
+	rm -f $(WEBSITE)/ocaml-libvirt/html/*.{html,css}
+	cp html/*.{html,css} $(WEBSITE)/ocaml-libvirt/html/
+	cp $(PACKAGE)-$(VERSION).tar.gz $(WEBSITE)/ocaml-libvirt/
+	cp README $(WEBSITE)/ocaml-libvirt/README.txt
+	cp ChangeLog $(WEBSITE)/ocaml-libvirt/ChangeLog.txt
+	cp virt-top/virt-top.txt $(WEBSITE)/virt-top/
+	cp ChangeLog $(WEBSITE)/virt-top/ChangeLog.txt
+
+force:
+
+.PHONY: all opt depend install clean distclean configure dist check-manifest \
+	release release_stage_2 release_stage_3 force
\ No newline at end of file