summaryrefslogtreecommitdiff
path: root/setup.rc
diff options
context:
space:
mode:
authorMichael Forney <mforney@mforney.org>2016-07-02 15:22:56 -0700
committerMichael Forney <mforney@mforney.org>2016-07-02 21:40:59 -0700
commit52b92b6ff3985b81d8ef513fea3d4d8b3c4bc6e5 (patch)
tree09bea4d90c2f63ed41da77509731356b432c2d91 /setup.rc
parent07e26ae6c04733909fc8577c9d37fd70ce87e687 (diff)
Add ffmpeg 3.1
For now, a very minimal set of codecs is enabled. This will likely be expanded later.
Diffstat (limited to 'setup.rc')
-rwxr-xr-xsetup.rc10
1 files changed, 7 insertions, 3 deletions
diff --git a/setup.rc b/setup.rc
index 25dddd2c..842203bb 100755
--- a/setup.rc
+++ b/setup.rc
@@ -11,6 +11,9 @@ fn usage {
if(! ~ $#* 0 1) usage
+# call this after a command capture to ensure it succeeded
+fn checkstatus {}
+
ifs='
'
@@ -18,7 +21,7 @@ ifs='
fn subgen {
subninja '$dir'/$1/local.ninja
- gen_inputs=($gen_inputs phony/'$dir'/$1/ninja)
+ ninja_inputs=($ninja_inputs phony/'$dir'/$1/ninja)
tree_inputs=($tree_inputs '$outdir'/$1/root.tree)
perms_inputs=($perms_inputs '$outdir'/$1/root.perms)
if(~ $recurse 1 || ! [ -f $1/local.ninja ]) @ gen $1 &
@@ -36,6 +39,7 @@ fn gen {
perms_inputs=()
tree_inputs=()
gen_inputs=()
+ ninja_inputs=()
absdir=`{pwd}
{
@@ -47,8 +51,8 @@ fn gen {
. $absdir/gen.rc
- build '$dir/local.ninja' gen '|' setup.rc config.rc ninja.rc '$dir/gen.rc'
- phony ninja '$dir/local.ninja' $gen_inputs
+ build '$dir/local.ninja' gen '|' setup.rc config.rc ninja.rc '$dir/gen.rc' $gen_inputs
+ phony ninja '$dir/local.ninja' $ninja_inputs
if(! ~ $#tree_perms 0) {
printf '%s\n' $tree_perms | sort >$absdir/local.perms