oasis

commit: 677b59c07c7bf2306a9cb387a402cb0feec3ced2
parent c19d7612ac01d43d7aeec6fa1d15b6c0c9b896ad
Author: Michael Forney <mforney@mforney.org>
Date:   Fri, 20 Oct 2017 21:36:30 -0700

Move some stuff from build.ninja to gen.lua

Diffstat:
M
build.ninja
4
----
M
gen.lua
5
++++-

2 files changed, 4 insertions(+), 5 deletions(-)
diff --git a/build.ninja b/build.ninja
@@ -16,8 +16,4 @@ repo_tag = tree
 repo_branch = master
 
 include config.ninja
-include rules.ninja
 include local.ninja
-
-build build.ninja: phony ninja
-  generator = 1
diff --git a/gen.lua b/gen.lua
@@ -1,3 +1,5 @@
+include 'rules.ninja'
+
 toolchain 'target'
 
 subgen 'pkg'
@@ -9,6 +11,7 @@ build('gitinit', '$builddir/root.stamp')
 build('gittree', '$builddir/root.tree', {'$outdir/root.index', '|', 'scripts/tree.rc', '||', '$builddir/root.stamp'})
 build('gitarchive', '$builddir/root.tar', {'|', '$builddir/root.tree'})
 build('gitcommit', '$builddir/root.commit', {'|', '$builddir/root.tree'})
-build('phony', 'commit', {'$builddir/root.commit'})
+build('phony', 'commit', '$builddir/root.commit')
+build('phony', 'build.ninja', 'ninja', {generator='1'})
 
 io.write('default $builddir/root.tree\n')