From cd814a13ac289e61904bdda1aaec14904d222f57 Mon Sep 17 00:00:00 2001 From: "jan.nijtmans" Date: Fri, 18 Jun 2021 10:15:01 +0000 Subject: Fix "make html-tcl" target, broken by this commit: [b70eeebb0d196bb2] (in core-8-7-a5-rc branch only) --- unix/Makefile.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/unix/Makefile.in b/unix/Makefile.in index b405348..f194c82 100644 --- a/unix/Makefile.in +++ b/unix/Makefile.in @@ -2390,7 +2390,7 @@ BUILD_HTML = \ @${NATIVE_TCLSH} $(TOOL_DIR)/tcltk-man2html.tcl \ --useversion=$(MAJOR_VERSION).$(MINOR_VERSION)$(PATCH_LEVEL) \ --htmldir="$(HTML_INSTALL_DIR)" \ - --srcdir=$(TOP_DIR)/.. $(BUILD_HTML_FLAGS) + --srcdir=$(TOP_DIR) $(BUILD_HTML_FLAGS) #-------------------------------------------------------------------------- # The list of all the targets that do not correspond to real files. This stops -- cgit v0.12 From ce199db516e7d83eb014a33579c727f4a7e68732 Mon Sep 17 00:00:00 2001 From: "jan.nijtmans" Date: Fri, 18 Jun 2021 10:44:08 +0000 Subject: Hm. tcltk-man2html.tcl cannot handle $(PATCH_LEVEL). Don't bother for now. --- unix/Makefile.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/unix/Makefile.in b/unix/Makefile.in index f194c82..9a6799c 100644 --- a/unix/Makefile.in +++ b/unix/Makefile.in @@ -2388,7 +2388,7 @@ html-tk: ${NATIVE_TCLSH} BUILD_HTML = \ @${NATIVE_TCLSH} $(TOOL_DIR)/tcltk-man2html.tcl \ - --useversion=$(MAJOR_VERSION).$(MINOR_VERSION)$(PATCH_LEVEL) \ + --useversion=$(MAJOR_VERSION).$(MINOR_VERSION) \ --htmldir="$(HTML_INSTALL_DIR)" \ --srcdir=$(TOP_DIR) $(BUILD_HTML_FLAGS) -- cgit v0.12 From eff036def9169a094533c7c709035a05b0b6f258 Mon Sep 17 00:00:00 2001 From: "jan.nijtmans" Date: Sat, 19 Jun 2021 23:24:24 +0000 Subject: Fix windows build failure, caused by [f8608fc420] --- generic/tclZipfs.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/generic/tclZipfs.c b/generic/tclZipfs.c index 4d43331..c1ba395 100644 --- a/generic/tclZipfs.c +++ b/generic/tclZipfs.c @@ -32,7 +32,7 @@ #define TBLS 1 #endif -#if !defined(NO_DLFCN_H) +#if !defined(_WIN32) && !defined(NO_DLFCN_H) #include #endif -- cgit v0.12 From ee4adbec91804f1019ce381319c4e336e450d03b Mon Sep 17 00:00:00 2001 From: "jan.nijtmans" Date: Sat, 19 Jun 2021 23:32:03 +0000 Subject: Assume chan-io-41.6 and chan-io-41.8 are UNIX-only. See [9be2726881c41893], those are failing on Windows now --- tests/chanio.test | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tests/chanio.test b/tests/chanio.test index 4e911f9..e8bcc5e 100644 --- a/tests/chanio.test +++ b/tests/chanio.test @@ -5511,7 +5511,7 @@ test chan-io-41.5 {Tcl_FileeventCmd: errors} -constraints fileevent -body { } -returnCodes error -result {bad event name "who-knows": must be readable or writable} -test chan-io-41.6 {Tcl_FileeventCmd: directory} -constraints fileevent -setup { +test chan-io-41.6 {Tcl_FileeventCmd: directory} -constraints {fileevent unix} -setup { set tempdir [::tcltests::tempdir] } -body { set chan [open $tempdir] @@ -5546,7 +5546,7 @@ test chan-io-41.7 {Tcl_FileeventCmd: special} -constraints { } -result 1 -test chan-io-41.8 {Tcl_FileeventCmd: symbolic link} -constraints fileevent -setup { +test chan-io-41.8 {Tcl_FileeventCmd: symbolic link} -constraints {fileevent unix} -setup { set tempdir [::tcltests::tempdir] } -body { set target [makeFile {not again} thefile $tempdir] -- cgit v0.12