On 24 Oct 2011, at 13:11, Gary V. Vaughan wrote: > Although I've kept it separate in this thread for easier review, I'll squash > it into the [PATCH 2/3] commit in 72 hours, pending any comments that need > addressing first. > > On 23 Oct 2011, at 23:12, Gary V. Vaughan wrote: >> >> * libltdl/config/mkstamp: File removed. >> * bootstrap.conf (gnulib_modules): Add git-version-gen. >> * configure.ac (AC_INIT, package_revision): Use git-version-gen to >> calculate version number. >> (TIMESTAMP): Removed. >> * libtoolize.m4sh, libltdl/config/ltmain.m4sh, libltdl/m4/libtool.m4 >> (TIMESTAMP): Ditto. >> * Makefile.am (TIMESTAMP): Ditto. >> (MKSTAMP): Renamed from this... >> (git_version_gen): ...to this. Set revision here. An alpha is now a >> release with an odd micro relase number. >> (rebuild): Don't reset revision here. >> (build_scripts): Remove mkstamp, add git-version-gen. >> (EXTRA_DIST, BUILT_SOURCES): Add .version. >> (libltdl/config/ltmain.sh, libltdl/m4/ltversion.m4, tests/package.m4): >> Don't depend on configure.ac or ChangeLog to determine when the >> version number has reved, use .version directly. >> (.version): Flush most recent configure calculated VERSION to disk. >> (dist-hook): Flush current VERSION to disk at dist time. > > Makefile.am (dotserial): Distributed file to cache the serial > number for when git is not available to recalculate it when > building from a release tarball. > (dist-hook): Make sure .serial is created. > (libltdl/config/ltversion.m4): Use .serial when it is present > (in a dist tarball) or calculate with git otherwise (in a git > working directory). > (EXTRA_DIST): Add .serial file.
Squashed and pushed, I'll commit changes describing the much simpler single branch release system we have been using for a few years already to http://www.gnu.org/software/libtool/contribute.html presently. Cheers, -- Gary V. Vaughan (gary AT gnu DOT org)
