Attachment 835631 Details for Bug 1040801 – Proposed patch to fix problem for fedora

[patch] Proposed patch to fix problem for fedora

0001-Allow-ninja-buildr-to-use-either-ninja-or-ninja-buil.patch (text/plain), 3.17 KB, created by Andrew Stitcher on 2013-12-12 06:49:51 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Andrew Stitcher

Created: 2013-12-12 06:49:51 UTC

Size: 3.17 KB

patch

obsolete

>From 4f5a00d28ea9f611e813de7ee5a4ddebae9cb784 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 buildr to use either ninja or ninja-build
> executables
>
>---
> kdevelop.kdev4                                          |  2 +-
> projectbuilders/ninjabuilder/kdevninjabuilderplugin.cpp |  4 +++-
> projectbuilders/ninjabuilder/ninjajob.cpp               | 12 +++++++++++-
> projectbuilders/ninjabuilder/ninjajob.h                 |  1 +
> 4 files changed, 16 insertions(+), 3 deletions(-)
>
>diff --git a/kdevelop.kdev4 b/kdevelop.kdev4
>index 023bd89..0eeaa08 100644
>--- a/kdevelop.kdev4
>+++ b/kdevelop.kdev4
>@@ -1,3 +1,3 @@
> [Project]
>-Name=KDevelop
> Manager=KDevCMakeManager
>+Name=kdevelop
>diff --git a/projectbuilders/ninjabuilder/kdevninjabuilderplugin.cpp b/projectbuilders/ninjabuilder/kdevninjabuilderplugin.cpp
>index 909d146..e92be2d 100644
>--- a/projectbuilders/ninjabuilder/kdevninjabuilderplugin.cpp
>+++ b/projectbuilders/ninjabuilder/kdevninjabuilderplugin.cpp
>@@ -43,7 +43,9 @@ KDevNinjaBuilderPlugin::KDevNinjaBuilderPlugin(QObject* parent, const QVariantLi
> 
> bool KDevNinjaBuilderPlugin::hasError() const
> {
>-    return KStandardDirs::findExe("ninja").isEmpty();
>+    return
>+        KStandardDirs::findExe("ninja").isEmpty() &&
>+        KStandardDirs::findExe("ninja-build").isEmpty();
> }
> 
> static QStringList targetsInFolder(KDevelop::ProjectFolderItem* item)
>diff --git a/projectbuilders/ninjabuilder/ninjajob.cpp b/projectbuilders/ninjabuilder/ninjajob.cpp
>index 9efa57c..83850e0 100644
>--- a/projectbuilders/ninjabuilder/ninjajob.cpp
>+++ b/projectbuilders/ninjabuilder/ninjajob.cpp
>@@ -29,6 +29,7 @@
> #include <interfaces/iproject.h>
> #include <interfaces/icore.h>
> #include <interfaces/iprojectcontroller.h>
>+#include <kstandarddirs.h>
> #include <QFile>
> 
> NinjaJob::NinjaJob(KDevelop::ProjectBaseItem* item, const QStringList& arguments, const QByteArray& signal, QObject* parent)
>@@ -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() const
>+{
>+    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..cc7e27f 100644
>--- a/projectbuilders/ninjabuilder/ninjajob.h
>+++ b/projectbuilders/ninjabuilder/ninjajob.h
>@@ -56,6 +56,7 @@ class NinjaJob : public KDevelop::OutputExecuteJob
>         QPersistentModelIndex m_idx;
>         QByteArray m_signal;
> 
>+        QString ninjaBinary() const;
>         void appendLines( const QStringList& lines );
> };
> 
>-- 
>1.8.3.1
>

Actions: View | Diff

Attachments on bug 1040801: 835631 | 835650