oasis

commit: 482d996d7339a862156ea7c867773482f733135e
parent 37adb2ae9cd11291254be667c56b3440566d8205
Author: Michael Forney <mforney@mforney.org>
Date:   Sun, 17 Nov 2019 20:08:59 -0800

Add more short command descriptions

Diffstat:
M
ninja.lua
2
+-
M
rules.ninja
23
++++++++++++++++++++---
M
setup.lua
4
+++-

3 files changed, 24 insertions(+), 5 deletions(-)
diff --git a/ninja.lua b/ninja.lua
@@ -339,7 +339,7 @@ function ar(out, files)
 		end
 	end
 	build('ar', out, objs)
-	build('lines', out..'.d', deps)
+	build('rsp', out..'.d', deps)
 end
 
 function lib(out, srcs, deps)
diff --git a/rules.ninja b/rules.ninja
@@ -7,31 +7,36 @@ rule cc
   command = $cc -MMD -MF $out.d $cflags -c -o $out $in
   depfile = $out.d
   deps = gcc
-  description = CC $out
+  description = 	CC	$out
 
 rule cpp
   command = $cc -MMD -MF $out.d $cflags -E -P -o $out $in
   depfile = $out.d
   deps = gcc
-  description = CPP $out
+  description = 	CPP	$out
 
 rule as
   command = $as $asflags -o $out $in
+  description = 	AS	$out
 
 rule link
   command = $cc $ldflags -o $out $in $ldlibs
+  description = 	LINK	$out
 
 rule ar
   command = rm -f $out && $ar crs $out $in
+  description = 	AR	$out
 
 rule ld
   command = $ld -o $out $in
+  description = 	LD	$out
 
 rule objcopy
   command = $objcopy $objcopyflags $in $out
 
-rule lines
+rule rsp
   command = ln -f $rspfile $out
+  description = 	RSP	$out
   rspfile = $out.tmp
   rspfile_content = $in_newline
 
@@ -58,27 +63,34 @@ rule touch
 
 rule empty
   command = >$out
+  description = 	EMPTY	$out
 
 rule copy
   command = ln -f $in $out
+  description = 	COPY	$out
 
 rule cat
   command = cat $in >$out
 
 rule mergeperms
   command = sort -k 2 -m $in >$out
+  description = 	PERMS	$out
 
 rule gzip
   command = gzip -c -9 -n <$in >$out
+  description = 	GZIP	$out
 
 rule yacc
   command = yacc $yaccflags $in
+  description = 	YACC	$out
 
 rule sed
   command = sed $expr $in >$out
+  description = 	SED	$out
 
 rule awk
   command = awk $expr $in >$out
+  description = 	AWK	$out
 
 rule grep
   command = grep $expr $in >$out
@@ -91,9 +103,11 @@ rule waylandproto
 
 rule githash
   command = sh ./scripts/hash.sh $repo $args $in >$out
+  description = 	HASH	$args
 
 rule gittree
   command = sh ./scripts/tree.sh $repo $repo_tag $in $out
+  description = 	TREE	$out
   restat = 1
 
 rule gitcommit
@@ -107,18 +121,21 @@ rule gitinit
 
 rule fetchcurl
   command = sh ./scripts/fetch-curl.sh $dir && touch $out
+  description = 	FETCH	$dir
   restat = 1
   generator = 1
   pool = console
 
 rule fetchgit
   command = sh ./scripts/fetch-git.sh $dir && touch $out
+  description = 	FETCH	$dir
   restat = 1
   generator = 1
   pool = console
 
 rule fetchlocal
   command = sh ./$dir/fetch.sh $dir && touch $out
+  description = 	FETCH	$dir
   restat = 1
   generator = 1
   pool = console
diff --git a/setup.lua b/setup.lua
@@ -91,7 +91,9 @@ function gen(dir)
 		build('empty', '$outdir/root.perms')
 	end
 	if next(pkg.inputs.index) then
-		build('cat', '$outdir/root.index', pkg.inputs.index)
+		build('cat', '$outdir/root.index', pkg.inputs.index, {
+			description='	INDEX	$outdir/root.index',
+		})
 	else
 		build('empty', '$outdir/root.index')
 	end