From 4c1826ac8e215dc06bd7cffc4c45a7dfb8fe2466 Mon Sep 17 00:00:00 2001 From: Nigel Tao Date: Sun, 5 Aug 2018 21:55:50 +1000 Subject: [PATCH] Factor build-all.sh into smaller scripts --- build-all.sh | 21 ++------------------- build-example.sh | 33 +++++++++++++++++++++++++++++++++ build-fuzz.sh | 23 +++++++++++++++++++++++ 3 files changed, 58 insertions(+), 19 deletions(-) create mode 100755 build-example.sh create mode 100755 build-fuzz.sh diff --git a/build-all.sh b/build-all.sh index a14956ee..a77aff1e 100755 --- a/build-all.sh +++ b/build-all.sh @@ -53,22 +53,5 @@ wuffs genlib -skipgen wuffs test -skipgen -mimic wuffs bench -skipgen -mimic -reps=1 -iterscale=1 -for f in example/*; do - echo "Building $f" - if [ "$f" = "example/crc32" ]; then - # example/crc32 is unusual in that it's C++, not C. - g++ -Wall -Werror $f/*.cc -o $f/a.out - elif [ "$f" = "example/library" ]; then - # example/library is unusual in that it uses separately compiled libraries - # (built by "wuffs genlib" above) instead of directly #include'ing Wuffs' - # .c files. - gcc -Wall -Werror -static -I.. $f/*.c gen/lib/c/gcc-static/libwuffs.a -o $f/a.out - elif [ -e $f/*.c ]; then - gcc -Wall -Werror $f/*.c -o $f/a.out - fi -done - -for f in fuzz/c/std/*_fuzzer.c; do - echo "Building $f" - gcc -DWUFFS_CONFIG__FUZZLIB_MAIN $f -o ${f%.c}.out -done +./build-example.sh +./build-fuzz.sh diff --git a/build-example.sh b/build-example.sh new file mode 100755 index 00000000..c494c93f --- /dev/null +++ b/build-example.sh @@ -0,0 +1,33 @@ +#!/bin/bash -eu +# Copyright 2018 The Wuffs Authors. +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# https://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. + +# ---------------- + +# See build-all.sh for commentary. + +for f in example/*; do + echo "Building $f" + if [ "$f" = "example/crc32" ]; then + # example/crc32 is unusual in that it's C++, not C. + g++ -Wall -Werror $f/*.cc -o $f/a.out + elif [ "$f" = "example/library" ]; then + # example/library is unusual in that it uses separately compiled libraries + # (built by "wuffs genlib" above) instead of directly #include'ing Wuffs' + # .c files. + gcc -Wall -Werror -static -I.. $f/*.c gen/lib/c/gcc-static/libwuffs.a -o $f/a.out + elif [ -e $f/*.c ]; then + gcc -Wall -Werror $f/*.c -o $f/a.out + fi +done diff --git a/build-fuzz.sh b/build-fuzz.sh new file mode 100755 index 00000000..33363cd8 --- /dev/null +++ b/build-fuzz.sh @@ -0,0 +1,23 @@ +#!/bin/bash -eu +# Copyright 2018 The Wuffs Authors. +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# https://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. + +# ---------------- + +# See build-all.sh for commentary. + +for f in fuzz/c/std/*_fuzzer.c; do + echo "Building $f" + gcc -DWUFFS_CONFIG__FUZZLIB_MAIN $f -o ${f%.c}.out +done