diff options
| -rw-r--r-- | .cvsignore | 1 | ||||
| -rw-r--r-- | ChangeLog | 3 | ||||
| -rw-r--r-- | HACKING | 28 | ||||
| -rw-r--r-- | Makefile.maint | 62 | ||||
| -rw-r--r-- | m4/gnulib-cache.m4 | 4 |
5 files changed, 19 insertions, 79 deletions
@@ -14,6 +14,7 @@ configure.lineno COPYING depcomp gendocs.sh +gnupload INSTALL install-sh lib @@ -1,5 +1,8 @@ 2006-08-22 Eric Blake <ebb9@byu.net> + * m4/gnulib-cache.m4: Augment with gnulib-tool --import gnupload. + * Makefile.maint (fetch): Simplify, now that we can use gnupload. + * checks/check-them: State why a test is skipped. * doc/m4.texinfo (Changeword, Sysval, Maketemp): Likewise. @@ -182,13 +182,6 @@ yyyy-mm-dd Name of Author <email@address> (tiny change) * Run ./configure (or create a build directory first and run configure from there, if you want to keep the build tree separate). -* Run `make -fMakefile.maint fetch' (or `make -f../Makefile.maint fetch' - if you are running from a VPATH build directory, where `../' is the - relative path to the directory with `configure' in it), which will - fetch new versions of the files that are maintained outside of m4. If - you are using GNU make, the included GNUmakefile allows you to leave - off the '-fMakefile.maint'. - * Run `make distcheck'. If there are any problems, fix them and start again. @@ -197,20 +190,19 @@ yyyy-mm-dd Name of Author <email@address> (tiny change) * Run `make -fMakefile.maint cvs-dist' (or `make -f../Makefile.maint cvs-dist' if you are running from a VPATH build directory, where `../' is the relative path to the directory with `configure' in it), which - will build a release tarball (with `make distcheck'), tag the tree - with release-$(VERSION) and generate the gpg signature files. + will build a release tarball (with `make distcheck') and tag the tree + with release-$(VERSION). * Run 'make -f[../]Makefile.maint deltas' (pass LASTRELEASE=maj.min[.mic[alpha]] if needed) to create both diff and - xdelta files between the previous release tarball and the new with - detached gpg signature files and clear signed directive files. - -* Upload release tarball, diff file and xdelta file, plus their associated - detached gpg signature files and clear signed directive files to - ftp-upload.gnu.org. If the upload is destined for ftp.gnu.org, then the - files should be placed in the /incoming/ftp directory. If the upload is - an alpha release destined for alpha.gnu.org, then the files should be - placed in the /incoming/alpha directory. + xdelta files between the previous release tarball and the new. + +* Run '[../]./gnupload --to [dest].gnu.org:m4 [files]' to create + detached gpg signature and clear signed directive files, and upload + the combination to the correct location. For an alpha release, + gnupload will place files in alpha.gnu.org, in /incoming/alpha, and + the xdelta file is not strictly necessary. For a full release, + gnupload will place files in ftp.gnu.org, in /incoming/ftp. * Send announcement to m4-discuss@gnu.org, m4-announce@gnu.org, and autotools-announce@gnu.org. If not an alpha send to info-gnu@gnu.org diff --git a/Makefile.maint b/Makefile.maint index 4638b12c..868c5f7c 100644 --- a/Makefile.maint +++ b/Makefile.maint @@ -20,7 +20,7 @@ TEXI2HTML = texi2html .PHONY: cvs-release -cvs-release: version-check prev-tarball cvs-news fetch cvs-commit cvs-dist deltas web-manual +cvs-release: version-check prev-tarball cvs-news cvs-commit cvs-dist deltas web-manual @tarname="$(PACKAGE)-$(VERSION).tar.gz"; \ diffname="$(PACKAGE)-$(LASTRELEASE)-$(VERSION).diff.gz"; \ xdeltaname="$(PACKAGE)-$(LASTRELEASE)-$(VERSION).xdelta"; \ @@ -73,46 +73,6 @@ cvs-news: exit 1; \ fi -## Program to use to fetch files. -WGET = wget -WGETSGO = $(WGET) http://savannah.gnu.org/cgi-bin/viewcvs/~checkout~ - -## Files that we fetch and which we compare against. -## FIXME should be a lot more here -FETCHFILES = \ -./INSTALL \ -./install-sh \ -doc/texinfo.tex - -## Fetch the latest versions of files we care about. -.PHONY: fetch -fetch: - rm -rf Fetchdir > /dev/null 2>&1 - mkdir Fetchdir -## If a get fails then that is a problem. - (cd Fetchdir && \ - $(WGETSGO)/autoconf/autoconf/INSTALL; \ - $(WGETSGO)/automake/automake/lib/install-sh; \ - $(WGETSGO)/texinfo/texinfo/doc/texinfo.tex; ) -## Don't exit after test because we want to give as many errors as -## possible. - @stat=0; for file in $(FETCHFILES); do \ - fetchedfile=Fetchdir/`echo $$file | sed 's,.*/,,g'`; \ - if diff -u $(srcdir)/$$file $$fetchedfile \ - >>Fetchdir/update.patch 2>/dev/null; then :; \ - else \ - stat=1; \ - echo "Updating $(srcdir)/$$file..."; \ - cp $$fetchedfile $(srcdir)/$$file; \ - fi; \ - done; \ - test $$stat = 1 && \ - echo "See Fetchdir/update.patch for a log of the changes."; \ - exit $$stat - - -GPG = gpg # set it to `:' to avoid gpg operations - .PHONY: cvs-commit cvs-commit: cvs-news cd $(srcdir) && $(SHELL) ./commit @@ -124,14 +84,6 @@ cvs-dist: cvs-news timestamps ## Finally, if everything was successful, tag the release cd $(srcdir) \ && $(CVS) -q tag `echo "release-$(VERSION)" | sed 's/\./_/g'` -## Generate signatures and directives for FSF ftp-upload: - for suffix in .gz .bz2; do \ - ofile="$(PACKAGE)-$(VERSION).tar$$suffix"; \ - $(GPG) --detach-sign $$ofile \ - && echo "directory: $(PACKAGE)" > $$ofile.directive \ - && $(GPG) --clearsign $$ofile.directive \ - && rm -f $$ofile.directive; \ - done .PHONY: new-tarball new-tarball: @@ -168,11 +120,7 @@ delta-diff: prev-tarball new-tarball && tar xzf "../$(PACKAGE)-$(VERSION).tar.gz" \ && $(DIFF) $(DIFF_OPTIONS) \ $(PACKAGE)-$(LASTRELEASE) $(PACKAGE)-$(VERSION) \ - | GZIP=$(GZIP_ENV) gzip -c > $$ofile \ - && $(GPG) --detach-sign $$ofile \ - && echo "directory: $(PACKAGE)" > $$ofile.directive \ - && $(GPG) --clearsign $$ofile.directive \ - && rm -f $$ofile.directive + | GZIP=$(GZIP_ENV) gzip -c > $$ofile rm -rf delta-diff @@ -188,11 +136,7 @@ delta-xdelta: prev-tarball new-tarball got-xdelta ( test -z `$(XDELTA) delta $(XDELTA_OPTIONS) \ $(PACKAGE)-$(LASTRELEASE).tar.gz $(PACKAGE)-$(VERSION).tar.gz \ $$ofile 2>&1` \ - && : ) \ - && $(GPG) --detach-sign $$ofile \ - && echo "directory: $(PACKAGE)" > $$ofile.directive \ - && $(GPG) --clearsign $$ofile.directive \ - && rm -f $$ofile.directive + && : ) .PHONY: web-manual web-manual: diff --git a/m4/gnulib-cache.m4 b/m4/gnulib-cache.m4 index 18dda565..5ab7bc11 100644 --- a/m4/gnulib-cache.m4 +++ b/m4/gnulib-cache.m4 @@ -15,10 +15,10 @@ # Specification in the form of a command-line invocation: -# gnulib-tool --import --dir=. --lib=libm4 --source-base=lib --m4-base=m4 --doc-base=doc --aux-dir=. --no-libtool --macro-prefix=M4 alloca binary-io cloexec close-stream error fdl fopen-safer free gendocs getopt mkstemp obstack regex stdlib-safer strtol tmpfile-safer unlocked-io verror xalloc xvasprintf +# gnulib-tool --import --dir=. --lib=libm4 --source-base=lib --m4-base=m4 --doc-base=doc --aux-dir=. --no-libtool --macro-prefix=M4 alloca binary-io cloexec close-stream error fdl fopen-safer free gendocs getopt gnupload mkstemp obstack regex stdlib-safer strtol tmpfile-safer unlocked-io verror xalloc xvasprintf # Specification in the form of a few gnulib-tool.m4 macro invocations: -gl_MODULES([alloca binary-io cloexec close-stream error fdl fopen-safer free gendocs getopt mkstemp obstack regex stdlib-safer strtol tmpfile-safer unlocked-io verror xalloc xvasprintf]) +gl_MODULES([alloca binary-io cloexec close-stream error fdl fopen-safer free gendocs getopt gnupload mkstemp obstack regex stdlib-safer strtol tmpfile-safer unlocked-io verror xalloc xvasprintf]) gl_AVOID([]) gl_SOURCE_BASE([lib]) gl_M4_BASE([m4]) |