0023095: Porting demo and samples on OCCT 6.5.3

Fix for paths in *.vcproj files in MFC sample
Fixed scripts for QT samples on Linux platform

samples/qt/Tutorial/Tutorial.pro

@@ -6,9 +6,6 @@ TARGET = Tutorial
 HEADERS = src/*.h
 SOURCES = src/*.cxx
 
-INCLUDES = $$(CSF_OPT_INC)
-PATHS = $$split(INCLUDES,";")
-for(path, PATHS):INCLUDEPATH += $${path}
 
 TS_FILES = ./src/Common-icon.ts \
            ./src/Common-string.ts \
@@ -18,6 +15,13 @@ TS_FILES = ./src/Common-icon.ts \
 DEFINES = CSFDB
 
 unix {
+    INCLUDES = $$(CSF_OPT_INC)
+    PATHS = $$split(INCLUDES,":")
+    for(path, PATHS):INCLUDEPATH += $${path}
+    LIBLIST = $$(LD_LIBRARY_PATH)
+    LIBPATHS = $$split(LIBLIST,":")
+    for(lib, LIBPATHS):LIBS += -L$${lib}
+    
     CONFIG(debug, debug|release) {
 	DESTDIR = ./Linux/bind
 	OBJECTS_DIR = ./Linux/objd
@@ -29,18 +33,16 @@ unix {
     }
     INCLUDEPATH += $$QMAKE_INCDIR_X11 $$QMAKE_INCDIR_OPENGL $$QMAKE_INCDIR_THREAD
     DEFINES += LIN LININTEL OCC_CONVERT_SIGNALS HAVE_CONFIG_H HAVE_WOK_CONFIG_H
-    LIBS = -L$(CASROOT)/Linux/lib -L$$QMAKE_LIBDIR_X11 $$QMAKE_LIBS_X11 -L$$QMAKE_LIBDIR_OPENGL $$QMAKE_LIBS_OPENGL $$QMAKE_LIBS_THREAD
-    FREEIMAGE_DIR = $$(FREEIMAGEDIR)
-    exists($$FREEIMAGE_DIR) {
-	LIBS += -L$(FREEIMAGEDIR)/lib -lfreeimageplus
-    }
-    TBB_LIB = $$(TBBLIB)
-    exists($$TBB_LIB) {
-	LIBS += -L$(TBBLIB) -ltbb -ltbbmalloc
-    }
+    LIBS += -L$$QMAKE_LIBDIR_X11 $$QMAKE_LIBS_X11 -L$$QMAKE_LIBDIR_OPENGL $$QMAKE_LIBS_OPENGL $$QMAKE_LIBS_THREAD
+	LIBS += -lfreeimageplus
+	LIBS += -ltbb -ltbbmalloc
 }
 
 win32 {
+    INCLUDES = $$(CSF_OPT_INC)
+    PATHS = $$split(INCLUDES,";")
+    for(path, PATHS):INCLUDEPATH += $${path}
+
     CONFIG(debug, debug|release) {
 	DEFINES += _DEBUG
 	!contains(QMAKE_HOST.arch, x86_64) {
@@ -129,11 +131,11 @@ win32 {
     DEFINES +=WNT WIN32 NO_COMMONSAMPLE_EXPORTS NO_IESAMPLE_EXPORTS
 }
 
-LIBS += TKernel.lib PTKernel.lib TKMath.lib TKService.lib TKV3d.lib TKV2d.lib \
-        TKBRep.lib TKIGES.lib TKSTL.lib TKVRML.lib TKSTEP.lib TKSTEPAttr.lib TKSTEP209.lib \
-        TKSTEPBase.lib TKShapeSchema.lib TKGeomBase.lib TKGeomAlgo.lib TKG3d.lib TKG2d.lib \
-        TKXSBase.lib TKPShape.lib TKShHealing.lib TKHLR.lib TKTopAlgo.lib TKMesh.lib TKPrim.lib \
-        TKCDF.lib TKBool.lib TKBO.lib TKFillet.lib TKOffset.lib \
+LIBS += -lTKernel -lPTKernel -lTKMath -lTKService -lTKV3d -lTKV2d \
+        -lTKBRep -lTKIGES -lTKSTL -lTKVRML -lTKSTEP -lTKSTEPAttr -lTKSTEP209 \
+        -lTKSTEPBase -lTKShapeSchema -lTKGeomBase -lTKGeomAlgo -lTKG3d -lTKG2d \
+        -lTKXSBase -lTKPShape -lTKShHealing -lTKHLR -lTKTopAlgo -lTKMesh -lTKPrim \
+        -lTKCDF -lTKBool -lTKBO -lTKFillet -lTKOffset \
 
 lrelease.name = LRELASE ${QMAKE_FILE_IN}
 lrelease.commands = lrelease ${QMAKE_FILE_IN} -qm ./res/${QMAKE_FILE_BASE}.qm
@@ -141,4 +143,4 @@ lrelease.output = ./res/${QMAKE_FILE_BASE}.qm
 lrelease.input = TS_FILES
 lrelease.clean = ./res/${QMAKE_FILE_BASE}.qm
 lrelease.CONFIG += no_link target_predeps
-QMAKE_EXTRA_COMPILERS += lrelease
+QMAKE_EXTRA_COMPILERS += lrelease

samples/qt/Tutorial/custom.sh

@@ -0,0 +1,19 @@
+#!/bin/sh
+
+#Define CASROOT and QTDIR variables in order to generate Makefile files by qmake
+
+export CASROOT=""
+
+export QTDIR=""
+
+if test "${CASROOT}" == ""; then
+   echo "Environment variable \"CASROOT\" not defined."
+   exit 1
+fi
+
+if test "${QTDIR}" == ""; then
+   echo "Environment variable \"QTDIR\" not defined."
+   exit 1
+fi
+
+export PATH=${QTDIR}/bin:${PATH}

samples/qt/Tutorial/env.bat

@@ -1,4 +1,4 @@
 SET RES_DIR=%~dp0res
 SET CSF_ResourcesDefaults=%RES_DIR%
-SET CSF_TuturialResourcesDefaults=%RES_DIR%
+SET CSF_TutorialResourcesDefaults=%RES_DIR%
 

samples/qt/Tutorial/env.sh

@@ -0,0 +1,5 @@
+#!/bin/sh
+
+if [ -e "${aSamplePath}/custom.sh" ]; then source "${aSamplePath}/custom.sh"; fi
+source $CASROOT/env.sh
+export CSF_OPT_INC="${CSF_OPT_INC}${CASROOT}/inc:"

samples/qt/Tutorial/make.sh

@@ -0,0 +1,7 @@
+#!/bin/sh
+
+export aSamplePath="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
+if [ -e "${aSamplePath}/custom.sh" ]; then source "${aSamplePath}/env.sh"; fi
+cd $aSamplePath
+qmake Tutorial.pro
+make

samples/qt/Tutorial/run.sh

@@ -1,58 +1,22 @@
 #!/bin/sh
 
+export aSamplePath="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
+if [ -e "${aSamplePath}/custom.sh" ]; then source "${aSamplePath}/env.sh"; fi
+cd $aSamplePath
+
 host=`uname -s`
-
-PROG_DIR=`dirname $0`
-ROOT_DIR=`(cd $PROG_DIR; pwd)`
-
-if test ! -d "$host/obj"; then
-    QTDIR="$CASROOT/../3rdparty/$host/qt"
-    QT_LD_PATH="$CASROOT/../3rdparty/$host/qt"
-    CASCADE_LD_PATH="$CASROOT/$host/lib"
-    LD_LIBRARY_PATH="${CASCADE_LD_PATH}:${QT_LD_PATH}:${LD_LIBRARY_PATH}"
-fi
 STATION=$host
 
-if test "${CASROOT+set}" != "set"; then
-   echo "Environment variable \"CASROOT\" not defined."
-   CASROOT="$CASCADE_ROOT"
-   if test -n "$CASROOT"; then
-      echo "Try to use CASROOT=$CASROOT"
-   else
-      exit 1
-   fi
-fi
-
-if test ! -d "$CASROOT"; then
-   echo "CasCade root directory \"$CASROOT\" not found."
-   exit 1
-fi
-
-if test "${QTDIR+set}" != "set"; then
-   echo "Environment variable \"QTDIR\" not defined."
-   exit 1
-fi
-
-occ_opengl_lib=libTKOpenGl.so
-
-RES_DIR="${ROOT_DIR}/res"
-BIN_DIR="${ROOT_DIR}/${STATION}/bin"
-
-CSF_GraphicShr="${CASROOT}/${STATION}/lib/${occ_opengl_lib}"
-CSF_UnitsLexicon="${CASROOT}/src/UnitsAPI/Lexi_Expr.dat"
-CSF_UnitsDefinition="${CASROOT}/src/UnitsAPI/Units.dat"
-CSF_MDTVFontDirectory="${CASROOT}/src/FontMFT"
-CSF_MDTVTexturesDirectory="${CASROOT}/src/Textures"
+RES_DIR="${aSamplePath}/res"
+BIN_DIR="${aSamplePath}/${STATION}/bin"
 
 CSF_ResourcesDefaults="${RES_DIR}"
-CSF_TuturialResourcesDefaults="${RES_DIR}"
+CSF_TutorialResourcesDefaults="${RES_DIR}"
 
 PATH="${BIN_DIR}:${PATH}"
 
-export CSF_GraphicShr CSF_UnitsLexicon CSF_UnitsDefinition
-export CSF_MDTVFontDirectory CSF_MDTVTexturesDirectory
-export CSF_TuturialResourcesDefaults CSF_ResourcesDefaults
-export PATH LD_LIBRARY_PATH
+export CSF_TutorialResourcesDefaults CSF_ResourcesDefaults
+export PATH
 
 if test ! -r "${BIN_DIR}/Tutorial"; then
    echo "Executable \"${BIN_DIR}/Tutorial\" not found."
@@ -61,4 +25,3 @@ if test ! -r "${BIN_DIR}/Tutorial"; then
 fi
 
 ${BIN_DIR}/Tutorial
-

samples/qt/Tutorial/src/ApplicationTut.cxx

@@ -58,7 +58,7 @@ void ApplicationTut::onMakeBottleAction()
 
 QString ApplicationTut::getTutResourceDir()
 {
-    static QString resDir( ::getenv( "CSF_TuturialResourcesDefaults" ) );
+    static QString resDir( ::getenv( "CSF_TutorialResourcesDefaults" ) );
     return resDir;
 }