Attachment 835650 Details for Bug 1040801 – Tidied up version of the patch

[patch] Tidied up version of the patch

0001-Allow-ninja-builder-to-use-either-ninja-or-ninja-bui.patch (text/plain), 3.12 KB, created by Andrew Stitcher on 2013-12-12 07:51:33 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Andrew Stitcher

Created: 2013-12-12 07:51:33 UTC

Size: 3.12 KB

patch

obsolete

>From 967f14ee9e8cf965298e47299385a4812673a178 Mon Sep 17 00:00:00 2001
>From: Andrew Stitcher <astitcher@apache.org>
>Date: Thu, 12 Dec 2013 01:28:56 -0500
>Subject: [PATCH] Allow ninja builder to use either ninja or ninja-build
> executables
>
>---
> projectbuilders/ninjabuilder/kdevninjabuilderplugin.cpp |  3 +--
> projectbuilders/ninjabuilder/ninjajob.cpp               | 12 +++++++++++-
> projectbuilders/ninjabuilder/ninjajob.h                 |  1 +
> 3 files changed, 13 insertions(+), 3 deletions(-)
>
>diff --git a/projectbuilders/ninjabuilder/kdevninjabuilderplugin.cpp b/projectbuilders/ninjabuilder/kdevninjabuilderplugin.cpp
>index 909d146..dc28408 100644
>--- a/projectbuilders/ninjabuilder/kdevninjabuilderplugin.cpp
>+++ b/projectbuilders/ninjabuilder/kdevninjabuilderplugin.cpp
>@@ -20,7 +20,6 @@
> #include "ninjajob.h"
> #include <KAboutData>
> #include <KPluginFactory>
>-#include <KStandardDirs>
> #include <KDebug>
> #include <KConfigGroup>
> #include <KShell>
>@@ -43,7 +42,7 @@ KDevNinjaBuilderPlugin::KDevNinjaBuilderPlugin(QObject* parent, const QVariantLi
> 
> bool KDevNinjaBuilderPlugin::hasError() const
> {
>-    return KStandardDirs::findExe("ninja").isEmpty();
>+    return NinjaJob::ninjaBinary().isEmpty();
> }
> 
> static QStringList targetsInFolder(KDevelop::ProjectFolderItem* item)
>diff --git a/projectbuilders/ninjabuilder/ninjajob.cpp b/projectbuilders/ninjabuilder/ninjajob.cpp
>index 9efa57c..acb5d07 100644
>--- a/projectbuilders/ninjabuilder/ninjajob.cpp
>+++ b/projectbuilders/ninjabuilder/ninjajob.cpp
>@@ -22,6 +22,7 @@
> #include <KDebug>
> #include <KLocalizedString>
> #include <KConfigGroup>
>+#include <KStandardDirs>
> #include <interfaces/iproject.h>
> #include <outputview/outputmodel.h>
> #include <project/interfaces/ibuildsystemmanager.h>
>@@ -44,7 +45,7 @@ NinjaJob::NinjaJob(KDevelop::ProjectBaseItem* item, const QStringList& arguments
>     setFilteringStrategy( KDevelop::OutputModel::CompilerFilter );
>     setProperties( NeedWorkingDirectory | PortableMessages | DisplayStderr | IsBuilderHint | PostProcessOutput );
> 
>-    *this << "ninja";
>+    *this << ninjaBinary();
>     *this << arguments;
> 
>     QStringList targets;
>@@ -68,6 +69,15 @@ void NinjaJob::setIsInstalling( bool isInstalling )
>     m_isInstalling = isInstalling;
> }
> 
>+QString NinjaJob::ninjaBinary()
>+{
>+    QString path = KStandardDirs::findExe("ninja-build");
>+    if (path.isEmpty()) {
>+        path = KStandardDirs::findExe("ninja");
>+    }
>+    return path;
>+}
>+
> KUrl NinjaJob::workingDirectory() const
> {
>     KDevelop::ProjectBaseItem* it = item();
>diff --git a/projectbuilders/ninjabuilder/ninjajob.h b/projectbuilders/ninjabuilder/ninjajob.h
>index 0bd1725..1186c06 100644
>--- a/projectbuilders/ninjabuilder/ninjajob.h
>+++ b/projectbuilders/ninjabuilder/ninjajob.h
>@@ -39,6 +39,7 @@ class NinjaJob : public KDevelop::OutputExecuteJob
>     public:
>         NinjaJob( KDevelop::ProjectBaseItem* item, const QStringList& arguments, const QByteArray& signal, QObject* parent );
>         void setIsInstalling( bool isInstalling );
>+        static QString ninjaBinary();
> 
>         virtual KUrl workingDirectory() const;
>         virtual QStringList privilegedExecutionCommand() const;
>-- 
>1.8.3.1
>

Actions: View | Diff

Attachments on bug 1040801: 835631 | 835650