From 97adda8abbf04c68397fb636005a3a871f0b914c Mon Sep 17 00:00:00 2001
From: hobbs <hobbs>
Date: Fri, 13 Jun 2008 21:48:35 +0000
Subject: improve handling of various versions for patchlevel to winversion
 conversion

---
 win/configure    | 13 ++++++-------
 win/configure.in | 13 +++++++------
 2 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/win/configure b/win/configure
index 50fbde1..7e028bf 100755
--- a/win/configure
+++ b/win/configure
@@ -4068,15 +4068,14 @@ else
 fi
 
 # The wish.exe.manifest requires these
-# TK_WIN_VERSION is the 4 dotted pair Windows version format
-# Make sure the patch level doesn't contain extra dotted pairs (interim rel)
-echo "patchlevel $TK_PATCH_LEVEL"
+# TK_WIN_VERSION is the 4 dotted pair Windows version format which needs
+# the release level, and must account for interim release versioning
 case "$TK_PATCH_LEVEL" in
-     .[0-9]a*) TK_WIN_VERSION="$TK_VERSION.0`echo $TK_PATCH_LEVEL | tr -d a`" ;;
-     .[0-9]b*) TK_WIN_VERSION="$TK_VERSION.1`echo $TK_PATCH_LEVEL | tr -d b`" ;;
-     *) TK_WIN_VERSION="$TK_VERSION.2$TK_PATCH_LEVEL" ;;
+     *a*) TK_RELEASE_LEVEL=0 ;;
+     *b*) TK_RELEASE_LEVEL=1 ;;
+     *)   TK_RELEASE_LEVEL=2 ;;
 esac
-echo "winversion $TK_WIN_VERSION"
+TK_WIN_VERSION="$TK_VERSION.$TK_RELEASE_LEVEL.`echo $TK_PATCH_LEVEL | tr -d ab.`"
 
 # X86|AMD64|IA64 for manifest
 
diff --git a/win/configure.in b/win/configure.in
index 7d908a3..184d537 100644
--- a/win/configure.in
+++ b/win/configure.in
@@ -3,7 +3,7 @@
 # generate the file "configure", which is run during Tk installation
 # to configure the system for the local environment.
 #
-# RCS: @(#) $Id: configure.in,v 1.77.2.2 2008/06/13 21:29:29 hobbs Exp $
+# RCS: @(#) $Id: configure.in,v 1.77.2.3 2008/06/13 21:48:35 hobbs Exp $
 
 AC_INIT(../generic/tk.h)
 AC_PREREQ(2.59)
@@ -230,13 +230,14 @@ else
 fi
 
 # The wish.exe.manifest requires these
-# TK_WIN_VERSION is the 4 dotted pair Windows version format
-# Make sure the patch level doesn't contain extra dotted pairs (interim rel)
+# TK_WIN_VERSION is the 4 dotted pair Windows version format which needs
+# the release level, and must account for interim release versioning
 case "$TK_PATCH_LEVEL" in
-     .[[0-9]]a*) TK_WIN_VERSION="$TK_VERSION.0`echo $TK_PATCH_LEVEL | tr -d a`" ;;
-     .[[0-9]]b*) TK_WIN_VERSION="$TK_VERSION.1`echo $TK_PATCH_LEVEL | tr -d b`" ;;
-     *) TK_WIN_VERSION="$TK_VERSION.2$TK_PATCH_LEVEL" ;;
+     *a*) TK_RELEASE_LEVEL=0 ;;
+     *b*) TK_RELEASE_LEVEL=1 ;;
+     *)   TK_RELEASE_LEVEL=2 ;;
 esac
+TK_WIN_VERSION="$TK_VERSION.$TK_RELEASE_LEVEL.`echo $TK_PATCH_LEVEL | tr -d ab.`"
 AC_SUBST(TK_WIN_VERSION)
 # X86|AMD64|IA64 for manifest
 AC_SUBST(MACHINE)
-- 
cgit v0.12