[gnome-continuous] Check for Ninja first
- From: Emmanuele Bassi <ebassi src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnome-continuous] Check for Ninja first
- Date: Wed, 29 Nov 2017 16:31:54 +0000 (UTC)
commit 4255b51d00f78880c1ec64c8f62d1ae64b77e982
Author: Emmanuele Bassi <ebassi gnome org>
Date: Wed Nov 29 16:30:51 2017 +0000
Check for Ninja first
Some projects do not use Autotools, but still provide a Makefile. If we
don't find a Ninja build rules file, let's fall back to the previous
behaviour.
src/ostree-build-compile-one | 14 +++++++-------
1 files changed, 7 insertions(+), 7 deletions(-)
---
diff --git a/src/ostree-build-compile-one b/src/ostree-build-compile-one
index 26ed4eb..5b01f3d 100755
--- a/src/ostree-build-compile-one
+++ b/src/ostree-build-compile-one
@@ -213,25 +213,25 @@ def main(args):
use_ninja = False
buildfile_path = None
- for name in ['Makefile', 'makefile', 'GNUmakefile']:
+ for name in ['build.ninja']:
buildfile_path = os.path.join(builddir, name)
if os.path.exists(buildfile_path):
- use_make = True
+ use_ninja = True
break
- for name in ['build.ninja']:
+ for name in ['Makefile', 'makefile', 'GNUmakefile']:
buildfile_path = os.path.join(builddir, name)
if os.path.exists(buildfile_path):
- use_ninja = True
+ use_make = True
break
if buildfile_path is None:
fatal("No build rules file found")
- if use_make:
- args = list(makeargs)
- else:
+ if use_ninja:
args = list(ninjaargs)
+ else:
+ args = list(makeargs)
user_specified_jobs = False
for arg in args:
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]