Merge 8.6

Author: jan.nijtmans

.fossil-settings/ignore-glob

@@ -64,6 +64,7 @@ unix/pkgs8/*
 unix/pkgs/*
 win/Debug*
 win/Release*
+win/tcl.pc
 win/*.manifest
 win/pkgs8/*
 win/pkgs/*

.github/workflows/win-build.yml

@@ -140,6 +140,9 @@ jobs:
         timeout-minutes: 30
         env:
           ERROR_ON_FAILURES: 1
+      - name: Install
+        run: make install
+        timeout-minutes: 5
 
 # If you add builds with Wine, be sure to define the environment variable
 # CI_USING_WINE when running them so that broken tests know not to run.

.gitignore

@@ -65,5 +65,6 @@ win/pkgs8/*
 win/pkgs/*
 win/coffbase.txt
 win/tcl.hpj
+win/tcl.pc
 win/nmakehlp.out
 win/nmhlp-out.txt

changes.md

@@ -16,6 +16,8 @@ to the userbase.
  - [Pointer arithmetic with NULL in buildInfoObjCmd()](https://core.tcl-lang.org/tcl/tktview/85fc8b)
  - [TclPushVarName(): pointer overflow](https://core.tcl-lang.org/tcl/tktview/77059c)
  - [Add IWYU export pragma annotations](https://core.tcl-lang.org/tcl/tktview/c7dc59)
+ - [Windows: Install man pages](https://core.tcl-lang.org/tcl/tktview/3161b7)
+ - [Windows: Install pkgconfig](https://core.tcl-lang.org/tcl/tktview/1cf49a)
 
 # Updated bundled packages, libraries, standards, data
  - http 2.10.1

generic/tclInt.h

@@ -5144,8 +5144,8 @@ typedef struct NRE_callback {
 #define NRE_ASSERT(expr)
 #endif
 
-#include "tclIntDecls.h"
-#include "tclIntPlatDecls.h"
+#include "tclIntDecls.h"  /* IWYU pragma: export */
+#include "tclIntPlatDecls.h"  /* IWYU pragma: export */
 
 #if !defined(USE_TCL_STUBS) && !defined(TCL_MEM_DEBUG)
 #define Tcl_AttemptAlloc	TclpAlloc

generic/tclOO.h

@@ -174,7 +174,7 @@ enum TclOOMetadataVersion {
  * Include all the public API, generated from tclOO.decls.
  */
 
-#include "tclOODecls.h"
+#include "tclOODecls.h"  /* IWYU pragma: export */
 
 #ifdef __cplusplus
 }

generic/tclOOInt.h

