diff options
| author | hobbs <hobbs> | 2008-06-13 21:49:31 (GMT) |
|---|---|---|
| committer | hobbs <hobbs> | 2008-06-13 21:49:31 (GMT) |
| commit | b1da42131f7821e1ee4d120f092c3a2f51f8a6d7 (patch) | |
| tree | 67d2c9931e18745d47c052b9f2d0463037d1761c /win | |
| parent | ee10365fe5ddffde317320b6ac35d36b86b21dc4 (diff) | |
| download | tk-b1da42131f7821e1ee4d120f092c3a2f51f8a6d7.zip tk-b1da42131f7821e1ee4d120f092c3a2f51f8a6d7.tar.gz tk-b1da42131f7821e1ee4d120f092c3a2f51f8a6d7.tar.bz2 | |
* win/configure, win/configure.in (TK_WIN_VERSION): fix handling
of interim a/b versioning for manifest usage.
Diffstat (limited to 'win')
| -rwxr-xr-x | win/configure | 12 | ||||
| -rw-r--r-- | win/configure.in | 14 |
2 files changed, 13 insertions, 13 deletions
diff --git a/win/configure b/win/configure index 4172c39..67a501c 100755 --- a/win/configure +++ b/win/configure @@ -4068,14 +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) -AB_PATCH_LEVEL="`echo $TK_PATCH_LEVEL | sed -e 's/\..*//'`" +# 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 - a*) TK_WIN_VERSION="$TK_VERSION.0.`echo $AB_PATCH_LEVEL | tr -d a`" ;; - b*) TK_WIN_VERSION="$TK_VERSION.1.`echo $AB_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.`" # X86|AMD64|IA64 for manifest diff --git a/win/configure.in b/win/configure.in index 48ee9ed..f8d71a8 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.78 2008/04/01 16:30:56 dgp Exp $ +# RCS: @(#) $Id: configure.in,v 1.79 2008/06/13 21:49:31 hobbs Exp $ AC_INIT(../generic/tk.h) AC_PREREQ(2.59) @@ -230,14 +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) -AB_PATCH_LEVEL="`echo $TK_PATCH_LEVEL | sed -e 's/\..*//'`" +# 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 - a*) TK_WIN_VERSION="$TK_VERSION.0.`echo $AB_PATCH_LEVEL | tr -d a`" ;; - b*) TK_WIN_VERSION="$TK_VERSION.1.`echo $AB_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) |