script fixes added

Windows batch scripts - quote paths:
  Removed CSF_DrawPluginQADefaults definition.
  Added DRAWHOME definition.

Bash scripts:
  Linux - setup PATH to 32 bit precompiled Tcl/Tk, bison and flex.
  Fixed libTKOpenGl.dylib / libTKOpenGl.so mismatch.
  Define DRAWHOME and CSF_DrawPluginDefaults variables.
Correctly parse DYLD_LIBRARY_PATH in template env.sh
Make codeblocks.sh workable on Linux too

diff --git a/src/WOKTclLib/templates/env.bat b/src/WOKTclLib/templates/env.bat
index ad7999072602ea0cdd0d526e4cbaeeff150617e5..4ab826614ec982a935fd740ee65e3ae7c14b3217 100644 (file)
--- a/src/WOKTclLib/templates/env.bat
+++ b/src/WOKTclLib/templates/env.bat
@@ -28,8 +28,8 @@ set "CSF_OPT_BIN32="
 set "CSF_OPT_BIN64="
 
 rem ----- Load local settings -----
-if exist %~dp0custom.bat (
-  call %~dp0custom.bat %1 %2 %3 %4 %5
+if exist "%~dp0custom.bat" (
+  call "%~dp0custom.bat" %1 %2 %3 %4 %5
 )
 
 rem ----- Read script arguments (override local settings) -----
@@ -126,8 +126,11 @@ set "CSF_IGESDefaults=%CASROOT%\src\XSTEPResource"
 set "CSF_STEPDefaults=%CASROOT%\src\XSTEPResource"
 set "CSF_XmlOcafResource=%CASROOT%\src\XmlOcafResource"
 set "CSF_MIGRATION_TYPES=%CASROOT%\src\StdResource\MigrationSheet.txt"
-if exist "%CASROOT%\src\QAResources" (
-  set "CSF_DrawPluginQADefaults=%CASROOT%\src\QAResources"
+
+rem Draw Harness special stuff
+if exist "%CASROOT%\src\DrawResources" (
+  set "DRAWHOME=%CASROOT%\src\DrawResources"
+  set "CSF_DrawPluginDefaults=%DRAWHOME%"
 )
 if exist "%SCRIPTROOT%\src\DrawResourcesProducts" (
   set "CSF_DrawPluginProductsDefaults=%SCRIPTROOT%\src\DrawResourcesProducts"

diff --git a/src/WOKTclLib/templates/env.sh b/src/WOKTclLib/templates/env.sh
index 3c8c992aa8586ea919f91d9474bbf06ee64d1c9e..eae1a35de8cae17296143bd1fecde9ad5a95941e 100644 (file)
--- a/src/WOKTclLib/templates/env.sh
+++ b/src/WOKTclLib/templates/env.sh
@@ -117,9 +117,9 @@ 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.so"
-else
   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"
@@ -127,3 +127,12 @@ export CSF_IGESDefaults="${CASROOT}/src/XSTEPResource"
 export CSF_STEPDefaults="${CASROOT}/src/XSTEPResource"
 export CSF_XmlOcafResource="${CASROOT}/src/XmlOcafResource"
 export CSF_MIGRATION_TYPES="${CASROOT}/src/StdResource/MigrationSheet.txt"
+
+# Draw Harness special stuff
+if [ -e "${CASROOT}/src/DrawResources" ]; then
+  export DRAWHOME="${CASROOT}/src/DrawResources"
+  export CSF_DrawPluginDefaults="${DRAWHOME}"
+fi
+if [ -e "${aScriptPath}/src/DrawResourcesProducts" ]; then
+  export CSF_DrawPluginProductsDefaults="${aScriptPath}/src/DrawResourcesProducts"
+fi

diff --git a/src/WOKsite/wok_confgui.bat b/src/WOKsite/wok_confgui.bat
index efee2cdaea18c8d635641d6e3fabb61d00961286..4313b40142ef849a939f173adc2bf9f713f7b8a1 100644 (file)
--- a/src/WOKsite/wok_confgui.bat
+++ b/src/WOKsite/wok_confgui.bat
@@ -3,6 +3,5 @@
 rem This file setup WOK environment (calls 'wok_env.bat' script)
 rem and launches the TCL shell bound to WOK.
 
-call %~dp0wok_env.bat
-
-%TCLBIN%/tclsh85.exe %~dp0wok_depsgui.tcl
+call "%~dp0wok_env.bat"
+"%TCLBIN%/tclsh85.exe" "%~dp0wok_depsgui.tcl"

diff --git a/src/WOKsite/wok_env.bat b/src/WOKsite/wok_env.bat
index 939d03b6fec76341cd969c6b84d4a4bcb0a8cbf4..b045d8701ef910dc77d35db848ef6177f0d6f99e 100644 (file)
--- a/src/WOKsite/wok_env.bat
+++ b/src/WOKsite/wok_env.bat
@@ -20,8 +20,8 @@ set "HAVE_GL2PS=false"
 set "VCVARS="
 
 rem ----- Set local settings (M$ Visual Studio compilers etc.) -----
-if exist %~dp0custom.bat (
-  call %~dp0custom.bat %1 %2 %3 %4 %5
+if exist "%~dp0custom.bat" (
+  call "%~dp0custom.bat" %1 %2 %3 %4 %5
 )
 
 set "PRODUCTS_DEFINES="

diff --git a/src/WOKsite/wok_env.sh b/src/WOKsite/wok_env.sh
index 816b0ac7ec9b22734f246bda39d34b59b6e14713..ce08e5023c8d029131615192672920ab4e5d571d 100644 (file)
--- a/src/WOKsite/wok_env.sh
+++ b/src/WOKsite/wok_env.sh
@@ -78,13 +78,24 @@ export WOKSITE="$WOKHOME/site";
 export WOK_SESSIONID="$HOME";
 
 # ----- Setup Environment Variables PATH and LD_LIBRARY_PATH -----
-export BISON_SIMPLE="$WOKHOME/3rdparty/${WOKSTATION}${ARCH}/codegen/bison.simple"
-export PATH="$WOK_LIBPATH:$PATH"
-export PATH="${WOKHOME}/3rdparty/${WOKSTATION}${ARCH}/codegen:${PATH}"
+# Linux and so on
 aTail=":${LD_LIBRARY_PATH}"
 if [ "$LD_LIBRARY_PATH" == "" ]; then aTail=""; fi
 export LD_LIBRARY_PATH="${WOK_LIBPATH}${aTail}"
-aTail=":$DYLD_LIBRARY_PATH"
+
+# Mac OS X
+aTail=":${DYLD_LIBRARY_PATH}"
 if [ "$DYLD_LIBRARY_PATH" == "" ]; then aTail=""; fi
 export DYLD_LIBRARY_PATH="${WOK_LIBPATH}${aTail}"
 export WOK_LIBPATH="${WOK_LIBRARY}:${WOK_LIBPATH}"
+
+export PATH="$WOK_LIBPATH:$PATH"
+if [ "$WOKSTATION" == "lin" ]; then
+  # always use 32-bit binaries
+  export BISON_SIMPLE="$WOKHOME/3rdparty/lin32/codegen/bison.simple"
+  export PATH="${WOKHOME}/3rdparty/lin32/tcltk/bin:${WOKHOME}/3rdparty/lin32/codegen:${PATH}"
+  export LD_LIBRARY_PATH="${WOKHOME}/3rdparty/lin32/tcltk/lib:${LD_LIBRARY_PATH}"
+else
+  export BISON_SIMPLE="$WOKHOME/3rdparty/${WOKSTATION}${ARCH}/codegen/bison.simple"
+  export PATH="${WOKHOME}/3rdparty/${WOKSTATION}${ARCH}/codegen:${PATH}"
+fi

diff --git a/src/WOKsite/wok_init.bat b/src/WOKsite/wok_init.bat
index 26d543b5269f12cb4971af721e90d7adc7c58b36..7ef143e87a34e400c0e34a5f613639bd774dc08a 100644 (file)
--- a/src/WOKsite/wok_init.bat
+++ b/src/WOKsite/wok_init.bat
@@ -4,8 +4,8 @@ rem This file setup WOK environment  (calls 'wok_env.bat' script)
 rem and perform default initialization according to current environment.
 rem As a result empty :LOC:dev will be created (if not yet exists).
 
-call %~dp0wok_env.bat
-
-rem ----- Create default Factory :Kas:dev -----
-cd %WOK_ROOTADMDIR%
-%TCLBIN%/tclsh85.exe < %WOKHOME%/site/CreateFactory.tcl
+call "%~dp0wok_env.bat"
+set "aPathBack=%CD%"
+cd "%WOK_ROOTADMDIR%"
+"%TCLBIN%/tclsh85.exe" < "%WOKHOME%/site/CreateFactory.tcl"
+cd "%aPathBack%"

diff --git a/src/WOKsite/wok_tclsh.bat b/src/WOKsite/wok_tclsh.bat
index 771aef4785e57a57a400e2f89f11fb8d9222ef04..6b723e85925748865fcbc0e905276f04c2f0ee68 100644 (file)
--- a/src/WOKsite/wok_tclsh.bat
+++ b/src/WOKsite/wok_tclsh.bat
@@ -3,6 +3,8 @@
 rem This file setup WOK environment (calls 'wok_env.bat' script)
 rem and launches the TCL shell bound to WOK.
 
-call %~dp0wok_env.bat
-cd %WOK_ROOTADMDIR%
-%TCLBIN%/tclsh85.exe
+call "%~dp0wok_env.bat"
+set "aPathBack=%CD%"
+cd "%WOK_ROOTADMDIR%"
+"%TCLBIN%/tclsh85.exe"
+cd "%aPathBack%"