From 39a970133d82163892a9817f24ef7059594739f9 Mon Sep 17 00:00:00 2001 From: ibs Date: Mon, 11 Feb 2013 15:55:16 +0400 Subject: [PATCH] 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 --- collect_binary_without_libs.sh | 2 +- src/WOKBuilderDef/CSF_LIN.edl | 2 +- src/WOKBuilderDef/CSF_MAC.edl | 4 ++-- src/WOKTclLib/templates/custom.sh.in | 4 ++-- src/WOKTclLib/templates/draw.sh | 1 + src/WOKTclLib/templates/env.sh | 6 +++--- src/WOKTclLib/templates/msvc.bat | 8 ++++++-- src/WOKTclLib/templates/template.ac | 6 ++---- src/WOKsite/wok_tclshrc.tcl | 11 ++++++++++- 9 files changed, 28 insertions(+), 16 deletions(-) diff --git a/collect_binary_without_libs.sh b/collect_binary_without_libs.sh index 655a866..a5d8250 100644 --- 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 73e5a98..6c81250 100644 --- 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 41f2f2f..eb07a3d 100644 --- 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 69a0d45..01a87b8 100644 --- 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 8470a91..2e68b3b 100644 --- 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 4875619..89ddb57 100755 --- 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 5036454..7ba7e35 100644 --- 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 3e9f6ff..4d258a0 100644 --- 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 ]) 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 1ae141d..3dac91e 100644 --- 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 -- 2.39.5