diff options
author | Craig Tiller <ctiller@google.com> | 2015-08-31 16:03:39 -0700 |
---|---|---|
committer | Craig Tiller <ctiller@google.com> | 2015-08-31 16:03:39 -0700 |
commit | e0b8a42552b0c891f054c4358a8a6fac2529be9d (patch) | |
tree | 3b4c2f9c116efaeae299e38e3f65d4895549f425 /tools/buildgen/generate_projects-old.sh | |
parent | 245bd8875b4640104df433f6a432b5d63799bfb8 (diff) | |
parent | 02a7bedaa3bdd9f7f7eae02e9ddb9b5462b1adf9 (diff) |
Merge branch 'cleaner-build' into third-coming
Diffstat (limited to 'tools/buildgen/generate_projects-old.sh')
-rw-r--r-- | tools/buildgen/generate_projects-old.sh | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/tools/buildgen/generate_projects-old.sh b/tools/buildgen/generate_projects-old.sh index 5399867746..55d93d4942 100644 --- a/tools/buildgen/generate_projects-old.sh +++ b/tools/buildgen/generate_projects-old.sh @@ -40,7 +40,7 @@ cd `dirname $0`/../.. mako_renderer=tools/buildgen/mako_renderer.py if [ "x$TEST" != "x" ] ; then - tools/buildgen/build-cleaner.py build.json + tools/buildgen/build-cleaner.py build.yaml fi . tools/buildgen/generate_build_additions.sh @@ -58,8 +58,8 @@ for dir in . ; do out=${dir}/${file#$dir/templates/} # strip templates dir prefix out=${out%.*} # strip template extension echo "generating file: $out" - json_files="build.json $gen_build_files" - data=`for i in $json_files ; do echo $i ; done | awk ' { printf "-d %s ", $0 } '` + yaml_files="build.yaml $gen_build_files" + data=`for i in $yaml_files ; do echo $i ; done | awk ' { printf "-d %s ", $0 } '` if [ "x$TEST" = "xtrue" ] ; then actual_out=$out out=`mktemp /tmp/gentXXXXXX` |