diff options
| author | jan.nijtmans <nijtmans@users.sourceforge.net> | 2017-09-08 14:38:27 (GMT) |
|---|---|---|
| committer | jan.nijtmans <nijtmans@users.sourceforge.net> | 2017-09-08 14:38:27 (GMT) |
| commit | d3fbbafe0819cd62a734173f1b994ba6e0554372 (patch) | |
| tree | dbbaee1b1b69fb66ce6aa6fae1fb17e6ec8f1a6a /win/configure.ac | |
| parent | 72cd4c6a0763c30b3f3a4fceb1ed78ad63711cb5 (diff) | |
| parent | 7d0ca0e42091bc22762c16669fe03d54d1bfa013 (diff) | |
| download | tcl-semver.zip tcl-semver.tar.gz tcl-semver.tar.bz2 | |
Re-base to trunk. Now versioned as 8.7.0-alpha.2semver
Diffstat (limited to 'win/configure.ac')
| -rw-r--r-- | win/configure.ac | 24 |
1 files changed, 8 insertions, 16 deletions
diff --git a/win/configure.ac b/win/configure.ac index d03695c..71624d1 100644 --- a/win/configure.ac +++ b/win/configure.ac @@ -14,8 +14,8 @@ SHELL=/bin/sh TCL_VERSION=8.7 TCL_MAJOR_VERSION=8 TCL_MINOR_VERSION=7 -TCL_PATCH_LEVEL="a2" -VER=$TCL_MAJOR_VERSION$TCL_MINOR_VERSION +TCL_PATCH_LEVEL=".0-alpha.2" +VER=$TCL_MAJOR_VERSION TCL_DDE_VERSION=1.4 TCL_DDE_MAJOR_VERSION=1 @@ -268,7 +268,7 @@ fi SC_ENABLE_SYMBOLS -TCL_DBGX=${DBGX} +TCL_DBGX="" #-------------------------------------------------------------------- # Embed the manifest if we can determine how @@ -324,17 +324,9 @@ CFG_TCL_EXPORT_FILE_SUFFIX=${TCL_EXPORT_FILE_SUFFIX} #-------------------------------------------------------------------- if test ${SHARED_BUILD} = 0 ; then - if test "${DBGX}" = "g"; then - RC_DEFINES="${RC_DEFINE} STATIC_BUILD ${RC_DEFINE} DEBUG" - else - RC_DEFINES="${RC_DEFINE} STATIC_BUILD" - fi + RC_DEFINES="${RC_DEFINE} STATIC_BUILD" else - if test "${DBGX}" = "g"; then - RC_DEFINES="${RC_DEFINE} DEBUG" - else - RC_DEFINES="" - fi + RC_DEFINES="" fi #-------------------------------------------------------------------- @@ -354,11 +346,11 @@ fi # TCL_WIN_VERSION is the 4 dotted pair Windows version format which needs # the release level, and must account for interim release versioning case "$TCL_PATCH_LEVEL" in - *a*) TCL_RELEASE_LEVEL=0 ;; - *b*) TCL_RELEASE_LEVEL=1 ;; + *alpha*) TCL_RELEASE_LEVEL=0 ;; + *beta*) TCL_RELEASE_LEVEL=1 ;; *) TCL_RELEASE_LEVEL=2 ;; esac -TCL_WIN_VERSION="$TCL_VERSION.$TCL_RELEASE_LEVEL.`echo $TCL_PATCH_LEVEL | tr -d ab.`" +TCL_WIN_VERSION="$TCL_VERSION.$TCL_RELEASE_LEVEL.0`echo $TCL_PATCH_LEVEL | tr -d 0abehlpt\\\\-.`" AC_SUBST(TCL_WIN_VERSION) # X86|AMD64|IA64 for manifest AC_SUBST(MACHINE) |