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

Maemo: Warn about problematic project name and try to work around it.

Browse Source 
Reviewed-by: kh1
This commit is contained in:
ck
2010-08-06 12:57:01 +02:00
parent 9704844e47
commit 875b425da1
3 changed files with 32 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -58,6 +58,7 @@
#include <QtCore/QProcess>
#include <QtCore/QProcessEnvironment>
#include <QtCore/QRegExp>
#include <QtCore/QStringBuilder>
#include <QtGui/QWidget>
@@ -134,6 +135,7 @@ bool MaemoPackageCreationStep::createPackage()
return true;
emit addOutput(tr("Creating package file ..."), BuildStep::MessageOutput);
checkProjectName();
m_buildProc.reset(new QProcess);
QString error;
if (!preparePackagingProcess(m_buildProc.data(), maemoToolChain(),
@@ -221,7 +223,8 @@ bool MaemoPackageCreationStep::removeDirectory(const QString &dirPath)
if (!dir.exists())
return true;
const QStringList &files = dir.entryList(QDir::Files);
const QStringList &files
= dir.entryList(QDir::Files | QDir::Hidden | QDir::System);
foreach (const QString &fileName, files) {
if (!dir.remove(fileName))
return false;
@@ -428,10 +431,34 @@ QString MaemoPackageCreationStep::packagingCommand(const MaemoToolChain *tc,
return perl + tc->maddeRoot() % QLatin1String("/madbin/") % commandName;
}
void MaemoPackageCreationStep::checkProjectName()
{
const QRegExp legalName(QLatin1String("[0-9-+a-z\\.]+"));
if (!legalName.exactMatch(buildConfiguration()->target()->project()->displayName())) {
emit addTask(Task(Task::Warning,
tr("Your project name contains characters not allowed in Debian packages.\n"
"They must only use lower-case letters, numbers, '-', '+' and '.'.\n"
"We will try to work around that, but you may experience problems."),
QString(), -1, TASK_CATEGORY_BUILDSYSTEM));
}
}
QString MaemoPackageCreationStep::packageName(const ProjectExplorer::Project *project)
{
QString packageName = project->displayName().toLower();
const QRegExp legalLetter(QLatin1String("[a-z0-9+-.]"), Qt::CaseSensitive,
QRegExp::WildcardUnix);
for (int i = 0; i < packageName.length(); ++i) {
if (!legalLetter.exactMatch(packageName.mid(i, 1)))
packageName[i] = QLatin1Char('-');
}
return packageName;
}
QString MaemoPackageCreationStep::packageFileName(const ProjectExplorer::Project *project,
const QString &version)
{
return project->displayName() % QLatin1Char('_') % version
return packageName(project) % QLatin1Char('_') % version
% QLatin1String("_armel.deb");
}