diff options
| author | jan.nijtmans <nijtmans@users.sourceforge.net> | 2021-01-06 09:26:30 (GMT) |
|---|---|---|
| committer | jan.nijtmans <nijtmans@users.sourceforge.net> | 2021-01-06 09:26:30 (GMT) |
| commit | f39dee95d792dd873d1c00643dfcdf86539ab839 (patch) | |
| tree | c7a3d32715b5d95f5e6072b1a99207dee46fb7df /win | |
| parent | 124e36102e8b08023fe370defa49f89705d61a13 (diff) | |
| download | tcl-f39dee95d792dd873d1c00643dfcdf86539ab839.zip tcl-f39dee95d792dd873d1c00643dfcdf86539ab839.tar.gz tcl-f39dee95d792dd873d1c00643dfcdf86539ab839.tar.bz2 | |
TIP #590 follow-up: Restore 2nd 'load' argument in dde/registry pkgIndex.tcl. Otherwise those pkgIndex.tcl files no longer work in a Tcl 8.6 environment.
dde -> 1.4.4, registry -> 1.3.6 (to stop all confusion about the difference to Tcl 8.6.11)
Diffstat (limited to 'win')
| -rw-r--r-- | win/Makefile.in | 4 | ||||
| -rw-r--r-- | win/makefile.vc | 4 | ||||
| -rw-r--r-- | win/tclWinDde.c | 2 | ||||
| -rw-r--r-- | win/tclWinReg.c | 2 |
4 files changed, 6 insertions, 6 deletions
diff --git a/win/Makefile.in b/win/Makefile.in index 10fd572..ab6cf76 100644 --- a/win/Makefile.in +++ b/win/Makefile.in @@ -156,8 +156,8 @@ TEST_DLL_FILE = tcltest$(VER)${DLLSUFFIX} TEST_EXE_FILE = tcltest${EXESUFFIX} TEST_LIB_FILE = @LIBPREFIX@tcltest$(VER)${DLLSUFFIX}${LIBSUFFIX} TEST_LOAD_PRMS = lappend ::auto_path {$(ROOT_DIR_WIN_NATIVE)/tests};\ - package ifneeded dde 1.4.3 [list load [file normalize ${DDE_DLL_FILE}]];\ - package ifneeded registry 1.3.5 [list load [file normalize ${REG_DLL_FILE}]] + package ifneeded dde 1.4.4 [list load [file normalize ${DDE_DLL_FILE}]];\ + package ifneeded registry 1.3.6 [list load [file normalize ${REG_DLL_FILE}]] TEST_LOAD_FACILITIES = package ifneeded tcl::test ${VERSION}@TCL_PATCH_LEVEL@ [list load [file normalize ${TEST_DLL_FILE}] Tcltest];\ $(TEST_LOAD_PRMS) ZLIB_DLL_FILE = zlib1.dll diff --git a/win/makefile.vc b/win/makefile.vc index 9629e58..ed3a852 100644 --- a/win/makefile.vc +++ b/win/makefile.vc @@ -495,8 +495,8 @@ test: test-core test-pkgs test-core: setup $(TCLTEST) dlls
set TCL_LIBRARY=$(ROOT:\=/)/library
$(DEBUGGER) $(TCLTEST) "$(ROOT:\=/)/tests/all.tcl" $(TESTFLAGS) -loadfile <<
- package ifneeded dde 1.4.3 [list load "$(TCLDDELIB:\=/)"]
- package ifneeded registry 1.3.5 [list load "$(TCLREGLIB:\=/)"]
+ package ifneeded dde 1.4.4 [list load "$(TCLDDELIB:\=/)"]
+ package ifneeded registry 1.3.6 [list load "$(TCLREGLIB:\=/)"]
<<
runtest: setup $(TCLTEST) dlls
diff --git a/win/tclWinDde.c b/win/tclWinDde.c index 2fc4990..2570954 100644 --- a/win/tclWinDde.c +++ b/win/tclWinDde.c @@ -79,7 +79,7 @@ static DWORD ddeInstance; /* The application instance handle given to us * by DdeInitialize. */ static int ddeIsServer = 0; -#define TCL_DDE_VERSION "1.4.3" +#define TCL_DDE_VERSION "1.4.4" #define TCL_DDE_PACKAGE_NAME "dde" #define TCL_DDE_SERVICE_NAME L"TclEval" #define TCL_DDE_EXECUTE_RESULT L"$TCLEVAL$EXECUTE$RESULT" diff --git a/win/tclWinReg.c b/win/tclWinReg.c index 16a0d3d..998521c 100644 --- a/win/tclWinReg.c +++ b/win/tclWinReg.c @@ -191,7 +191,7 @@ Registry_Init( cmd = Tcl_CreateObjCommand(interp, "registry", RegistryObjCmd, interp, DeleteCmd); Tcl_SetAssocData(interp, REGISTRY_ASSOC_KEY, NULL, cmd); - return Tcl_PkgProvideEx(interp, "registry", "1.3.5", NULL); + return Tcl_PkgProvideEx(interp, "registry", "1.3.6", NULL); } /* |