diff options
| author | jan.nijtmans <nijtmans@users.sourceforge.net> | 2019-11-28 11:35:51 (GMT) |
|---|---|---|
| committer | jan.nijtmans <nijtmans@users.sourceforge.net> | 2019-11-28 11:35:51 (GMT) |
| commit | 7c405f2e81b0eb2fbc2eae23dfaab798dcf44411 (patch) | |
| tree | 0a335afe0c1626ff5b698661b08a298c6b07a39c /win | |
| parent | 1b760ca1a5b4b09e2828f360064484801d3899b2 (diff) | |
| parent | d473f1507c154f001a28c74e520d79d0b8edd8e3 (diff) | |
| download | tcl-7c405f2e81b0eb2fbc2eae23dfaab798dcf44411.zip tcl-7c405f2e81b0eb2fbc2eae23dfaab798dcf44411.tar.gz tcl-7c405f2e81b0eb2fbc2eae23dfaab798dcf44411.tar.bz2 | |
Merge 8.5 (Update opt package from 0.4.6 to 0.4.7).
Also fix installation of opt0.4 as done by makefile.vc, which never worked in Tcl 8.6.
Diffstat (limited to 'win')
| -rw-r--r-- | win/makefile.vc | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/win/makefile.vc b/win/makefile.vc index 9b36abf..fe9b790 100644 --- a/win/makefile.vc +++ b/win/makefile.vc @@ -153,6 +153,9 @@ VERSION = $(TCL_MAJOR_VERSION)$(TCL_MINOR_VERSION) !if [echo PKG_HTTP_VER = \>> versions.vc] \
&& [nmakehlp -V ..\library\http\pkgIndex.tcl http >> versions.vc]
!endif
+!if [echo PKG_OPT_VER = \>> versions.vc] \
+ && [nmakehlp -V ..\library\opt\pkgIndex.tcl opt >> versions.vc]
+!endif
!if [echo PKG_TCLTEST_VER = \>> versions.vc] \
&& [nmakehlp -V ..\library\tcltest\pkgIndex.tcl tcltest >> versions.vc]
!endif
@@ -872,6 +875,8 @@ 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)\..\tcl8" \
$(MKDIR) "$(SCRIPT_INSTALL_DIR)\..\tcl8"
@if not exist "$(SCRIPT_INSTALL_DIR)\..\tcl8\8.4" \
@@ -909,10 +914,10 @@ 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 http1.0 directory
+ @echo Installing package http 1.0 (obsolete)
@$(CPY) "$(ROOT)\library\http1.0\*.tcl" \
"$(SCRIPT_INSTALL_DIR)\http1.0\"
- @echo Installing library opt0.4 directory
+ @echo Installing package opt $(PKG_OPT_VER)
@$(CPY) "$(ROOT)\library\opt\*.tcl" \
"$(SCRIPT_INSTALL_DIR)\opt0.4\"
@echo Installing package http $(PKG_HTTP_VER) as a Tcl Module
|