summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorhobbs <hobbs>2000-11-03 21:23:25 (GMT)
committerhobbs <hobbs>2000-11-03 21:23:25 (GMT)
commit6d53093ff7010ba43b5064e0967efca26bbfdaf7 (patch)
treeead378226f5954612bd50b235e09cb8d6c866be8
parent6ad77ab1b4cf1373427365beb9b285cc2e336dbd (diff)
downloadtcl-6d53093ff7010ba43b5064e0967efca26bbfdaf7.zip
tcl-6d53093ff7010ba43b5064e0967efca26bbfdaf7.tar.gz
tcl-6d53093ff7010ba43b5064e0967efca26bbfdaf7.tar.bz2
* tools/tcl.wse.in: updated for unversioning of library dirs
* unix/Makefile.in (install-libraries, dist): * win/makefile.vc (install-libraries): * win/Makefile.in (install-libraries): updated to install unversioned library directories into versioned directories.
-rw-r--r--ChangeLog11
-rw-r--r--tools/tcl.wse.in33
-rw-r--r--unix/Makefile.in52
-rw-r--r--win/Makefile.in37
-rw-r--r--win/makefile.vc22
5 files changed, 102 insertions, 53 deletions
diff --git a/ChangeLog b/ChangeLog
index 1363ebe..c00263f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,16 @@
2000-11-03 Jeff Hobbs <hobbs@ajubasolutions.com>
+ * unix/Makefile.in (install-libraries, dist):
+ * win/makefile.vc (install-libraries):
+ * win/Makefile.in (install-libraries): updated to install
+ unversioned library directories into versioned directories.
+
+ * tools/tcl.wse.in: updated for unversioning of library dirs
+
+ * unix/mkLinks: updated mkLinks with latest doc updates
+
+ * doc/Tcl_Main.3: added docs for Tcl_SetMainLoop
+
* generic/tclStubInit.c:
* generic/tclDecls.h:
* generic/tcl.decls: added Tcl_SetMainLoop proc that allows people
diff --git a/tools/tcl.wse.in b/tools/tcl.wse.in
index c26be37..a55143b 100644
--- a/tools/tcl.wse.in
+++ b/tools/tcl.wse.in
@@ -1062,28 +1062,23 @@ item: If/While Statement
Flags=00001010
end
item: Install File
- Source=${__TCLBASEDIR__}\library\msgcat1.0\pkgIndex.tcl
- Destination=%MAINDIR%\lib\tcl%VER%\msgcat1.0\pkgIndex.tcl
+ Source=${__TCLBASEDIR__}\library\msgcat\pkgIndex.tcl
+ Destination=%MAINDIR%\lib\tcl%VER%\msgcat1.2\pkgIndex.tcl
Flags=0000000010000010
end
item: Install File
- Source=${__TCLBASEDIR__}\library\msgcat1.0\msgcat.tcl
- Destination=%MAINDIR%\lib\tcl%VER%\msgcat1.0\msgcat.tcl
+ Source=${__TCLBASEDIR__}\library\msgcat\msgcat.tcl
+ Destination=%MAINDIR%\lib\tcl%VER%\msgcat1.2\msgcat.tcl
Flags=0000000010000010
end
item: Install File
- Source=${__TCLBASEDIR__}\library\tcltest1.0\pkgIndex.tcl
- Destination=%MAINDIR%\lib\tcl%VER%\tcltest1.0\pkgIndex.tcl
+ Source=${__TCLBASEDIR__}\library\tcltest\pkgIndex.tcl
+ Destination=%MAINDIR%\lib\tcl%VER%\tcltest2.0\pkgIndex.tcl
Flags=0000000000000010
end
item: Install File
- Source=${__TCLBASEDIR__}\library\tcltest1.0\tcltest.tcl
- Destination=%MAINDIR%\lib\tcl%VER%\tcltest1.0\tcltest.tcl
- Flags=0000000000000010
-end
-item: Install File
- Source=${__TCLBASEDIR__}\library\tcltest1.0\tcltest2.tcl
- Destination=%MAINDIR%\lib\tcl%VER%\tcltest1.0\tcltest2.tcl
+ Source=${__TCLBASEDIR__}\library\tcltest\tcltest.tcl
+ Destination=%MAINDIR%\lib\tcl%VER%\tcltest2.0\tcltest.tcl
Flags=0000000000000010
end
item: Install File
@@ -1432,22 +1427,22 @@ item: Install File
Flags=0000000000000010
end
item: Install File
- Source=${__TCLBASEDIR__}\library\opt0.4\pkgIndex.tcl
+ Source=${__TCLBASEDIR__}\library\opt\pkgIndex.tcl
Destination=%MAINDIR%\lib\tcl%VER%\opt0.4\pkgIndex.tcl
Flags=0000000000000010
end
item: Install File
- Source=${__TCLBASEDIR__}\library\opt0.4\optparse.tcl
+ Source=${__TCLBASEDIR__}\library\opt\optparse.tcl
Destination=%MAINDIR%\lib\tcl%VER%\opt0.4\optparse.tcl
Flags=0000000000000010
end
item: Install File
- Source=${__TCLBASEDIR__}\library\http2.3\pkgIndex.tcl
+ Source=${__TCLBASEDIR__}\library\http\pkgIndex.tcl
Destination=%MAINDIR%\lib\tcl%VER%\http2.3\pkgIndex.tcl
Flags=0000000000000010
end
item: Install File
- Source=${__TCLBASEDIR__}\library\http2.3\http.tcl
+ Source=${__TCLBASEDIR__}\library\http\http.tcl
Destination=%MAINDIR%\lib\tcl%VER%\http2.3\http.tcl
Flags=0000000000000010
end
@@ -1582,7 +1577,7 @@ item: Install File
Flags=0000000000000010
end
item: Install File
- Source=${__TCLBASEDIR__}\library\reg1.0\pkgIndex.tcl
+ Source=${__TCLBASEDIR__}\library\reg\pkgIndex.tcl
Destination=%MAINDIR%\lib\tcl%VER%\reg1.0\pkgIndex.tcl
Flags=0000000000000010
end
@@ -1592,7 +1587,7 @@ item: Install File
Flags=0000000000000010
end
item: Install File
- Source=${__TCLBASEDIR__}\library\dde1.1\pkgIndex.tcl
+ Source=${__TCLBASEDIR__}\library\dde\pkgIndex.tcl
Destination=%MAINDIR%\lib\tcl%VER%\dde1.1\pkgIndex.tcl
Flags=0000000000000010
end
diff --git a/unix/Makefile.in b/unix/Makefile.in
index 381a233..29e0349 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.69 2000/09/29 21:43:32 hobbs Exp $
+# RCS: @(#) $Id: Makefile.in,v 1.70 2000/11/03 21:23:26 hobbs Exp $
VERSION = @TCL_VERSION@
@@ -554,7 +554,7 @@ install-libraries: libraries
else true; \
fi; \
done;
- @for i in http2.3 http1.0 opt0.4 encoding msgcat1.0 tcltest1.0; \
+ @for i in http2.3 http1.0 opt0.4 encoding msgcat1.2 tcltest2.0; \
do \
if [ ! -d $(SCRIPT_INSTALL_DIR)/$$i ] ; then \
echo "Making directory $(SCRIPT_INSTALL_DIR)/$$i"; \
@@ -577,13 +577,30 @@ install-libraries: libraries
do \
$(INSTALL_DATA) $$i $(SCRIPT_INSTALL_DIR); \
done;
- @for i in http2.3 http1.0 opt0.4 msgcat1.0 tcltest1.0; \
+ @echo "Installing library http1.0 directory";
+ @for j in $(TOP_DIR)/library/http1.0/*.tcl ; \
do \
- echo "Installing library $$i directory"; \
- for j in $(TOP_DIR)/library/$$i/*.tcl ; \
- do \
- $(INSTALL_DATA) $$j $(SCRIPT_INSTALL_DIR)/$$i; \
- done; \
+ $(INSTALL_DATA) $$j $(SCRIPT_INSTALL_DIR)/http1.0; \
+ done;
+ @echo "Installing library http2.3 directory";
+ @for j in $(TOP_DIR)/library/http/*.tcl ; \
+ do \
+ $(INSTALL_DATA) $$j $(SCRIPT_INSTALL_DIR)/http2.3; \
+ done;
+ @echo "Installing library opt0.4 directory";
+ @for j in $(TOP_DIR)/library/opt/*.tcl ; \
+ do \
+ $(INSTALL_DATA) $$j $(SCRIPT_INSTALL_DIR)/opt0.4; \
+ done;
+ @echo "Installing library msgcat1.2 directory";
+ @for j in $(TOP_DIR)/library/msgcat/*.tcl ; \
+ do \
+ $(INSTALL_DATA) $$j $(SCRIPT_INSTALL_DIR)/msgcat1.2; \
+ done;
+ @echo "Installing library tcltest2.0 directory";
+ @for j in $(TOP_DIR)/library/tcltest/*.tcl ; \
+ do \
+ $(INSTALL_DATA) $$j $(SCRIPT_INSTALL_DIR)/tcltest2.0; \
done;
@echo "Installing library encoding directory";
@for i in $(TOP_DIR)/library/encoding/*.enc ; do \
@@ -1126,11 +1143,20 @@ 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.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; \
- done;
+ mkdir $(DISTDIR)/library/http1.0
+ cp -p $(TOP_DIR)/library/http1.0/*.tcl $(DISTDIR)/library/http1.0
+ mkdir $(DISTDIR)/library/http2.3
+ cp -p $(TOP_DIR)/library/http/*.tcl $(DISTDIR)/library/http2.3
+ mkdir $(DISTDIR)/library/opt0.4
+ cp -p $(TOP_DIR)/library/opt/*.tcl $(DISTDIR)/library/opt0.4
+ mkdir $(DISTDIR)/library/msgcat1.2
+ cp -p $(TOP_DIR)/library/msgcat/*.tcl $(DISTDIR)/library/msgcat1.2
+ mkdir $(DISTDIR)/library/reg1.0
+ cp -p $(TOP_DIR)/library/reg/*.tcl $(DISTDIR)/library/reg1.0
+ mkdir $(DISTDIR)/library/dde1.1
+ cp -p $(TOP_DIR)/library/dde/*.tcl $(DISTDIR)/library/dde1.1
+ mkdir $(DISTDIR)/library/tcltest2.0
+ cp -p $(TOP_DIR)/library/tcltest/*.tcl $(DISTDIR)/library/tcltest2.0
mkdir $(DISTDIR)/library/encoding
cp -p $(TOP_DIR)/library/encoding/*.enc $(DISTDIR)/library/encoding
mkdir $(DISTDIR)/doc
diff --git a/win/Makefile.in b/win/Makefile.in
index 659e78a..1b0c044 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.41 2000/10/31 01:20:09 davidg Exp $
+# RCS: @(#) $Id: Makefile.in,v 1.42 2000/11/03 21:23:28 hobbs Exp $
VERSION = @TCL_VERSION@
@@ -452,7 +452,7 @@ install-binaries:
@if [ -f $(DDE_DLL_FILE) ]; then \
echo installing $(DDE_DLL_FILE); \
$(COPY) $(DDE_DLL_FILE) $(LIB_INSTALL_DIR)/dde1.1; \
- $(COPY) $(ROOT_DIR)/library/dde1.1/pkgIndex.tcl $(LIB_INSTALL_DIR)/dde1.1; \
+ $(COPY) $(ROOT_DIR)/library/dde/pkgIndex.tcl $(LIB_INSTALL_DIR)/dde1.1; \
fi
@if [ -f $(DDE_LIB_FILE) ]; then \
echo installing $(DDE_LIB_FILE); \
@@ -461,7 +461,7 @@ install-binaries:
@if [ -f $(REG_DLL_FILE) ]; then \
echo installing $(REG_DLL_FILE); \
$(COPY) $(REG_DLL_FILE) $(LIB_INSTALL_DIR)/reg1.0; \
- $(COPY) $(ROOT_DIR)/library/reg1.0/pkgIndex.tcl $(LIB_INSTALL_DIR)/reg1.0; \
+ $(COPY) $(ROOT_DIR)/library/reg/pkgIndex.tcl $(LIB_INSTALL_DIR)/reg1.0; \
fi
@if [ -f $(REG_LIB_FILE) ]; then \
echo installing $(REG_LIB_FILE); \
@@ -478,7 +478,7 @@ install-libraries:
else true; \
fi; \
done;
- @for i in http1.0 http2.3 opt0.4 encoding msgcat1.0 tcltest1.0; \
+ @for i in http1.0 http2.3 opt0.4 encoding msgcat1.2 tcltest2.0; \
do \
if [ ! -d $(SCRIPT_INSTALL_DIR)/$$i ] ; then \
echo "Making directory $(SCRIPT_INSTALL_DIR)/$$i"; \
@@ -497,13 +497,30 @@ install-libraries:
do \
$(COPY) "$$i" "$(SCRIPT_INSTALL_DIR)"; \
done;
- @for i in http2.3 http1.0 opt0.4 msgcat1.0 tcltest1.0; \
+ @echo "Installing library http1.0 directory"; \
+ @for j in $(ROOT_DIR)/library/http1.0/*.tcl; \
do \
- echo "Installing library $$i directory"; \
- for j in $(ROOT_DIR)/library/$$i/*.tcl; \
- do \
- $(COPY) "$$j" "$(SCRIPT_INSTALL_DIR)/$$i"; \
- done; \
+ $(COPY) "$$j" "$(SCRIPT_INSTALL_DIR)/http1.0"; \
+ done;
+ @echo "Installing library http2.3 directory"; \
+ @for j in $(ROOT_DIR)/library/http/*.tcl; \
+ do \
+ $(COPY) "$$j" "$(SCRIPT_INSTALL_DIR)/http2.3"; \
+ done;
+ @echo "Installing library opt0.4 directory"; \
+ @for j in $(ROOT_DIR)/library/opt/*.tcl; \
+ do \
+ $(COPY) "$$j" "$(SCRIPT_INSTALL_DIR)/opt0.4"; \
+ done;
+ @echo "Installing library msgcat1.2 directory"; \
+ @for j in $(ROOT_DIR)/library/msgcat/*.tcl; \
+ do \
+ $(COPY) "$$j" "$(SCRIPT_INSTALL_DIR)/msgcat1.2"; \
+ done;
+ @echo "Installing library tcltest2.0 directory"; \
+ @for j in $(ROOT_DIR)/library/tcltest/*.tcl; \
+ do \
+ $(COPY) "$$j" "$(SCRIPT_INSTALL_DIR)/tcltest2.0"; \
done;
@echo "Installing encodings"
@for i in $(ROOT_DIR)/library/encoding/*.enc ; do \
diff --git a/win/makefile.vc b/win/makefile.vc
index 675ff54..924e3a9 100644
--- a/win/makefile.vc
+++ b/win/makefile.vc
@@ -6,7 +6,7 @@
# Copyright (c) 1995-1996 Sun Microsystems, Inc.
# Copyright (c) 1998-2000 Ajuba Solutions.
#
-# RCS: @(#) $Id: makefile.vc,v 1.58 2000/11/03 01:10:23 hobbs Exp $
+# RCS: @(#) $Id: makefile.vc,v 1.59 2000/11/03 21:23:28 hobbs Exp $
# Does not depend on the presence of any environment variables in
# order to compile tcl; all needed information is derived from
@@ -391,24 +391,24 @@ install-libraries:
-@copy "$(ROOT)\library\http1.0\pkgIndex.tcl" "$(SCRIPT_INSTALL_DIR)\http1.0"
@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"
+ -@copy "$(ROOT)\library\http\http.tcl" "$(SCRIPT_INSTALL_DIR)\http2.3"
+ -@copy "$(ROOT)\library\http\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"
- -@copy "$(ROOT)\library\opt0.4\pkgIndex.tcl" "$(SCRIPT_INSTALL_DIR)\opt0.4"
- @echo installing msgcat1.0
- -@$(MKDIR) "$(SCRIPT_INSTALL_DIR)\msgcat1.0"
- -@copy "$(ROOT)\library\msgcat1.0\msgcat.tcl" "$(SCRIPT_INSTALL_DIR)\msgcat1.0"
- -@copy "$(ROOT)\library\msgcat1.0\pkgIndex.tcl" "$(SCRIPT_INSTALL_DIR)\msgcat1.0"
+ -@copy "$(ROOT)\library\opt\optparse.tcl" "$(SCRIPT_INSTALL_DIR)\opt0.4"
+ -@copy "$(ROOT)\library\opt\pkgIndex.tcl" "$(SCRIPT_INSTALL_DIR)\opt0.4"
+ @echo installing msgcat1.2
+ -@$(MKDIR) "$(SCRIPT_INSTALL_DIR)\msgcat1.2"
+ -@copy "$(ROOT)\library\msgcat\msgcat.tcl" "$(SCRIPT_INSTALL_DIR)\msgcat1.0"
+ -@copy "$(ROOT)\library\msgcat\pkgIndex.tcl" "$(SCRIPT_INSTALL_DIR)\msgcat1.0"
@echo installing $(TCLDDEDLLNAME)
-@$(MKDIR) "$(SCRIPT_INSTALL_DIR)\dde1.1"
-@copy "$(TCLDDEDLL)" "$(SCRIPT_INSTALL_DIR)\dde1.1"
- -@copy "$(ROOT)\library\dde1.1\pkgIndex.tcl" "$(SCRIPT_INSTALL_DIR)\dde1.1"
+ -@copy "$(ROOT)\library\dde\pkgIndex.tcl" "$(SCRIPT_INSTALL_DIR)\dde1.1"
@echo installing $(TCLREGDLLNAME)
-@$(MKDIR) "$(SCRIPT_INSTALL_DIR)\reg1.0"
-@copy "$(TCLREGDLL)" "$(SCRIPT_INSTALL_DIR)\reg1.0"
- -@copy "$(ROOT)\library\reg1.0\pkgIndex.tcl" "$(SCRIPT_INSTALL_DIR)\reg1.0"
+ -@copy "$(ROOT)\library\reg\pkgIndex.tcl" "$(SCRIPT_INSTALL_DIR)\reg1.0"
@echo installing encoding files
-@$(MKDIR) "$(SCRIPT_INSTALL_DIR)\encoding"
-@copy "$(ROOT)\library\encoding\*.enc" "$(SCRIPT_INSTALL_DIR)\encoding"