diff options
| author | Michael Forney <mforney@mforney.org> | 2016-04-14 23:25:00 -0700 |
|---|---|---|
| committer | Michael Forney <mforney@mforney.org> | 2016-04-15 02:10:08 -0700 |
| commit | f3ba2434e68f48db37e3de2a91753016e85508c1 (patch) | |
| tree | 25518a8633eb47929d44ae02614bca131924297f | |
| parent | 20a3b2ad4421763e4b19d7897cc5addecf06898d (diff) | |
Move builddir to config.ninja and check-in build.ninja
| -rw-r--r-- | .gitignore | 1 | ||||
| -rw-r--r-- | build.ninja | 7 | ||||
| -rw-r--r-- | config.ninja | 2 | ||||
| -rw-r--r-- | rules.ninja | 2 | ||||
| -rwxr-xr-x | setup.rc | 38 |
5 files changed, 13 insertions, 37 deletions
@@ -1,4 +1,3 @@ -/build.ninja local.ninja local.perms .*.swp diff --git a/build.ninja b/build.ninja new file mode 100644 index 00000000..8f0d5148 --- /dev/null +++ b/build.ninja @@ -0,0 +1,7 @@ +include config.ninja +include rules.ninja + +subninja local.ninja + +build build.ninja: stamp | local.ninja + generator = 1 diff --git a/config.ninja b/config.ninja index 4c2c5d5c..e950ab13 100644 --- a/config.ninja +++ b/config.ninja @@ -1,3 +1,5 @@ +builddir = out + ar = ar cc = cc diff --git a/rules.ninja b/rules.ninja index 7fc28808..5ec4c01a 100644 --- a/rules.ninja +++ b/rules.ninja @@ -1,5 +1,5 @@ rule gen - command = rc ./setup.rc -n -b $builddir $srcdir + command = rc ./setup.rc $srcdir generator = 1 # toolchain @@ -3,27 +3,10 @@ flag e + fn usage { - { - echo 'usage: '$0' [-b builddir]' - echo ' '$0' [-n]' - } >[1=2] + echo 'usage: '$0' [dir]' >[1=2] exit 2 } -builddir=out -norecurse=() - -while(~ $1 -*) switch($1) { -case -b - builddir=$2 - shift 2 -case -n - norecurse=1 - shift -case * - usage $0 -} - . ./ninja.rc fn subgen { @@ -75,20 +58,5 @@ fn gen { if(! ~ $#* 0) { gen $1 ; exit } -if(~ $#norecurse 0) { - recurse=1 - @ gen . -} - -{ - set builddir $builddir - - include config.ninja - include rules.ninja - - subninja local.ninja - - build build.ninja gen '|' setup.rc ninja.rc local.ninja -} >build.ninja.tmp - -mv build.ninja.tmp build.ninja +recurse=1 +@ gen . |