From 6b38524bba4254c06ac5811fdde66bcafb49632f Mon Sep 17 00:00:00 2001 From: Oswald Buddenhagen Date: Fri, 10 May 2013 18:21:27 +0200 Subject: get rid of syncqt wrapper scripts instead, rename it to syncqt.pl and rely on qtPrepareTool()'s new ability to correctly invoke it as a perl script even under windows. the wrappers themselves have been trivial at this point, so there is no added value in keeping them, either. Change-Id: I77cf65edbcfaa48ed1900defe940d4eb4b82d5b9 Reviewed-by: Thiago Macieira Reviewed-by: Joerg Bornemann --- tools/configure/configureapp.cpp | 24 +++--------------------- 1 file changed, 3 insertions(+), 21 deletions(-) (limited to 'tools') 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()); -- cgit v1.2.3