* Merged changes from 8.1.0 branch

7 files changed, 86 insertions, 32 deletions

diff --git a/tools/README b/tools/README
index 1caf63c..9161214 100644
--- a/tools/README
+++ b/tools/README
@@ -2,9 +2,18 @@
  This directory contains unsupported tools that are used
  during the release engineering process.
 
+Generating HTML files.
+The tcl8.1-tk8.1-man-html.tcl script from Robert Critchlow
+generates a nice set of HTML with good cross references.
+Use it like
+    tclsh8.0 tcl8.1-tk8.1-man-html.tcl --htmldir=/tmp/tcl8.1
+This script is very picky about the organization of man pages,
+effectively acting as a style enforcer.
+
 Generating Windows Help Files:
-1) On UNIX, (after autoconf and configure), do
-	make winhelp
+1) Build tcl in the ../unix directory
+2) On UNIX, (after autoconf and configure), do
+	make
     this converts the Nroff to RTF files.
 2) On Windows, convert the RTF to a Help doc, do
 	nmake helpfile
diff --git a/tools/configure.in b/tools/configure.in
index 147b99e..a48d6d7 100644
--- a/tools/configure.in
+++ b/tools/configure.in
@@ -2,7 +2,7 @@ dnl	This file is an input file used by the GNU "autoconf" program to
 dnl	generate the file "configure", which is run to configure the
 dnl	Makefile in this directory.
 AC_INIT(man2tcl.c)
-# RCS: @(#) $Id: configure.in,v 1.5 1999/04/16 00:47:38 stanton Exp $
+# RCS: @(#) $Id: configure.in,v 1.6 1999/04/30 22:45:03 stanton Exp $
 
 # Recover information that Tcl computed with its configure script.
 
@@ -30,5 +30,4 @@ AC_SUBST(TCL_PATCH_LEVEL)
 AC_SUBST(TCL_SRC_DIR)
 AC_SUBST(TCL_BIN_DIR)
 
-AC_OUTPUT(Makefile)
-AC_OUTPUT(tcl.hpj)
+AC_OUTPUT(Makefile tcl.hpj)
diff --git a/tools/encoding/README b/tools/encoding/README
index 65b0a91..0713f4e 100644
--- a/tools/encoding/README
+++ b/tools/encoding/README
@@ -1,5 +1,5 @@
-Use "make" to compile all the encoding files (*.txt,*.esc) into the format
-that Tcl can use (*.enc).  It is the caller's responsibility to move the
-generated .enc files to the appropriate place (the $TCL_LIBRARY/encoding
-directory).
+On Unix, use "make" to compile all the encoding files (*.txt,*.esc)
+into the format that Tcl can use (*.enc).  It is the caller's
+responsibility to move the generated .enc files to the appropriate
+place (the $TCL_LIBRARY/encoding directory).
 
diff --git a/tools/genStubs.tcl b/tools/genStubs.tcl
index 6ac76fc..e4bc088 100644
--- a/tools/genStubs.tcl
+++ b/tools/genStubs.tcl
@@ -8,7 +8,7 @@
 # See the file "license.terms" for information on usage and redistribution
 # of this file, and for a DISCLAIMER OF ALL WARRANTIES.
 # 
