diff options
| author | hypnotoad <yoda@etoyoc.com> | 2014-10-21 01:20:10 (GMT) |
|---|---|---|
| committer | hypnotoad <yoda@etoyoc.com> | 2014-10-21 01:20:10 (GMT) |
| commit | 6b423f0d9ebf71415e7d74789128eb873a77ef3a (patch) | |
| tree | e2b5c3796642e6d0a72ad175be0b0232d167ede9 | |
| parent | bdc43f824155a8ac53c6e6d3c332f4776dd81c9e (diff) | |
| download | tcl-6b423f0d9ebf71415e7d74789128eb873a77ef3a.zip tcl-6b423f0d9ebf71415e7d74789128eb873a77ef3a.tar.gz tcl-6b423f0d9ebf71415e7d74789128eb873a77ef3a.tar.bz2 | |
Fixes to allow a standard tclsh build to do the zip file encoding, instead of
having to do it all through the zip enabled shell.
| -rw-r--r-- | library/zvfstools/zvfstools.tcl | 2 | ||||
| -rw-r--r-- | tools/mkzip.tcl | 1 | ||||
| -rw-r--r-- | unix/Makefile.in | 4 |
3 files changed, 4 insertions, 3 deletions
diff --git a/library/zvfstools/zvfstools.tcl b/library/zvfstools/zvfstools.tcl index 26f17c4..274d5a1 100644 --- a/library/zvfstools/zvfstools.tcl +++ b/library/zvfstools/zvfstools.tcl @@ -21,6 +21,8 @@ package require Tcl 8.6 # or a zipfile using mkzip filename.zip -directory dirname -exclude "*~" # +namespace eval ::zvfs {} + proc ::zvfs::setbinary chan { fconfigure $chan \ -encoding binary \ diff --git a/tools/mkzip.tcl b/tools/mkzip.tcl index e53bae3..ba10908 100644 --- a/tools/mkzip.tcl +++ b/tools/mkzip.tcl @@ -1,6 +1,5 @@ ### # Wrapper to allow access to Tcl's zvfs::mkzip command from Makefiles ### -package require zvfs source [file join [file dirname [file normalize [info script]]] .. library zvfstools zvfstools.tcl] zvfs::mkzip {*}$argv diff --git a/unix/Makefile.in b/unix/Makefile.in index b635c0a..0819197 100644 --- a/unix/Makefile.in +++ b/unix/Makefile.in @@ -624,7 +624,7 @@ SRCS = $(GENERIC_SRCS) $(TOMMATH_SRCS) $(UNIX_SRCS) $(NOTIFY_SRCS) \ all: binaries libraries doc packages -binaries: ${LIB_FILE} ${TCL_EXE} +binaries: ${LIB_FILE} ${TCL_EXE} ${TCLZSH_EXE} libraries: @@ -679,7 +679,7 @@ ${TCLZSH_BASE}_bare: ${TCLZSH_OBJS} ${TCL_LIB_FILE} ${TCL_STUB_LIB_FILE} # Builds an executable linked to the Tcl dynamic library ${TCLZSH_EXE}: ${TCLZSH_BASE}_bare tclzsh.vfs - ./${TCLZSH_BASE}_bare ../tools/mkzip.tcl ${TCLZSH_EXE} \ + @$(TCL_EXE) ../tools/mkzip.tcl ${TCLZSH_EXE} \ -runtime ${TCLZSH_BASE}_bare \ -directory tclzsh.vfs chmod a+x ${TCLZSH_EXE} |