Attachment "402602.diff.update" to
ticket [402602ffff]
added by
andreas_kupries
2001-09-14 07:28:53.
Index: library/dde/pkgIndex.tcl
===================================================================
RCS file: /cvsroot/tcl/tcl/library/dde/pkgIndex.tcl,v
retrieving revision 1.6
diff -u -r1.6 pkgIndex.tcl
--- library/dde/pkgIndex.tcl 2001/08/09 01:06:42 1.6
+++ library/dde/pkgIndex.tcl 2001/09/14 00:26:10
@@ -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 tcldde84d.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 tcldde84.dll] dde]
+ package ifneeded dde 1.1 [list load [file join $dir tcldde11.dll] dde]
}
Index: library/reg/pkgIndex.tcl
===================================================================
RCS file: /cvsroot/tcl/tcl/library/reg/pkgIndex.tcl,v
retrieving revision 1.9
diff -u -r1.9 pkgIndex.tcl
--- library/reg/pkgIndex.tcl 2001/08/09 01:06:42 1.9
+++ library/reg/pkgIndex.tcl 2001/09/14 00:26:10
@@ -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 tclreg84d.dll] registry]
+ [list load [file join $dir tclreg10d.dll] registry]
} else {
package ifneeded registry 1.0 \
- [list load [file join $dir tclreg84.dll] registry]
+ [list load [file join $dir tclreg10.dll] registry]
}
Index: win/Makefile.in
===================================================================
RCS file: /cvsroot/tcl/tcl/win/Makefile.in,v
retrieving revision 1.53
diff -u -r1.53 Makefile.in
--- win/Makefile.in 2001/09/10 00:33:09 1.53
+++ win/Makefile.in 2001/09/14 00:26:10
@@ -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
Index: win/configure.in
===================================================================
RCS file: /cvsroot/tcl/tcl/win/configure.in,v
retrieving revision 1.40
diff -u -r1.40 configure.in
--- win/configure.in 2001/08/08 22:28:24 1.40
+++ win/configure.in 2001/09/14 00:26:10
@@ -12,6 +12,18 @@
TCL_PATCH_LEVEL="a4"
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
+
if test "${prefix}" = "NONE"; then
prefix=/usr/local
fi
@@ -168,6 +180,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)
AC_SUBST(TCL_DLL_FILE)
Index: win/makefile.bc
===================================================================
RCS file: /cvsroot/tcl/tcl/win/makefile.bc,v
retrieving revision 1.6
diff -u -r1.6 makefile.bc
--- win/makefile.bc 2001/09/07 02:43:12 1.6
+++ win/makefile.bc 2001/09/14 00:26:10
@@ -110,6 +110,12 @@
DOTVERSION = 8.4
VERSION = 84
+DDEVERSION = 11
+DDEDOTVERSION = 1.1
+
+REGVERSION = 10
+REGDOTVERSION = 1.0
+
BINROOT = ..
!IF "$(NODEBUG)" == "1"
TMPDIRNAME = Release
@@ -137,9 +143,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
Index: win/makefile.vc
===================================================================
RCS file: /cvsroot/tcl/tcl/win/makefile.vc,v
retrieving revision 1.64
diff -u -r1.64 makefile.vc
--- win/makefile.vc 2001/09/07 02:43:12 1.64
+++ win/makefile.vc 2001/09/14 00:26:10
@@ -99,6 +99,12 @@
DOTVERSION = 8.4
VERSION = 84
+DDEVERSION = 11
+DDEDOTVERSION = 1.1
+
+REGVERSION = 10
+REGDOTVERSION = 1.0
+
BINROOT = .
!IF "$(NODEBUG)" == "1"
TMPDIRNAME = Release
@@ -125,9 +131,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
