From: ibs <ibs@opencascade.com>
Date: Mon, 11 Nov 2013 10:41:38 +0000 (+0400)
Subject: 0023975: Remove CSF_GraphicShr environment variable from the generated env.bat
X-Git-Tag: V6_7_1~15
X-Git-Url: http://git.dev.opencascade.org/gitweb/?a=commitdiff_plain;h=83b6c0588a357ed1bbee14ff5c3a3a8453c95c84;p=occt-wok.git

0023975: Remove CSF_GraphicShr environment variable from the generated env.bat

CSF_GraphicShr environment variable removed
---

diff --git a/src/WOKTclLib/templates/env.bat b/src/WOKTclLib/templates/env.bat
index 141dc91..f069d51 100644
--- a/src/WOKTclLib/templates/env.bat
+++ b/src/WOKTclLib/templates/env.bat
@@ -122,7 +122,6 @@ set "CSF_PluginDefaults=%CASROOT%\src\StdResource"
 set "CSF_XCAFDefaults=%CASROOT%\src\StdResource"
 set "CSF_TObjDefaults=%CASROOT%\src\StdResource"
 set "CSF_StandardLiteDefaults=%CASROOT%\src\StdResource"
-set "CSF_GraphicShr=TKOpenGl.dll"
 set "CSF_UnitsLexicon=%CASROOT%\src\UnitsAPI\Lexi_Expr.dat"
 set "CSF_UnitsDefinition=%CASROOT%\src\UnitsAPI\Units.dat"
 set "CSF_IGESDefaults=%CASROOT%\src\XSTEPResource"
diff --git a/src/WOKTclLib/templates/env.bat.in b/src/WOKTclLib/templates/env.bat.in
index f6a0886..20ae357 100644
--- a/src/WOKTclLib/templates/env.bat.in
+++ b/src/WOKTclLib/templates/env.bat.in
@@ -32,7 +32,6 @@ set "CSF_PluginDefaults=@RESOURCE_DIR_PREFIX@\StdResource"
 set "CSF_XCAFDefaults=@RESOURCE_DIR_PREFIX@\StdResource"
 set "CSF_TObjDefaults=@RESOURCE_DIR_PREFIX@\StdResource"
 set "CSF_StandardLiteDefaults=@RESOURCE_DIR_PREFIX@\StdResource"
-set "CSF_GraphicShr=TKOpenGl.dll"
 set "CSF_UnitsLexicon=@RESOURCE_DIR_PREFIX@\UnitsAPI\Lexi_Expr.dat"
 set "CSF_UnitsDefinition=@RESOURCE_DIR_PREFIX@\UnitsAPI\Units.dat"
 set "CSF_IGESDefaults=@RESOURCE_DIR_PREFIX@\XSTEPResource"
diff --git a/src/WOKTclLib/templates/env.sh b/src/WOKTclLib/templates/env.sh
index f28b440..6929a05 100755
--- a/src/WOKTclLib/templates/env.sh
+++ b/src/WOKTclLib/templates/env.sh
@@ -179,11 +179,6 @@ export CSF_PluginDefaults="${CASROOT}/src/StdResource"
 export CSF_XCAFDefaults="${CASROOT}/src/StdResource"
 export CSF_TObjDefaults="${CASROOT}/src/StdResource"
 export CSF_StandardLiteDefaults="${CASROOT}/src/StdResource"
-if [ "$WOKSTATION" == "mac" ]; then
-  export CSF_GraphicShr="libTKOpenGl.dylib"
-else
-  export CSF_GraphicShr="libTKOpenGl.so"
-fi
 export CSF_UnitsLexicon="${CASROOT}/src/UnitsAPI/Lexi_Expr.dat"
 export CSF_UnitsDefinition="${CASROOT}/src/UnitsAPI/Units.dat"
 export CSF_IGESDefaults="${CASROOT}/src/XSTEPResource"
diff --git a/src/WOKTclLib/templates/env.sh.in b/src/WOKTclLib/templates/env.sh.in
index 8db7672..1015bee 100644
--- a/src/WOKTclLib/templates/env.sh.in
+++ b/src/WOKTclLib/templates/env.sh.in
@@ -73,11 +73,6 @@ export CSF_PluginDefaults="${aScriptPath}/res/StdResource"
 export CSF_XCAFDefaults="${aScriptPath}/res/StdResource"
 export CSF_TObjDefaults="${aScriptPath}/res/StdResource"
 export CSF_StandardLiteDefaults="${aScriptPath}/res/StdResource"
-if [ "$WOKSTATION" == "mac" ]; then
-  export CSF_GraphicShr="libTKOpenGl.dylib"
-else
-  export CSF_GraphicShr="libTKOpenGl.so"
-fi
 export CSF_UnitsLexicon="${aScriptPath}/res/UnitsAPI/Lexi_Expr.dat"
 export CSF_UnitsDefinition="${aScriptPath}/res/UnitsAPI/Units.dat"
 export CSF_IGESDefaults="${aScriptPath}/res/XSTEPResource"
diff --git a/src/WOKsite/wok_tclshrc.tcl b/src/WOKsite/wok_tclshrc.tcl
index c7af742..1b3e9c6 100644
--- a/src/WOKsite/wok_tclshrc.tcl
+++ b/src/WOKsite/wok_tclshrc.tcl
@@ -520,19 +520,6 @@ proc wenv {} {
     #puts "Warning! 'DrawResourcesProducts' package not found!"
   }
 
-  if { $env(WOKSTATION) == "wnt" } {
-    set aTkGlLib [woklocate -p TKOpenGl:library:TKOpenGl.dll]
-  } elseif { $env(WOKSTATION) == "mac" } {
-    set aTkGlLib [woklocate -p TKOpenGl:library:libTKOpenGl.dylib]
-  } else {
-    set aTkGlLib [woklocate -p TKOpenGl:library:libTKOpenGl.so]
-  }
-  if { $aTkGlLib != "" } {
-    set env(CSF_GraphicShr) $aTkGlLib
-  } else {
-    puts "Warning! 'TKOpenGl'      library not found!"
-  }
-
   puts "Environment configured"
 }