feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Debian packaging does now work on windows.

Browse Source
This commit is contained in:
kh1
2010-04-09 18:24:43 +02:00
parent 37d192099d
commit a5cd901747
1 changed files with 22 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
src/plugins/qt4projectmanager/qt-maemo/maemopackagecreationstep.cpp
View File

@@ -41,7 +41,9 @@
#include "maemopackagecreationstep.h" #include "maemopackagecreationstep.h"
#include "maemoconstants.h"
#include "maemotoolchain.h" #include "maemotoolchain.h"
#include <qt4buildconfiguration.h> #include <qt4buildconfiguration.h>
#include <qt4project.h> #include <qt4project.h>
#include <qt4target.h> #include <qt4target.h>
@@ -115,11 +117,11 @@ bool MaemoPackageCreationStep::createPackage()
const QString &path = QDir::toNativeSeparators(maddeRoot() + QLatin1Char('/')); const QString &path = QDir::toNativeSeparators(maddeRoot() + QLatin1Char('/'));
const QLatin1String key("PATH"); const QLatin1String key("PATH");
QString colon = QLatin1String(":");
#ifdef Q_OS_WIN #ifdef Q_OS_WIN
const QLatin1String colon(";"); colon = QLatin1String(";");
env.insert(key, targetRoot() % "/bin" % colon % env.value(key));
env.insert(key, path % QLatin1String("bin") % colon % env.value(key)); env.insert(key, path % QLatin1String("bin") % colon % env.value(key));
#elif defined(Q_OS_UNIX)
const QLatin1String colon(":");
#endif #endif
env.insert(key, path % QLatin1String("madbin") % colon % env.value(key)); env.insert(key, path % QLatin1String("madbin") % colon % env.value(key));
env.insert(QLatin1String("PERL5LIB"), path % QLatin1String("madlib/perl5")); env.insert(QLatin1String("PERL5LIB"), path % QLatin1String("madlib/perl5"));
@@ -135,7 +137,7 @@ bool MaemoPackageCreationStep::createPackage()
env.insert(envPattern.cap(1), envPattern.cap(2)); env.insert(envPattern.cap(1), envPattern.cap(2));
} while (!line.isEmpty()); } while (!line.isEmpty());
qDebug("Process environment: %s", qPrintable(env.toStringList().join(colon))); qDebug("Process environment: %s", qPrintable(env.toStringList().join("\n")));
qDebug("sysroot: '%s'", qPrintable(env.value(QLatin1String("SYSROOT_DIR")))); qDebug("sysroot: '%s'", qPrintable(env.value(QLatin1String("SYSROOT_DIR"))));
QProcess buildProc; QProcess buildProc;
@@ -165,6 +167,7 @@ bool MaemoPackageCreationStep::createPackage()
if (!runCommand(buildProc, QLatin1String("dh_installdirs"))) if (!runCommand(buildProc, QLatin1String("dh_installdirs")))
return false; return false;
const QString targetFile(projectDir % QLatin1String("/debian/") const QString targetFile(projectDir % QLatin1String("/debian/")
% executableFileName().toLower() % QLatin1String("/usr/bin/") % executableFileName().toLower() % QLatin1String("/usr/bin/")
% executableFileName()); % executableFileName());
@@ -192,24 +195,27 @@ bool MaemoPackageCreationStep::createPackage()
return true; return true;
} }
bool MaemoPackageCreationStep::runCommand(QProcess &proc, bool MaemoPackageCreationStep::runCommand(QProcess &proc, const QString &command)
const QString &command)
{ {
qDebug("Running command '%s'", qPrintable(command)); qDebug("Running command '%s'", qPrintable(command));
proc.start(maddeRoot() % QLatin1String("/madbin/") % command); QString perl;
#ifdef Q_OS_WIN
perl = maddeRoot() + QLatin1String("/bin/perl.exe ");
#endif
proc.start(perl + maddeRoot() % QLatin1String("/madbin/") % command);
proc.write("\n"); // For dh_make proc.write("\n"); // For dh_make
if (!proc.waitForFinished(10000) && proc.error() == QProcess::Timedout) { if (!proc.waitForFinished(100000) && proc.error() == QProcess::Timedout) {
qDebug("command '%s' hangs", qPrintable(command)); qDebug("command '%s' hangs", qPrintable(command));
return false; return false;
} }
if (proc.exitCode() != 0) { if (proc.exitCode() != 0) {
qDebug("command '%s' failed with return value %d and output '%s'", qDebug("command '%s' failed with return value %d and output '%s'",
qPrintable(command), proc.exitCode(), qPrintable(command), proc.exitCode(), (proc.readAllStandardOutput()
(proc.readAllStandardOutput() + "\n" + proc.readAllStandardError()).data()); + "\n" + proc.readAllStandardError()).data());
return false; return false;
} }
qDebug("Command finished, output was '%s'", qDebug("Command finished, output was '%s'", (proc.readAllStandardOutput()
(proc.readAllStandardOutput() + "\n" + proc.readAllStandardError()).data()); + "\n" + proc.readAllStandardError()).data());
return true; return true;
} }