Move tarball generation functions to util/gen-tarball

2003-03-23 01:37:53 -05:00 · 2003-03-23 01:37:53 -05:00 · bff0cc950b
parent 00aba96743
commit bff0cc950b
10 changed files with 361 additions and 286 deletions
--- a/11
+++ b/11
@ -1,3 +1,14 @@
+2003-03-22  Theodore Ts'o  <tytso@mit.edu>
+
+	* configure.in: Add E2FSPROGS_DAY expansion.  Add
+		e2fsprogs.spec and util/gen-tarball to the list of files
+		generated by config.status
+
+	* e2fsprogs.spec: Now generated from e2fsprogs.spec.in
+
+	* Makefile.in: Remove tarball generation functions; moved to
+		util/gen-tarball.
+
 2003-03-17  Theodore Ts'o  <tytso@mit.edu>

 	* configure.in: Fix the Apple Darwin port.
--- a/Makefile.in
+++ b/Makefile.in
@ -122,91 +122,3 @@ realclean-local: distclean-local

 check::	subs check-recursive

-distribution_tar_file:
-	$(RM) -rf /tmp/dest
-	$(MAKE) DESTDIR=/tmp/dest install
-	cp -r $(srcdir)/README $(srcdir)/install-utils /tmp/dest
-	$(RM) -rf /tmp/dest/install-utils/CVS /tmp/dest/install-utils/ChangeLog
-	cp $(srcdir)/INSTALL.@BINARY_TYPE@ /tmp/dest/INSTALL
-	(cd /tmp/dest && $(TAR) cf - . ) | gzip -9 \
-		> e2fsprogs-@E2FSPROGS_VERSION@-@BINARY_TYPE@.tar.gz
-
-SRCROOT = `echo e2fsprogs-@E2FSPROGS_VERSION@ | sed -e 's/-WIP//' \
-			-e 's/pre-//' -e 's/-PLUS//'`
-
-SSROOT = `echo e2fsprogs-libs-@E2FSPROGS_VERSION@ | sed -e 's/-WIP//' \
-			-e 's/pre-//' -e 's/-PLUS//'`
-
-$(srcdir)/.exclude-file:
-	a=$(SRCROOT); \
-	(cd $(srcdir)/.. && find e2fsprogs \( -name \*~ -o -name \*.orig \
-		-o -name CVS -o -name \*.rej -o -name Makefile.pq \
-		-o -name TAGS -o -name \*.old -o -name \*.gmo -o -name SCCS \
-		-o -name changed-files -o -name .#\* \) \
-		-print) | sed -e "s/e2fsprogs/$$a/" > $(srcdir)/.exclude-file
-	echo "$(SRCROOT)/BitKeeper" >> $(srcdir)/.exclude-file
-	echo "$(SRCROOT)/README.subset" >> $(srcdir)/.exclude-file
-	echo "$(SRCROOT)/build" >> $(srcdir)/.exclude-file
-	echo "$(SRCROOT)/rpm.log" >> $(srcdir)/.exclude-file
-	echo "$(SRCROOT)/TODO" >> $(srcdir)/.exclude-file
-	echo "$(SRCROOT)/powerquest" >> $(srcdir)/.exclude-file
-	echo "$(SRCROOT)/.exclude-file" >> $(srcdir)/.exclude-file
-	echo "$(SRCROOT)/po/stamp-cat-id" >> $(srcdir)/.exclude-file
-	echo "$(SRCROOT)/po/cat-id-tbl.c" >> $(srcdir)/.exclude-file
-	echo $(SRCROOT)/e2fsprogs-@E2FSPROGS_VERSION@.tar.gz \
-		>> $(srcdir)/.exclude-file
-
-$(srcdir)/.exclude-subset:
-	a=$(SSROOT); \
-	(cd $(srcdir)/.. && find e2fsprogs \( -name \*~ -o -name \*.orig \
-		-o -name CVS -o -name \*.rej -o -name Makefile.pq \
-		-o -name TAGS -o -name \*.old -o -name \*.gmo -o -name SCCS \
-		-o -name changed-files -o -name .#\* \) \
-		-print) | sed -e "s/e2fsprogs/$$a/" > $(srcdir)/.exclude-subset
-	echo "$(SSROOT)/BitKeeper" >> $(srcdir)/.exclude-subset
-	echo "$(SSROOT)/build" >> $(srcdir)/.exclude-subset
-	echo "$(SSROOT)/rpm.log" >> $(srcdir)/.exclude-subset
-	echo "$(SSROOT)/TODO" >> $(srcdir)/.exclude-subset
-	echo "$(SSROOT)/powerquest" >> $(srcdir)/.exclude-subset
-	echo "$(SSROOT)/.exclude-subset" >> $(srcdir)/.exclude-subset
-	echo "$(SSROOT)/po/stamp-cat-id" >> $(srcdir)/.exclude-subset
-	echo "$(SSROOT)/po/cat-id-tbl.c" >> $(srcdir)/.exclude-subset
-	echo $(SSROOT)/e2fsprogs-@E2FSPROGS_VERSION@.tar.gz \
-		>> $(srcdir)/.exclude-subset
-	echo "$(SSROOT)/e2fsck" >> $(srcdir)/.exclude-subset
-	echo "$(SSROOT)/ext2ed" >> $(srcdir)/.exclude-subset
-	echo "$(SSROOT)/debugfs" >> $(srcdir)/.exclude-subset
-	echo "$(SSROOT)/misc" >> $(srcdir)/.exclude-subset
-	echo "$(SSROOT)/tests" >> $(srcdir)/.exclude-subset
-	echo "$(SSROOT)/resize" >> $(srcdir)/.exclude-subset
-	echo "$(SSROOT)/contrib" >> $(srcdir)/.exclude-subset
-	echo "$(SSROOT)/po" >> $(srcdir)/.exclude-subset
-	echo "$(SSROOT)/include" >> $(srcdir)/.exclude-subset
-	echo "$(SSROOT)/debian" >> $(srcdir)/.exclude-subset
-	echo "$(SSROOT)/lib/e2p" >> $(srcdir)/.exclude-subset
-	echo "$(SSROOT)/lib/evms" >> $(srcdir)/.exclude-subset
-	echo "$(SSROOT)/lib/ext2fs" >> $(srcdir)/.exclude-subset
-	echo "$(SSROOT)/ABOUT-NLS" >> $(srcdir)/.exclude-subset
-	echo "$(SSROOT)/README" >> $(srcdir)/.exclude-subset
-	echo "$(SSROOT)/INSTALL" >> $(srcdir)/.exclude-subset
-	echo "$(SSROOT)/INSTALL.dllbin" >> $(srcdir)/.exclude-subset
-	echo "$(SSROOT)/INSTALL.elfbin" >> $(srcdir)/.exclude-subset
-	echo "$(SSROOT)/RELEASE-NOTES" >> $(srcdir)/.exclude-subset
-	echo "$(SSROOT)/e2fsprogs.lsm" >> $(srcdir)/.exclude-subset
-	echo "$(SSROOT)/e2fsprogs.spec" >> $(srcdir)/.exclude-subset
-
-source_tar_file: $(srcdir)/.exclude-file
-	cd $(srcdir)/.. && a=$(SRCROOT); rm -f $$a ; ln -sf e2fsprogs $$a ; \
-		$(TAR) -c -h -v -f - \
-			-X $$a/.exclude-file $$a | \
-		gzip -9 > e2fsprogs-@E2FSPROGS_VERSION@.tar.gz
-	rm -f $(srcdir)/.exclude-file
-
-subset_tar_file: $(srcdir)/.exclude-subset
-	cd $(srcdir)/.. && a=$(SSROOT); rm -f $$a ; ln -sf e2fsprogs $$a ; \
-		$(TAR) -c -h -v -f - \
-			-X $$a/.exclude-subset $$a | \
-		gzip -9 > e2fsprogs-libs-@E2FSPROGS_VERSION@.tar.gz
-	rm -f $(srcdir)/.exclude-file $(srcdir)/.exclude-subset
-
-
--- a/390
+++ b/390
--- a/configure.in
+++ b/configure.in
@ -10,6 +10,7 @@ E2FSPROGS_VERSION=`grep E2FSPROGS_VERSION ${srcdir}/version.h  \
 	| awk '{print $3}' | tr \" " " | awk '{print $1}'`
 DATE=`grep E2FSPROGS_DATE ${srcdir}/version.h | awk '{print $3}' \
 	| tr \" " "`
+E2FSPROGS_DAY=`echo $DATE | awk -F- '{print $1}'`
 MONTH=`echo $DATE | awk -F- '{print $2}'`
 YEAR=`echo $DATE | awk -F- '{print $3}'`

@ -42,6 +43,7 @@ echo "Generating configuration file for e2fsprogs version $E2FSPROGS_VERSION"
 echo "Release date is ${E2FSPROGS_MONTH}, ${E2FSPROGS_YEAR}"
 AC_SUBST(E2FSPROGS_YEAR)
 AC_SUBST(E2FSPROGS_MONTH)
+AC_SUBST(E2FSPROGS_DAY)
 AC_SUBST(E2FSPROGS_VERSION)
 AC_CANONICAL_HOST
 dnl
@ -759,8 +761,9 @@ test -d lib || mkdir lib
 test -d include || mkdir include
 test -d include/linux || mkdir include/linux
 test -d include/asm || mkdir include/asm
-for i in MCONFIG Makefile util/Makefile util/subst.conf lib/et/Makefile \
-	lib/ss/Makefile lib/ext2fs/Makefile lib/e2p/Makefile \
+for i in MCONFIG Makefile e2fsprogs.spec \
+	util/Makefile util/subst.conf util/gen-tarball \
+	lib/et/Makefile lib/ss/Makefile lib/ext2fs/Makefile lib/e2p/Makefile \
 	lib/uuid/Makefile lib/uuid/uuid_types.h \
 	lib/blkid/Makefile lib/blkid/blkid_types.h \
 	lib/evms/Makefile misc/Makefile ext2ed/Makefile e2fsck/Makefile \
--- a/e2fsprogs.spec.in
+++ b/e2fsprogs.spec.in
@ -3,7 +3,7 @@

 Summary: Utilities for managing the second extended (ext2) filesystem.
 Name: e2fsprogs
-Version: 1.33
+Version: @E2FSPROGS_VERSION@
 Release: 0
 Copyright: GPL
 Group: System Environment/Base
--- a/util/ChangeLog
+++ b/util/ChangeLog
@ -1,3 +1,9 @@
+2003-03-23  Theodore Ts'o  <tytso@mit.edu>
+
+	* gen-tarball.in, all.exclude, subset.exclude: New files for
+		managing the automatic generation of distribution
+		tarballs.
+
 2002-11-09  Theodore Ts'o  <tytso@mit.edu>

 	* Release of E2fsprogs 1.32
--- a/util/Makefile.in
+++ b/util/Makefile.in
@ -18,13 +18,22 @@ SRCS = $(srcdir)/subst.c

 PROGS=		subst

-all:: $(PROGS)
+all:: $(PROGS) gen-tarball

 subst: subst.o
 	$(BUILD_CC) $(ALL_LDFLAGS) -o subst subst.o

+gen-tarball: $(srcdir)/gen-tarball.in $(top_builddir)/config.status
+	cd $(top_builddir); CONFIG_FILES=util/gen-tarball ./config.status
+	chmod +x gen-tarball
+
+tarballs: gen-tarball
+	sh gen-tarball debian
+	sh gen-tarball all
+	sh gen-tarball subset
+
 clean:
-	$(RM) -f $(PROGS) \#* *.s *.o *.a *~ core
+	$(RM) -f $(PROGS) \#* *.s *.o *.a *~ core *.tar.gz

 mostlyclean: clean

--- a/util/all.exclude
+++ b/util/all.exclude
@ -0,0 +1,9 @@
+BitKeeper
+README.subset
+build
+rpm.log
+TODO
+powerquest
+.exclude-file
+po/stamp-cat-id
+po/cat-id-tbl.c
--- a/util/gen-tarball.in
+++ b/util/gen-tarball.in
@ -0,0 +1,92 @@
+#!/bin/sh
+#
+# This script is used to generate the distribution tarball
+#
+srcdir=@srcdir@
+top_srcdir=@top_srcdir@
+top_dir=`cd $top_srcdir; pwd`
+base_ver=`echo @E2FSPROGS_VERSION@ | sed -e 's/-WIP//' -e 's/pre-//' -e 's/-PLUS//'`
+base_e2fsprogs=`basename $top_dir`
+exclude=/tmp/exclude
+
+case @E2FSPROGS_MONTH@ in 
+    January)
+	mon=01
+	;;
+    February)
+	mon=02
+	;;
+    March)
+	mon=03
+	;;
+    April)
+	mon=04
+	;;
+    May)
+	mon=05
+	;;
+    June)
+	mon=06
+	;;
+    July)
+	mon=07
+	;;
+    August)
+	mon=08
+	;;
+    September)
+	mon=09
+	;;
+    October)
+	mon=10
+	;;
+    November)
+	mon=11
+	;;
+    December)
+	mon=12
+	;;
+esac
+    
+case $1 in
+    debian)
+	date_spec="@E2FSPROGS_YEAR@.$mon.@E2FSPROGS_DAY@"
+	case @E2FSPROGS_VERSION@ in
+	*-WIP|pre-*)
+		deb_vers=`echo $base_ver 0.01 - p | dc`
+		SRCROOT="e2fsprogs-$deb_vers+$base_ver-WIP-$date_spec"
+		;;
+	*-PLUS)
+		SRCROOT="e2fsprogs-$base_ver+$date_spec"
+		;;
+	*)
+		SRCROOT="e2fsprogs-$base_ver"
+		;;
+        esac
+	list=all
+	;;
+    subset)
+	SRCROOT="e2fsprogs-libs-$base_ver"
+	list=subset
+	;;
+   all|*)
+	SRCROOT="e2fsprogs-$base_ver"
+	list=all
+	;;
+esac
+
+mv ../e2fsprogs.spec $top_srcdir/e2fsprogs.spec
+(cd $top_srcdir/.. ; find $base_e2fsprogs \( -name \*~ -o -name \*.orig \
+		-o -name CVS -o -name \*.rej -o -name Makefile.pq \
+		-o -name TAGS -o -name \*.old -o -name \*.gmo -o -name SCCS \
+		-o -name changed-files -o -name .#\* -o -name \*.tar.gz \) \
+		-print) | sed -e "s/^$base_e2fsprogs/$SRCROOT/" > $exclude
+sed -e "s;^;$SRCROOT/;" < $srcdir/$list.exclude >> $exclude
+
+(cd $top_srcdir/.. ; rm -f $SRCROOT ; ln -sf e2fsprogs $SRCROOT)
+
+(cd $top_srcdir/.. ; tar -c -h -v -f - -X $exclude $SRCROOT) \
+	 | gzip -9 > $SRCROOT.tar.gz
+
+(cd $top_srcdir/.. ; rm -f $SRCROOT)
+mv $top_srcdir/e2fsprogs.spec ../e2fsprogs.spec 
--- a/util/subset.exclude
+++ b/util/subset.exclude
@ -0,0 +1,29 @@
+BitKeeper
+build
+rpm.log
+TODO
+powerquest
+.exclude-subset
+po/stamp-cat-id
+po/cat-id-tbl.c
+e2fsck
+ext2ed
+debugfs
+misc
+tests
+resize
+contrib
+po
+include
+debian
+lib/e2p
+lib/evms
+lib/ext2fs
+ABOUT-NLS
+README
+INSTALL
+INSTALL.dllbin
+INSTALL.elfbin
+RELEASE-NOTES
+e2fsprogs.lsm
+e2fsprogs.spec