oasis

commit: 5cbbb9e3773b329f13ea05b97be40a48d5f8d0d6
parent e6afdebdfe8b8874eb2ecfd8bcb1c81b97966649
Author: Michael Forney <mforney@mforney.org>
Date:   Mon, 22 Jun 2020 12:39:55 -0700

Use hyphenated rule names

Diffstat:
M
gen.lua
8
++++----
M
ninja.lua
12
++++++------
M
probe/gen.lua
2
+-
M
rules.ninja
20
++++++++++----------

4 files changed, 21 insertions(+), 21 deletions(-)
diff --git a/gen.lua b/gen.lua
@@ -23,10 +23,10 @@ build('awk', '$outdir/root.perms', {'$outdir/root.fspec', '|', '$basedir/scripts
 })
 gitfile('.perms', '644', '$outdir/root.perms')
 
-build('gitinit', '$outdir/root.stamp')
-build('gittree', '$outdir/root.tree', {'$outdir/root.index', '|', '$basedir/scripts/tree.sh', '||', '$outdir/root.stamp'})
-build('gitarchive', '$outdir/root.tar', {'|', '$outdir/root.tree'})
-build('gitcommit', '$outdir/root.commit', {'|', '$outdir/root.tree'})
+build('git-init', '$outdir/root.stamp')
+build('git-tree', '$outdir/root.tree', {'$outdir/root.index', '|', '$basedir/scripts/tree.sh', '||', '$outdir/root.stamp'})
+build('git-archive', '$outdir/root.tar', {'|', '$outdir/root.tree'})
+build('git-commit', '$outdir/root.commit', {'|', '$outdir/root.tree'})
 build('phony', 'commit', '$builddir/root.commit')
 build('phony', 'build.ninja', 'ninja', {generator='1'})
 
diff --git a/ninja.lua b/ninja.lua
@@ -378,14 +378,14 @@ end
 function waylandproto(proto, outs, args)
 	proto = '$srcdir/'..proto
 	if outs.client then
-		build('waylandproto', '$outdir/'..outs.client, proto, {type='client-header'})
+		build('wayland-proto', '$outdir/'..outs.client, proto, {type='client-header'})
 	end
 	if outs.server then
-		build('waylandproto', '$outdir/'..outs.server, proto, {type='server-header'})
+		build('wayland-proto', '$outdir/'..outs.server, proto, {type='server-header'})
 	end
 	if outs.code then
 		local code = '$outdir/'..outs.code
-		build('waylandproto', code, proto, {type='public-code'})
+		build('wayland-proto', code, proto, {type='public-code'})
 		cc(code, {'pkg/wayland/headers'}, args)
 	end
 end
@@ -397,7 +397,7 @@ function fetch(method)
 	else
 		script = '$basedir/scripts/fetch-'..method..'.sh'
 	end
-	build('fetch'..method, '$dir/fetch', {'|', '$dir/ver', script})
+	build('fetch-'..method, '$dir/fetch', {'|', '$dir/ver', script})
 	if basedir ~= '.' then
 		build('phony', '$gendir/fetch', '$dir/fetch')
 	end
@@ -439,7 +439,7 @@ end
 function gitfile(path, mode, src)
 	local out = '$builddir/root.hash/'..path
 	local perm = ('10%04o %s'):format(tonumber(mode, 8), path)
-	build('githash', out, {src, '|', '$basedir/scripts/hash.sh', '||', '$builddir/root.stamp'}, {
+	build('git-hash', out, {src, '|', '$basedir/scripts/hash.sh', '||', '$builddir/root.stamp'}, {
 		args=perm,
 	})
 	table.insert(pkg.inputs.index, out)
@@ -479,7 +479,7 @@ function sym(path, target)
 		target=target,
 	}
 	local out = '$builddir/root.hash/'..path
-	build('githash', out, {'|', '$basedir/scripts/hash.sh', '||', '$builddir/root.stamp'}, {
+	build('git-hash', out, {'|', '$basedir/scripts/hash.sh', '||', '$builddir/root.stamp'}, {
 		args=string.format('120000 %s %s', path, target),
 	})
 	table.insert(pkg.inputs.index, out)
diff --git a/probe/gen.lua b/probe/gen.lua
@@ -11,7 +11,7 @@ probe('HAVE___BUILTIN_CTZL')
 probe('HAVE___BUILTIN_POPCOUNT')
 
 local function probesize(var)
-	build('probesize', '$outdir/'..var, {'$dir/'..var, '|', '$basedir/scripts/probe-size.sh'}, {var=var})
+	build('probe-size', '$outdir/'..var, {'$dir/'..var, '|', '$basedir/scripts/probe-size.sh'}, {var=var})
 end
 
 probesize('SIZEOF_LONG')
diff --git a/rules.ninja b/rules.ninja
@@ -54,7 +54,7 @@ rule muse
 rule probe
   command = sh $basedir/scripts/probe.sh $var $out $cc $cflags $ldflags -o /dev/null -x c $in
 
-rule probesize
+rule probe-size
   command = sh $basedir/scripts/probe-size.sh $var $out $cc $cflags -c -o /dev/null -x c $in
 
 # misc tools
@@ -97,42 +97,42 @@ rule printf
 rule tic
   command = tic $ticflags $in
 
-rule waylandproto
+rule wayland-proto
   command = wayland-scanner $type <$in >$out
 
-rule githash
+rule git-hash
   command = sh $basedir/scripts/hash.sh $repo $args $in >$out
   description = 	HASH	$args
 
-rule gittree
+rule git-tree
   command = sh $basedir/scripts/tree.sh $repo $repo_tag $in $out
   description = 	TREE	$out
   restat = 1
 
-rule gitcommit
+rule git-commit
   command = sh $basedir/scripts/commit.sh $repo $repo_branch $repo_tag $out
 
-rule gitarchive
+rule git-archive
   command = git -C $repo archive -o $$PWD/$out $repo_tag
 
-rule gitinit
+rule git-init
   command = git init $repo_flags $repo && touch $out
 
-rule fetchcurl
+rule fetch-curl
   command = cd $basedir && sh scripts/fetch-curl.sh $gendir && touch $$OLDPWD/$out
   description = 	FETCH	$gendir
   restat = 1
   generator = 1
   pool = console
 
-rule fetchgit
+rule fetch-git
   command = cd $basedir && sh scripts/fetch-git.sh $gendir && touch $$OLDPWD/$out
   description = 	FETCH	$gendir
   restat = 1
   generator = 1
   pool = console
 
-rule fetchlocal
+rule fetch-local
   command = cd $basedir && sh $gendir/fetch.sh $gendir && touch $$OLDPWD/$out
   description = 	FETCH	$gendir
   restat = 1