summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Forney <mforney@mforney.org>2016-06-17 22:07:00 -0700
committerMichael Forney <mforney@mforney.org>2016-06-17 22:07:00 -0700
commit47b8d35f0c78b8e031e40457ff1867bdf3659c20 (patch)
tree7328bf095016e43ac206c7c124f4efb32d8424ea
parent4f1a3837c0aec14d3ac5db4e29da7462e7df1fe4 (diff)
template: Use symlinks for perms-hook
By the time these hooks are run, we will have checked-out /libexec/oasis/perms-hook, and can just run that. This way, we can keep track of updates to perms-hook.
-rw-r--r--gen.rc1
l---------template/hooks/post-checkout1
l---------template/hooks/post-merge1
-rw-r--r--template/local.ninja6
4 files changed, 2 insertions, 7 deletions
diff --git a/gen.rc b/gen.rc
index 9febaf9a..2058d3d0 100644
--- a/gen.rc
+++ b/gen.rc
@@ -4,7 +4,6 @@ subgen devel
subgen extra
subgen util
-subninja template/local.ninja
file .perms '$outdir'/root.perms 644
diff --git a/template/hooks/post-checkout b/template/hooks/post-checkout
new file mode 120000
index 00000000..acd988a5
--- /dev/null
+++ b/template/hooks/post-checkout
@@ -0,0 +1 @@
+../../libexec/oasis/perms-hook \ No newline at end of file
diff --git a/template/hooks/post-merge b/template/hooks/post-merge
new file mode 120000
index 00000000..acd988a5
--- /dev/null
+++ b/template/hooks/post-merge
@@ -0,0 +1 @@
+../../libexec/oasis/perms-hook \ No newline at end of file
diff --git a/template/local.ninja b/template/local.ninja
deleted file mode 100644
index d5d8d55d..00000000
--- a/template/local.ninja
+++ /dev/null
@@ -1,6 +0,0 @@
-dir = template
-outdir = $builddir/$dir
-build $outdir/config: copy $dir/config
-build $outdir/info/sparse-checkout: copy $dir/info/sparse-checkout
-build $outdir/hooks/post-merge: copy $builddir/util/perms-hook
-build $outdir/hooks/post-checkout: copy $builddir/util/perms-hook