From 9220e7851aacae79ea9b7727e398eb1551407c50 Mon Sep 17 00:00:00 2001 From: bugmaster Date: Mon, 30 Apr 2012 14:12:13 +0400 Subject: [PATCH] 0023124: Porting products samples on OCCT 6.5.3 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 | 19 ------------ samples/qt/Common/env.bat | 28 ------------------ samples/qt/Common/generation-vc-projects.bat | 21 ------------- samples/qt/IESample/make.sh | 2 +- samples/qt/IESample/run.sh | 2 +- samples/qt/Interface/Run_MSVC.bat | 19 ------------ samples/qt/Interface/env.bat | 31 -------------------- samples/qt/Tutorial/make.sh | 2 +- samples/qt/Tutorial/run.sh | 2 +- 9 files changed, 4 insertions(+), 122 deletions(-) delete mode 100755 samples/qt/Common/Run_MSVC.bat delete mode 100755 samples/qt/Common/env.bat delete mode 100755 samples/qt/Common/generation-vc-projects.bat delete mode 100755 samples/qt/Interface/Run_MSVC.bat delete mode 100755 samples/qt/Interface/env.bat diff --git a/samples/qt/Common/Run_MSVC.bat b/samples/qt/Common/Run_MSVC.bat deleted file mode 100755 index 974c1e668b..0000000000 --- a/samples/qt/Common/Run_MSVC.bat +++ /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 index 7e47e3e437..0000000000 --- a/samples/qt/Common/env.bat +++ /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 index a495a9d38b..0000000000 --- a/samples/qt/Common/generation-vc-projects.bat +++ /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 diff --git a/samples/qt/IESample/make.sh b/samples/qt/IESample/make.sh index df89ed0b86..765429899f 100644 --- a/samples/qt/IESample/make.sh +++ b/samples/qt/IESample/make.sh @@ -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 diff --git a/samples/qt/IESample/run.sh b/samples/qt/IESample/run.sh index 0732ddaf4a..200b06ba3e 100755 --- a/samples/qt/IESample/run.sh +++ b/samples/qt/IESample/run.sh @@ -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 index 6746d7dff0..0000000000 --- a/samples/qt/Interface/Run_MSVC.bat +++ /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 index 328f690122..0000000000 --- a/samples/qt/Interface/env.bat +++ /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 diff --git a/samples/qt/Tutorial/make.sh b/samples/qt/Tutorial/make.sh index 2ad70910ec..1f7b3acd29 100644 --- a/samples/qt/Tutorial/make.sh +++ b/samples/qt/Tutorial/make.sh @@ -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 diff --git a/samples/qt/Tutorial/run.sh b/samples/qt/Tutorial/run.sh index 2bf6ce8653..bd6790906f 100755 --- a/samples/qt/Tutorial/run.sh +++ b/samples/qt/Tutorial/run.sh @@ -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` -- 2.20.1