Commit d54673c0 authored by ck's avatar ck
Browse files

Maemo: Fix incorrect assumption about build directory.

Reviewed-by: kh1
parent c55a4753
...@@ -148,7 +148,7 @@ bool MaemoPackageCreationStep::createPackage() ...@@ -148,7 +148,7 @@ bool MaemoPackageCreationStep::createPackage()
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"));
const QString buildDir = QFileInfo(localExecutableFilePath()).absolutePath(); const QString buildDir = buildDirectory();
env.insert(QLatin1String("PWD"), buildDir); env.insert(QLatin1String("PWD"), buildDir);
const QRegExp envPattern(QLatin1String("([^=]+)=[\"']?([^;\"']+)[\"']? ;.*")); const QRegExp envPattern(QLatin1String("([^=]+)=[\"']?([^;\"']+)[\"']? ;.*"));
...@@ -288,6 +288,13 @@ QString MaemoPackageCreationStep::localExecutableFilePath() const ...@@ -288,6 +288,13 @@ QString MaemoPackageCreationStep::localExecutableFilePath() const
+ QLatin1Char('/') + ti.target)); + QLatin1Char('/') + ti.target));
} }
QString MaemoPackageCreationStep::buildDirectory() const
{
const TargetInformation &ti = qt4BuildConfiguration()->qt4Target()
->qt4Project()->rootProjectNode()->targetInformation();
return ti.valid ? ti.buildDir : QString();
}
QString MaemoPackageCreationStep::executableFileName() const QString MaemoPackageCreationStep::executableFileName() const
{ {
return QFileInfo(localExecutableFilePath()).fileName(); return QFileInfo(localExecutableFilePath()).fileName();
...@@ -326,8 +333,7 @@ bool MaemoPackageCreationStep::packagingNeeded() const ...@@ -326,8 +333,7 @@ bool MaemoPackageCreationStep::packagingNeeded() const
QString MaemoPackageCreationStep::packageFilePath() const QString MaemoPackageCreationStep::packageFilePath() const
{ {
QFileInfo execInfo(localExecutableFilePath()); return buildDirectory() % QDir::separator() % executableFileName().toLower()
return execInfo.path() % QDir::separator() % execInfo.fileName().toLower()
% QLatin1Char('_') % versionString() % QLatin1String("_armel.deb"); % QLatin1Char('_') % versionString() % QLatin1String("_armel.deb");
} }
......
...@@ -95,6 +95,7 @@ private: ...@@ -95,6 +95,7 @@ private:
bool packagingNeeded() const; bool packagingNeeded() const;
void raiseError(const QString &shortMsg, void raiseError(const QString &shortMsg,
const QString &detailedMsg = QString()); const QString &detailedMsg = QString());
QString buildDirectory() const;
static const QLatin1String CreatePackageId; static const QLatin1String CreatePackageId;
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment