Changing tcltk version from 8.5 to 8.6

diff --git a/src/WOKBuilderDef/CSF_LIN.edl b/src/WOKBuilderDef/CSF_LIN.edl
index ec58b5c8e89bc8351b1d3d3fce2fc7ed086283e9..0eefe70fb1edc34d767ee5614bd3e8d94c2770fd 100644 (file)
--- a/src/WOKBuilderDef/CSF_LIN.edl
+++ b/src/WOKBuilderDef/CSF_LIN.edl
@@ -66,11 +66,11 @@
   -- Tcl/Tk configuration
   @if (%CSF_TCL_HOME != "") then
     @string %CSF_TCL_INCLUDE = "-I" %CSF_TCL_HOME "/include ";
-    @string %CSF_TclLibs   = "-L" %CSF_TCL_HOME "/lib -ltcl8.5 ";
-    @string %CSF_TclTkLibs = "-L" %CSF_TCL_HOME "/lib -ltk8.5 -L" %X11_LIB " -lX11 ";
+    @string %CSF_TclLibs   = "-L" %CSF_TCL_HOME "/lib -ltcl8.6 ";
+    @string %CSF_TclTkLibs = "-L" %CSF_TCL_HOME "/lib -ltk8.6 -L" %X11_LIB " -lX11 ";
   @else
-    @string %CSF_TclLibs   = " -ltcl8.5 ";
-    @string %CSF_TclTkLibs = " -ltk8.5 -L" %X11_LIB " -lX11 ";
+    @string %CSF_TclLibs   = " -ltcl8.6 ";
+    @string %CSF_TclTkLibs = " -ltk8.6 -L" %X11_LIB " -lX11 ";
   @endif;
 
 @endif;

diff --git a/src/WOKBuilderDef/CSF_MAC.edl b/src/WOKBuilderDef/CSF_MAC.edl
index 9d5447944ebcc9579e84590914e254cfcad47674..260ba35d940d5c4e04829a71ec9e6a3528f5d426 100755 (executable)
--- a/src/WOKBuilderDef/CSF_MAC.edl
+++ b/src/WOKBuilderDef/CSF_MAC.edl
@@ -82,11 +82,11 @@
 
   @if (%CSF_TCL_HOME != "") then
     @string %CSF_TCL_INCLUDE = "-I" %CSF_TCL_HOME "/include ";
-    @string %CSF_TclLibs   = "-L" %CSF_TCL_HOME "/lib -ltcl8.5 ";
-    @string %CSF_TclTkLibs += "-L" %CSF_TCL_HOME "/lib -ltk8.5 ";
+    @string %CSF_TclLibs   = "-L" %CSF_TCL_HOME "/lib -ltcl8.6 ";
+    @string %CSF_TclTkLibs += "-L" %CSF_TCL_HOME "/lib -ltk8.6 ";
   @else
-    @string %CSF_TclLibs   = " -ltcl8.5 ";
-    @string %CSF_TclTkLibs += "-ltk8.5 ";
+    @string %CSF_TclLibs   = " -ltcl8.6 ";
+    @string %CSF_TclTkLibs += "-ltk8.6 ";
   @endif;
 
 @endif;

diff --git a/src/WOKBuilderDef/CSF_WNT.edl b/src/WOKBuilderDef/CSF_WNT.edl
index 391b105d13efac99f0bb7ab0e4b3ea0da9714265..d9f9c047709e8660daa65b3ae43b1eabc706f323 100644 (file)
--- a/src/WOKBuilderDef/CSF_WNT.edl
+++ b/src/WOKBuilderDef/CSF_WNT.edl
@@ -70,8 +70,8 @@
   --
 
   -- Tcl/Tk configuration
-  @string %CSF_TclLibs   = "tcl85.lib";
-  @string %CSF_TclTkLibs = "tk85.lib";
+  @string %CSF_TclLibs   = "tcl86.lib";
+  @string %CSF_TclTkLibs = "tk86.lib";
 
   -- Qt4 framework, doesn't required for OCCT itself
   @string %CSF_QT_INCLUDES = " ";

