Attachment "winverfix.patch" to
ticket [624541ffff]
added by
kirben
2002-10-18 20:53:01.
diff -bur otcl-8.3.5/library/dde1.1/pkgIndex.tcl tcl-8.3.5/library/dde1.1/pkgIndex.tcl
--- otcl-8.3.5/library/dde1.1/pkgIndex.tcl 2001-08-09 11:00:56.000000000 +1000
+++ tcl-8.3.5/library/dde1.1/pkgIndex.tcl 2002-10-18 23:40:00.000000000 +1000
@@ -1,6 +1,6 @@
if {![package vsatisfies [package provide Tcl] 8]} {return}
if {[info exists tcl_platform(debug)]} {
- package ifneeded dde 1.1 [list load [file join $dir tcldde83d.dll] dde]
+ package ifneeded dde 1.1 [list load [file join $dir tcldde11d.dll] dde]
} else {
- package ifneeded dde 1.1 [list load [file join $dir tcldde83.dll] dde]
+ package ifneeded dde 1.1 [list load [file join $dir tcldde11.dll] dde]
}
diff -bur otcl-8.3.5/library/reg1.0/pkgIndex.tcl tcl-8.3.5/library/reg1.0/pkgIndex.tcl
--- otcl-8.3.5/library/reg1.0/pkgIndex.tcl 2001-08-09 11:00:58.000000000 +1000
+++ tcl-8.3.5/library/reg1.0/pkgIndex.tcl 2002-10-18 23:40:34.000000000 +1000
@@ -1,8 +1,8 @@
if {![package vsatisfies [package provide Tcl] 8]} {return}
if {[info exists tcl_platform(debug)]} {
package ifneeded registry 1.0 \
- [list load [file join $dir tclreg83d.dll] registry]
+ [list load [file join $dir tclreg10d.dll] registry]
} else {
package ifneeded registry 1.0 \
- [list load [file join $dir tclreg83.dll] registry]
+ [list load [file join $dir tclreg10.dll] registry]
}
Only in otcl-8.3.5/win: .#configure.in.1.20.2.10
diff -bur otcl-8.3.5/win/Makefile.in tcl-8.3.5/win/Makefile.in
--- otcl-8.3.5/win/Makefile.in 2002-10-11 21:50:18.000000000 +1000
+++ tcl-8.3.5/win/Makefile.in 2002-10-18 23:33:06.000000000 +1000
@@ -118,10 +118,10 @@
TCL_STUB_LIB_FILE = @TCL_STUB_LIB_FILE@
TCL_DLL_FILE = @TCL_DLL_FILE@
TCL_LIB_FILE = @TCL_LIB_FILE@
-DDE_DLL_FILE = tcldde$(VER)${DLLSUFFIX}
-DDE_LIB_FILE = tcldde$(VER)${LIBSUFFIX}
-REG_DLL_FILE = tclreg$(VER)${DLLSUFFIX}
-REG_LIB_FILE = tclreg$(VER)${LIBSUFFIX}
+DDE_DLL_FILE = tcldde$(DDEVER)${DLLSUFFIX}
+DDE_LIB_FILE = tcldde$(DDEVER)${LIBSUFFIX}
+REG_DLL_FILE = tclreg$(REGVER)${DLLSUFFIX}
+REG_LIB_FILE = tclreg$(REGVER)${LIBSUFFIX}
PIPE_DLL_FILE = tclpip$(VER)${DLLSUFFIX}
SHARED_LIBRARIES = $(TCL_DLL_FILE) $(TCL_STUB_LIB_FILE) \
@@ -162,6 +162,10 @@
SHLIB_SUFFIX = @SHLIB_SUFFIX@
VER = @TCL_MAJOR_VERSION@@TCL_MINOR_VERSION@
DOTVER = @TCL_MAJOR_VERSION@.@TCL_MINOR_VERSION@
+DDEVER = @TCL_DDE_MAJOR_VERSION@@TCL_DDE_MINOR_VERSION@
+DDEDOTVER = @TCL_DDE_MAJOR_VERSION@.@TCL_DDE_MINOR_VERSION@
+REGVER = @TCL_REG_MAJOR_VERSION@@TCL_REG_MINOR_VERSION@
+REGDOTVER = @TCL_REG_MAJOR_VERSION@.@TCL_REG_MINOR_VERSION@
LIBS = @LIBS@
RMDIR = rm -rf
diff -bur otcl-8.3.5/win/configure.in tcl-8.3.5/win/configure.in
--- otcl-8.3.5/win/configure.in 2002-10-18 11:47:20.000000000 +1000
+++ tcl-8.3.5/win/configure.in 2002-10-18 23:30:20.000000000 +1000
@@ -13,6 +13,18 @@
TCL_PATCH_LEVEL=".5"
VER=$TCL_MAJOR_VERSION$TCL_MINOR_VERSION
+TCL_DDE_VERSION=1.1
+ TCL_DDE_MAJOR_VERSION=1
+ TCL_DDE_MINOR_VERSION=1
+ TCL_DDE_PATCH_LEVEL=""
+ DDEVER=$TCL_DDE_MAJOR_VERSION$TCL_DDE_MINOR_VERSION
+
+ TCL_REG_VERSION=1.0
+ TCL_REG_MAJOR_VERSION=1
+ TCL_REG_MINOR_VERSION=0
+ TCL_REG_PATCH_LEVEL=""
+ REGVER=$TCL_REG_MAJOR_VERSION$TCL_REG_MINOR_VERSION
+
#------------------------------------------------------------------------
# Handle the --prefix=... option
#------------------------------------------------------------------------
@@ -227,7 +239,14 @@
AC_SUBST(TCL_MAJOR_VERSION)
AC_SUBST(TCL_MINOR_VERSION)
AC_SUBST(TCL_PATCH_LEVEL)
-
+AC_SUBST(TCL_DDE_VERSION)
+AC_SUBST(TCL_DDE_MAJOR_VERSION)
+AC_SUBST(TCL_DDE_MINOR_VERSION)
+AC_SUBST(TCL_DDE_PATCH_LEVEL)
+AC_SUBST(TCL_REG_VERSION)
+AC_SUBST(TCL_REG_MAJOR_VERSION)
+AC_SUBST(TCL_REG_MINOR_VERSION)
+AC_SUBST(TCL_REG_PATCH_LEVEL)
AC_SUBST(TCL_LIB_FILE)
AC_SUBST(TCL_LIB_FLAG)
# empty on win
diff -bur otcl-8.3.5/win/makefile.vc tcl-8.3.5/win/makefile.vc
--- otcl-8.3.5/win/makefile.vc 2002-10-11 21:50:18.000000000 +1000
+++ tcl-8.3.5/win/makefile.vc 2002-10-18 23:35:42.000000000 +1000
@@ -90,6 +90,12 @@
DOTVERSION = 8.3
VERSION = 83
+DDEVERSION = 11
+DDEDOTVERSION = 1.1
+
+REGVERSION = 10
+REGDOTVERSION = 1.0
+
BINROOT = .
!IF "$(NODEBUG)" == "1"
TMPDIRNAME = Release
@@ -116,9 +122,9 @@
TCLSHP = $(OUTDIR)\$(NAMEPREFIX)shp$(VERSION)$(DBGX).exe
TCLPIPEDLLNAME = $(NAMEPREFIX)pip$(VERSION)$(DBGX).dll
TCLPIPEDLL = $(OUTDIR)\$(TCLPIPEDLLNAME)
-TCLREGDLLNAME = $(NAMEPREFIX)reg$(VERSION)$(DBGX).dll
+TCLREGDLLNAME = $(NAMEPREFIX)reg$(REGVERSION)$(DBGX).dll
TCLREGDLL = $(OUTDIR)\$(TCLREGDLLNAME)
-TCLDDEDLLNAME = $(NAMEPREFIX)dde$(VERSION)$(DBGX).dll
+TCLDDEDLLNAME = $(NAMEPREFIX)dde$(DDEVERSION)$(DBGX).dll
TCLDDEDLL = $(OUTDIR)\$(TCLDDEDLLNAME)
TCLTEST = $(OUTDIR)\$(NAMEPREFIX)test.exe
CAT32 = $(TMPDIR)\cat32.exe
