summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorhobbs <hobbs>2000-04-25 20:58:47 (GMT)
committerhobbs <hobbs>2000-04-25 20:58:47 (GMT)
commit405c654f4235a7ea25bf91ed717a07fc2fe5cca7 (patch)
treee792c6fe9de2b3c5a125e2c12974f5aef195e39e
parentff45c4b9443f92c8c48f3c69281820421692bddf (diff)
downloadtcl-405c654f4235a7ea25bf91ed717a07fc2fe5cca7.zip
tcl-405c654f4235a7ea25bf91ed717a07fc2fe5cca7.tar.gz
tcl-405c654f4235a7ea25bf91ed717a07fc2fe5cca7.tar.bz2
* unix/Makefile.in:
* win/Makefile.in: * win/makefile.vc: updated for http change and some cleanup * library/http2.[13]: moved dir http2.1 to http2.3 to match version
-rw-r--r--ChangeLog14
-rw-r--r--unix/Makefile.in32
-rw-r--r--win/Makefile.in31
-rw-r--r--win/makefile.vc10
4 files changed, 54 insertions, 33 deletions
diff --git a/ChangeLog b/ChangeLog
index b25b58d..ba697fb 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,17 @@
+2000-04-25 Jeff Hobbs <hobbs@scriptics.com>
+
+ * unix/Makefile.in:
+ * win/Makefile.in:
+ * win/makefile.vc: updated for http change and some cleanup
+ * library/http2.[13]: moved dir http2.1 to http2.3 to match version
+
+ * doc/Utf.3: clarified docs for Tcl_(UniChar|Utf)AtIndex
+
+ * unix/tclUnixThrd.c: removed {}s around PTHREAD_MUTEX_INITIALIZER
+ [Bug: 5254]
+
+ * unix/tclLoadDyld.c (TclpLoadFile): removed use of interp->result
+
2000-04-24 Eric Melski <ericm@scriptics.com>
* unix/mkLinks:
diff --git a/unix/Makefile.in b/unix/Makefile.in
index d2c828f..df69f9c 100644
--- a/unix/Makefile.in
+++ b/unix/Makefile.in
@@ -5,7 +5,7 @@
# "autoconf" program (constructs like "@foo@" will get replaced in the
# actual Makefile.
#
-# RCS: @(#) $Id: Makefile.in,v 1.62 2000/04/19 08:32:45 hobbs Exp $
+# RCS: @(#) $Id: Makefile.in,v 1.63 2000/04/25 20:58:48 hobbs Exp $
VERSION = @TCL_VERSION@
@@ -49,8 +49,7 @@ BIN_INSTALL_DIR = $(INSTALL_ROOT)$(bindir)
# Directory in which to install libtcl.so or libtcl.a:
LIB_INSTALL_DIR = $(INSTALL_ROOT)$(libdir)
-# Path name to use when installing library scripts. Don't
-# include $(prefix) here since it's already part of $(TCL_LIBRARY)
+# Path name to use when installing library scripts.
SCRIPT_INSTALL_DIR = $(INSTALL_ROOT)$(TCL_LIBRARY)
# Directory in which to install the include file tcl.h:
@@ -166,6 +165,13 @@ INSTALL = @srcdir@/install-sh -c
INSTALL_PROGRAM = ${INSTALL}
INSTALL_DATA = ${INSTALL} -m 644
+# The following specifies which Tcl executable to use for make targets
+# below. This can generally be 'tclsh', meaning all targets will work
+# once we have created the initial executable, but in some cases you
+# may want to use a target without having made tclsh on these sources
+# (like for make genstubs)
+TCL_EXE = tclsh
+
# The symbols below provide support for dynamic loading and shared
# libraries. See configure.in for a description of what the
# symbols mean. The values of the symbols are normally set by the
@@ -467,7 +473,7 @@ topDirName:
gendate:
yacc -l $(GENERIC_DIR)/tclGetDate.y
sed -e 's/yy/TclDate/g' -e '/^#include <values.h>/d' \
- -e 's?SCCSID?RCS: @(#) $$Id: Makefile.in,v 1.62 2000/04/19 08:32:45 hobbs Exp $$?' \
+ -e 's?SCCSID?RCS: @(#) $$Id: Makefile.in,v 1.63 2000/04/25 20:58:48 hobbs Exp $$?' \
-e '/#ifdef __STDC__/,/#endif/d' -e '/TclDateerrlab:/d' \
-e '/TclDatenewstate:/d' -e '/#pragma/d' \
-e '/#include <inttypes.h>/d' -e 's/const /CONST /g' \
@@ -543,7 +549,7 @@ install-libraries: libraries
else true; \
fi; \
done;
- @for i in http2.1 http1.0 opt0.4 encoding msgcat1.0 tcltest1.0; \
+ @for i in http2.3 http1.0 opt0.4 encoding msgcat1.0 tcltest1.0; \
do \
if [ ! -d $(SCRIPT_INSTALL_DIR)/$$i ] ; then \
echo "Making directory $(SCRIPT_INSTALL_DIR)/$$i"; \
@@ -565,7 +571,7 @@ install-libraries: libraries
do \
$(INSTALL_DATA) $$i $(SCRIPT_INSTALL_DIR); \
done;
- @for i in http2.1 http1.0 opt0.4 msgcat1.0 tcltest1.0; \
+ @for i in http2.3 http1.0 opt0.4 msgcat1.0 tcltest1.0; \
do \
echo "Installing library $$i directory"; \
for j in $(TOP_DIR)/library/$$i/*.tcl ; \
@@ -1012,11 +1018,11 @@ tclStubLib.o: $(GENERIC_DIR)/tclStubLib.c
$(GENERIC_DIR)/tclStubInit.c: $(GENERIC_DIR)/tcl.decls \
$(GENERIC_DIR)/tclInt.decls
- tclsh $(TOOL_DIR)/genStubs.tcl $(GENERIC_DIR) \
+ $(TCL_EXE) $(TOOL_DIR)/genStubs.tcl $(GENERIC_DIR) \
$(GENERIC_DIR)/tcl.decls $(GENERIC_DIR)/tclInt.decls
genstubs:
- tclsh $(TOOL_DIR)/genStubs.tcl $(GENERIC_DIR) \
+ $(TCL_EXE) $(TOOL_DIR)/genStubs.tcl $(GENERIC_DIR) \
$(GENERIC_DIR)/tcl.decls $(GENERIC_DIR)/tclInt.decls
#
@@ -1095,7 +1101,7 @@ dist: $(UNIX_DIR)/configure
chmod 775 $(DISTDIR)/unix/ldAix
chmod +x $(DISTDIR)/unix/install-sh
- tclsh $(UNIX_DIR)/mkLinks.tcl \
+ $(TCL_EXE) $(UNIX_DIR)/mkLinks.tcl \
$(UNIX_DIR)/../doc/*.[13n] > $(DISTDIR)/unix/mkLinks
chmod +x $(DISTDIR)/unix/mkLinks
mkdir $(DISTDIR)/generic
@@ -1108,7 +1114,7 @@ dist: $(UNIX_DIR)/configure
mkdir $(DISTDIR)/library
cp -p $(TOP_DIR)/license.terms $(TOP_DIR)/library/*.tcl \
$(TOP_DIR)/library/tclIndex $(DISTDIR)/library
- for i in http2.1 http1.0 opt0.4 msgcat1.0 reg1.0 dde1.1 tcltest1.0; \
+ for i in http2.3 http1.0 opt0.4 msgcat1.0 reg1.0 dde1.1 tcltest1.0; \
do \
mkdir $(DISTDIR)/library/$$i ;\
cp -p $(TOP_DIR)/library/$$i/*.tcl $(DISTDIR)/library/$$i; \
@@ -1210,7 +1216,7 @@ allpatch: dist
#
html:
- tclsh $(TOOL_DIR)/tcltk-man2html.tcl --htmldir=$(DISTDIR)/html \
+ $(TCL_EXE) $(TOOL_DIR)/tcltk-man2html.tcl --htmldir=$(DISTDIR)/html \
--srcdir=$(TOP_DIR)/..
#
@@ -1225,7 +1231,7 @@ macdist: dist machtml
machtml:
rm -f $(DISTDIR)/mac/tclMacProjects.sea.hqx
rm -rf $(DISTDIR)/doc
- tclsh $(TOOL_DIR)/cvtEOL.tcl $(DISTDIR)
+ $(TCL_EXE) $(TOOL_DIR)/cvtEOL.tcl $(DISTDIR)
#
# Targets to build Solaris package of the distribution for the current
@@ -1301,7 +1307,7 @@ package-generate:
$(DISTDIR)/$(PACKAGE)/$(VERSION)/lib=lib \
$(DISTDIR)/$(PACKAGE)/$(VERSION)/man=man \
$(DISTDIR)/$(PACKAGE)/$(VERSION)/`arch`=`arch` \
- | tclsh $(UNIX_DIR)/mkProto.tcl \
+ | $(TCL_EXE) $(UNIX_DIR)/mkProto.tcl \
$(VERSION) $(UNIX_DIR) > prototype
pkgmk -o -d . -f prototype -a `arch`
pkgtrans -s . $(PACKAGE).`arch` $(PACKAGE)
diff --git a/win/Makefile.in b/win/Makefile.in
index 80d8f93..d03e9a9 100644
--- a/win/Makefile.in
+++ b/win/Makefile.in
@@ -5,7 +5,7 @@
# "autoconf" program (constructs like "@foo@" will get replaced in the
# actual Makefile.
#
-# RCS: @(#) $Id: Makefile.in,v 1.32 2000/04/20 01:30:20 hobbs Exp $
+# RCS: @(#) $Id: Makefile.in,v 1.33 2000/04/25 20:58:48 hobbs Exp $
VERSION = @TCL_VERSION@
@@ -22,8 +22,12 @@ VERSION = @TCL_VERSION@
# at configure-time with the --exec-prefix and --prefix options
# to the "configure" script.
-prefix = @prefix@
-exec_prefix = @exec_prefix@
+prefix = @prefix@
+exec_prefix = @exec_prefix@
+bindir = @bindir@
+libdir = @libdir@
+includedir = @includedir@
+mandir = @mandir@
# The following definition can be set to non-null for special systems
# like AFS with replication. It allows the pathnames used for installation
@@ -38,22 +42,22 @@ INSTALL_ROOT =
TCL_LIBRARY = $(prefix)/lib/tcl$(VERSION)
# Path to use at runtime to refer to LIB_INSTALL_DIR:
-LIB_RUNTIME_DIR = $(exec_prefix)/lib
+LIB_RUNTIME_DIR = $(libdir)
# Directory in which to install the program tclsh:
-BIN_INSTALL_DIR = $(INSTALL_ROOT)$(exec_prefix)/bin
+BIN_INSTALL_DIR = $(INSTALL_ROOT)$(bindir)
# Directory in which to install libtcl.so or libtcl.a:
-LIB_INSTALL_DIR = $(INSTALL_ROOT)$(exec_prefix)/lib
+LIB_INSTALL_DIR = $(INSTALL_ROOT)$(libdir)
-# Path name to use when installing library scripts:
-SCRIPT_INSTALL_DIR = $(INSTALL_ROOT)$(TCL_LIBRARY)
+# Path name to use when installing library scripts.
+SCRIPT_INSTALL_DIR = $(INSTALL_ROOT)$(TCL_LIBRARY)
# Directory in which to install the include file tcl.h:
-INCLUDE_INSTALL_DIR = $(INSTALL_ROOT)$(prefix)/include
+INCLUDE_INSTALL_DIR = $(INSTALL_ROOT)$(includedir)
# Top-level directory in which to install manual entries:
-MAN_INSTALL_DIR = $(INSTALL_ROOT)$(prefix)/man
+MAN_INSTALL_DIR = $(INSTALL_ROOT)$(mandir)
# Directory in which to install manual entry for tclsh:
MAN1_INSTALL_DIR = $(MAN_INSTALL_DIR)/man1
@@ -66,9 +70,6 @@ MAN3_INSTALL_DIR = $(MAN_INSTALL_DIR)/man3
# Tcl commands:
MANN_INSTALL_DIR = $(MAN_INSTALL_DIR)/mann
-# Directory in which to install the include file tcl.h:
-INCLUDE_INSTALL_DIR = @includedir@
-
# Libraries built with optimization switches have this additional extension
TCL_DBGX = @TCL_DBGX@
@@ -463,7 +464,7 @@ install-libraries:
else true; \
fi; \
done;
- @for i in http1.0 http2.1 opt0.4 encoding msgcat1.0 tcltest1.0; \
+ @for i in http1.0 http2.3 opt0.4 encoding msgcat1.0 tcltest1.0; \
do \
if [ ! -d $(SCRIPT_INSTALL_DIR)/$$i ] ; then \
echo "Making directory $(SCRIPT_INSTALL_DIR)/$$i"; \
@@ -481,7 +482,7 @@ install-libraries:
do \
$(COPY) "$$i" "$(SCRIPT_INSTALL_DIR)"; \
done;
- @for i in http2.1 http1.0 opt0.4 msgcat1.0 tcltest1.0; \
+ @for i in http2.3 http1.0 opt0.4 msgcat1.0 tcltest1.0; \
do \
echo "Installing library $$i directory"; \
for j in $(ROOT_DIR)/library/$$i/*.tcl; \
diff --git a/win/makefile.vc b/win/makefile.vc
index 988e838..8fe5cda 100644
--- a/win/makefile.vc
+++ b/win/makefile.vc
@@ -6,7 +6,7 @@
# Copyright (c) 1995-1996 Sun Microsystems, Inc.
# Copyright (c) 1998-1999 by Scriptics Corporation.
#
-# RCS: @(#) $Id: makefile.vc,v 1.49 2000/02/10 02:54:33 hobbs Exp $
+# RCS: @(#) $Id: makefile.vc,v 1.50 2000/04/25 20:58:48 hobbs Exp $
# Does not depend on the presence of any environment variables in
# order to compile tcl; all needed information is derived from
@@ -367,10 +367,10 @@ install-libraries:
-@$(MKDIR) "$(SCRIPT_INSTALL_DIR)\http1.0"
-@copy "$(ROOT)\library\http1.0\http.tcl" "$(SCRIPT_INSTALL_DIR)\http1.0"
-@copy "$(ROOT)\library\http1.0\pkgIndex.tcl" "$(SCRIPT_INSTALL_DIR)\http1.0"
- @echo installing http2.1
- -@$(MKDIR) "$(SCRIPT_INSTALL_DIR)\http2.1"
- -@copy "$(ROOT)\library\http2.1\http.tcl" "$(SCRIPT_INSTALL_DIR)\http2.1"
- -@copy "$(ROOT)\library\http2.1\pkgIndex.tcl" "$(SCRIPT_INSTALL_DIR)\http2.1"
+ @echo installing http2.3
+ -@$(MKDIR) "$(SCRIPT_INSTALL_DIR)\http2.3"
+ -@copy "$(ROOT)\library\http2.3\http.tcl" "$(SCRIPT_INSTALL_DIR)\http2.3"
+ -@copy "$(ROOT)\library\http2.3\pkgIndex.tcl" "$(SCRIPT_INSTALL_DIR)\http2.3"
@echo installing opt0.4
-@$(MKDIR) "$(SCRIPT_INSTALL_DIR)\opt0.4"
-@copy "$(ROOT)\library\opt0.4\optparse.tcl" "$(SCRIPT_INSTALL_DIR)\opt0.4"