Mirror/zeek
1
0
Fork 0
mirror of https://github.com/zeek/zeek.git synced 2025-10-02 14:48:21 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

updates to development helper scripts to support new workflow

Browse source
This commit is contained in:
Vern Paxson 2021-06-04 17:02:43 -07:00
parent e1dc3e7b08
commit e722607bd9
6 changed files with 18 additions and 33 deletions
Download patch file Download diff file Expand all files Collapse all files

7
src/script_opt/CPP/bare-embedded-build
View file

@ -2,11 +2,8 @@
build=../../../build build=../../../build
echo > CPP-gen-addl.h cd $build
(cd $build
export -n ZEEK_USE_CPP ZEEK_ADD_CPP export -n ZEEK_USE_CPP ZEEK_ADD_CPP
export ZEEK_HASH_DIR=. export ZEEK_HASH_DIR=.
echo | src/zeek -b -O gen-C++ echo | src/zeek -b -O gen-C++
) ninja || echo Bare embedded build failed
mv $build/CPP-gen-addl.h CPP-gen.cc
(cd $build ; ninja || echo Bare embedded build failed)

7
src/script_opt/CPP/full-embedded-build
View file

@ -2,11 +2,8 @@
build=../../../build build=../../../build
echo > CPP-gen-addl.h cd $build
(cd $build
export -n ZEEK_USE_CPP ZEEK_ADD_CPP export -n ZEEK_USE_CPP ZEEK_ADD_CPP
export ZEEK_HASH_DIR=. export ZEEK_HASH_DIR=.
echo | src/zeek -O gen-C++ echo | src/zeek -O gen-C++
) ninja || echo Full embedded build failed
mv $build/CPP-gen-addl.h CPP-gen.cc
(cd $build ; ninja || echo Full embedded build failed)

6
src/script_opt/CPP/non-embedded-build
View file

@ -1,7 +1,5 @@
#! /bin/sh #! /bin/sh
base=../../.. cd ../../../build
so=$base/src/script_opt/CPP echo >CPP-gen.cc
echo > $so/CPP-gen.cc
cd $base/build
ninja || echo Non-embedded build failed ninja || echo Non-embedded build failed

7
src/script_opt/CPP/single-full-test.sh
View file

@ -4,11 +4,8 @@ echo $1
base=../../.. base=../../..
test=$base/testing/btest test=$base/testing/btest
so=$base/src/script_opt/CPP
build=$base/build build=$base/build
gen=CPP-gen-addl.h gen=CPP-gen.cc
echo >$gen
./non-embedded-build >$build/errs 2>&1 || echo non-embedded build failed ./non-embedded-build >$build/errs 2>&1 || echo non-embedded build failed
@ -17,7 +14,7 @@ export ZEEK_HASH_DIR=$test ZEEK_GEN_CPP=
cd $test cd $test
../../auxil/btest/btest $1 >jbuild-$1.out 2>&1 ../../auxil/btest/btest $1 >jbuild-$1.out 2>&1
grep -c '^namespace' $gen grep -c '^namespace' $gen
mv $gen $so/CPP-gen.cc mv $gen $build/
cd $build cd $build
ninja >& errs || echo build for $1 failed ninja >& errs || echo build for $1 failed

6
src/script_opt/CPP/single-test.sh
View file

@ -4,18 +4,16 @@ echo $1
base=../../.. base=../../..
test=$base/testing/btest test=$base/testing/btest
so=$base/src/script_opt/CPP
build=$base/build build=$base/build
gen=CPP-gen-addl.h gen=CPP-gen.cc
export -n ZEEK_USE_CPP export -n ZEEK_USE_CPP
export ZEEK_HASH_DIR=$test ZEEK_ADD_CPP= export ZEEK_HASH_DIR=$test ZEEK_ADD_CPP=
cd $test cd $test
cp $build/CPP-hashes.dat . cp $build/CPP-hashes.dat .
echo >$gen
../../auxil/btest/btest $1 >cpp-build-$1.out 2>&1 ../../auxil/btest/btest $1 >cpp-build-$1.out 2>&1
grep -c '^namespace' $gen grep -c '^namespace' $gen
mv $gen $so mv $gen $build
cd $build cd $build
ninja >& errs || echo build for $1 failed ninja >& errs || echo build for $1 failed

6
src/script_opt/CPP/update-single-test.sh
View file

@ -2,18 +2,16 @@
base=../../.. base=../../..
test=$base/testing/btest test=$base/testing/btest
so=$base/src/script_opt/CPP
build=$base/build build=$base/build
gen=CPP-gen-addl.h gen=CPP-gen.cc
export -n ZEEK_USE_CPP export -n ZEEK_USE_CPP
export ZEEK_HASH_DIR=$test ZEEK_ADD_CPP= export ZEEK_HASH_DIR=$test ZEEK_ADD_CPP=
cd $test cd $test
cp $build/CPP-hashes.dat . cp $build/CPP-hashes.dat .
echo >$gen
../../auxil/btest/btest $1 >jbuild-$1.out 2>&1 ../../auxil/btest/btest $1 >jbuild-$1.out 2>&1
grep -c '^namespace' $gen grep -c '^namespace' $gen
mv $gen $so mv $gen $build/
cd $build cd $build
ninja >& errs || echo build for $1 failed ninja >& errs || echo build for $1 failed