0023124: Porting products samples on OCCT 6.5.3
authorbugmaster <bugmaster@opencascade.com>
Mon, 30 Apr 2012 10:12:13 +0000 (14:12 +0400)
committerbugmaster <bugmaster@opencascade.com>
Mon, 30 Apr 2012 10:12:13 +0000 (14:12 +0400)
Removed redundant scripts from samples/qt/Common and samples/qt/Interface folders
Fixed Linux scripts for Tutorial and ImportExport samples

samples/qt/Common/Run_MSVC.bat [deleted file]
samples/qt/Common/env.bat [deleted file]
samples/qt/Common/generation-vc-projects.bat [deleted file]
samples/qt/IESample/make.sh
samples/qt/IESample/run.sh
samples/qt/Interface/Run_MSVC.bat [deleted file]
samples/qt/Interface/env.bat [deleted file]
samples/qt/Tutorial/make.sh
samples/qt/Tutorial/run.sh

diff --git a/samples/qt/Common/Run_MSVC.bat b/samples/qt/Common/Run_MSVC.bat
deleted file mode 100755 (executable)
index 974c1e6..0000000
+++ /dev/null
@@ -1,19 +0,0 @@
-@ECHO OFF
-
-call env.bat
-
-IF NOT DEFINED QTDIR GOTO ERR_QTDIR
-
-REM *** To start build on MSVC6 ***
-REM msdev.exe Common.dsw
-
-REM *** To start build on MSVC7 ***
-start "%VS71COMNTOOLS%\..\IDE\devenv.exe" Common.sln
-
-GOTO END
-
-:ERR_QTDIR
-ECHO Environment variable "QTDIR" has not been defined. Abort.
-GOTO END
-
-:END
diff --git a/samples/qt/Common/env.bat b/samples/qt/Common/env.bat
deleted file mode 100755 (executable)
index 7e47e3e..0000000
+++ /dev/null
@@ -1,28 +0,0 @@
-@ECHO OFF
-
-IF NOT DEFINED CASROOT GOTO ERR_CASROOT
-
-IF NOT EXIST "%CASROOT%\win32\bin\TKernel.dll" GOTO ERR_CASCADE
-
-SET CASLIBS=%CASROOT%\win32\bin
-
-SET ROOT=%CASROOT%\..
-
-SET RES_DIR=res
-SET BIN_DIR=win32\bin
-
-SET CSF_ResourcesDefaults=%RES_DIR%
-
-SET PATH=%CASLIBS%;%QTDIR%\bin;%PATH%
-
-GOTO END
-
-:ERR_CASROOT
-ECHO Environment variable "CASROOT" has not been defined. Abort.
-EXIT
-
-:ERR_CASCADE
-ECHO Environment variable "CASROOT" defined incorrectly. Abort.
-EXIT
-
-:END
diff --git a/samples/qt/Common/generation-vc-projects.bat b/samples/qt/Common/generation-vc-projects.bat
deleted file mode 100755 (executable)
index a495a9d..0000000
+++ /dev/null
@@ -1,21 +0,0 @@
-@ECHO OFF
-
-call env.bat
-
-IF NOT DEFINED QTDIR GOTO ERR_QTDIR
-
-SET PATH=%QTDIR%\bin;%PATH%
-
-SET TMP_CASROOT=%CASROOT%
-SET CASROOT=
-
-qmake -tp vc -r IESample.pro
-
-SET CASROOT=%TMP_CASROOT%
-GOTO END
-
-:ERR_QTDIR
-ECHO Environment variable "QTDIR" has not been defined. Abort.
-GOTO END
-
-:END
index df89ed0..7654298 100644 (file)
@@ -1,7 +1,7 @@
 #!/bin/sh
 
 export aSamplePath="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
-if [ -e "${aSamplePath}/custom.sh" ]; then source "${aSamplePath}/env.sh"; fi
+if [ -e "${aSamplePath}/env.sh" ]; then source "${aSamplePath}/env.sh"; fi
 cd $aSamplePath
 qmake IESample.pro
 make
index 0732dda..200b06b 100755 (executable)
@@ -1,7 +1,7 @@
 #!/bin/sh
 
 export aSamplePath="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
-if [ -e "${aSamplePath}/custom.sh" ]; then source "${aSamplePath}/env.sh"; fi
+if [ -e "${aSamplePath}/env.sh" ]; then source "${aSamplePath}/env.sh"; fi
 cd $aSamplePath
 
 host=`uname -s`
diff --git a/samples/qt/Interface/Run_MSVC.bat b/samples/qt/Interface/Run_MSVC.bat
deleted file mode 100755 (executable)
index 6746d7d..0000000
+++ /dev/null
@@ -1,19 +0,0 @@
-@ECHO OFF
-
-call env.bat
-
-IF NOT DEFINED QTDIR GOTO ERR_QTDIR
-
-REM *** To start build on MSVC6 ***
-REM msdev.exe Interface.dsw
-
-REM *** To start build on MSVC7 ***
-start "%VS71COMNTOOLS%\..\IDE\devenv.exe" Interface.sln
-
-GOTO END
-
-:ERR_QTDIR
-ECHO Environment variable "QTDIR" not defined. Abort.
-GOTO END
-
-:END
diff --git a/samples/qt/Interface/env.bat b/samples/qt/Interface/env.bat
deleted file mode 100755 (executable)
index 328f690..0000000
+++ /dev/null
@@ -1,31 +0,0 @@
-@ECHO OFF
-
-IF NOT DEFINED CASROOT GOTO ERR_CASROOT
-
-IF NOT EXIST "%CASROOT%\win32\bin\TKernel.dll" GOTO ERR_CASCADE
-
-SET CASLIBS=%CASROOT%\win32\bin
-
-SET ROOT=%CASROOT%\..
-
-SET RES_DIR=res
-SET BIN_DIR=win32\bin
-
-SET CSF_ResourcesDefaults=..\Common\res
-SET CSF_IEResourcesDefaults=%RES_DIR%
-
-SET COMMONROOT=..\Common
-
-SET PATH=%COMMONROOT%\win32\bin;%CASLIBS%;%QTDIR%\bin;%PATH%
-
-GOTO END
-
-:ERR_CASROOT
-ECHO Environment variable "CASROOT" has not been defined. Abort.
-EXIT
-
-:ERR_CASCADE
-ECHO Environment variable "CASROOT" defined incorrectly. Abort.
-EXIT
-
-:END
index 2ad7091..1f7b3ac 100644 (file)
@@ -1,7 +1,7 @@
 #!/bin/sh
 
 export aSamplePath="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
-if [ -e "${aSamplePath}/custom.sh" ]; then source "${aSamplePath}/env.sh"; fi
+if [ -e "${aSamplePath}/env.sh" ]; then source "${aSamplePath}/env.sh"; fi
 cd $aSamplePath
 qmake Tutorial.pro
 make
index 2bf6ce8..bd67909 100755 (executable)
@@ -1,7 +1,7 @@
 #!/bin/sh
 
 export aSamplePath="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
-if [ -e "${aSamplePath}/custom.sh" ]; then source "${aSamplePath}/env.sh"; fi
+if [ -e "${aSamplePath}/env.sh" ]; then source "${aSamplePath}/env.sh"; fi
 cd $aSamplePath
 
 host=`uname -s`