-# RCS: @(#) $Id: genStubs.tcl,v 1.4 1999/04/24 01:46:53 stanton Exp $
+# RCS: @(#) $Id: genStubs.tcl,v 1.5 1999/04/30 22:45:03 stanton Exp $
 
 namespace eval genStubs {
     # libraryName --
@@ -717,7 +717,9 @@ proc genStubs::emitHeader {name} {
 
     append text "} ${capName}Stubs;\n"
 
-    append text "\nextern ${capName}Stubs *${name}StubsPtr;\n"
+    append text "\n#ifdef __cplusplus\nextern \"C\" {\n#endif\n"
+    append text "extern ${capName}Stubs *${name}StubsPtr;\n"
+    append text "#ifdef __cplusplus\n}\n#endif\n"
 
     emitMacros $name text
 
diff --git a/tools/genWinImage.tcl b/tools/genWinImage.tcl
index b5fc051..cecca62 100644
--- a/tools/genWinImage.tcl
+++ b/tools/genWinImage.tcl
@@ -5,7 +5,7 @@
 # Copyright (c) 1999 by Scriptics Corporation.
 # All rights reserved.
 # 
-# RCS: @(#) $Id: genWinImage.tcl,v 1.2 1999/04/16 00:47:39 stanton Exp $
+# RCS: @(#) $Id: genWinImage.tcl,v 1.3 1999/04/30 22:45:03 stanton Exp $
 
 
 # This file is insensitive to the directory from which it is invoked.
@@ -69,6 +69,27 @@ proc genWinImage::init {} {
 	    [clock format [clock seconds] -format "%Y%m%d-%H:%M"] --\n\n"
 }
 
+# genWinImage::makeTextFile --
+#
+#	Convert the input file into a CRLF terminated text file.
+#
+# Arguments:
+#	infile		The input file to convert.
+#	outfile		The location where the text file should be stored.
+#
+# Results:
+#	None.
+
+proc genWinImage::makeTextFile {infile outfile} {
+    set f [open $infile r]
+    set text [read $f]
+    close $f
+    set f [open $outfile w]
+    fconfigure $f -translation crlf
+    puts -nonewline $f $text
+    close $f
+}
+
 # genWinImage::generateInstallers --
 #
 #	Perform substitutions on the pro.wse.in file and then
@@ -103,6 +124,13 @@ proc genWinImage::generateInstallers {} {
     puts $f $s
     close $f
 
+    # Ensure the text files are CRLF terminated
+
+    makeTextFile [file join $tclBuildDir win/README.binary] \
+	    [file join $tclBuildDir win/readme.txt]
+    makeTextFile [file join $tclBuildDir license.terms] \
+	    [file join $tclBuildDir license.txt]
+
     set wise32ProgFilePath [file native [file join $__WISE__ wise32.exe]]
 
     # Run the Wise installer to create the Windows install images.
diff --git a/tools/tcl.wse.in b/tools/tcl.wse.in
index 2be334f..43a6581 100644
--- a/tools/tcl.wse.in
+++ b/tools/tcl.wse.in
@@ -46,7 +46,7 @@ item: Set Variable
 end

 item: Set Variable

   Variable=PATCHLEVEL

-  Value=8.1b3

+  Value=8.1

 end

 item: Set Variable

   Variable=APPTITLE

@@ -945,12 +945,12 @@ item: Check Disk Space
   Component=COMPONENTS

 end

 item: Install File

-  Source=${__TCLBASEDIR__}\license.terms

+  Source=${__TCLBASEDIR__}\license.txt

   Destination=%MAINDIR%\license.txt

   Flags=0000000000000010

 end

 item: Install File

-  Source=${__TCLBASEDIR__}\win\Readme.binary

+  Source=${__TCLBASEDIR__}\win\Readme.txt

   Destination=%MAINDIR%\Readme.txt

   Flags=0000000000000010

 end

@@ -1062,16 +1062,6 @@ item: Install File
   Flags=0000000010000010

 end

 item: Install File

-  Source=${__TCLBASEDIR__}\library\encoding\ksc5601.enc

-  Destination=%MAINDIR%\lib\tcl%VER%\encoding\ksc5601.enc

-  Flags=0000000010000010

-end

-item: Install File

-  Source=${__TCLBASEDIR__}\library\encoding\euc-kr.enc

-  Destination=%MAINDIR%\lib\tcl%VER%\encoding\euc-kr.enc

-  Flags=0000000010000010

-end

-item: Install File

   Source=${__TCLBASEDIR__}\library\encoding\symbol.enc

   Destination=%MAINDIR%\lib\tcl%VER%\encoding\symbol.enc

   Flags=0000000000000010

@@ -1142,6 +1132,16 @@ item: Install File
   Flags=0000000000000010

 end

 item: Install File

+  Source=${__TCLBASEDIR__}\library\encoding\ksc5601.enc

+  Destination=%MAINDIR%\lib\tcl%VER%\encoding\ksc5601.enc

+  Flags=0000000010000010

+end

+item: Install File

+  Source=${__TCLBASEDIR__}\library\encoding\koi8-r.enc

+  Destination=%MAINDIR%\lib\tcl%VER%\encoding\ksc5601.enc

+  Flags=0000000010000010

+end

+item: Install File

   Source=${__TCLBASEDIR__}\library\encoding\jis0212.enc

   Destination=%MAINDIR%\lib\tcl%VER%\encoding\jis0212.enc

   Flags=0000000000000010

@@ -1232,11 +1232,21 @@ item: Install File
   Flags=0000000000000010

 end

 item: Install File

+  Source=${__TCLBASEDIR__}\library\encoding\euc-cn.enc

+  Destination=%MAINDIR%\lib\tcl%VER%\encoding\euc-cn.enc

+  Flags=0000000010000010

+end

+item: Install File

   Source=${__TCLBASEDIR__}\library\encoding\euc-jp.enc

   Destination=%MAINDIR%\lib\tcl%VER%\encoding\euc-jp.enc

   Flags=0000000000000010

 end

 item: Install File

+  Source=${__TCLBASEDIR__}\library\encoding\euc-kr.enc

+  Destination=%MAINDIR%\lib\tcl%VER%\encoding\euc-kr.enc

+  Flags=0000000010000010

+end

+item: Install File

   Source=${__TCLBASEDIR__}\library\encoding\dingbats.enc

   Destination=%MAINDIR%\lib\tcl%VER%\encoding\dingbats.enc

   Flags=0000000000000010

@@ -1387,13 +1397,13 @@ item: Install File
   Flags=0000000000000010

 end

 item: Install File

-  Source=${__TCLBASEDIR__}\library\encoding\big5.enc

-  Destination=%MAINDIR%\lib\tcl%VER%\encoding\big5.enc

+  Source=${__TCLBASEDIR__}\library\encoding\ascii.enc

+  Destination=%MAINDIR%\lib\tcl%VER%\encoding\ascii.enc

   Flags=0000000000000010

 end

 item: Install File

-  Source=${__TCLBASEDIR__}\library\encoding\ascii.enc

-  Destination=%MAINDIR%\lib\tcl%VER%\encoding\ascii.enc

+  Source=${__TCLBASEDIR__}\library\encoding\big5.enc

+  Destination=%MAINDIR%\lib\tcl%VER%\encoding\big5.enc

   Flags=0000000000000010

 end

 item: Install File

@@ -1705,7 +1715,7 @@ item: Install File
 end

 item: Install File

   Source=${__TKBASEDIR__}\library\demos\twind.tcl

-  Destination=%MAINDIR%\lib\tk%VER%\demos\twind.tcl

+  Destination=%MAINDIR%\lib\tk%VER%\demos\twin\released.tcl

   Flags=0000000000000010

 end

 item: Install File

@@ -2298,13 +2308,19 @@ item: Custom Dialog Set
       Text Italian=Premere il pulsante Fine per uscire dall'installazione.

     end

     item: Checkbox

-      Rectangle=88 156 245 170

+      Rectangle=88 143 245 157

       Variable=TO_SCRIPTICS

       Enabled Color=00000000000000001111111111111111

       Create Flags=01010000000000010000000000000011

-      Text=Take me to learn more about Tcl/Tk %VER%

+      Text=Show me important information about

       Text=

     end

+    item: Static

+      Rectangle=99 156 245 170

+      Enabled Color=00000000000000001111111111111111

+      Create Flags=01010000000000000000000000000000

+      Text=Tcl/Tk %VER% and TclPro

+    end

   end

 end

 item: End Block

diff --git a/tools/tclSplash.bmp b/tools/tclSplash.bmp
index 2636c41..19e3c4a 100644
--- a/tools/tclSplash.bmp
+++ b/tools/tclSplash.bmp