diff options
| -rwxr-xr-x | bin/syncqt.bat | 44 | ||||
| -rwxr-xr-x | bin/syncqt.pl (renamed from bin/syncqt) | 0 | ||||
| -rwxr-xr-x | configure | 13 | ||||
| -rw-r--r-- | configure.bat | 2 | ||||
| -rw-r--r-- | qtbase.pro | 7 | ||||
| -rw-r--r-- | tools/configure/configureapp.cpp | 24 |
6 files changed, 8 insertions, 82 deletions
diff --git a/bin/syncqt.bat b/bin/syncqt.bat deleted file mode 100755 index 99ada5baa7..0000000000 --- a/bin/syncqt.bat +++ /dev/null @@ -1,44 +0,0 @@ -::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::: -:: -:: Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). -:: Contact: http://www.qt-project.org/legal -:: -:: This file is part of the tools applications of the Qt Toolkit. -:: -:: $QT_BEGIN_LICENSE:LGPL$ -:: Commercial License Usage -:: Licensees holding valid commercial Qt licenses may use this file in -:: accordance with the commercial license agreement provided with the -:: Software or, alternatively, in accordance with the terms contained in -:: a written agreement between you and Digia. For licensing terms and -:: conditions see http://qt.digia.com/licensing. For further information -:: use the contact form at http://qt.digia.com/contact-us. -:: -:: GNU Lesser General Public License Usage -:: Alternatively, 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, Digia gives you certain additional -:: rights. These rights are described in the Digia 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. -:: -:: -:: $QT_END_LICENSE$ -:: -::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::: -@echo off -rem ***** This assumes PERL is in the PATH ***** -set scriptpath=%~dp0 -perl.exe %scriptpath%syncqt %* diff --git a/bin/syncqt b/bin/syncqt.pl index ce07af4895..ce07af4895 100755 --- a/bin/syncqt +++ b/bin/syncqt.pl @@ -2396,15 +2396,6 @@ if [ "$OPT_SHADOW" = "yes" ]; then [ -d "$outpath/bin" ] || mkdir -p "$outpath/bin" - # make a syncqt script that can be used in the shadow - rm -f "$outpath/bin/syncqt" - if [ -x "$relpath/bin/syncqt" ]; then - mkdir -p "$outpath/bin" - echo "#!/bin/sh" >"$outpath/bin/syncqt" - echo "perl \"$relpath/bin/syncqt\" \"\$@\"" >>"$outpath/bin/syncqt" - chmod 755 "$outpath/bin/syncqt" - fi - # save a pre-existing mkspecs/modules dir test -d "$outpath/mkspecs/modules" && \ mv "$outpath/mkspecs/modules" "$outpath/mkspecs-modules" @@ -3892,8 +3883,8 @@ fi # ----------------------------------------------------------------------------- # symlink includes -if [ -n "$PERL" ] && [ -x "$relpath/bin/syncqt" ]; then - "$outpath/bin/syncqt" -minimal -module QtCore "$relpath" || exit 1 +if [ -n "$PERL" ] && [ -x "$relpath/bin/syncqt.pl" ]; then + "$relpath/bin/syncqt.pl" -minimal -module QtCore "$relpath" || exit 1 fi # $1: input variable name (awk regexp) diff --git a/configure.bat b/configure.bat index bdc8ffd947..923f1184b3 100644 --- a/configure.bat +++ b/configure.bat @@ -55,7 +55,7 @@ if not exist mkspecs ( md mkspecs if errorlevel 1 goto exit ) -perl %QTSRC%bin\syncqt -minimal -module QtCore -outdir %QTDIR% %QTSRC% +perl %QTSRC%bin\syncqt.pl -minimal -module QtCore -outdir %QTDIR% %QTSRC% if errorlevel 1 goto exit if not exist tools\configure ( diff --git a/qtbase.pro b/qtbase.pro index 4c41cfff50..60497a80d1 100644 --- a/qtbase.pro +++ b/qtbase.pro @@ -77,17 +77,14 @@ INSTALLS += qmake #syncqt syncqt.path = $$[QT_HOST_BINS] -syncqt.files = $$PWD/bin/syncqt -equals(QMAKE_HOST.os, Windows):syncqt.files += $$PWD/bin/syncqt.bat +syncqt.files = $$PWD/bin/syncqt.pl INSTALLS += syncqt # If we are doing a prefix build, create a "module" pri which enables # qtPrepareTool() to find the non-installed syncqt. prefix_build { - cmd = $$shell_path($$OUT_PWD/bin/syncqt) - contains(QMAKE_HOST.os, Windows): \ - cmd = $${cmd}.bat + cmd = perl -w $$shell_path($$PWD/bin/syncqt.pl) TOOL_PRI = $$OUT_PWD/mkspecs/modules/qt_tool_syncqt.pri diff --git a/tools/configure/configureapp.cpp b/tools/configure/configureapp.cpp index fbc9941ac7..00bc61a077 100644 --- a/tools/configure/configureapp.cpp +++ b/tools/configure/configureapp.cpp @@ -160,24 +160,6 @@ Configure::Configure(int& argc, char** argv) cout << "Preparing build tree..." << endl; QDir(buildPath).mkpath("bin"); - { //make a syncqt script(s) that can be used in the shadow - QFile syncqt(buildPath + "/bin/syncqt"); - // no QFile::Text, just in case the perl interpreter can't cope with them (unlikely) - if (syncqt.open(QFile::WriteOnly)) { - QTextStream stream(&syncqt); - stream << "#!/usr/bin/perl -w" << endl - << "require \"" << sourcePath + "/bin/syncqt\";" << endl; - } - QFile syncqt_bat(buildPath + "/bin/syncqt.bat"); - if (syncqt_bat.open(QFile::WriteOnly | QFile::Text)) { - QTextStream stream(&syncqt_bat); - stream << "@echo off" << endl - << "call " << QDir::toNativeSeparators(sourcePath + "/bin/syncqt.bat") - << " %*" << endl; - syncqt_bat.close(); - } - } - //copy the mkspecs buildDir.mkpath("mkspecs"); if (!Environment::cpdir(sourcePath + "/mkspecs", buildPath + "/mkspecs")){ @@ -2029,8 +2011,7 @@ QString Configure::defaultTo(const QString &option) return "auto"; if (option == "SYNCQT" - && (!QFile::exists(sourcePath + "/bin/syncqt") || - !QFile::exists(sourcePath + "/bin/syncqt.bat"))) + && (!QFile::exists(sourcePath + "/bin/syncqt.pl"))) return "no"; return "yes"; @@ -3700,7 +3681,8 @@ void Configure::generateHeaders() if (!QStandardPaths::findExecutable(QStringLiteral("perl.exe")).isEmpty()) { cout << "Running syncqt..." << endl; QStringList args; - args += buildPath + "/bin/syncqt.bat"; + args << "perl" << "-w"; + args += sourcePath + "/bin/syncqt.pl"; args << "-minimal" << "-module" << "QtCore"; args += sourcePath; int retc = Environment::execute(args, QStringList(), QStringList()); |