In (git) commit e6d2228ababda2bf3aaf3c73b776a7c984ce166f,
there is, for texinfo/Makefile.in, the fragment:
+dvc-version.texinfo: $(top_srcdir)/configure
+ @echo Creating $@
+ @( echo @set VERSION $(PACKAGE_VERSION) ; \
+ date +'@set UPDATED %F' -r $< ) > $@
whereas in (bzr) revno 463, this fragment is missing.
This results in revno 463 not being able to build docs.
I wonder: Is this a problem w/ Git, Bzr, DVC, or Emacs?
(Or perhaps with ttn?)
FWIW, the "git show" output is attached. [This is ironic, since
one motivation for posting notifications to repo changes, instead
of patches directly, was to avoid munged-by-mail problems. :-/]
thi
commit e6d2228ababda2bf3aaf3c73b776a7c984ce166f
Author: Thien-Thi Nguyen <[EMAIL PROTECTED]>
Date: Mon Jul 7 14:55:15 2008 +0200
Clean up versioning infrastructure.
This involves making configure.ac AC_INIT the unique source
of version info, and removing `RELEASE_ID' support.
* configure.ac (DVC_PRE_INIT, DVC_VERSION): Delete m4 macros.
(AC_INIT): For package version, use literal "0".
* Makefile.in (PACKAGE_TARNAME, PACKAGE_VERSION): New vars.
(TARDIRNAME): Rewrite rhs of this var.
* lisp/Makefile.in (top_srcdir): New var.
(PACKAGE_VERSION, PACKAGE_BUGREPORT): Likewise.
(BZR_DIR_EXISTS, BZR_REVISION_CMD): Delete vars.
(dvc-version.el): Rewrite target.
* texinfo/Makefile.in (top_srcdir): New var.
(PACKAGE_VERSION): Likewise.
(BZR_DIR_EXISTS, BZR_REVISION_CMD): Delete vars.
(dvc-version.texinfo): Rewrite target.
* texinfo/dvc.texinfo: @include dvc-version.texinfo earlier.
Update intro blurb to use @value{UPDATED} and @value{VERSION}.
* docs/HACKING (Release & distribution process): Rewrite section.
diff --git a/Makefile.in b/Makefile.in
index a6341a6..9f5b9cc 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -1,5 +1,8 @@
@SET_MAKE@
+PACKAGE_TARNAME = @PACKAGE_TARNAME@
+PACKAGE_VERSION = @PACKAGE_VERSION@
+
# location of required programms
TAR = @TAR@
BZR = @BZR@
@@ -92,11 +95,7 @@ texinfo/dvc-version.texinfo:
generated-files: lisp/dvc-version.el \
texinfo/dvc-version.texinfo
-ifeq ($(RELEASE_ID),)
-TARDIRNAME=dvc-snapshot
-else
-TARDIRNAME=dvc-$(RELEASE_ID)
-endif
+TARDIRNAME = $(PACKAGE_TARNAME)-$(PACKAGE_VERSION)
dist: tarball
diff --git a/configure.ac b/configure.ac
index 2460c4f..2da8f55 100644
--- a/configure.ac
+++ b/configure.ac
@@ -19,9 +19,6 @@
# Process this file with autoconf to produce a new configure script
-m4_define([DVC_PRE_INIT],
-[ m4_define([DVC_VERSION], 0) ])
-
# DVC_ARG_SUBST(VAR, OPTION, VAL, DESC[, DEFAULT[, ACTION]])
#
# Substitute the autoconf variable VAR to a value specified by the user
@@ -311,21 +308,8 @@ TEST
AC_SUBST(HAS_TREE_WIDGET)
])
-dnl dnl AC_DEFUN([DVC_RELEASE_ID],
-dnl dnl [ AC_MSG_CHECKING(for release ID)
-dnl dnl AC_ARG_WITH([release-id],
-dnl dnl AC_HELP_STRING([--with-release-id=ID],
-dnl dnl [Version number for an official release]),
-dnl dnl [ RELEASE_ID="${withval}";
-dnl dnl AC_MSG_RESULT(${RELEASE_ID})],
-dnl dnl [ RELEASE_ID="";
-dnl dnl AC_MSG_RESULT(none)])]
-dnl dnl AC_SUBST(RELEASE_ID))
-
-
##############################################################################
-DVC_PRE_INIT
-AC_INIT([DVC], [DVC_VERSION], [EMAIL PROTECTED])
+AC_INIT([DVC], [0], [EMAIL PROTECTED])
# It seems that the latest GNU Emacs sets --always-color to GREP_OPTIONS (for M-x grep?).
# So configure will confuse if it is run from emacs's *shell*.
@@ -369,7 +353,6 @@ DVC_PROG_MAKEINFO
DVC_PROG_TEXI2DVI
DVC_OTHERDIRS
DVC_HAS_TREE_WIDGET
-dnl dnl DVC_RELEASE_ID
# is there a sane way to set this to a useful default?
DVC_ARG_SUBST([PACKAGEDIR], [package-dir], [DIR],
diff --git a/docs/HACKING b/docs/HACKING
index 9d8a6dc..287d6e2 100644
--- a/docs/HACKING
+++ b/docs/HACKING
@@ -213,17 +213,8 @@ Release & distribution process
* Development version
---------------------
-The prefered way to get a development version is to use arch itself to
-get the latest development version. However, xtla's configuration and
-build system provides a way to distribute development tarballs:
-
-make tarball
-
-Will generate xtla-snapshot.tar.gz. This snapshot is put online every
-nights on http://download.gna.org/xtla-el/xtla-snapshot.tar.gz
-
-The documentation is made available separately on
-http://download.gna.org/xtla-el/docs/xtla-snapshot.html
+The prefered way to get a development version is to use either
+Bazaar or Git to clone the latest repo.
* Official releases
-------------------
@@ -231,35 +222,12 @@ http://download.gna.org/xtla-el/docs/xtla-snapshot.html
Official releases will be made by the release manager, after
discussion on the mailing list.
-The release manager will for example type the commands
-
- make RELEASE_ID=1.1 tarball
-
-to generate xtla-1.1.tar.gz, that will be put online on
-http://download.gna.org/xtla-el/xtla-1.1.tar.gz
-
-This is the command I (Matthieu Moy) use to upload the tarball to
-gna.org.
-
- scp -i ~/.ssh/gna_org xtla-1.1.tar.gz \
- [EMAIL PROTECTED]:/upload/xtla-el
-
-The documentation is made available separately on
-http://download.gna.org/xtla-el/docs/xtla-1.1.html
-
-This is the command I use to generate and upload the documentation:
-
- make -C texinfo xtla.html
- scp -i ~/.ssh/gna_org texinfo/xtla.html \
- [EMAIL PROTECTED]:/upload/xtla-el/docs/xtla-snapshot.html
-
-
-* Helper script
----------------
+The release manager will modify configure.ac to set the second
+arg of AC_INIT to 1.1, for example, and then type the commands
-During the pre-1.0 phase, nightly snapshot tarballs and documentation
-were made by Matthieu MOY. The scripts scripts/xtla-cron.sh was
-actually doing the job, ran by cron every nights.
+ autoreconf
+ ./configure (or ./config.status --recheck)
+ make
+ make dist
-A future maintainer could reuse this script and adapt it to his
-configuration.
+to generate dvc-1.1.tar.gz, to be uploaded somewhere.
diff --git a/lisp/Makefile.in b/lisp/Makefile.in
index 66c7fe2..b39f9ee 100644
--- a/lisp/Makefile.in
+++ b/lisp/Makefile.in
@@ -1,5 +1,9 @@
@SET_MAKE@
+top_srcdir = @top_srcdir@
+PACKAGE_VERSION = @PACKAGE_VERSION@
+PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
+
##############################################################################
# location of required programms
prefix = @prefix@
@@ -110,40 +114,14 @@ autoloads:
##############################################################################
-BZR_DIR_EXISTS=${shell if [ -r '@top_srcdir@/.bzr' ]; then printf "%s" yes; else printf "%s" no; fi }
-BZR_REVISION_CMD=cd @top_srcdir@ && $(BZR) version-info | sed -ne 's/^revision-id: //p'
-
-ifeq ($(BZR_DIR_EXISTS),yes)
-dvc-version.el: @top_srcdir@/.bzr $(SRCS:[EMAIL PROTECTED]@/%)
- $(RM) -f $@
- echo ';; do not edit -- automatically generated file' > $@
- echo ';; do not delete -- needed for bug reports' >> $@
- printf "%s" '(defconst dvc-version "' >> $@
- if [ "x$(RELEASE_ID)" != "x" ]; then \
- printf "%s (%s)" $(RELEASE_ID) \
- `$(BZR_REVISION_CMD)` >> $@; \
- else \
- printf "%s" `$(BZR_REVISION_CMD)` >> $@; \
- fi
- echo '")' >> $@
- echo "(provide 'dvc-version)" >> $@
- chmod -w $@
-else
-dvc-version.el: $(SRCS:[EMAIL PROTECTED]@/%)
- $(RM) -f $@
- echo ';; do not edit -- automatically generated file' > $@
- echo ';; do not delete -- needed for bug reports' >> $@
- @echo "*** Warning: Unknown bzr release"
- printf "%s" '(defconst dvc-version "' >> $@
- if [ "x$(RELEASE_ID)" != "x" ]; then \
- printf "%s" "$(RELEASE_ID)" >> $@; \
- else \
- printf "%s" "Unknown version" >> $@; \
- fi
- echo '")' >> $@
- echo "(provide 'dvc-version)" >> $@
- chmod -w $@
-endif
+dvc-version.el: $(top_srcdir)/configure
+ @echo Creating $@
+ @( echo ';;; $@ (generated file -- do not edit!)' ; \
+ echo '(defconst dvc-version "$(PACKAGE_VERSION)"' ; \
+ echo ' "Version of DVC loaded.' ; \
+ echo 'Please send bug reports to <$(PACKAGE_BUGREPORT)>.")' ; \
+ echo "(provide 'dvc-version)" ) \
+ > $@
dvc-site.el: ../config.status @srcdir@/dvc-site.el.in
(cd .. ; ./config.status lisp/$@)
diff --git a/texinfo/Makefile.in b/texinfo/Makefile.in
index d577e14..06a18f0 100644
--- a/texinfo/Makefile.in
+++ b/texinfo/Makefile.in
@@ -1,5 +1,8 @@
@SET_MAKE@
+top_srcdir = @top_srcdir@
+PACKAGE_VERSION = @PACKAGE_VERSION@
+
##############################################################################
# location of required programms
RM = @RM@
@@ -101,30 +104,7 @@ distclean: clean
.PHONY: pdf dvi html info clean distclean install-pkg uninstall-pkg all
-BZR_DIR_EXISTS=${shell if [ -r '@top_srcdir@/.bzr' ]; then printf "%s" yes; else printf "%s" no; fi }
-BZR_REVISION_CMD=cd @top_srcdir@ && $(BZR) version-info | sed -ne 's/^revision-id: //p'
-
-ifeq ($(BZR_DIR_EXISTS),yes)
-dvc-version.texinfo: @top_srcdir@/.bzr
- $(RM) -f $@
- printf "%s" "@verbatim " >> $@
- if [ "x$(RELEASE_ID)" != "x" ]; then \
- printf "%s (%s)" $(RELEASE_ID) \
- `$(BZR_REVISION_CMD)` >> $@; \
- else \
- ($(BZR_REVISION_CMD)) >> $@; \
- fi
- @echo >> $@
- @echo "@end verbatim" >> $@
- chmod -w $@
-else
-dvc-version.texinfo:
- $(RM) -f $@
- @echo "*** Warning: Unknown DVC arch release"
- if [ "x$(RELEASE_ID)" != "x" ]; then \
- printf "%s" "$(RELEASE_ID)" >> $@; \
- else \
- printf "%s" "Unknown version" >> $@; \
- fi
- chmod -w $@
-endif
+dvc-version.texinfo: $(top_srcdir)/configure
+ @echo Creating $@
+ @( echo @set VERSION $(PACKAGE_VERSION) ; \
+ date +'@set UPDATED %F' -r $< ) > $@
diff --git a/texinfo/dvc.texinfo b/texinfo/dvc.texinfo
index 0e1759b..1a13c18 100644
--- a/texinfo/dvc.texinfo
+++ b/texinfo/dvc.texinfo
@@ -16,6 +16,8 @@
Copyright (c) 2004-2005, 2007, 2008 The DVC Development Team
@end ifinfo
[EMAIL PROTECTED] dvc-version.texinfo
+
@titlepage
@title DVC User Manual
@subtitle The Emacs interface to Distributed Version Control Systems
@@ -25,9 +27,8 @@
Copyright @copyright{} 2004-2005 The DVC Development Team
@sp 2
-This is edition
[EMAIL PROTECTED] dvc-version.texinfo
-of the User Manual for @cite{DVC}
+This is the @value{UPDATED} edition
+of the User Manual for @cite{DVC} @value{VERSION}.
@sp 2
_______________________________________________
Dvc-dev mailing list
[email protected]
https://mail.gna.org/listinfo/dvc-dev
