From 5cdbbab8f53a3d2d99512a94437a4b4854d28a8d Mon Sep 17 00:00:00 2001 From: Wade Berrier Date: Fri, 9 Nov 2007 17:34:11 +0000 Subject: 2007-11-09 Wade Berrier * configure.in: define MONO_TOOSL in a mcs friendly way (svn revs) version bump -> 1.2.6 2007-11-09 Wade Berrier * docbrowser/AssemblyInfo.cs.in: use TOOLS_VERSION because it is in an mcs friendly format (for svn revisions) svn path=/trunk/mono-tools/; revision=89329 --- ChangeLog | 5 +++++ configure.in | 13 ++++++++++++- docbrowser/AssemblyInfo.cs.in | 2 +- docbrowser/ChangeLog | 5 +++++ 4 files changed, 23 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index 84969c2c..60ac343c 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2007-11-99 Wade Berrier + + * configure.in: define MONO_TOOSL in a mcs friendly way (svn revs) + version bump -> 1.2.6 + 2007-11-08 Mike Kestner * configure.in: configure checks for gtkhtml-sharp-3.14 diff --git a/configure.in b/configure.in index 56f9f304..6298ec42 100644 --- a/configure.in +++ b/configure.in @@ -1,6 +1,6 @@ AC_INIT(README) AC_CANONICAL_SYSTEM -AM_INIT_AUTOMAKE(mono-tools, 1.2.4) +AM_INIT_AUTOMAKE(mono-tools, 1.2.6) AM_MAINTAINER_MODE AC_PROG_INSTALL @@ -81,6 +81,17 @@ AM_GLIB_GNU_GETTEXT GNUNIT_VERSION=0.5 AC_SUBST(GNUNIT_VERSION) +AC_PROG_AWK +export VERSION +[TOOLS_VERSION=$($AWK 'BEGIN { + split (ENVIRON["VERSION"] ".0.0.0", vsplit, ".") + if(length(vsplit [1]) > 4) { + split (substr(ENVIRON["VERSION"], 0, 4) "." substr(ENVIRON["VERSION"], 5) ".0.0", vsplit, ".") + } + print vsplit [1] "." vsplit [2] "." vsplit [3] "." vsplit [4] +}')] + +AC_SUBST(TOOLS_VERSION) AC_OUTPUT([ Makefile diff --git a/docbrowser/AssemblyInfo.cs.in b/docbrowser/AssemblyInfo.cs.in index ce49b10e..243912fb 100644 --- a/docbrowser/AssemblyInfo.cs.in +++ b/docbrowser/AssemblyInfo.cs.in @@ -9,7 +9,7 @@ using System.Reflection; using System.Runtime.CompilerServices; -[assembly: AssemblyVersion("@VERSION@")] +[assembly: AssemblyVersion("@TOOLS_VERSION@")] [assembly: AssemblyTitle ("Mono Documentation Browser")] [assembly: AssemblyDescription ("A documentation browser.")] [assembly: AssemblyCopyright ("Copyright (c) 2003-2005 Novell, Inc.")] diff --git a/docbrowser/ChangeLog b/docbrowser/ChangeLog index f5f42094..09362a32 100644 --- a/docbrowser/ChangeLog +++ b/docbrowser/ChangeLog @@ -1,3 +1,8 @@ +2007-11-09 Wade Berrier + + * AssemblyInfo.cs.in: use TOOLS_VERSION because it is + in an mcs friendly format (for svn revisions) + 2007-11-08 Mike Kestner * PrintManager.cs: extracted existing duplicated print -- cgit v1.2.3