Skip to content

Commit a7cc682

Browse files
author
jan.nijtmans
committed
complete the job in the previous commit
1 parent 4480249 commit a7cc682

File tree

5 files changed

+13
-13
lines changed

5 files changed

+13
-13
lines changed

doc/safe.n

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -513,7 +513,7 @@ own value is also specified:
513513
safe::interpCreate foo -accessPath {
514514
/usr/local/TclHome/lib/tcl9.0
515515
/usr/local/TclHome/lib/tcl9.0/http1.0
516-
/usr/local/TclHome/lib/tcl9.0/opt0.5
516+
/usr/local/TclHome/lib/tcl9.0/opt0.4
517517
/usr/local/TclHome/lib/tcl9.0/msgs
518518
/usr/local/TclHome/lib/tcl9.0/encoding
519519
/usr/local/TclHome/lib
@@ -531,7 +531,7 @@ safe::interpConfigure foo -autoPath {
531531
safe::interpCreate foo -accessPath {
532532
/usr/local/TclHome/lib/tcl9.0
533533
/usr/local/TclHome/lib/tcl9.0/http1.0
534-
/usr/local/TclHome/lib/tcl9.0/opt0.5
534+
/usr/local/TclHome/lib/tcl9.0/opt0.4
535535
/usr/local/TclHome/lib/tcl9.0/msgs
536536
/usr/local/TclHome/lib/tcl9.0/encoding
537537
/usr/local/TclHome/lib

tests/safe-stock.test

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -53,9 +53,9 @@ if {[string match *zipfs:/* [info library]]} {
5353
}
5454

5555
# Directory of opt for tests 7.4, 9.10, 9.12 for "package require opt".
56-
if {[file exists [file join [info library] opt0.5]]} {
57-
# Installed files in lib9.0/opt0.5
58-
set pkgOptDir opt0.5
56+
if {[file exists [file join [info library] opt0.4]]} {
57+
# Installed files in lib9.0/opt0.4
58+
set pkgOptDir opt0.4
5959
} elseif {[file exists [file join [info library] opt]]} {
6060
# Installed files in zipfs, or source files used by "make test"
6161
set pkgOptDir opt

unix/Makefile.in

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1045,7 +1045,7 @@ install-libraries: libraries
10451045
$(INSTALL_DATA_DIR) "$$i"; \
10461046
fi; \
10471047
done;
1048-
@for i in opt0.5 cookiejar0.2 encoding; \
1048+
@for i in opt0.4 cookiejar0.2 encoding; \
10491049
do \
10501050
if [ ! -d "$(SCRIPT_INSTALL_DIR)/$$i" ] ; then \
10511051
echo "Making directory $(SCRIPT_INSTALL_DIR)/$$i"; \
@@ -1074,9 +1074,9 @@ install-libraries: libraries
10741074
@echo "Installing package http 2.10.1 as a Tcl Module"
10751075
@$(INSTALL_DATA) $(TOP_DIR)/library/http/http.tcl \
10761076
"$(MODULE_INSTALL_DIR)/9.0/http-2.10.1.tm"
1077-
@echo "Installing package opt0.5 files to $(SCRIPT_INSTALL_DIR)/opt0.5/"
1077+
@echo "Installing package opt0.4 files to $(SCRIPT_INSTALL_DIR)/opt0.4/"
10781078
@for i in $(TOP_DIR)/library/opt/*.tcl; do \
1079-
$(INSTALL_DATA) $$i "$(SCRIPT_INSTALL_DIR)/opt0.5"; \
1079+
$(INSTALL_DATA) $$i "$(SCRIPT_INSTALL_DIR)/opt0.4"; \
10801080
done
10811081
@echo "Installing package msgcat 1.7.1 as a Tcl Module"
10821082
@$(INSTALL_DATA) $(TOP_DIR)/library/msgcat/msgcat.tcl \

win/Makefile.in

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -912,7 +912,7 @@ install-libraries: libraries install-tzdata install-msgs
912912
else true; \
913913
fi; \
914914
done;
915-
@for i in opt0.5 cookiejar0.2 encoding; \
915+
@for i in opt0.4 cookiejar0.2 encoding; \
916916
do \
917917
if [ ! -d "$(SCRIPT_INSTALL_DIR)/$$i" ] ; then \
918918
echo "Making directory $(SCRIPT_INSTALL_DIR)/$$i"; \
@@ -941,7 +941,7 @@ install-libraries: libraries install-tzdata install-msgs
941941
@$(COPY) $(ROOT_DIR)/library/http/http.tcl "$(MODULE_INSTALL_DIR)/9.0/http-2.10.1.tm";
942942
@echo "Installing package opt 0.4.10";
943943
@for j in $(ROOT_DIR)/library/opt/*.tcl; do \
944-
$(COPY) "$$j" "$(SCRIPT_INSTALL_DIR)/opt0.5"; \
944+
$(COPY) "$$j" "$(SCRIPT_INSTALL_DIR)/opt0.4"; \
945945
done;
946946
@echo "Installing package msgcat 1.7.1 as a Tcl Module";
947947
@$(COPY) $(ROOT_DIR)/library/msgcat/msgcat.tcl "$(MODULE_INSTALL_DIR)/9.0/msgcat-1.7.1.tm";

win/makefile.vc

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1098,10 +1098,10 @@ install-libraries: tclConfig tcl-nmake install-msgs install-tzdata
10981098
@$(CPY) "$(ROOT)\library\cookiejar\*.gz" \
10991099
"$(SCRIPT_INSTALL_DIR)\cookiejar0.2\"
11001100
@echo Installing package opt $(PKG_OPT_VER)
1101-
@if not exist "$(SCRIPT_INSTALL_DIR)\opt0.5" \
1102-
$(MKDIR) "$(SCRIPT_INSTALL_DIR)\opt0.5"
1101+
@if not exist "$(SCRIPT_INSTALL_DIR)\opt0.4" \
1102+
$(MKDIR) "$(SCRIPT_INSTALL_DIR)\opt0.4"
11031103
@$(CPY) "$(ROOT)\library\opt\*.tcl" \
1104-
"$(SCRIPT_INSTALL_DIR)\opt0.5\"
1104+
"$(SCRIPT_INSTALL_DIR)\opt0.4\"
11051105
@if not exist "$(MODULE_INSTALL_DIR)" \
11061106
$(MKDIR) "$(MODULE_INSTALL_DIR)"
11071107
@echo Installing package http $(PKG_HTTP_VER) as a Tcl Module

0 commit comments

Comments
 (0)