[DRBD-cvs] drbd by lars; make tgz magic update

drbd-user@lists.linbit.com drbd-user@lists.linbit.com
Fri, 9 Jul 2004 20:28:31 +0200 (CEST)


DRBD CVS committal

Author  : lars
Module  : drbd

Dir     : drbd


Modified Files:
      Tag: rel-0_7-branch
	drbd.spec.in Makefile 


Log Message:
 make tgz magic update
===================================================================
RCS file: /var/lib/cvs/drbd/drbd/drbd.spec.in,v
retrieving revision 1.7.2.3
retrieving revision 1.7.2.4
diff -u -3 -r1.7.2.3 -r1.7.2.4
--- drbd.spec.in	6 Jul 2004 10:07:48 -0000	1.7.2.3
+++ drbd.spec.in	9 Jul 2004 18:28:26 -0000	1.7.2.4
@@ -177,7 +177,7 @@
 /sbin/depmod -a -F /boot/System.map-%{kernelversion} %{kernelversion} >/dev/null 2>&1 || true
 
 %changelog
-* Wed Sep 24 2003 21:48:39 +0100 Lars Ellenberg <l.g.e@web.de>
-- drbd (0.7_pre9-1)
+* Fri Jul 09 2004 20:03:33 +0200 Lars Ellenberg <l.g.e@web.de>
+- drbd (0.7_pre10-1)
   FIXME write changelog :^)
 
===================================================================
RCS file: /var/lib/cvs/drbd/drbd/Makefile,v
retrieving revision 1.11.2.20
retrieving revision 1.11.2.21
diff -u -3 -r1.11.2.20 -r1.11.2.21
--- Makefile	6 Jul 2004 10:07:48 -0000	1.11.2.20
+++ Makefile	9 Jul 2004 18:28:26 -0000	1.11.2.21
@@ -21,7 +21,16 @@
 
 SUBDIRS     = user drbd scripts benchmark documentation #testing
 ALLSUBDIRS  = user drbd scripts benchmark documentation testing
+ifdef FORCE
+#
+# NOTE to generate a tgz even if too lazy to update the changelogs,
+# or to forcefully include the cvs date in the tgz name:
+#   make distclean doc update.filelist tgz FORCE=1
+#
+REL_VERSION := $(shell sed -ne '/REL_VERSION/{s/^.*"\(.*\) cvs .Date: \(.\{10\}\).*/\1-\2/;s,/,,g;p;q;}' drbd_config.h)
+else
 REL_VERSION := $(shell sed -ne '/REL_VERSION/{s/^.*"\(.*\) cvs .*/\1/;p;q;}' drbd/linux/drbd_config.h)
+endif
 DIST_VERSION := $(subst -,_,$(REL_VERSION))
 
 LN_S = ln -s
@@ -62,6 +71,7 @@
 
 check_changelogs_up2date:
 	@ up2date=true; dver_re=$(DIST_VERSION); dver_re=$${dver_re//./\\.}; \
+	echo "checking for presence of $$dver_re in various changelog files"; \
 	in_changelog=$$(sed -n -e '0,/^%changelog/d' \
 	                     -e '/^- *drbd ('"$$dver_re"'-/p' \
 	                     -e '/^\*.* \['"$$dver_re"'-/p' < drbd.spec.in) ; \
@@ -79,6 +89,7 @@
 	cvs status | grep -o "/drbd/drbd/[^,]*" |                 \
 	sed "s/Attic\///;                                         \
 	     s/\/drbd\/drbd/drbd-$(DIST_VERSION)/;" > .filelist  ;\
+	[ -s .filelist ] # assert there is something in .filelist now
 	find documentation -name "[^.]*.[58]" -o -name "*.html" | \
 	sed "s/^/drbd-$(DIST_VERSION)\//" >> .filelist           ;\
 	echo drbd-$(DIST_VERSION)/drbd_config.h >> .filelist     ;\
@@ -93,6 +104,7 @@
 	ln -sf drbd/linux/drbd_config.h drbd_config.h
 	rm -f drbd-$(DIST_VERSION)
 	ln -s . drbd-$(DIST_VERSION)
+	set -e ; for f in $$(<.filelist) ; do [ -e $$f ] ; done
 	tar --owner=0 --group=0 -czf drbd-$(DIST_VERSION).tar.gz -T .filelist
 	rm drbd-$(DIST_VERSION)