From 3ed4f6ac40882ef7d7be752c081bbd1a34941875 Mon Sep 17 00:00:00 2001 From: bugmaster Date: Fri, 1 Nov 2013 15:24:50 +0400 Subject: [PATCH] Changing tcltk version from 8.5 to 8.6 --- src/WOKBuilderDef/CSF_LIN.edl | 8 ++++---- src/WOKBuilderDef/CSF_MAC.edl | 8 ++++---- src/WOKBuilderDef/CSF_WNT.edl | 4 ++-- src/WOKTclLib/osutils.tcl | 8 ++++---- src/WOKsite/wok_deps.tcl | 14 +++++++------- src/WOKsite/wok_env.bat | 4 ++-- 6 files changed, 23 insertions(+), 23 deletions(-) diff --git a/src/WOKBuilderDef/CSF_LIN.edl b/src/WOKBuilderDef/CSF_LIN.edl index ec58b5c..0eefe70 100644 --- 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 9d54479..260ba35 100755 --- 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 391b105..d9f9c04 100644 --- 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 0ff9c37..42f0331 100755 --- 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 f9ff07e..c040310 100644 --- 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 481669d..f3f8bf9 100644 --- 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%" -- 2.39.5