* Merged changes from 8.1.0 branch

1 files changed, 36 insertions, 20 deletions

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