From d8a1ef082777292ede109a0ed919d8174d6929dd Mon Sep 17 00:00:00 2001 From: "jan.nijtmans" Date: Tue, 26 Nov 2019 21:35:52 +0000 Subject: Fix installation of cookiejar on UNIX, and add same pieces to windows as well. Also modify manifext.txt accordingly, for the zipfile vfs. --- library/manifest.txt | 2 ++ unix/Makefile.in | 2 +- win/Makefile.in | 7 ++++++- win/makefile.vc | 13 +++++++++++-- 4 files changed, 20 insertions(+), 4 deletions(-) diff --git a/library/manifest.txt b/library/manifest.txt index 16092b8..6bbbb51 100644 --- a/library/manifest.txt +++ b/library/manifest.txt @@ -8,6 +8,8 @@ apply {{dir} { 0 http 2.9.1 {http http.tcl} 1 msgcat 1.7.0 {msgcat msgcat.tcl} 1 opt 0.4.7 {opt optparse.tcl} + 0 cookiejar 0.1 {cookiejar cookiejar.tcl} + 0 tcl::idna 1.0 {cookiejar idna.tcl} 0 platform 1.0.14 {platform platform.tcl} 0 platform::shell 1.1.4 {platform shell.tcl} 1 tcltest 2.5.1 {tcltest tcltest.tcl} diff --git a/unix/Makefile.in b/unix/Makefile.in index 2ba9f5f..1d0727d 100644 --- a/unix/Makefile.in +++ b/unix/Makefile.in @@ -1014,7 +1014,7 @@ install-libraries: libraries $(INSTALL_DATA_DIR) "$$i"; \ fi; \ done - @for i in opt0.4 encoding ../tcl8 ../tcl8/8.4 ../tcl8/8.4/platform ../tcl8/8.5 ../tcl8/8.6 ../tcl8/8.7; do \ + @for i in opt0.4 cookiejar0.1 encoding ../tcl8 ../tcl8/8.4 ../tcl8/8.4/platform ../tcl8/8.5 ../tcl8/8.6 ../tcl8/8.7; do \ if [ ! -d "$(SCRIPT_INSTALL_DIR)"/$$i ] ; then \ echo "Making directory $(SCRIPT_INSTALL_DIR)/$$i"; \ $(INSTALL_DATA_DIR) "$(SCRIPT_INSTALL_DIR)"/$$i; \ diff --git a/win/Makefile.in b/win/Makefile.in index 1c2057a..51ac71c 100644 --- a/win/Makefile.in +++ b/win/Makefile.in @@ -850,7 +850,7 @@ install-libraries: libraries install-tzdata install-msgs else true; \ fi; \ done; - @for i in opt0.4 encoding ../tcl8 ../tcl8/8.4 ../tcl8/8.4/platform ../tcl8/8.5 ../tcl8/8.6 ../tcl8/8.7; \ + @for i in opt0.4 cookiejar0.1 encoding ../tcl8 ../tcl8/8.4 ../tcl8/8.4/platform ../tcl8/8.5 ../tcl8/8.6 ../tcl8/8.7; \ do \ if [ ! -d $(SCRIPT_INSTALL_DIR)/$$i ] ; then \ echo "Making directory $(SCRIPT_INSTALL_DIR)/$$i"; \ @@ -863,6 +863,11 @@ install-libraries: libraries install-tzdata install-msgs do \ $(COPY) "$$i" "$(SCRIPT_INSTALL_DIR)"; \ done; + @echo "Installing package cookiejar 0.1 files to $(SCRIPT_INSTALL_DIR)/cookiejar0.1/" + @for j in $(ROOT_DIR)/library/cookiejar/*.{tcl,txt.gz}; do \ + do \ + $(COPY) "$$j" "$(SCRIPT_INSTALL_DIR)/cookiejar0.1"; \ + done; @echo "Installing package http 2.9.1 as a Tcl Module"; @$(COPY) $(ROOT_DIR)/library/http/http.tcl $(SCRIPT_INSTALL_DIR)/../tcl8/8.6/http-2.9.1.tm; @echo "Installing library opt0.4 directory"; diff --git a/win/makefile.vc b/win/makefile.vc index 44597a3..b943ed8 100644 --- a/win/makefile.vc +++ b/win/makefile.vc @@ -881,6 +881,10 @@ install-binaries: install-libraries: tclConfig tcl-nmake install-msgs install-tzdata @if not exist "$(SCRIPT_INSTALL_DIR)" \ $(MKDIR) "$(SCRIPT_INSTALL_DIR)" + @if not exist "$(SCRIPT_INSTALL_DIR)\opt0.4" \ + $(MKDIR) "$(SCRIPT_INSTALL_DIR)\opt0.4" + @if not exist "$(SCRIPT_INSTALL_DIR)\cookiejar0.1" \ + $(MKDIR) "$(SCRIPT_INSTALL_DIR)\cookiejar0.1" @if not exist "$(SCRIPT_INSTALL_DIR)\..\tcl8" \ $(MKDIR) "$(SCRIPT_INSTALL_DIR)\..\tcl8" @if not exist "$(SCRIPT_INSTALL_DIR)\..\tcl8\8.4" \ @@ -920,8 +924,13 @@ install-libraries: tclConfig tcl-nmake install-msgs install-tzdata @$(CPY) "$(WIN_DIR)\targets.vc" "$(LIB_INSTALL_DIR)\nmake\" @$(CPY) "$(WIN_DIR)\nmakehlp.c" "$(LIB_INSTALL_DIR)\nmake\" @$(CPY) "$(OUT_DIR)\tcl.nmake" "$(LIB_INSTALL_DIR)\nmake\" - @echo Installing library opt0.4 directory - @$(CPY) "$(ROOT)\library\opt\*.tcl" \ + @echo Installing package cookiejar 0.1 files to $(SCRIPT_INSTALL_DIR)/cookiejar0.1/ + @$(CPY) "$(ROOT)\library\cookiejar\*.tcl" \ + "$(SCRIPT_INSTALL_DIR)\cookiejar0.1\" + @$(CPY) "$(ROOT)\library\cookiejar\*.gz" \ + "$(SCRIPT_INSTALL_DIR)\cookiejar0.1\" + @echo Installing package opt0.4 files to $(SCRIPT_INSTALL_DIR)/opt0.4/ + @$(CPY) "$(ROOT)\library\opt0.4\*.tcl" \ "$(SCRIPT_INSTALL_DIR)\opt0.4\" @echo Installing package http $(PKG_HTTP_VER) as a Tcl Module @$(COPY) "$(ROOT)\library\http\http.tcl" \ -- cgit v0.12