0023608: configure scripts reports on failed multibuf.h

0023742: Fix msvc script for Visual Studio 2012
0023740: WOK doesn't correctly generate make files

copying of files without extensions placed in templates folder added
-fexceptions options added in make
__CASBIN__ variable added

diff --git a/collect_binary_without_libs.sh b/collect_binary_without_libs.sh
index 655a866b291939f6f61e883ae6c3f5664fcdc8b1..a5d8250b64a71d29be0ff158be08290ca0af5865 100644 (file)
--- a/collect_binary_without_libs.sh
+++ b/collect_binary_without_libs.sh
@@ -173,7 +173,7 @@ cp -f src/WOKBuilderDef/USECONFIG.edl $installRelatePath/lib/
 cp -f src/WOKTclLib/templates/template.mam $installRelatePath/lib/
 cp -f src/WOKTclLib/templates/template.mamx $installRelatePath/lib/
 
-cp -r src/WOKTclLib/templates/*.* $installRelatePath/lib/templates/
+cp -r src/WOKTclLib/templates/* $installRelatePath/lib/templates/
 
 cp -f src/WOKTclLib/tclIndex $installRelatePath/lib/
 cp -f src/WOKTclLib/abstract.xpm $installRelatePath/lib/

diff --git a/src/WOKBuilderDef/CSF_LIN.edl b/src/WOKBuilderDef/CSF_LIN.edl
index 73e5a98131aaabfd0fc6c54265d0e0215f8dc19b..6c81250bdff0c3501e82571e6330c860bf1ad5e8 100644 (file)
--- a/src/WOKBuilderDef/CSF_LIN.edl
+++ b/src/WOKBuilderDef/CSF_LIN.edl
@@ -21,7 +21,7 @@
   @set %CSF_C_COMPILER = "gcc ";
   @string %CSF_C_INCLUDE +=  "";
   @set %CSF_C_SysOptions = " -fPIC -DPIC";
-  @set %CSF_C_Options    = " -DLIN -DLININTEL -D_GNU_SOURCE=1 ";
+  @set %CSF_C_Options    = " -DLIN -DLININTEL -D_GNU_SOURCE=1 -fexceptions";
   @set %CSF_C_ModeOpt    = " -O3 -DNDEBUG -DNo_Exception ";
   @set %CSF_C_ModeOptDeb = " -O0 -g -DDEB -D_DEBUG ";
 

diff --git a/src/WOKBuilderDef/CSF_MAC.edl b/src/WOKBuilderDef/CSF_MAC.edl
index 41f2f2f7f2f4ebf6d17dc8cf1e23bb233606a55f..eb07a3d66e17f1c8ac49cf4b340d5c2b0476d167 100644 (file)
--- a/src/WOKBuilderDef/CSF_MAC.edl
+++ b/src/WOKBuilderDef/CSF_MAC.edl
@@ -25,8 +25,8 @@
   @set %CSF_C_COMPILER = "gcc ";
   @string %CSF_C_INCLUDE +=  "";
 
-  @set %CSF_C_SysOptions = " -fPIC -funsigned-char -Wall -fexceptions";
-  @set %CSF_C_Options    = "";
+  @set %CSF_C_SysOptions = " -fPIC -funsigned-char -Wall";
+  @set %CSF_C_Options    = " -fexceptions";
   @set %CSF_C_ModeOpt    = " -O3 -DNDEBUG -DNo_Exception ";
   @set %CSF_C_ModeOptDeb = " -gdwarf-2 -O0 -DDEB -D_DEBUG ";
 

diff --git a/src/WOKTclLib/templates/custom.sh.in b/src/WOKTclLib/templates/custom.sh.in
index 69a0d452edfcbd2122ff5ae05477a8cf4c83f2d3..01a87b847222b634d01e3380cf6891ffe98671d2 100644 (file)
--- a/src/WOKTclLib/templates/custom.sh.in
+++ b/src/WOKTclLib/templates/custom.sh.in
@@ -1,5 +1,5 @@
 #!/bin/bash
-
+#
 # Mandatory 3rd-parties switches
 export HAVE_FREETYPE=@HAVE_FREETYPE@
 export HAVE_FTGL=@HAVE_FTGL@
@@ -9,7 +9,7 @@ export HAVE_FREEIMAGE=@HAVE_FREEIMAGE@
 export HAVE_GL2PS=@HAVE_GL2PS@
 export HAVE_TBB=@HAVE_TBB@
 export HAVE_QT=@HAVE_QT@
-
+#
 export CSF_OPT_INC="@CSF_OPT_INC@"
 export CSF_OPT_LIB@ARCH@="@CSF_OPT_LIB@"
 export CSF_OPT_BIN@ARCH@="@CSF_OPT_BIN@"

diff --git a/src/WOKTclLib/templates/draw.sh b/src/WOKTclLib/templates/draw.sh
index 8470a919900bf499ca2341a868ddd1ea857f4c6e..2e68b3be9d6c3b9126de06000d6f9eb186f852e1 100644 (file)
--- a/src/WOKTclLib/templates/draw.sh
+++ b/src/WOKTclLib/templates/draw.sh
@@ -2,4 +2,5 @@
 
 source ./env.sh "$1"
 
+echo 'Hint: use "pload ALL" command to load standard commands'
 DRAWEXE

diff --git a/src/WOKTclLib/templates/env.sh b/src/WOKTclLib/templates/env.sh
index 48756197e6b060fd6e5380940cbe75a8d94a3773..89ddb5794cfb48c2e7b8aebab75cae11c7a24783 100755 (executable)
--- a/src/WOKTclLib/templates/env.sh
+++ b/src/WOKTclLib/templates/env.sh
@@ -48,7 +48,7 @@ else
   export WOKSTATION="lin";
 fi
 
-export CASBIN="${WOKSTATION}/cbp"
+export CASBIN="__CASBIN__"
 
 export CSF_OPT_CMPL=""
 
@@ -111,8 +111,8 @@ else
   export CSF_OPT_LNK32D="$OPT_LINKER_OPTIONS"
 fi
 
-export PATH="${CASROOT}/${CASBIN}/bin${CASDEB}:${PATH}"
-export LD_LIBRARY_PATH="${CASROOT}/${CASBIN}/lib${CASDEB}:${LD_LIBRARY_PATH}"
+export PATH="${CASROOT}/${CASBIN}bin${CASDEB}:${PATH}"
+export LD_LIBRARY_PATH="${CASROOT}/${CASBIN}lib${CASDEB}:${LD_LIBRARY_PATH}"
 if [ "$WOKSTATION" == "mac" ]; then
   export DYLD_LIBRARY_PATH="${LD_LIBRARY_PATH}:${DYLD_LIBRARY_PATH}"
 fi

diff --git a/src/WOKTclLib/templates/msvc.bat b/src/WOKTclLib/templates/msvc.bat
index 5036454fee81acfda36a0cbdc912e38565bcaf0a..7ba7e35863be27b03561af5c0a57c7d3e6f05dbe 100644 (file)
--- a/src/WOKTclLib/templates/msvc.bat
+++ b/src/WOKTclLib/templates/msvc.bat
@@ -10,6 +10,8 @@ if not "%4" == "" (
   set "PRJFILE=%4"
 )
 
+set "VisualStudioExpressName=VCExpress"
+
 if "%VCVER%" == "vc8" (
   set "DevEnvDir=%VS80COMNTOOLS%..\IDE"
 ) else if "%VCVER%" == "vc9" (
@@ -18,6 +20,8 @@ if "%VCVER%" == "vc8" (
   set "DevEnvDir=%VS100COMNTOOLS%..\IDE"
 ) else if "%VCVER%" == "vc11" (
   set "DevEnvDir=%VS110COMNTOOLS%..\IDE"
+  rem Visual Studio 2012 Express for Windows Desktop have a new name for executable - WDExpress
+  set "VisualStudioExpressName=WDExpress"
 ) else (
   echo Error: wrong VS identifier
   exit /B
@@ -26,8 +30,8 @@ if "%VCVER%" == "vc8" (
 rem Launch Visual Studio - either professional (devenv) or Express, as available
 if exist "%DevEnvDir%\devenv.exe"  (
   start "%DevEnvDir%\devenv.exe" "%PRJFILE%"
-) else if exist "%DevEnvDir%\VCExpress.exe"  (
-  start "%DevEnvDir%\VCExpress.exe" "%PRJFILE%"
+) else if exist "%DevEnvDir%\%VisualStudioExpressName%.exe"  (
+  start "%DevEnvDir%\%VisualStudioExpressName%.exe" "%PRJFILE%"
 ) else (
   echo Error: Could not find MS Visual Studio ^(%VCVER%^)
   echo Check relevant environment variable ^(e.g. VS80COMNTOOLS for vc8^)

diff --git a/src/WOKTclLib/templates/template.ac b/src/WOKTclLib/templates/template.ac
index 3e9f6ffc7e78d556c50b9b9ad547296fa231ae32..4d258a0c7bcad9c10f421dae3a74d501a8333687 100644 (file)
--- a/src/WOKTclLib/templates/template.ac
+++ b/src/WOKTclLib/templates/template.ac
@@ -1,5 +1,5 @@
 dnl Process this file with autoconf to produce a configure script.
-AC_INIT([OpenCASCADE], [6.5.3])
+AC_INIT([OpenCASCADE], [6.5.4])
 AC_CONFIG_AUX_DIR(make)
 AM_INIT_AUTOMAKE([foreign])
 AC_CANONICAL_HOST
@@ -54,9 +54,7 @@ AC_CHECK_HEADERS(stream.h strstream.h istream.h ostream.h fstream.h stdlib.h ios
 AC_CHECK_HEADERS(iomanip.h limits.h values.h float.h)
 AC_CHECK_HEADERS(siginfo.h bits/sigset.h bstring.h sys/types.h sys/select.h)
 AC_CHECK_HEADERS(X11/extensions/transovl.h X11/extensions/readdisplay.h)
-AC_CHECK_HEADERS(X11/extensions/multibuf.h)
-AC_CHECK_HEADERS(sys/filio.h sys/mman.h libc.h)
-AC_CHECK_HEADERS(X11/extensions/multibuf.h)
+AC_CHECK_HEADERS(X11/extensions/multibuf.h,[],[],[#include <X11/Xlib.h>])
 AC_CHECK_HEADERS(sys/filio.h sys/mman.h libc.h)
 
 #-----------------------------------------------------------------------------

diff --git a/src/WOKsite/wok_tclshrc.tcl b/src/WOKsite/wok_tclshrc.tcl
index 1ae141dc7d96b424908bba726c3014f09296723a..3dac91e175b8fe228528fa0aca4d63c22734586d 100644 (file)
--- a/src/WOKsite/wok_tclshrc.tcl
+++ b/src/WOKsite/wok_tclshrc.tcl
@@ -267,8 +267,17 @@ proc wgenprojbat {thePath theIDE} {
     }
     set anOsIncPath [relativePath "$aBox" "$anOsRootPath"]
 
-    regsub -all -- {__CASROOT__}     $anEnvTmpl "$aCasRoot"    anEnvTmpl
+    if { "$theIDE" == "amk" } {
+      regsub -all -- {__CASROOT__}   $anEnvTmpl "\$PWD" anEnvTmpl
+      regsub -all -- {__CASBIN__}    $anEnvTmpl ""      anEnvTmpl
+      
+    } else {
+      regsub -all -- {__CASROOT__}   $anEnvTmpl "$aCasRoot"    anEnvTmpl
+      regsub -all -- {__CASBIN__}    $anEnvTmpl "\${WOKSTATION}/cbp/" anEnvTmpl
+    }
+    
     regsub -all -- {__CSF_OPT_INC__} $anEnvTmpl "$anOsIncPath" anEnvTmpl
+    
     if { "$::tcl_platform(platform)" != "windows" } {
       if { "$::ARCH" == "32"} {
         regsub -all -- {__CSF_OPT_LIB32__}  $anEnvTmpl "${anOsRootPath}/${::env(WOKSTATION)}/cbp/lib"  anEnvTmpl