oasis

commit: f910bf367cb5c1244b8339c34f05c06526310a9a
parent 87f393d52187d6e5350b612747d1850a201e9eaf
Author: Michael Forney <mforney@mforney.org>
Date:   Tue, 25 May 2021 00:01:35 -0700

Rename some fspec files

Diffstat:
M
gen.lua
6
+++---
M
setup.lua
8
++++----

2 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/gen.lua b/gen.lua
@@ -18,7 +18,7 @@ subgen 'probe'
 subgen 'pkg'
 subgen 'src'
 
-build('awk', '$outdir/root.perms', {'$outdir/root.fspec', '|', '$basedir/scripts/perms.awk'}, {
+build('awk', '$outdir/root.perms', {'$outdir/tree.fspec', '|', '$basedir/scripts/perms.awk'}, {
 	expr='-f $basedir/scripts/perms.awk',
 })
 gitfile('.perms', '644', '$outdir/root.perms')
@@ -28,8 +28,8 @@ build('git-tree', '$outdir/root.tree', {'$outdir/root.index', '|', '$basedir/scr
 build('git-commit', '$outdir/root.commit', {'|', '$outdir/root.tree'})
 build('phony', 'commit', '$builddir/root.commit')
 
-build('fspec-sort', '$outdir/root-sorted.fspec', {'$outdir/root.fspec', '|', '$builddir/pkg/fspec-sync/host/fspec-sort'})
-build('fspec-tar', '$outdir/root.tar', {'$outdir/root-sorted.fspec', '|', '$builddir/pkg/fspec-sync/host/fspec-tar'})
+build('fspec-sort', '$outdir/root.fspec', {'$outdir/tree.fspec', '|', '$builddir/pkg/fspec-sync/host/fspec-sort'})
+build('fspec-tar', '$outdir/root.tar', {'$outdir/root.fspec', '|', '$builddir/pkg/fspec-sync/host/fspec-tar'})
 
 build('phony', 'build.ninja', 'ninja', {generator='1'})
 
diff --git a/setup.lua b/setup.lua
@@ -110,11 +110,11 @@ local function gen(gendir)
 		build('empty', '$outdir/root.index')
 	end
 	if next(pkg.inputs.fspec) then
-		build('cat', '$outdir/root.fspec', pkg.inputs.fspec, {
-			description = '	FSPEC	$outdir/root.fspec',
+		build('cat', '$outdir/tree.fspec', pkg.inputs.fspec, {
+			description = '	FSPEC	$outdir/tree.fspec',
 		})
 	else
-		build('empty', '$outdir/root.fspec')
+		build('empty', '$outdir/tree.fspec')
 	end
 	build('phony', '$dir/root', pkg.inputs.root)
 	io.close()
@@ -129,7 +129,7 @@ function subgen(dir)
 	subninja(file)
 	table.insert(pkg.inputs.ninja, '$gendir/'..dir..'/ninja')
 	table.insert(pkg.inputs.index, '$outdir/'..dir..'/root.index')
-	table.insert(pkg.inputs.fspec, '$outdir/'..dir..'/root.fspec')
+	table.insert(pkg.inputs.fspec, '$outdir/'..dir..'/tree.fspec')
 	local cmd = ('exec test -f %s/%s/local.ninja'):format(pkg.gendir, dir)
 	if recurse or not os.execute(cmd) then
 		local oldpkg, oldout = pkg, io.output()