Andrew, On Mon, Jan 14, 2013 at 12:17:09PM -0600, Andrew Dahl wrote: > Refactored release scripts to conform to using git archive > > When generating a release, there is a risk of some files being > stale, such as configure and the m4/autotools temp files. This > is fixed with a clean at the beginning of release generation. > In addition, there is no uniformity in the current method of > source tar generation between xfs utilities. Using git archive > solves this issue across all utilities. > > Signed-off-by: Andrew Dahl <adahl@xxxxxxx> > --- > Makefile | 20 ++++++++++++++++++++ > release.sh | 11 +++++++++-- > 2 files changed, 29 insertions(+), 2 deletions(-) > mode change 100644 => 100755 release.sh > > diff --git a/Makefile b/Makefile > index b68ec11..a0aef85 100644 > --- a/Makefile > +++ b/Makefile > @@ -39,12 +39,17 @@ ifeq ($(HAVE_BUILDDEFS), yes) > include $(TOPDIR)/include/builddefs > endif > > +SRCTAR = $(PKG_NAME)-$(PKG_VERSION).tar.gz > + > TESTS = $(shell sed -n -e '/^[0-9][0-9][0-9]*/s/ .*//p' group) > CONFIGURE = configure include/builddefs include/config.h > LSRCFILES = configure configure.ac aclocal.m4 README VERSION > LDIRT = config.log .ltdep .dep config.status config.cache confdefs.h \ > conftest* check.log check.time > > +ifeq ($(HAVE_BUILDDEFS), yes) > +LDIRT += $(SRCTAR) > +endif > > LIB_SUBDIRS = include lib > TOOL_SUBDIRS = ltp src m4 > @@ -102,3 +107,18 @@ install-dev install-lib: > realclean distclean: clean > $(Q)rm -f $(LDIRT) $(CONFIGURE) > $(Q)rm -rf autom4te.cache Logs > + > +dist: include/builddefs include/config.h default > +ifeq ($(HAVE_BUILDDEFS), no) > + $(Q)$(MAKE) $(MAKEOPTS) -C . $@ > +else > + $(Q)$(MAKE) $(MAKEOPTS) $(SRCTAR) > +endif > + > +$(SRCTAR) : default > + $(Q)git archive --prefix=$(PKG_NAME)-$(PKG_VERSION)/ --format=tar \ > + v$(PKG_VERSION) -o $(PKG_NAME)-$(PKG_VERSION).tar Again, changed this to > $(PKG_NAME)-$(PKG_VERSION).tar And it worked fine. Reviewed-by: Ben Myers <bpm@xxxxxxx> Regards, Ben _______________________________________________ xfs mailing list xfs@xxxxxxxxxxx http://oss.sgi.com/mailman/listinfo/xfs
