diff options
| author |  Nicolas Noble <nicolasnoble@users.noreply.github.com> | 2015-05-28 14:05:31 -0700 |
|---|---|---|
| committer | Nicolas Noble <nicolasnoble@users.noreply.github.com> | 2015-05-28 14:05:31 -0700 |
| commit | 40c466583c36f999c573acb721f6162a4359aebf (patch) | |
| tree | 670cdabf1f69229b71dac9dbc934f51b74dc3c00 | |
| parent | 5ae14d1a5bf73bbe3cc2cfbf40b85e75f9f8d8b8 (diff) | |
| parent | 06e3f446ee034ab50e117396fc87e40ab4aa111f (diff) | |
Merge pull request #1787 from ctiller/refactor-some-growing-insanity
Factor out extra json generation
| -rw-r--r-- | tools/buildgen/generate_build_additions.sh | 38 | ||||
| -rwxr-xr-x | tools/buildgen/generate_projects.sh | 9 |
2 files changed, 39 insertions, 8 deletions
diff --git a/tools/buildgen/generate_build_additions.sh b/tools/buildgen/generate_build_additions.sh new file mode 100644 index 0000000000..44fc2558fa --- /dev/null +++ b/tools/buildgen/generate_build_additions.sh @@ -0,0 +1,38 @@ +#!/bin/sh +# Copyright 2015, Google Inc. +# All rights reserved. +# +# Redistribution and use in source and binary forms, with or without +# modification, are permitted provided that the following conditions are +# met: +# +# * Redistributions of source code must retain the above copyright +# notice, this list of conditions and the following disclaimer. +# * Redistributions in binary form must reproduce the above +# copyright notice, this list of conditions and the following disclaimer +# in the documentation and/or other materials provided with the +# distribution. +# * Neither the name of Google Inc. nor the names of its +# contributors may be used to endorse or promote products derived from +# this software without specific prior written permission. +# +# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS +# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT +# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR +# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT +# OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, +# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT +# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, +# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY +# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE +# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + +gen_build_json_dirs="test/core/end2end test/core/bad_client" +gen_build_files="" +for gen_build_json in $gen_build_json_dirs +do + output_file=`mktemp /tmp/genXXXXXX` + $gen_build_json/gen_build_json.py > $output_file + gen_build_files="$gen_build_files $output_file" +done diff --git a/tools/buildgen/generate_projects.sh b/tools/buildgen/generate_projects.sh index d896380c37..5399867746 100755 --- a/tools/buildgen/generate_projects.sh +++ b/tools/buildgen/generate_projects.sh @@ -38,19 +38,12 @@ fi cd `dirname $0`/../.. mako_renderer=tools/buildgen/mako_renderer.py -gen_build_json_dirs="test/core/end2end test/core/bad_client" if [ "x$TEST" != "x" ] ; then tools/buildgen/build-cleaner.py build.json fi -gen_build_files="" -for gen_build_json in $gen_build_json_dirs -do - output_file=`mktemp /tmp/genXXXXXX` - $gen_build_json/gen_build_json.py > $output_file - gen_build_files="$gen_build_files $output_file" -done +. tools/buildgen/generate_build_additions.sh global_plugins=`find ./tools/buildgen/plugins -name '*.py' | sort | grep -v __init__ | awk ' { printf "-p %s ", $0 } '` |