diff --git a/src/WOKTclLib/osutils.tcl b/src/WOKTclLib/osutils.tcl
index 0ff9c37402eb89007868eca2e90430406ab3df24..42f0331fc77b0b2b3c0e42a77b8d3328996786c6 100755 (executable)
--- a/src/WOKTclLib/osutils.tcl
+++ b/src/WOKTclLib/osutils.tcl
@@ -1848,8 +1848,8 @@ proc osutils:csfList { theOS  theCsfMap } {
     set aCsfMap(CSF_OpenGlLibs) "opengl32.lib glu32.lib"
 
     # -- 3rd-parties precompiled libraries
-    set aCsfMap(CSF_TclLibs)    "tcl85.lib"
-    set aCsfMap(CSF_TclTkLibs)  "tk85.lib"
+    set aCsfMap(CSF_TclLibs)    "tcl86.lib"
+    set aCsfMap(CSF_TclTkLibs)  "tk86.lib"
     set aCsfMap(CSF_QT)         "QtCore4.lib QtGui4.lib"
 
   } else {
@@ -1871,8 +1871,8 @@ proc osutils:csfList { theOS  theCsfMap } {
     set aCsfMap(CSF_MotifLibs)  "X11"
 
     #-- Tcl/Tk configuration
-    set aCsfMap(CSF_TclLibs)    "tcl8.5"
-    set aCsfMap(CSF_TclTkLibs)  "X11 tk8.5"
+    set aCsfMap(CSF_TclLibs)    "tcl8.6"
+    set aCsfMap(CSF_TclTkLibs)  "X11 tk8.6"
 
     # variable is required for support for OCCT version that use fgtl
     #-- FTGL (font renderer for OpenGL)

diff --git a/src/WOKsite/wok_deps.tcl b/src/WOKsite/wok_deps.tcl
index f9ff07eb07cc2b607ccb4b21cbd2bc9859ca528d..c0403109ebb1a29c5e0a8a1fc35d7ffa5dc79d97 100644 (file)
--- a/src/WOKsite/wok_deps.tcl
+++ b/src/WOKsite/wok_deps.tcl
@@ -222,9 +222,9 @@ proc wokdep:SearchTclTk {theErrInc theErrLib32 theErrLib64 theErrBin32 theErrBin
   set aTclHPath [wokdep:SearchHeader "tcl.h"]
   set aTkHPath  [wokdep:SearchHeader "tcl.h"]
   if { "$aTclHPath" == "" || "$aTkHPath" == "" } {
-    if { [file exists "/usr/include/tcl8.5/tcl.h"]
-      && [file exists "/usr/include/tcl8.5/tk.h" ] } {
-      lappend ::CSF_OPT_INC "/usr/include/tcl8.5"
+    if { [file exists "/usr/include/tcl8.6/tcl.h"]
+      && [file exists "/usr/include/tcl8.6/tk.h" ] } {
+      lappend ::CSF_OPT_INC "/usr/include/tcl8.6"
     } else {
       set aPath [wokdep:Preferred [glob -nocomplain -directory "$::PRODUCTS_PATH" -type d *{tcl}*] "$::VCVER" "$::ARCH" ]
       if { "$aPath" != "" && [file exists "$aPath/include/tcl.h"] && [file exists "$aPath/include/tk.h"] } {
@@ -237,11 +237,11 @@ proc wokdep:SearchTclTk {theErrInc theErrLib32 theErrLib64 theErrBin32 theErrBin
   }
 
   if { "$::tcl_platform(platform)" == "windows" } {
-    set aTclLibName "tcl85"
-    set aTkLibName  "tk85"
+    set aTclLibName "tcl86"
+    set aTkLibName  "tk86"
   } else {
-    set aTclLibName "tcl8.5"
-    set aTkLibName  "tk8.5"
+    set aTclLibName "tcl8.6"
+    set aTkLibName  "tk8.6"
   }
 
   foreach anArchIter {64 32} {

diff --git a/src/WOKsite/wok_env.bat b/src/WOKsite/wok_env.bat
index 481669d2a91185a6b45d9a597d5d3485ed1cd9aa..f3f8bf93085075791ac3831dfa59139cba4f1498 100644 (file)
--- a/src/WOKsite/wok_env.bat
+++ b/src/WOKsite/wok_env.bat
@@ -72,8 +72,8 @@ rem ----- Setup Environment Variables for TCL/TK -----
 set "TCLHOME=%WOKHOME%/3rdparty/win32/tcltk"
 set "TCLBIN=%TCLHOME%/bin"
 set "TCLLIB=%TCLHOME%/lib"
-set "TCL_LIBRARY=%TCLLIB%/tcl8.5"
-set "TK_LIBRARY=%TCLLIB%/tk8.5"
+set "TCL_LIBRARY=%TCLLIB%/tcl8.6"
+set "TK_LIBRARY=%TCLLIB%/tk8.6"
 rem set "TCLX_LIBRARY=%TCLLIB%/teapot/package/win32-ix86/lib/tclx8.4"
 rem set "TCLLIBPATH=%TCLBIN% %TCLLIB% %TCL_LIBRARY% %TK_LIBRARY% %TCLX_LIBRARY%"
 set "TCLLIBPATH=%TCLBIN% %TCLLIB% %TCL_LIBRARY% %TK_LIBRARY%"