summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorjan.nijtmans <nijtmans@users.sourceforge.net>2024-04-12 15:14:43 (GMT)
committerjan.nijtmans <nijtmans@users.sourceforge.net>2024-04-12 15:14:43 (GMT)
commit18c447499e3cad65a00ecb5455ae1e3f3b9e752a (patch)
tree715e3b36990e0651da4cb17868fcb50f23d302ba
parentb42b1ca4605e3684ab06d75b8e4b86da1e7b13e2 (diff)
downloadtcl-18c447499e3cad65a00ecb5455ae1e3f3b9e752a.zip
tcl-18c447499e3cad65a00ecb5455ae1e3f3b9e752a.tar.gz
tcl-18c447499e3cad65a00ecb5455ae1e3f3b9e752a.tar.bz2
Since all tools are in utf-8 (actually: ascii), make that explicit
-rwxr-xr-xtools/makeTestCases.tcl2
-rw-r--r--tools/man2html.tcl4
-rwxr-xr-xtools/tcltk-man2html.tcl2
-rw-r--r--unix/Makefile.in10
-rw-r--r--win/Makefile.in4
-rw-r--r--win/makefile.vc4
6 files changed, 13 insertions, 13 deletions
diff --git a/tools/makeTestCases.tcl b/tools/makeTestCases.tcl
index 70213e0..1eae645 100755
--- a/tools/makeTestCases.tcl
+++ b/tools/makeTestCases.tcl
@@ -4,7 +4,7 @@
package require msgcat
set d [file dirname [file dirname [info script]]]
puts "getting transition data from [file join $d library tzdata America Detroit]"
-source [file join $d library/tzdata/America/Detroit]
+source -encoding utf-8 [file join $d library/tzdata/America/Detroit]
namespace eval ::tcl::clock {
::msgcat::mcmset en_US_roman {
diff --git a/tools/man2html.tcl b/tools/man2html.tcl
index 28a6751..20ce7a0 100644
--- a/tools/man2html.tcl
+++ b/tools/man2html.tcl
@@ -143,7 +143,7 @@ proc main {argv} {
# build hyperlink database arrays: NAME_file and KEY_file
#
puts "\nScanning man pages in $tcl_dir/$package/doc..."
- uplevel \#0 [list source $homeDir/man2html1.tcl]
+ uplevel \#0 [list source -encoding utf-8 $homeDir/man2html1.tcl]
doDir $tcl_dir/$package/doc
@@ -168,7 +168,7 @@ proc main {argv} {
# now translate the man pages to HTML pages
#
- uplevel \#0 [list source $homeDir/man2html2.tcl]
+ uplevel \#0 [list source -encoding utf-8 $homeDir/man2html2.tcl]
puts "\nBuilding html pages from man pages in $tcl_dir/$package/doc..."
doDir $tcl_dir/$package/doc
diff --git a/tools/tcltk-man2html.tcl b/tools/tcltk-man2html.tcl
index 6a47528..9116394 100755
--- a/tools/tcltk-man2html.tcl
+++ b/tools/tcltk-man2html.tcl
@@ -29,7 +29,7 @@ set ::CSSFILE "docs.css"
## Source the utility functions that provide most of the
## implementation of the transformation from nroff to html.
##
-source [file join [file dirname [info script]] tcltk-man2html-utils.tcl]
+source -encoding utf-8 [file join [file dirname [info script]] tcltk-man2html-utils.tcl]
proc parse_command_line {} {
global argv Version
diff --git a/unix/Makefile.in b/unix/Makefile.in
index b4d440d..814ec71 100644
--- a/unix/Makefile.in
+++ b/unix/Makefile.in
@@ -742,7 +742,7 @@ runtest: ${TCLTEST_EXE}
# Useful target for running the test suite with an unwritable current
# directory...
ro-test: ${TCLTEST_EXE}
- echo 'exec chmod -w .;package require tcltest;tcltest::temporaryDirectory /tmp;source ../tests/all.tcl;exec chmod +w .' | $(SHELL_ENV) ./${TCLTEST_EXE}
+ echo 'exec chmod -w .;package require tcltest;tcltest::temporaryDirectory /tmp;source -encoding utf-8 ../tests/all.tcl;exec chmod +w .' | $(SHELL_ENV) ./${TCLTEST_EXE}
# The following target generates the shared libraries in dltest/ that are used
# for testing; they are included as part of the "tcltest" target (via the
@@ -1850,7 +1850,7 @@ gendate:
# run (and the results checked) after updating to a new release of libtommath.
gentommath_h:
- $(NATIVE_TCLSH) "$(TOOL_DIR)/fix_tommath_h.tcl" \
+ $(NATIVE_TCLSH) -encoding utf-8 "$(TOOL_DIR)/fix_tommath_h.tcl" \
"$(TOMMATH_DIR)/tommath.h" \
> "$(GENERIC_DIR)/tclTomMath.h"
@@ -1870,10 +1870,10 @@ $(GENERIC_DIR)/tclOOStubInit.c: $(GENERIC_DIR)/tclOO.decls
@echo "This warning can be safely ignored, do not report as a bug!"
genstubs:
- $(NATIVE_TCLSH) $(TOOL_DIR)/genStubs.tcl $(GENERIC_DIR) \
+ $(NATIVE_TCLSH) -encoding utf-8 $(TOOL_DIR)/genStubs.tcl $(GENERIC_DIR) \
$(GENERIC_DIR)/tcl.decls $(GENERIC_DIR)/tclInt.decls \
$(GENERIC_DIR)/tclTomMath.decls
- $(NATIVE_TCLSH) $(TOOL_DIR)/genStubs.tcl $(GENERIC_DIR) \
+ $(NATIVE_TCLSH) -encoding utf-8 $(TOOL_DIR)/genStubs.tcl $(GENERIC_DIR) \
$(GENERIC_DIR)/tclOO.decls
#
@@ -2146,7 +2146,7 @@ html-tk: ${NATIVE_TCLSH}
# from Makefile.in in the first place...
HTML_VERSION = `basename $(TOP_DIR) | sed s/tcl//`
BUILD_HTML = \
- @${NATIVE_TCLSH} $(TOOL_DIR)/tcltk-man2html.tcl \
+ @${NATIVE_TCLSH} -encoding utf-8 $(TOOL_DIR)/tcltk-man2html.tcl \
--useversion=$(HTML_VERSION) --htmldir="$(HTML_INSTALL_DIR)" \
--srcdir=$(TOP_DIR)/.. $(BUILD_HTML_FLAGS)
diff --git a/win/Makefile.in b/win/Makefile.in
index b9d7e6a..a325ac3 100644
--- a/win/Makefile.in
+++ b/win/Makefile.in
@@ -924,12 +924,12 @@ $(GENERIC_DIR)/tclStubInit.c: $(GENERIC_DIR)/tcl.decls \
@echo "This warning can be safely ignored, do not report as a bug!"
genstubs:
- $(TCL_EXE) "$(ROOT_DIR_NATIVE)/tools/genStubs.tcl" \
+ $(TCL_EXE) -encoding utf-8 "$(ROOT_DIR_NATIVE)/tools/genStubs.tcl" \
"$(GENERIC_DIR_NATIVE)" \
"$(GENERIC_DIR_NATIVE)/tcl.decls" \
"$(GENERIC_DIR_NATIVE)/tclInt.decls" \
"$(GENERIC_DIR_NATIVE)/tclTomMath.decls"
- $(TCL_EXE) "$(ROOT_DIR_NATIVE)/tools/genStubs.tcl" \
+ $(TCL_EXE) -encoding utf-8 "$(ROOT_DIR_NATIVE)/tools/genStubs.tcl" \
"$(GENERIC_DIR_NATIVE)" \
"$(GENERIC_DIR_NATIVE)/tclOO.decls"
diff --git a/win/makefile.vc b/win/makefile.vc
index de7f889..4d0bf70 100644
--- a/win/makefile.vc
+++ b/win/makefile.vc
@@ -583,10 +583,10 @@ genstubs:
!if !exist($(TCLSH))
@echo Build tclsh first!
!else
- $(TCLSH) $(TOOLSDIR:\=/)/genStubs.tcl $(GENERICDIR:\=/) \
+ $(TCLSH) -encoding utf-8 $(TOOLSDIR:\=/)/genStubs.tcl $(GENERICDIR:\=/) \
$(GENERICDIR:\=/)/tcl.decls $(GENERICDIR:\=/)/tclInt.decls \
$(GENERICDIR:\=/)/tclTomMath.decls
- $(TCLSH) $(TOOLSDIR:\=/)/genStubs.tcl $(GENERICDIR:\=/) \
+ $(TCLSH) -encoding utf-8 $(TOOLSDIR:\=/)/genStubs.tcl $(GENERICDIR:\=/) \
$(GENERICDIR:\=/)/tclOO.decls
!endif