From cef552a741f24b7791368b6bba94624df42ef4a4 Mon Sep 17 00:00:00 2001 From: Oswald Buddenhagen Date: Tue, 11 Sep 2012 14:56:49 +0200 Subject: remove setcepaths.bat we don't need it any more, as the makefiles are self-contained now. Change-Id: I1a560a8331856e246e03c55ec1b1dd1a5cb112e4 Reviewed-by: Andreas Holzammer Reviewed-by: Joerg Bornemann --- bin/setcepaths.bat | 163 --------------------------------------- tools/configure/configureapp.cpp | 3 - 2 files changed, 166 deletions(-) delete mode 100755 bin/setcepaths.bat diff --git a/bin/setcepaths.bat b/bin/setcepaths.bat deleted file mode 100755 index e9f588b69f..0000000000 --- a/bin/setcepaths.bat +++ /dev/null @@ -1,163 +0,0 @@ -::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::: -:: -:: Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies). -:: Contact: http://www.qt-project.org/ -:: -:: This file is part of the tools applications of the Qt Toolkit. -:: -:: $QT_BEGIN_LICENSE:LGPL$ -:: GNU Lesser General Public License Usage -:: This file may be used under the terms of the GNU Lesser General Public -:: License version 2.1 as published by the Free Software Foundation and -:: appearing in the file LICENSE.LGPL included in the packaging of this -:: file. Please review the following information to ensure the GNU Lesser -:: General Public License version 2.1 requirements will be met: -:: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. -:: -:: In addition, as a special exception, Nokia gives you certain additional -:: rights. These rights are described in the Nokia Qt LGPL Exception -:: version 1.1, included in the file LGPL_EXCEPTION.txt in this package. -:: -:: GNU General Public License Usage -:: Alternatively, this file may be used under the terms of the GNU General -:: Public License version 3.0 as published by the Free Software Foundation -:: and appearing in the file LICENSE.GPL included in the packaging of this -:: file. Please review the following information to ensure the GNU General -:: Public License version 3.0 requirements will be met: -:: http://www.gnu.org/copyleft/gpl.html. -:: -:: Other Usage -:: Alternatively, this file may be used in accordance with the terms and -:: conditions contained in a signed written agreement between you and Nokia. -:: -:: -:: -:: -:: -:: -:: $QT_END_LICENSE$ -:: -::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::: -@echo off -IF "%1" EQU "wincewm50pocket-msvc2005" ( -checksdk.exe -sdk "Windows Mobile 5.0 Pocket PC SDK (ARMV4I)" -script tmp_created_script_setup.bat 1>NUL -tmp_created_script_setup.bat -del tmp_created_script_setup.bat -echo Windows Mobile 5.01 for Pocket PC selected, environment is set up -) ELSE IF "%1" EQU "wincewm50smart-msvc2005" ( -checksdk.exe -sdk "Windows Mobile 5.0 Smartphone SDK (ARMV4I)" -script tmp_created_script_setup.bat 1>NUL -tmp_created_script_setup.bat -del tmp_created_script_setup.bat -echo Windows Mobile 5.01 for Smartphone for arm selected, environment is set up -) ELSE IF "%1" EQU "wince50standard-x86-msvc2005" ( -checksdk.exe -sdk "STANDARDSDK_500 (x86)" -script tmp_created_script_setup.bat 1>NUL -tmp_created_script_setup.bat -del tmp_created_script_setup.bat -echo Standard SDK selected, environment is set up -) ELSE IF "%1" EQU "wince50standard-armv4i-msvc2005" ( -checksdk.exe -sdk "STANDARDSDK_500 (ARMV4I)" -script tmp_created_script_setup.bat 1>NUL -tmp_created_script_setup.bat -del tmp_created_script_setup.bat -echo Standard SDK for arm selected, environment is set up -) ELSE IF "%1" EQU "wince50standard-mipsii-msvc2005" ( -checksdk.exe -sdk "STANDARDSDK_500 (MIPSII)" -script tmp_created_script_setup.bat 1>NUL -tmp_created_script_setup.bat -del tmp_created_script_setup.bat -echo Standard SDK for mips-ii selected, environment is set up -) ELSE IF "%1" EQU "wince50standard-mipsiv-msvc2005" ( -checksdk.exe -sdk "STANDARDSDK_500 (MIPSIV)" -script tmp_created_script_setup.bat 1>NUL -tmp_created_script_setup.bat -del tmp_created_script_setup.bat -echo Standard SDK for mips-iv selected, environment is set up -) ELSE IF "%1" EQU "wince50standard-sh4-msvc2005" ( -checksdk.exe -sdk "STANDARDSDK_500 (SH4)" -script tmp_created_script_setup.bat 1>NUL -tmp_created_script_setup.bat -del tmp_created_script_setup.bat -echo Standard SDK for sh4 selected, environment is set up -) ELSE IF "%1" EQU "wincewm60professional-msvc2005" ( -checksdk.exe -sdk "Windows Mobile 6 Professional SDK (ARMV4I)" -script tmp_created_script_setup.bat 1>NUL -tmp_created_script_setup.bat -del tmp_created_script_setup.bat -echo Windows Mobile 6 Professional selected, environment is set up -) ELSE IF "%1" EQU "wincewm65professional-msvc2005" ( -checksdk.exe -sdk "Windows Mobile 6 Professional SDK (ARMV4I)" -script tmp_created_script_setup.bat 1>NUL -tmp_created_script_setup.bat -del tmp_created_script_setup.bat -echo Windows Mobile 6 Professional selected, environment is set up -) ELSE IF "%1" EQU "wincewm60standard-msvc2005" ( -checksdk.exe -sdk "Windows Mobile 6 Standard SDK (ARMV4I)" -script tmp_created_script_setup.bat 1>NUL -tmp_created_script_setup.bat -del tmp_created_script_setup.bat -echo Windows Mobile 6 Standard selected, environment is set up -) ELSE IF "%1" EQU "wincewm50pocket-msvc2008" ( -checksdk.exe -sdk "Windows Mobile 5.0 Pocket PC SDK (ARMV4I)" -script tmp_created_script_setup.bat 1>NUL -tmp_created_script_setup.bat -del tmp_created_script_setup.bat -echo Windows Mobile 5.01 for Pocket PC selected, environment is set up -) ELSE IF "%1" EQU "wincewm50smart-msvc2008" ( -checksdk.exe -sdk "Windows Mobile 5.0 Smartphone SDK (ARMV4I)" -script tmp_created_script_setup.bat 1>NUL -tmp_created_script_setup.bat -del tmp_created_script_setup.bat -echo Windows Mobile 5.01 for Smartphone for arm selected, environment is set up -) ELSE IF "%1" EQU "wince50standard-x86-msvc2008" ( -checksdk.exe -sdk "STANDARDSDK_500 (x86)" -script tmp_created_script_setup.bat 1>NUL -tmp_created_script_setup.bat -del tmp_created_script_setup.bat -echo Standard SDK selected, environment is set up -) ELSE IF "%1" EQU "wince50standard-armv4i-msvc2008" ( -checksdk.exe -sdk "STANDARDSDK_500 (ARMV4I)" -script tmp_created_script_setup.bat 1>NUL -tmp_created_script_setup.bat -del tmp_created_script_setup.bat -echo Standard SDK for arm selected, environment is set up -) ELSE IF "%1" EQU "wince50standard-mipsii-msvc2008" ( -checksdk.exe -sdk "STANDARDSDK_500 (MIPSII)" -script tmp_created_script_setup.bat 1>NUL -tmp_created_script_setup.bat -del tmp_created_script_setup.bat -echo Standard SDK for mips-ii selected, environment is set up -) ELSE IF "%1" EQU "wince50standard-mipsiv-msvc2008" ( -checksdk.exe -sdk "STANDARDSDK_500 (MIPSIV)" -script tmp_created_script_setup.bat 1>NUL -tmp_created_script_setup.bat -del tmp_created_script_setup.bat -echo Standard SDK for mips-iv selected, environment is set up -) ELSE IF "%1" EQU "wince50standard-sh4-msvc2008" ( -checksdk.exe -sdk "STANDARDSDK_500 (SH4)" -script tmp_created_script_setup.bat 1>NUL -tmp_created_script_setup.bat -del tmp_created_script_setup.bat -echo Standard SDK for sh4 selected, environment is set up -) ELSE IF "%1" EQU "wincewm60professional-msvc2008" ( -checksdk.exe -sdk "Windows Mobile 6 Professional SDK (ARMV4I)" -script tmp_created_script_setup.bat 1>NUL -tmp_created_script_setup.bat -del tmp_created_script_setup.bat -echo Windows Mobile 6 Professional selected, environment is set up -) ELSE IF "%1" EQU "wincewm65professional-msvc2008" ( -checksdk.exe -sdk "Windows Mobile 6 Professional SDK (ARMV4I)" -script tmp_created_script_setup.bat 1>NUL -tmp_created_script_setup.bat -del tmp_created_script_setup.bat -echo Windows Mobile 6 Professional selected, environment is set up -) ELSE IF "%1" EQU "wincewm60standard-msvc2008" ( -checksdk.exe -sdk "Windows Mobile 6 Standard SDK (ARMV4I)" -script tmp_created_script_setup.bat 1>NUL -tmp_created_script_setup.bat -del tmp_created_script_setup.bat -echo Windows Mobile 6 Standard selected, environment is set up -) ELSE ( -echo no SDK to build Windows CE selected -echo. -echo Current choices are: -echo wincewm50pocket-msvc2005 - SDK for Windows Mobile 5.01 PocketPC -echo wincewm50smart-msvc2005 - SDK for Windows Mobile 5.01 Smartphone -echo wince50standard-x86-msvc2005 - Build for the WinCE standard SDK 5.0 -echo with x86 platform preset -echo wince50standard-armv4i-msvc2005 - Build for the WinCE standard SDK 5.0 -echo with armv4i platform preset -echo wince50standard-mipsiv-msvc2005 - Build for the WinCE standard SDK 5.0 -echo with mips platform preset -echo wince50standard-sh4-msvc2005 - Build for the WinCE standard SDK 5.0 -echo with sh4 platform preset -echo wincewm60professional-msvc2005 - SDK for Windows Mobile 6 professional -echo wincewm60standard-msvc2005 - SDK for Windows Mobile 6 Standard -echo and the corresponding versions for msvc2008. -echo. -) - - - diff --git a/tools/configure/configureapp.cpp b/tools/configure/configureapp.cpp index a61c73b2a6..339b2f1b56 100644 --- a/tools/configure/configureapp.cpp +++ b/tools/configure/configureapp.cpp @@ -169,9 +169,6 @@ Configure::Configure(int& argc, char** argv) } } - // For Windows CE and shadow builds we need to copy these to the - // build directory. - QFile::copy(sourcePath + "/bin/setcepaths.bat" , buildPath + "/bin/setcepaths.bat"); //copy the mkspecs buildDir.mkpath("mkspecs"); if (!Environment::cpdir(sourcePath + "/mkspecs", buildPath + "/mkspecs")){ -- cgit v1.2.3