summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rwxr-xr-xdist.sh24
-rwxr-xr-xtest/windows/odb/build.bat17
2 files changed, 40 insertions, 1 deletions
diff --git a/dist.sh b/dist.sh
index 37aa447..932b1c5 100755
--- a/dist.sh
+++ b/dist.sh
@@ -71,6 +71,7 @@ if [ $rebuild = y ]; then
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-*
rm -rf $out_root/odb-examples/* $out_root/odb-examples-*
@@ -86,6 +87,7 @@ mkdir -p $out_root/libodb
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
mkdir -p $out_root/odb-examples
@@ -226,6 +228,26 @@ cp $out_root/libodb-boost/libodb-boost-$ver.zip $out_root/pack/
cp $out_root/libodb-boost/libodb-boost-$ver.tar.gz $out_root/pack/
cp $out_root/libodb-boost/libodb-boost-$ver.tar.bz2 $out_root/pack/
+# Build libodb-qt
+#
+make -C $src_root/libodb-qt dist dist_prefix=$out_root/libodb-qt
+
+cd $out_root/libodb-qt
+
+if [ $rebuild = y ]; then
+ ./bootstrap
+ ./configure --with-libodb=../libodb CXXFLAGS="$CXXFLAGS"
+fi
+
+make -j 8
+make dist
+
+cd $wd
+
+cp $out_root/libodb-qt/libodb-qt-$ver.zip $out_root/pack/
+cp $out_root/libodb-qt/libodb-qt-$ver.tar.gz $out_root/pack/
+cp $out_root/libodb-qt/libodb-qt-$ver.tar.bz2 $out_root/pack/
+
# Build odb-tests
#
make -C $src_root/tests-mysql -f $src_root/tests/makefile dist \
@@ -252,6 +274,7 @@ for d in $db; do
--with-libodb-tracer=../libodb-tracer \
--with-libodb-$d=../libodb-$d \
--with-libodb-boost=../libodb-boost \
+--with-libodb-qt=../libodb-qt \
CXXFLAGS="$CXXFLAGS" \
ODB=$odb
fi
@@ -298,6 +321,7 @@ for d in $db; do
--with-libodb=../libodb \
--with-libodb-$d=../libodb-$d \
--with-libodb-boost=../libodb-boost \
+--with-libodb-qt=../libodb-qt \
CXXFLAGS="$CXXFLAGS" \
ODB=$odb
fi
diff --git a/test/windows/odb/build.bat b/test/windows/odb/build.bat
index 323ec99..efe9c2a 100755
--- a/test/windows/odb/build.bat
+++ b/test/windows/odb/build.bat
@@ -71,7 +71,7 @@ goto :eof
:start
-for %%d in (libodb libodb-tracer libodb-%1 libodb-boost) do (
+for %%d in (libodb libodb-tracer libodb-%1 libodb-boost libodb-qt) do (
for %%c in (%confs%) do (
for %%p in (%plats%) do (
call :run_build %%d/%%d-vc%vcver%.sln %%c %%p
@@ -97,6 +97,14 @@ for %%c in (%confs%) do (
if not "_%failed%_" == "__" goto error
+for %%c in (%confs%) do (
+ for %%p in (%plats%) do (
+ call :run_build odb-examples-%1/qt/qt-%1-vc%vcver%.sln %%c %%p
+ )
+)
+
+if not "_%failed%_" == "__" goto error
+
cd odb-tests-%1
call build.bat %1 %2 %3 %4 %action%
if errorlevel 1 (
@@ -111,6 +119,13 @@ if errorlevel 1 (
goto error
)
+cd ..\qt
+call build.bat %1 %2 %3 %4 %action%
+if errorlevel 1 (
+ cd ..\..
+ goto error
+)
+
echo.
echo ALL BUILDS SUCCEEDED
echo.