From c1cdec6e6fe786f691a88f1369c7b808e3ee5fd9 Mon Sep 17 00:00:00 2001 From: David Hilvert Date: Sun, 5 Apr 2009 18:19:14 +0000 Subject: [PATCH] Revised bootstrap to inject package variables from VERSION file. Ditz-issue: 8ffa5cdb90b3f4ec2d4989f324f198d6fd550e37 --- VERSION | 21 +++++++- bootstrap | 4 ++ ...e-8ffa5cdb90b3f4ec2d4989f324f198d6fd550e37.yaml | 12 ++++- configure.in | 3 +- doc/Makefile | 2 +- doc/ale-doc.xsl | 22 +++------ version | 56 ++++++++++++++++++++++ 7 files changed, 99 insertions(+), 21 deletions(-) rewrite VERSION (100%) create mode 100755 version diff --git a/VERSION b/VERSION dissimilarity index 100% index 752bf1d..a50edc1 100644 --- a/VERSION +++ b/VERSION @@ -1 +1,20 @@ -git-repository +:package-name: ALE +:version: git-repository +:testing-ver: 0.9.0.3 +:stable-ver: 0.8.11.2 +:invocation: ale +:git-repo: http://repo.or.cz/w/Ale.git +:git-rss: {git-repo}?a=rss +:web-root: http://auricle.dyndns.org/ALE +:home-page: {web-root}/ +:manuals-url: {web-root}/manuals/ +:download-root: {web-root}/download +:web-gpl-link: {download-root}/COPYING +:version-pack: {invocation}-{version} +:version-gz: {version-pack}.tar.gz +:version-url: {download-root}/{version-gz} +:testing-url: {download-root}/{invocation}-{testing-ver}.tar.gz +:stable-url: {download-root}/{invocation}-{stable-ver}.tar.gz +:mailing-list: ale@ventricle.dyndns.org +:ml-listinfo: http://ventricle.dyndns.org/cgi-bin/mailman/listinfo/ale +:ml-archive: http://ventricle.dyndns.org/pipermail/ale/ diff --git a/bootstrap b/bootstrap index 60fc5b3..b226022 100755 --- a/bootstrap +++ b/bootstrap @@ -39,6 +39,8 @@ if test -e configure && test "x$1" != "x-r"; then exit fi +chmod a+x version + if ! which gnulib-tool &> /dev/null; then echo "*** Cannot find 'gnulib-tool'. ***" exit @@ -81,6 +83,8 @@ cp /usr/share/aclocal/ax_check_glut.m4 m4/. chmod a+x doc/make-changelog chmod a+x doc/make-infos +XSLT_VERSION_INFO=`./version -x` +export XSLT_VERSION_INFO make -C doc ../TODO ../README ../ChangeLog ../NEWS a2x -f manpage doc/man/ale.1.txt diff --git a/bugs/issue-8ffa5cdb90b3f4ec2d4989f324f198d6fd550e37.yaml b/bugs/issue-8ffa5cdb90b3f4ec2d4989f324f198d6fd550e37.yaml index 292097e..c4726ff 100644 --- a/bugs/issue-8ffa5cdb90b3f4ec2d4989f324f198d6fd550e37.yaml +++ b/bugs/issue-8ffa5cdb90b3f4ec2d4989f324f198d6fd550e37.yaml @@ -5,8 +5,8 @@ type: :task component: ale release: reporter: David Hilvert -status: :unstarted -disposition: +status: :closed +disposition: :fixed creation_time: 2009-04-04 00:03:35.122256 Z references: [] @@ -29,4 +29,12 @@ log_events: Note that asciidoc attribute entries might be used as a means of embedding the variables into package documentation. +- - 2009-04-05 13:47:29.744676 Z + - David Hilvert + - commented + - Modified VERSION to store variables as asciidoc-style attribute entries. +- - 2009-04-05 18:19:03.410827 Z + - David Hilvert + - closed with disposition fixed + - "" git_branch: diff --git a/configure.in b/configure.in index 37e67d1..b2ede72 100644 --- a/configure.in +++ b/configure.in @@ -30,8 +30,7 @@ # AC_PREREQ(2.60) -AC_INIT(Ale, translit(m4_include(VERSION),' -'), ale@ventricle.dyndns.org) +AC_INIT(m4_esyscmd(./version -n package-name), m4_esyscmd(./version -n version), m4_esyscmd(./version -n mailing-list)) AC_CONFIG_SRCDIR([ale_accum.h]) AC_CONFIG_HEADER([config.h]) diff --git a/doc/Makefile b/doc/Makefile index e4be177..714e8b2 100644 --- a/doc/Makefile +++ b/doc/Makefile @@ -65,7 +65,7 @@ TXT_MAKER_FLAGS = -dump # xsl XSLT = xsltproc -XSLT_FLAGS = --xinclude +XSLT_FLAGS = --xinclude $(XSLT_VERSION_INFO) # http://dblatex.sourceforge.net/ DBLATEX = dblatex diff --git a/doc/ale-doc.xsl b/doc/ale-doc.xsl index 3be9c91..222a2ca 100644 --- a/doc/ale-doc.xsl +++ b/doc/ale-doc.xsl @@ -111,21 +111,13 @@ - Product information --> - - - - - - - - - - + + + + + + +