From cd960ad4d9cd5709a3865f9b5c919af6c0ed03de Mon Sep 17 00:00:00 2001 From: ibs Date: Mon, 11 Nov 2013 11:54:28 +0400 Subject: [PATCH] 0024331: CMake scripts improvements invariable cmake files moved from wok to adm/cmake_invar folder --- src/WOKTclLib/templates/env.bat.in | 56 ------------------ src/WOKTclLib/templates/env.sh.in | 95 ------------------------------ src/WOKsite/wok_tclshrc.tcl | 6 +- 3 files changed, 1 insertion(+), 156 deletions(-) delete mode 100644 src/WOKTclLib/templates/env.bat.in delete mode 100644 src/WOKTclLib/templates/env.sh.in diff --git a/src/WOKTclLib/templates/env.bat.in b/src/WOKTclLib/templates/env.bat.in deleted file mode 100644 index 20ae357..0000000 --- a/src/WOKTclLib/templates/env.bat.in +++ /dev/null @@ -1,56 +0,0 @@ -echo off - -set "SCRIPTROOT=%~dp0" -set "SCRIPTROOT=%SCRIPTROOT:~0,-1%" - -@CASROOT_DEFINITION@ - -set "FREETYPE_DIR=@3RDPARTY_FREETYPE_DLL_DIR@" -set "GL2PS_DIR=@3RDPARTY_GL2PS_DLL_DIR@" - -set "TBB_DIR=@3RDPARTY_TBB_DLL_DIR@" -set "FREEIMAGE_DIR=@3RDPARTY_FREEIMAGE_DLL_DIR@" - -set "TCL_DIR=@3RDPARTY_TCL_DLL_DIR@" - -set "PATH=%FREETYPE_DIR%;%GL2PS_DIR%;%FREEIMAGE_DIR%;%TBB_DIR%;%TCL_DIR%;%PATH%" - -rem ----- Set path to 3rd party and OCCT libraries ----- -set "PATH=%SCRIPTROOT%\@BIN_DIR_POSTFIX@;%PATH%" - -rem ----- Set envoronment variables used by OCCT ----- -set CSF_LANGUAGE=us -set MMGT_CLEAR=1 -set CSF_EXCEPTION_PROMPT=1 -set "CSF_SHMessage=@RESOURCE_DIR_PREFIX@\SHMessage" -set "CSF_MDTVTexturesDirectory=@RESOURCE_DIR_PREFIX@\Textures" -set "CSF_ShadersDirectory=@RESOURCE_DIR_PREFIX@\Shaders" -set "CSF_XSMessage=@RESOURCE_DIR_PREFIX@\XSMessage" -set "CSF_TObjMessage=@RESOURCE_DIR_PREFIX@\TObj" -set "CSF_StandardDefaults=@RESOURCE_DIR_PREFIX@\StdResource" -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_UnitsLexicon=@RESOURCE_DIR_PREFIX@\UnitsAPI\Lexi_Expr.dat" -set "CSF_UnitsDefinition=@RESOURCE_DIR_PREFIX@\UnitsAPI\Units.dat" -set "CSF_IGESDefaults=@RESOURCE_DIR_PREFIX@\XSTEPResource" -set "CSF_STEPDefaults=@RESOURCE_DIR_PREFIX@\XSTEPResource" -set "CSF_XmlOcafResource=@RESOURCE_DIR_PREFIX@\XmlOcafResource" -set "CSF_MIGRATION_TYPES=@RESOURCE_DIR_PREFIX@\StdResource\MigrationSheet.txt" - -rem Draw Harness special stuff -if exist "@RESOURCE_DIR_PREFIX@\DrawResources" ( - set "DRAWHOME=@RESOURCE_DIR_PREFIX@\DrawResources" - set "CSF_DrawPluginDefaults=@RESOURCE_DIR_PREFIX@\DrawResources" - - if exist "@RESOURCE_DIR_PREFIX@\DrawResources\DrawDefault" ( - set "DRAWDEFAULT=@RESOURCE_DIR_PREFIX@\DrawResources\DrawDefault" - ) -) - -if exist "@RESOURCE_DIR_PREFIX@\DrawResourcesProducts" ( - set "CSF_DrawPluginProductsDefaults=@RESOURCE_DIR_PREFIX@\DrawResourcesProducts" -) - -@RUN_PROJECT@ \ No newline at end of file diff --git a/src/WOKTclLib/templates/env.sh.in b/src/WOKTclLib/templates/env.sh.in deleted file mode 100644 index 1015bee..0000000 --- a/src/WOKTclLib/templates/env.sh.in +++ /dev/null @@ -1,95 +0,0 @@ -echo off - -aScriptPath=${BASH_SOURCE%/*}; if [ -d "${aScriptPath}" ]; then cd "$aScriptPath"; fi; aScriptPath="$PWD"; - -FREETYPE_DIR="@3RDPARTY_FREETYPE_DLL_DIR@" -GL2PS_DIR="@3RDPARTY_GL2PS_DLL_DIR@" - -TBB_DIR="@3RDPARTY_TBB_DLL_DIR@" -FREEIMAGE_DIR="@3RDPARTY_FREEIMAGE_DLL_DIR@" - -TCL_DIR="@3RDPARTY_TCL_DLL_DIR@" - -aLibPath="$aScriptPath/lib" -if [ "$TCL_DIR" != "" ]; then - aLibPath="${TCL_DIR}:${aLibPath}" -fi -if [ "$TBB_DIR" != "" ]; then - aLibPath="${TBB_DIR}:${aLibPath}" -fi -if [ "$FREEIMAGE_DIR" != "" ]; then - aLibPath="${FREEIMAGE_DIR}:${aLibPath}" -fi -if [ "$GL2PS_DIR" != "" ]; then - aLibPath="${GL2PS_DIR}:${aLibPath}" -fi -if [ "$FREETYPE_DIR" != "" ]; then - aLibPath="${FREETYPE_DIR}:${aLibPath}" -fi - -# ----- Set path to 3rd party and OCCT libraries ----- -aSystem=`uname -s` -if [ "$aSystem" == "Darwin" ]; then - export WOKSTATION="mac"; - if [ "$DYLD_LIBRARY_PATH" != "" ]; then - export DYLD_LIBRARY_PATH="${aLibPath}:${DYLD_LIBRARY_PATH}" - else - export DYLD_LIBRARY_PATH="${aLibPath}" - fi -else - export WOKSTATION="lin"; - if [ "$LD_LIBRARY_PATH" != "" ]; then - export LD_LIBRARY_PATH="${aLibPath}:${LD_LIBRARY_PATH}" - else - export LD_LIBRARY_PATH="${aLibPath}" - fi -fi - -# ----- Set path to OCCT executables ----- -PATH="${PATH}:$aScriptPath/bin" - -# ----- Setup Environment Variables ----- -anArch=`uname -m` -if [ "$anArch" != "x86_64" ] && [ "$anArch" != "ia64" ]; then - export ARCH="32"; -else - export ARCH="64"; -fi -if [ "$aSystem" == "Darwin" ]; then - export ARCH="64"; -fi - -# ----- Set envoronment variables used by OCCT ----- -export CSF_LANGUAGE=us -export MMGT_CLEAR=1 -export CSF_EXCEPTION_PROMPT=1 -export CSF_SHMessage="${aScriptPath}/res/SHMessage" -export CSF_MDTVTexturesDirectory="${aScriptPath}/res/Textures" -export CSF_ShadersDirectory="${aScriptPath}/res/Shaders" -export CSF_XSMessage="SCRIPTROOT/res/XSMessage" -export CSF_TObjMessage="SCRIPTROOT/res/TObj" -export CSF_StandardDefaults="${aScriptPath}/res/StdResource" -export CSF_PluginDefaults="${aScriptPath}/res/StdResource" -export CSF_XCAFDefaults="${aScriptPath}/res/StdResource" -export CSF_TObjDefaults="${aScriptPath}/res/StdResource" -export CSF_StandardLiteDefaults="${aScriptPath}/res/StdResource" -export CSF_UnitsLexicon="${aScriptPath}/res/UnitsAPI/Lexi_Expr.dat" -export CSF_UnitsDefinition="${aScriptPath}/res/UnitsAPI/Units.dat" -export CSF_IGESDefaults="${aScriptPath}/res/XSTEPResource" -export CSF_STEPDefaults="${aScriptPath}/res/XSTEPResource" -export CSF_XmlOcafResource="${aScriptPath}/res/XmlOcafResource" -export CSF_MIGRATION_TYPES="${aScriptPath}/res/StdResource/MigrationSheet.txt" - -# Draw Harness special stuff -if [ -e "${aScriptPath}/res/DrawResources" ]; then - export DRAWHOME="${aScriptPath}/res/DrawResources" - export CSF_DrawPluginDefaults="${aScriptPath}/res/DrawResources" - - if [ -e "${aScriptPath}/res/DrawResources/DrawDefault" ]; then - export DRAWDEFAULT="${aScriptPath}/res/DrawResources/DrawDefault" - fi -fi - -if [ -e "${aScriptPath}/res/DrawResourcesProducts" ]; then - export CSF_DrawPluginProductsDefaults="${aScriptPath}/res/DrawResourcesProducts" -fi \ No newline at end of file diff --git a/src/WOKsite/wok_tclshrc.tcl b/src/WOKsite/wok_tclshrc.tcl index 1b3e9c6..62e50f5 100644 --- a/src/WOKsite/wok_tclshrc.tcl +++ b/src/WOKsite/wok_tclshrc.tcl @@ -272,11 +272,7 @@ proc wgenprojbat {thePath theIDE} { file copy -force -- "$::env(WOKHOME)/lib/config.h" "$aBox/inc/config.h" } - if {"$theIDE" == "cmake"} { - file copy -force -- "$::env(WOKHOME)/lib/templates/draw.${aTargetPlatformExt}" "$aBox/adm/cmake/draw.${aTargetPlatformExt}" - file copy -force -- "$::env(WOKHOME)/lib/templates/env.${aTargetPlatformExt}.in" "$aBox/adm/cmake/env.${aTargetPlatformExt}.in" - } else { - + if {"$theIDE" != "cmake"} { set anEnvTmplFile [open "$::env(WOKHOME)/lib/templates/env.${aTargetPlatformExt}" "r"] set anEnvTmpl [read $anEnvTmplFile] close $anEnvTmplFile -- 2.39.5