diff options
| author | dkf <donal.k.fellows@manchester.ac.uk> | 2019-11-26 11:16:12 (GMT) |
|---|---|---|
| committer | dkf <donal.k.fellows@manchester.ac.uk> | 2019-11-26 11:16:12 (GMT) |
| commit | 582196abb892f5a7a487da81005747ebdef32c59 (patch) | |
| tree | 612c532dc2c56878315d8538ad00966bea25007a | |
| parent | 76414db5a3f045ea24107335e1e8486244c48c2f (diff) | |
| download | tcl-582196abb892f5a7a487da81005747ebdef32c59.zip tcl-582196abb892f5a7a487da81005747ebdef32c59.tar.gz tcl-582196abb892f5a7a487da81005747ebdef32c59.tar.bz2 | |
Move the cookiejar package to its own directory so http works as a TM. Fix the unix installation code to include the bootstrap registrar names.
| -rw-r--r-- | library/cookiejar/cookiejar.tcl (renamed from library/http/cookiejar.tcl) | 0 | ||||
| -rw-r--r-- | library/cookiejar/effective_tld_names.txt.gz (renamed from library/http/effective_tld_names.txt.gz) | bin | 70836 -> 70836 bytes | |||
| -rw-r--r-- | library/cookiejar/idna.tcl (renamed from library/http/idna.tcl) | 0 | ||||
| -rw-r--r-- | library/cookiejar/pkgIndex.tcl | 3 | ||||
| -rw-r--r-- | library/http/pkgIndex.tcl | 2 | ||||
| -rw-r--r-- | unix/Makefile.in | 7 |
6 files changed, 9 insertions, 3 deletions
diff --git a/library/http/cookiejar.tcl b/library/cookiejar/cookiejar.tcl index 2eae877..2eae877 100644 --- a/library/http/cookiejar.tcl +++ b/library/cookiejar/cookiejar.tcl diff --git a/library/http/effective_tld_names.txt.gz b/library/cookiejar/effective_tld_names.txt.gz Binary files differindex 13e08bb..13e08bb 100644 --- a/library/http/effective_tld_names.txt.gz +++ b/library/cookiejar/effective_tld_names.txt.gz diff --git a/library/http/idna.tcl b/library/cookiejar/idna.tcl index 2a7d289..2a7d289 100644 --- a/library/http/idna.tcl +++ b/library/cookiejar/idna.tcl diff --git a/library/cookiejar/pkgIndex.tcl b/library/cookiejar/pkgIndex.tcl new file mode 100644 index 0000000..a8d8742 --- /dev/null +++ b/library/cookiejar/pkgIndex.tcl @@ -0,0 +1,3 @@ +if {![package vsatisfies [package provide Tcl] 8.6-]} {return} +package ifneeded cookiejar 0.1 [list source [file join $dir cookiejar.tcl]] +package ifneeded tcl::idna 1.0 [list source [file join $dir idna.tcl]] diff --git a/library/http/pkgIndex.tcl b/library/http/pkgIndex.tcl index e126083..f9f1176 100644 --- a/library/http/pkgIndex.tcl +++ b/library/http/pkgIndex.tcl @@ -1,4 +1,2 @@ if {![package vsatisfies [package provide Tcl] 8.6-]} {return} package ifneeded http 2.9.1 [list tclPkgSetup $dir http 2.9.1 {{http.tcl source {::http::config ::http::formatQuery ::http::geturl ::http::reset ::http::wait ::http::register ::http::unregister ::http::mapReply}}}] -package ifneeded cookiejar 0.1 [list source [file join $dir cookiejar.tcl]] -package ifneeded tcl::idna 1.0 [list source [file join $dir idna.tcl]] diff --git a/unix/Makefile.in b/unix/Makefile.in index 8d74cc3..2ba9f5f 100644 --- a/unix/Makefile.in +++ b/unix/Makefile.in @@ -1025,6 +1025,10 @@ install-libraries: libraries $(UNIX_DIR)/tclAppInit.c @LDAIX_SRC@ @DTRACE_SRC@ ; do \ $(INSTALL_DATA) $$i "$(SCRIPT_INSTALL_DIR)"; \ done + @echo "Installing package cookiejar 0.1 files to $(SCRIPT_INSTALL_DIR)/cookiejar0.1/" + @for i in $(TOP_DIR)/library/cookiejar/*.{tcl,txt.gz}; do \ + $(INSTALL_DATA) $$i "$(SCRIPT_INSTALL_DIR)"/cookiejar0.1; \ + done @echo "Installing package http 2.9.1 as a Tcl Module" @$(INSTALL_DATA) $(TOP_DIR)/library/http/http.tcl \ "$(MODULE_INSTALL_DIR)"/tcl8/8.6/http-2.9.1.tm @@ -2220,7 +2224,7 @@ DISTROOT = /tmp/dist DISTNAME = tcl${VERSION}${PATCH_LEVEL} ZIPNAME = tcl${MAJOR_VERSION}${MINOR_VERSION}${PATCH_LEVEL}-src.zip DISTDIR = $(DISTROOT)/$(DISTNAME) -BUILTIN_PACKAGE_LIST = http opt msgcat reg dde tcltest platform +BUILTIN_PACKAGE_LIST = cookiejar http opt msgcat reg dde tcltest platform $(UNIX_DIR)/configure: $(UNIX_DIR)/configure.ac $(UNIX_DIR)/tcl.m4 \ $(UNIX_DIR)/aclocal.m4 @@ -2262,6 +2266,7 @@ dist: $(UNIX_DIR)/configure $(UNIX_DIR)/tclConfig.h.in $(UNIX_DIR)/tcl.pc.in \ mkdir $(DISTDIR)/library/$$i;\ cp -p $(TOP_DIR)/library/$$i/*.tcl $(DISTDIR)/library/$$i; \ done + cp -p $(TOP_DIR)/library/cookiejar/*.txt.gz $(DISTDIR)/library/cookiejar @mkdir $(DISTDIR)/library/encoding cp -p $(TOP_DIR)/library/encoding/*.enc $(DISTDIR)/library/encoding @mkdir $(DISTDIR)/library/msgs |