From 335f1c54e598af6088ac6f0c7b98793ea2854ae2 Mon Sep 17 00:00:00 2001 From: Boris Kolpackov Date: Tue, 8 Nov 2011 12:36:25 +0200 Subject: Get rid of special tracer database The include, types, and pragma tests have been moved to the common/ directory while the object test has been merged into common/lifecycle. The transaction test will be re-implemented as common/ test as soon as SQL statement tracing support is merged. --- dist.sh | 24 ------------------------ 1 file changed, 24 deletions(-) (limited to 'dist.sh') diff --git a/dist.sh b/dist.sh index df1b78f..f6a0fa7 100755 --- a/dist.sh +++ b/dist.sh @@ -101,7 +101,6 @@ if [ $rebuild = y ]; then rm -rf $out_root/libodb-pgsql/* rm -rf $out_root/libodb-sqlite/* rm -rf $out_root/libodb-mysql/* - rm -rf $out_root/libodb-tracer/* rm -rf $out_root/libodb-boost/* rm -rf $out_root/libodb-qt/* rm -rf $out_root/odb-tests/* $out_root/odb-tests-* @@ -119,7 +118,6 @@ mkdir -p $out_root/libodb mkdir -p $out_root/libodb-pgsql mkdir -p $out_root/libodb-sqlite mkdir -p $out_root/libodb-mysql -mkdir -p $out_root/libodb-tracer mkdir -p $out_root/libodb-boost mkdir -p $out_root/libodb-qt mkdir -p $out_root/odb-tests @@ -247,27 +245,6 @@ cp $out_root/libodb-mysql/libodb-mysql-$ver.*.zip $out_root/pack/ cp $out_root/libodb-mysql/libodb-mysql-$ver.*.tar.gz $out_root/pack/ cp $out_root/libodb-mysql/libodb-mysql-$ver.*.tar.bz2 $out_root/pack/ -# Build libodb-tracer -# -make -C `find_out_dir $src_root/libodb-tracer` \ --f $src_root/libodb-tracer/makefile dist dist_prefix=$out_root/libodb-tracer - -cd $out_root/libodb-tracer - -if [ $rebuild = y ]; then - ./bootstrap - ./configure --with-libodb=../libodb CXX=$cxx CXXFLAGS="$CXXFLAGS" -fi - -make -j 8 -make dist - -cd $wd - -cp $out_root/libodb-tracer/libodb-tracer-$ver.*.zip $out_root/pack/ -cp $out_root/libodb-tracer/libodb-tracer-$ver.*.tar.gz $out_root/pack/ -cp $out_root/libodb-tracer/libodb-tracer-$ver.*.tar.bz2 $out_root/pack/ - # Build libodb-boost # make -C `find_out_dir $src_root/libodb-boost` \ @@ -333,7 +310,6 @@ for d in $db; do ../odb-tests/configure \ --with-database=$d \ --with-libodb=../libodb \ ---with-libodb-tracer=../libodb-tracer \ --with-libodb-$d=../libodb-$d \ --with-libodb-boost=../libodb-boost \ --with-libodb-qt=../libodb-qt \ -- cgit v1.1