@@ -663,7 +663,7 @@ MODULE_SCOPE void	TclOORegisterInstanceProperty(Object *oPtr,
  * Include all the private API, generated from tclOO.decls.
  */
 
-#include "tclOOIntDecls.h"
+#include "tclOOIntDecls.h"  /* IWYU pragma: export */
 
 /*
  * Alternatives to Tcl_Preserve/Tcl_EventuallyFree/Tcl_Release.

generic/tclTomMath.h

@@ -44,6 +44,6 @@
 #elif !defined(BN_H_) /* If BN_H_ already defined, don't try to include tommath.h again. */
 #   include "tommath.h"
 #endif
-#include "tclTomMathDecls.h"
+#include "tclTomMathDecls.h"  /* IWYU pragma: export */
 
 #endif

win/Makefile.in

@@ -104,6 +104,7 @@ TOP_DIR			= $(shell cd @srcdir@/..; pwd -W 2>/dev/null || pwd -P)
 BUILD_DIR		= @builddir@
 GENERIC_DIR		= $(TOP_DIR)/generic
 WIN_DIR			= $(TOP_DIR)/win
+UNIX_DIR		= $(TOP_DIR)/unix
 COMPAT_DIR		= $(TOP_DIR)/compat
 PKGS_DIR		= $(TOP_DIR)/pkgs
 TOOL_DIR		= $(TOP_DIR)/tools
@@ -216,6 +217,11 @@ RM		= rm -f
 COPY		= cp
 LN		= ln
 GDB		= gdb
+INSTALL			= $(SHELL) $(UNIX_DIR)/install-sh -c
+INSTALL_PROGRAM		= ${INSTALL}
+INSTALL_LIBRARY		= ${INSTALL}
+INSTALL_DATA		= ${INSTALL} -m 644
+INSTALL_DATA_DIR	= ${INSTALL} -d -m 755
 
 ###
 # Tip 430 - ZipFS Modifications
@@ -901,6 +907,9 @@ install-binaries: binaries
 	    echo Installing $(REG_LIB_FILE); \
 	    $(COPY) $(REG_LIB_FILE) "$(LIB_INSTALL_DIR)/registry${REGDOTVER}"; \
 	    fi
+	@echo "Installing pkg-config file to $(LIB_INSTALL_DIR)/pkgconfig/"
+	@$(INSTALL_DATA_DIR) "$(LIB_INSTALL_DIR)/pkgconfig"
+	@$(INSTALL_DATA) tcl.pc "$(LIB_INSTALL_DIR)/pkgconfig/tcl.pc"
 
 install-libraries: libraries install-tzdata install-msgs
 	@for i in "$(prefix)/lib" "$(INCLUDE_INSTALL_DIR)" \
@@ -967,7 +976,27 @@ install-msgs:
 	    "$(ROOT_DIR)/library/msgs" "$(SCRIPT_INSTALL_DIR_NATIVE)/msgs"
 
 install-doc: doc
-
+	@for i in "$(MAN_INSTALL_DIR)" "$(MAN1_INSTALL_DIR)" "$(MAN3_INSTALL_DIR)" "$(MANN_INSTALL_DIR)" ; \
+	    do \
+	    if [ ! -d "$$i" ] ; then \
+		echo "Making directory $$i"; \
+		$(INSTALL_DATA_DIR) "$$i"; \
+		else true; \
+		fi; \
+	    done;
+	@echo "Installing and cross-linking top-level (.1) docs to $(MAN1_INSTALL_DIR)/";
+	@for i in $(TOP_DIR)/doc/*.1; do \
+	    $(SHELL) $(UNIX_DIR)/installManPage $(MAN_FLAGS) $$i "$(MAN1_INSTALL_DIR)"; \
+	done
+	@echo "Installing and cross-linking C API (.3) docs to $(MAN3_INSTALL_DIR)/";
+	@for i in $(TOP_DIR)/doc/*.3; do \
+	    $(SHELL) $(UNIX_DIR)/installManPage $(MAN_FLAGS) $$i "$(MAN3_INSTALL_DIR)"; \
+	done
+	@echo "Installing and cross-linking command (.n) docs to $(MANN_INSTALL_DIR)/";
+	@for i in $(TOP_DIR)/doc/*.n; do \
+	    $(SHELL) $(UNIX_DIR)/installManPage $(MAN_FLAGS) $$i "$(MANN_INSTALL_DIR)"; \
+	done
+ 
 install-headers:
 	@for i in "$(INCLUDE_INSTALL_DIR)"; \
 	    do \

win/configure

@@ -661,6 +661,7 @@ TCL_STUB_LIB_SPEC
 TCL_STUB_LIB_FLAG
 TCL_STUB_LIB_FILE
 TCL_LIB_SPEC
+TCL_LIBS
 TCL_IMPORT_LIB_FLAG
 TCL_IMPORT_LIB_FILE
 TCL_STATIC_LIB_FLAG
@@ -5823,6 +5824,7 @@ eval "TCL_SRC_DIR=\"`cd $srcdir/..; $CYGPATH $(pwd)`\""
 
 eval "TCL_DLL_FILE=tcl${VER}${DLLSUFFIX}"
 
+eval "TCL_LIB_FLAG=\"-ltcl${VER}${LIBFLAGSUFFIX}\""
 eval "TCL_STUB_LIB_FILE=\"${LIBPREFIX}tclstub${LIBSUFFIX}\""
 eval "TCL_STUB_LIB_FLAG=\"-ltclstub${LIBFLAGSUFFIX}\""
 eval "TCL_BUILD_STUB_LIB_SPEC=\"-L`$CYGPATH $(pwd)` ${TCL_STUB_LIB_FLAG}\""
@@ -5915,6 +5917,7 @@ TCL_WIN_VERSION="$TCL_VERSION.$TCL_RELEASE_LEVEL.`echo $TCL_PATCH_LEVEL | tr -d
 
 
 
+
 # win/tcl.m4 doesn't set (CFLAGS)
 
 
@@ -5971,7 +5974,7 @@ TCL_WIN_VERSION="$TCL_VERSION.$TCL_RELEASE_LEVEL.`echo $TCL_PATCH_LEVEL | tr -d
 
 
 
-ac_config_files="$ac_config_files Makefile tclConfig.sh tclsh.exe.manifest"
+ac_config_files="$ac_config_files Makefile tclConfig.sh tclsh.exe.manifest tcl.pc:../unix/tcl.pc.in"
 
 cat >confcache <<\_ACEOF
 # This file is a shell script that caches the results of configure
@@ -6677,6 +6680,7 @@ do
     "Makefile") CONFIG_FILES="$CONFIG_FILES Makefile" ;;
     "tclConfig.sh") CONFIG_FILES="$CONFIG_FILES tclConfig.sh" ;;
     "tclsh.exe.manifest") CONFIG_FILES="$CONFIG_FILES tclsh.exe.manifest" ;;
+    "tcl.pc") CONFIG_FILES="$CONFIG_FILES tcl.pc:../unix/tcl.pc.in" ;;
 
   *) as_fn_error $? "invalid argument: '$ac_config_target'" "$LINENO" 5;;
   esac