From: Gary V. Vaughan Date: Sat, 6 Sep 2008 21:12:18 +0000 (+0800) Subject: Prepare for next stable release. X-Git-Tag: v2.2.6~2 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c2b86363045da50958294cfc17095cc44021f163;p=thirdparty%2Flibtool.git Prepare for next stable release. * libltdl/Makefile.inc (LTDL_VERSION_INFO): Update. * libltdl/m4/libtool.m4: Bump serial number to account for changes since 2.2.4 release. * INSTALL, config/config.guess, config/texinfo.tex: Updated from canonical source. * configure.ac (AM_INIT_AUTOMAKE): Specify dist-lzma, which was introduced after automake-1.10 was released. (abs_top_srcdir, abs_top_builddir): No need to substitute these from configure anymore, since we require automake 1.10.1, which does perform the substitutions properly. (TIMESTAMP): Normal releases were displaying the long-form timestamp. Fix to show the short release timestamp as per alpha release numbers. * NEWS: Update with missing entries from ChangeLog. * HACKING (Release Procedure): We release lzma tarballs now but no xdeltas. * Makefile.maint: Updated to match Release Procedure instructions in HACKING. Signed-off-by: Gary V. Vaughan --- diff --git a/ChangeLog b/ChangeLog index 4ac84b90e..967fc4011 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,25 @@ 2008-09-07 Gary V. Vaughan + Prepare for next stable release. + * libltdl/Makefile.inc (LTDL_VERSION_INFO): Update. + * libltdl/m4/libtool.m4: Bump serial number to account for + changes since 2.2.4 release. + * INSTALL, config/config.guess, config/texinfo.tex: Updated + from canonical source. + * configure.ac (AM_INIT_AUTOMAKE): Specify dist-lzma, which + was introduced after automake-1.10 was released. + (abs_top_srcdir, abs_top_builddir): No need to substitute these + from configure anymore, since we require automake 1.10.1, which + does perform the substitutions properly. + (TIMESTAMP): Normal releases were displaying the long-form + timestamp. Fix to show the short release timestamp as per + alpha release numbers. + * NEWS: Update with missing entries from ChangeLog. + * HACKING (Release Procedure): We release lzma tarballs now + but no xdeltas. + * Makefile.maint: Updated to match Release Procedure + instructions in HACKING. + Convert mailnotify headers to git. * clcommit.m4sh: Improve mailnotify contents. diff --git a/HACKING b/HACKING index 266e3806c..10d4bb3ac 100644 --- a/HACKING +++ b/HACKING @@ -665,10 +665,7 @@ or obtained by writing to the Free Software Foundation, Inc., (esp. bug-libtool) for outstanding bug reports also in the list of pending moderation requests. -* Make sure you have wget installed. - -* Make sure you have a copy of xdelta installed, and a copy of the previous - release tarball in the build directory. +* Make sure you have wget and lzma installed. * Make sure your locale is sane, e.g. by exporting LC_ALL=C. @@ -687,9 +684,6 @@ or obtained by writing to the Free Software Foundation, Inc., * Run ./bootstrap. -* Have some tea. If you are running on less than 3.6GHz CPU, order - a pizza too ;-) - * Run ./configure (or create a build directory first and run configure from there, if you want to keep the build tree separate). @@ -699,25 +693,26 @@ or obtained by writing to the Free Software Foundation, Inc., fetch new versions of the files that are maintained outside of libtool. -* Run `make distcheck' and `make distcheck - DISTCHECK_CONFIGURE_FLAGS=--disable-ltdl-install'. Try a distcheck - with --program-prefix=g. If there are any problems, fix them and - start again. +* Run `make distcheck' + and `make distcheck DISTCHECK_CONFIGURE_FLAGS=--disable-ltdl-install' + and `make distcheck DISTCHECK_CONFIGURE_FLAGS=--program-prefix=g' + and `make distcheck CC=g++' + If there are any problems, fix them and start again. * Run ./commit from the source tree. -* Run `make -fMakefile.maint cvs-dist' (or `make -f../Makefile.maint - cvs-dist' if you are running from a VPATH build directory, where `../' +* Run `make -fMakefile.maint git-dist' (or `make -f../Makefile.maint + git-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. -* 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. +* Run 'make -f[../]Makefile.maint diffs' (pass + LASTRELEASE=maj.min[.mic[alpha]] if needed) to create diff 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 +* Upload release tarballs and diff files, 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 @@ -739,7 +734,8 @@ or obtained by writing to the Free Software Foundation, Inc., release number and the news page should get a HTMLified copy of your release announcement. -* If not an alpha, replace manual.html with the new one +* If not an alpha, upload new manual pages with cvs to: + @cvs.savannah.gnu.org:/webcvs/libtool (generate with `make -f[../]Makefile.maint web-manual'). diff --git a/Makefile.maint b/Makefile.maint index 72cac5b77..f944d6373 100644 --- a/Makefile.maint +++ b/Makefile.maint @@ -61,16 +61,16 @@ $(srcdir)/$(auxdir)/mailnotify: $(auxdir)/mailnotify.m4sh mv -f mailnotify.tmp mailnotify; \ rm -f mailnotify.in -.PHONY: cvs-release -cvs-release: version-check prev-tarball cvs-news fetch cvs-commit cvs-dist deltas web-manual +.PHONY: git-release +git-release: version-check prev-tarball check-news fetch git-commit git-dist diffs web-manual @tarname="$(PACKAGE)-$(VERSION).tar.gz"; \ + lzmaname="$(PACKAGE)-$(VERSION).tar.lzma"; \ diffname="$(PACKAGE)-$(LASTRELEASE)-$(VERSION).diff.gz"; \ - xdeltaname="$(PACKAGE)-$(LASTRELEASE)-$(VERSION).xdelta"; \ echo " *** Upload $$tarname, $$tarname.sig,";\ - echo " *** $$tarname.directive.asc, $$diffname,"; \ - echo " *** $$diffname.sig, $$diffname.directive.asc,"; \ - echo " *** $$xdeltaname, $$xdeltaname.sig and";\ - echo " *** $$xdeltaname.directive.asc to either" + echo " *** $$tarname.directive.asc, $$lzmaname,";\ + echo " *** $$lzmaname.sig, $$lzmaname.directive.asc,";\ + echo " *** $$diffname, $$diffname.sig";\ + echo " *** and $$diffname.directive.asc to either"; \ echo " *** /incoming/alpha or /incoming/ftp on ftp-upload.gnu.org." echo " *** You might need to upload manual.html to webcvs/libtool." @@ -84,28 +84,17 @@ version-check: ;; \ esac -.PHONY: prev-tarball -prev-tarball: -## Make sure we have the previous release tarball in the tree. - @if test -z "$(LASTRELEASE)"; \ - then echo "LASTRELEASE is not set"; exit 1; fi - @ofile="$(PACKAGE)-$(LASTRELEASE).tar.gz"; \ - if test -f $$ofile; then :; \ - else echo "Cannot make deltas without $$ofile"; exit 1; fi +GIT = git # set it to `:' to avoid git write operations -TSDEPS = ChangeLog libltdl/m4/libtool.m4 -CVS = cvs # set it to `:' to avoid CVS operations +.PHONY: check-commit +check-commit: + @if (cd $(srcdir) && test -d .git && \ + $(GIT) status | grep 'modified:'); then \ + echo "Cannot make git-dist before commit"; exit 1; else :; fi -.PHONY: timestamps update-timestamps -timestamps: update-timestamps -update-timestamps: - @if (cd $(srcdir) && test -d CVS && \ - $(CVS) -n update $(TSDEPS) | grep '^M'); then \ - echo "Cannot make cvs-dist before commit"; exit 1; else :; fi - -.PHONY: cvs-news -cvs-news: +.PHONY: check-news +check-news: ## Make sure the NEWS file is up-to-date: @if sed '1,2d;3q' $(srcdir)/NEWS | grep -e "$(VERSION)" >/dev/null; \ then :; \ @@ -159,19 +148,19 @@ fetch: GPG = gpg # set it to `:' to avoid gpg operations -.PHONY: cvs-commit -cvs-commit: cvs-news +.PHONY: git-commit +git-commit: git-news cd $(srcdir) && $(SHELL) ./commit -.PHONY: cvs-dist -cvs-dist: cvs-news timestamps +.PHONY: git-dist +git-dist: git-news check-commit ## Build the distribution: $(MAKE) distcheck ## Finally, if everything was successful, tag the release cd $(srcdir) \ - && $(CVS) -q tag `echo "release-$(VERSION)" | sed 's/\./-/g'` + && $(GIT) tag -s "v$(VERSION)" ## Generate signatures and directives for FSF ftp-upload: - for suffix in gz bz2; do \ + for suffix in gz lzma; do \ ofile="$(PACKAGE)-$(VERSION).tar.$$suffix"; \ $(GPG) --detach-sign $$ofile \ && echo "directory: libtool" > $$ofile.directive \ @@ -179,31 +168,27 @@ cvs-dist: cvs-news timestamps && rm -f $$ofile.directive; \ done +.PHONY: prev-tarball +prev-tarball: +## Make sure we have the previous release tarball in the tree. + @if test -z "$(LASTRELEASE)"; \ + then echo "LASTRELEASE is not set"; exit 1; fi + @ofile="$(PACKAGE)-$(LASTRELEASE).tar.gz"; \ + if test -f $$ofile; then :; \ + else echo "Cannot make diffs without $$ofile"; exit 1; fi + .PHONY: new-tarball new-tarball: ## Make sure we have the new release tarball in the tree. @ofile="$(PACKAGE)-$(VERSION).tar.gz"; \ if test -f $$ofile; then :; \ - else echo "Cannot make deltas without $$ofile"; exit 1; fi - -.PHONY: got-xdelta -got-xdelta: -## Make sure xdelta exists; - @if ($(XDELTA) --version 2>&1 | grep version)>/dev/null 2>/dev/null; \ - then :;\ - else \ - echo "Get xdelta from http://sourceforge.net/projects/xdelta."; \ - exit 1; \ - fi - -.PHONY: deltas -deltas: delta-diff delta-xdelta + else echo "Cannot make diffs without $$ofile"; exit 1; fi DIFF = diff DIFF_OPTIONS = -ruNp -.PHONY: delta-diff -delta-diff: prev-tarball new-tarball +.PHONY: diff +diffs: prev-tarball new-tarball ## Unpack the tarballs somewhere to diff them rm -rf delta-diff mkdir delta-diff @@ -222,28 +207,12 @@ delta-diff: prev-tarball new-tarball rm -rf delta-diff -XDELTA = xdelta -XDELTA_OPTIONS = -9 - -.PHONY: delta-xdelta -delta-xdelta: prev-tarball new-tarball got-xdelta -## Generate the delta file (xdelta has wierd exit statuses, so we need to -## add some shell code to keep make happy), and then generate the signatures -## for FSF ftp-upload: - ofile="$(PACKAGE)-$(LASTRELEASE)-$(VERSION).xdelta"; \ - ( test -z `$(XDELTA) delta $(XDELTA_OPTIONS) \ - $(PACKAGE)-$(LASTRELEASE).tar.gz $(PACKAGE)-$(VERSION).tar.gz \ - $$ofile 2>&1` \ - && : ) \ - && $(GPG) --detach-sign $$ofile \ - && echo "directory: libtool" > $$ofile.directive \ - && $(GPG) --clearsign $$ofile.directive \ - && rm -f $$ofile.directive - .PHONY: web-manual web-manual: - @rm -f doc/manual.texi manual.html - @$(LN_S) $(abs_srcdir)/doc/libtool.texi doc/manual.texi - $(TEXI2HTML) -I doc -I $(srcdir)/doc -monolithic -number -verbose doc/manual.texi - @test -f manual.html || mv doc/manual.html manual.html - @rm -f doc/manual.texi + cd $(srcdir)/doc; \ + rm -f gendocs.sh* gendocs_template*; \ + test -d manual && rm -rf manual; \ + $(WGETSGO)'/texinfo/texinfo/util/gendocs.sh' && \ + $(WGETSGO)'/texinfo/texinfo/util/gendocs_template' && \ + chmod 755 gendocs.sh && \ + ./gendocs.sh libtool "GNU Libtool Manual" diff --git a/NEWS b/NEWS index 862e2a55c..dfdc48b25 100644 --- a/NEWS +++ b/NEWS @@ -1,6 +1,6 @@ NEWS - list of user-visible changes between releases of GNU Libtool -New in 2.2.??: 2008-08-??: git version 2.2.5a, Libtool team: +New in 2.2.6 2008-09-05: git version 2.2.5a, Libtool team: * New features: @@ -13,6 +13,7 @@ New in 2.2.??: 2008-08-??: git version 2.2.5a, Libtool team: - Fixes for ifort on Darwin, and newer Intel compilers (icc 10, ifort 9) on GNU/Linux. + - Fixes for cwrapper (cygwin/mingw) under -stdc=c99. - Support cross compile of MinGW with Wine. - Initial support for cegcc (Windows CE/PocketPC) cross compilation. - Initial support for lf95 (Lahey Fortran 8.1) on GNU/Linux. @@ -27,6 +28,12 @@ New in 2.2.??: 2008-08-??: git version 2.2.5a, Libtool team: - Revert "lt_dlopen(NULL) works on AIX again.". It was not the correct fix. + - Diagnose '-L' arguments correctly. + + - Libtool no longer tries to open devices as files in execute mode. + + - Libtool no longer removes *.gcno profile information from GCC. + New in 2.2.4: 2008-05-04: git version 2.2.3a, Libtool team: * New features: diff --git a/clcommit.m4sh b/clcommit.m4sh index 0ee3b1954..a3a2c28e8 100644 --- a/clcommit.m4sh +++ b/clcommit.m4sh @@ -207,7 +207,7 @@ set -e fi # The funny quoting allows keeping one option per # line in $rc_file: - eval set dummy $(echo $(cat $rc_file) \${1+\"\$@\"}) + eval set dummy `echo \`cat $rc_file\` \${1+"\$@"}` shift ;; diff --git a/configure.ac b/configure.ac index 9c181db78..9cf7131a3 100644 --- a/configure.ac +++ b/configure.ac @@ -30,7 +30,7 @@ dnl Oldest automake required for bootstrap is below in AM_INIT_AUTOMAKE. ## ------------------------ ## ## Autoconf initialisation. ## ## ------------------------ ## -AC_INIT([libtool], [2.2.5a], [bug-libtool@gnu.org]) +AC_INIT([libtool], [2.2.6], [bug-libtool@gnu.org]) AC_CONFIG_HEADERS([config.h:config-h.in]) AC_CONFIG_SRCDIR([libtoolize.in]) LT_CONFIG_LTDL_DIR([libltdl], [nonrecursive]) @@ -106,7 +106,7 @@ AC_SUBST([LASTRELEASE]) TIMESTAMP=`${CONFIG_SHELL} ${ac_aux_dir}/mkstamp ${srcdir}` package_revision=`( set $TIMESTAMP; echo $1; )` case $lt_alpha in - [[bdfhjlnprtvxz]]) + ""|[[bdfhjlnprtvxz]]) TIMESTAMP= ;; esac @@ -120,9 +120,9 @@ AC_SUBST([package_revision]) ## Automake Initialisation. ## ## ------------------------ ## -dnl These are bootstrap requirements, once built, libtool may work with +dnl These are bootstrap requirements! Once built, libtool may work with dnl much older releases of autoconf and automake. See release notes. -AM_INIT_AUTOMAKE([1.9 gnu subdir-objects dist-bzip2]) +AM_INIT_AUTOMAKE([1.10.1 gnu subdir-objects dist-lzma]) dnl We use m4sh to generate libtool's portable shell scripts AC_SUBST([M4SH], ['$(AUTOM4TE) --language=m4sh']) @@ -130,7 +130,8 @@ AC_SUBST([M4SH], ['$(AUTOM4TE) --language=m4sh']) dnl Make sure config.status is regenerated when the version timestamp changes AC_SUBST([CONFIG_STATUS_DEPENDENCIES], ['$(top_srcdir)/ChangeLog']) -dnl automake-1.9.x or autoconf-2.59 don't support subdir libobjs +dnl when installed libtool is used with automake-1.9.x or autoconf-2.59, +dnl subdir libobjs don't work without a little extra help AC_MSG_CHECKING([whether subdir libobjs are useable]) test -f $srcdir/argz.c || sublibobjs_supported=yes AM_CONDITIONAL([LTDL_SUBDIR_LIBOBJS], test x"${sublibobjs_supported-no}" != xno) @@ -141,9 +142,6 @@ AC_MSG_RESULT([${sublibobjs_supported-no}]) ## Libtool specific configuration. ## ## ------------------------------- ## -dnl automake-1.9 does not substitute these two by default -AC_SUBST([abs_top_srcdir]) -AC_SUBST([abs_top_builddir]) AC_SUBST([aclocaldir], ["\${datadir}/aclocal"]) AC_SUBST([pkgdatadir], ["\${datadir}/$PACKAGE"]) diff --git a/libltdl/Makefile.inc b/libltdl/Makefile.inc index 71cb30f8e..9218a50f8 100644 --- a/libltdl/Makefile.inc +++ b/libltdl/Makefile.inc @@ -36,7 +36,7 @@ AM_CPPFLAGS += -DLT_CONFIG_H='<$(LT_CONFIG_H)>' \ -DLTDL -I. -I$(srcdir) -Ilibltdl \ -I$(srcdir)/libltdl -I$(srcdir)/libltdl/libltdl AM_LDFLAGS += -no-undefined -LTDL_VERSION_INFO = -version-info 8:2:1 +LTDL_VERSION_INFO = -version-info 9:0:0 noinst_LTLIBRARIES += $(LT_DLLOADERS) diff --git a/libltdl/configure.ac b/libltdl/configure.ac index 9a7d58a44..bb13fba91 100644 --- a/libltdl/configure.ac +++ b/libltdl/configure.ac @@ -40,7 +40,7 @@ AC_PREREQ(2.59)dnl We use AS_HELP_STRING ## ------------------------ ## ## Autoconf initialisation. ## ## ------------------------ ## -AC_INIT([libltdl], [2.2.5a], [bug-libtool@gnu.org]) +AC_INIT([libltdl], [2.2.6], [bug-libtool@gnu.org]) AC_CONFIG_HEADERS([config.h:config-h.in]) AC_CONFIG_SRCDIR([ltdl.c]) AC_CONFIG_AUX_DIR([config]) diff --git a/libltdl/m4/ltdl.m4 b/libltdl/m4/ltdl.m4 index f84f15f67..f6be54a94 100644 --- a/libltdl/m4/ltdl.m4 +++ b/libltdl/m4/ltdl.m4 @@ -7,7 +7,7 @@ # unlimited permission to copy and/or distribute it, with or without # modifications, as long as this notice is preserved. -# serial 16 LTDL_INIT +# serial 17 LTDL_INIT # LT_CONFIG_LTDL_DIR(DIRECTORY, [LTDL-MODE]) # ------------------------------------------