summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--doc/safe.n4
-rw-r--r--generic/tclIcu.c3
-rw-r--r--generic/tclZipfs.c3
-rw-r--r--library/manifest.txt2
-rw-r--r--library/opt/optparse.tcl2
-rw-r--r--library/opt/pkgIndex.tcl4
-rw-r--r--library/safe.tcl2
-rw-r--r--tests/opt.test2
-rw-r--r--tests/safe-stock.test6
-rw-r--r--unix/Makefile.in6
-rw-r--r--win/Makefile.in6
-rw-r--r--win/makefile.vc6
12 files changed, 22 insertions, 24 deletions
diff --git a/doc/safe.n b/doc/safe.n
index 14e0125..453784c 100644
--- a/doc/safe.n
+++ b/doc/safe.n
@@ -513,7 +513,7 @@ own value is also specified:
safe::interpCreate foo -accessPath {
/usr/local/TclHome/lib/tcl9.0
/usr/local/TclHome/lib/tcl9.0/http1.0
- /usr/local/TclHome/lib/tcl9.0/opt0.4
+ /usr/local/TclHome/lib/tcl9.0/opt0.5
/usr/local/TclHome/lib/tcl9.0/msgs
/usr/local/TclHome/lib/tcl9.0/encoding
/usr/local/TclHome/lib
@@ -531,7 +531,7 @@ safe::interpConfigure foo -autoPath {
safe::interpCreate foo -accessPath {
/usr/local/TclHome/lib/tcl9.0
/usr/local/TclHome/lib/tcl9.0/http1.0
- /usr/local/TclHome/lib/tcl9.0/opt0.4
+ /usr/local/TclHome/lib/tcl9.0/opt0.5
/usr/local/TclHome/lib/tcl9.0/msgs
/usr/local/TclHome/lib/tcl9.0/encoding
/usr/local/TclHome/lib
diff --git a/generic/tclIcu.c b/generic/tclIcu.c
index b2b4403..8be5b4a 100644
--- a/generic/tclIcu.c
+++ b/generic/tclIcu.c
@@ -1188,8 +1188,7 @@ IcuNormalizeObjCmd(
if (objPtr) {
Tcl_SetObjResult(interp, objPtr);
return TCL_OK;
- }
- else {
+ } else {
return TCL_ERROR;
}
}
diff --git a/generic/tclZipfs.c b/generic/tclZipfs.c
index 5370842..4c97468 100644
--- a/generic/tclZipfs.c
+++ b/generic/tclZipfs.c
@@ -6547,8 +6547,7 @@ TclZipfsInitEncodingDirs(void)
searchPathObj = Tcl_GetEncodingSearchPath();
if (searchPathObj == NULL) {
TclNewObj(searchPathObj);
- }
- else {
+ } else {
searchPathObj = Tcl_DuplicateObj(searchPathObj);
}
Tcl_Obj *fullPathObj = Tcl_FSJoinToPath(libDirObj, 1, &subDirObj);
diff --git a/library/manifest.txt b/library/manifest.txt
index 9681af4..db1b453 100644
--- a/library/manifest.txt
+++ b/library/manifest.txt
@@ -6,7 +6,7 @@ apply {{dir} {
foreach {safe package version file} {
0 http 2.10.1 {http http.tcl}
1 msgcat 1.7.1 {msgcat msgcat.tcl}
- 1 opt 0.4.9 {opt optparse.tcl}
+ 1 opt 0.5.0 {opt optparse.tcl}
0 cookiejar 0.2.0 {cookiejar cookiejar.tcl}
0 tcl::idna 1.0.1 {cookiejar idna.tcl}
0 platform 1.1.0 {platform platform.tcl}
diff --git a/library/opt/optparse.tcl b/library/opt/optparse.tcl
index 4b93a04..25ddbf7 100644
--- a/library/opt/optparse.tcl
+++ b/library/opt/optparse.tcl
@@ -11,7 +11,7 @@
package require Tcl 8.5-
# When this version number changes, update the pkgIndex.tcl file
# and the install directory in the Makefiles.
-package provide opt 0.4.9
+package provide opt 0.5.0
namespace eval ::tcl {
diff --git a/library/opt/pkgIndex.tcl b/library/opt/pkgIndex.tcl
index aad00af..b51a140 100644
--- a/library/opt/pkgIndex.tcl
+++ b/library/opt/pkgIndex.tcl
@@ -8,5 +8,5 @@
# script is sourced, the variable $dir must contain the
# full path name of this file's directory.
-if {![package vsatisfies [package provide Tcl] 8.5-]} {return}
-package ifneeded opt 0.4.9 [list source -encoding utf-8 [file join $dir optparse.tcl]]
+if {![package vsatisfies [package provide Tcl] 8.6-]} {return}
+package ifneeded opt 0.5.0 [list source -encoding utf-8 [file join $dir optparse.tcl]]
diff --git a/library/safe.tcl b/library/safe.tcl
index 45ee73c..5e9620f 100644
--- a/library/safe.tcl
+++ b/library/safe.tcl
@@ -20,7 +20,7 @@
#
# Needed utilities package
-package require opt 0.4.9
+package require opt 0.5.0
# Create the safe namespace
namespace eval ::safe {
diff --git a/tests/opt.test b/tests/opt.test
index 1f87ae6..27377cf 100644
--- a/tests/opt.test
+++ b/tests/opt.test
@@ -17,7 +17,7 @@ if {"::tcltest" ni [namespace children]} {
}
# the package we are going to test
-package require opt 0.4.9
+package require opt 0.5.0
# we are using implementation specifics to test the package
diff --git a/tests/safe-stock.test b/tests/safe-stock.test
index 98468ab..f96b3f6 100644
--- a/tests/safe-stock.test
+++ b/tests/safe-stock.test
@@ -53,9 +53,9 @@ if {[string match *zipfs:/* [info library]]} {
}
# Directory of opt for tests 7.4, 9.10, 9.12 for "package require opt".
-if {[file exists [file join [info library] opt0.4]]} {
- # Installed files in lib8.7/opt0.4
- set pkgOptDir opt0.4
+if {[file exists [file join [info library] opt0.5]]} {
+ # Installed files in lib9.0/opt0.5
+ set pkgOptDir opt0.5
} elseif {[file exists [file join [info library] opt]]} {
# Installed files in zipfs, or source files used by "make test"
set pkgOptDir opt
diff --git a/unix/Makefile.in b/unix/Makefile.in
index 6df734f..b91a38b 100644
--- a/unix/Makefile.in
+++ b/unix/Makefile.in
@@ -1053,7 +1053,7 @@ install-libraries: libraries
$(INSTALL_DATA_DIR) "$$i"; \
fi; \
done;
- @for i in opt0.4 cookiejar0.2 encoding; \
+ @for i in opt0.5 cookiejar0.2 encoding; \
do \
if [ ! -d "$(SCRIPT_INSTALL_DIR)/$$i" ] ; then \
echo "Making directory $(SCRIPT_INSTALL_DIR)/$$i"; \
@@ -1082,9 +1082,9 @@ install-libraries: libraries
@echo "Installing package http 2.10.1 as a Tcl Module"
@$(INSTALL_DATA) $(TOP_DIR)/library/http/http.tcl \
"$(MODULE_INSTALL_DIR)/9.0/http-2.10.1.tm"
- @echo "Installing package opt0.4 files to $(SCRIPT_INSTALL_DIR)/opt0.4/"
+ @echo "Installing package opt0.5 files to $(SCRIPT_INSTALL_DIR)/opt0.5/"
@for i in $(TOP_DIR)/library/opt/*.tcl; do \
- $(INSTALL_DATA) $$i "$(SCRIPT_INSTALL_DIR)/opt0.4"; \
+ $(INSTALL_DATA) $$i "$(SCRIPT_INSTALL_DIR)/opt0.5"; \
done
@echo "Installing package msgcat 1.7.1 as a Tcl Module"
@$(INSTALL_DATA) $(TOP_DIR)/library/msgcat/msgcat.tcl \
diff --git a/win/Makefile.in b/win/Makefile.in
index 52558b3..6dbe81a 100644
--- a/win/Makefile.in
+++ b/win/Makefile.in
@@ -899,7 +899,7 @@ install-libraries: libraries install-tzdata install-msgs
else true; \
fi; \
done;
- @for i in opt0.4 cookiejar0.2 encoding; \
+ @for i in opt0.5 cookiejar0.2 encoding; \
do \
if [ ! -d "$(SCRIPT_INSTALL_DIR)/$$i" ] ; then \
echo "Making directory $(SCRIPT_INSTALL_DIR)/$$i"; \
@@ -926,9 +926,9 @@ install-libraries: libraries install-tzdata install-msgs
done;
@echo "Installing package http 2.10.1 as a Tcl Module";
@$(COPY) $(ROOT_DIR)/library/http/http.tcl "$(MODULE_INSTALL_DIR)/9.0/http-2.10.1.tm";
- @echo "Installing package opt 0.4.7";
+ @echo "Installing package opt 0.5.0";
@for j in $(ROOT_DIR)/library/opt/*.tcl; do \
- $(COPY) "$$j" "$(SCRIPT_INSTALL_DIR)/opt0.4"; \
+ $(COPY) "$$j" "$(SCRIPT_INSTALL_DIR)/opt0.5"; \
done;
@echo "Installing package msgcat 1.7.1 as a Tcl Module";
@$(COPY) $(ROOT_DIR)/library/msgcat/msgcat.tcl "$(MODULE_INSTALL_DIR)/9.0/msgcat-1.7.1.tm";
diff --git a/win/makefile.vc b/win/makefile.vc
index fc153e4..eeb4d76 100644
--- a/win/makefile.vc
+++ b/win/makefile.vc
@@ -1107,10 +1107,10 @@ install-libraries: tclConfig tcl-nmake install-msgs install-tzdata
@$(CPY) "$(ROOT)\library\cookiejar\*.gz" \
"$(SCRIPT_INSTALL_DIR)\cookiejar0.2\"
@echo Installing package opt $(PKG_OPT_VER)
- @if not exist "$(SCRIPT_INSTALL_DIR)\opt0.4" \
- $(MKDIR) "$(SCRIPT_INSTALL_DIR)\opt0.4"
+ @if not exist "$(SCRIPT_INSTALL_DIR)\opt0.5" \
+ $(MKDIR) "$(SCRIPT_INSTALL_DIR)\opt0.5"
@$(CPY) "$(ROOT)\library\opt\*.tcl" \
- "$(SCRIPT_INSTALL_DIR)\opt0.4\"
+ "$(SCRIPT_INSTALL_DIR)\opt0.5\"
@if not exist "$(MODULE_INSTALL_DIR)" \
$(MKDIR) "$(MODULE_INSTALL_DIR)"
@echo Installing package http $(PKG_HTTP_VER) as a Tcl Module
generated by cgit v0.12 at 2026-04-02 09:45:25 (GMT)