From 9b52eaea0d2a76c3a8fd32b4ab24b7a53ba4377f Mon Sep 17 00:00:00 2001
From: Boris Kolpackov <boris@codesynthesis.com>
Date: Wed, 16 Mar 2011 08:21:43 +0200
Subject: Update MinGW build scripts to build libodb-boost

---
 test/windows/odb/mingw/build  | 21 ++++++++++++++++++---
 test/windows/odb/mingw/unpack |  5 ++++-
 2 files changed, 22 insertions(+), 4 deletions(-)

(limited to 'test')

diff --git a/test/windows/odb/mingw/build b/test/windows/odb/mingw/build
index 979cc16..28e8964 100755
--- a/test/windows/odb/mingw/build
+++ b/test/windows/odb/mingw/build
@@ -19,9 +19,10 @@ function clean ()
   fi
 }
 
-MYSQL=/c/projects/mysql-mingw32/bin/mysql.exe
-CPPFLAGS=-I/c/projects/mysql-mingw32/include
-LDFLAGS="-L/c/projects/mysql-mingw32/lib -Wl,--enable-auto-import"
+ROOT=/c/projects
+MYSQL=$ROOT/mysql-mingw32/bin/mysql.exe
+CPPFLAGS="-I$ROOT/boost-mingw32 -I$ROOT/mysql-mingw32/include"
+LDFLAGS="-L$ROOT/boost-mingw32/stage/lib -L$ROOT/mysql-mingw32/lib -Wl,--enable-auto-import"
 
 test=n
 rebuild=n
@@ -49,6 +50,7 @@ if [ $rebuild = y ]; then
   clean libodb
   clean libodb-mysql
   clean libodb-tracer
+  clean libodb-boost
   clean odb-tests
   clean odb-examples
 fi
@@ -86,6 +88,17 @@ fi
 make
 cd ..
 
+# Build libodb-boost
+#
+cd libodb-boost
+
+if [ $rebuild = y ]; then
+  ./configure --with-libodb=../libodb CPPFLAGS="$CPPFLAGS" LDFLAGS="$LDFLAGS"
+fi
+
+make
+cd ..
+
 # Build odb-tests
 #
 cd odb-tests
@@ -96,6 +109,7 @@ if [ $rebuild = y ]; then
 --with-libodb=../libodb \
 --with-libodb-mysql=../libodb-mysql \
 --with-libodb-tracer=../libodb-tracer \
+--with-libodb-boost=../libodb-boost \
 --with-mysql-host=192.168.0.5 \
 --with-mysql-client=$MYSQL \
 CPPFLAGS="$CPPFLAGS" LDFLAGS="$LDFLAGS" DIFFFLAGS=-ubB
@@ -118,6 +132,7 @@ if [ $rebuild = y ]; then
 --with-database=mysql \
 --with-libodb=../libodb \
 --with-libodb-mysql=../libodb-mysql \
+--with-libodb-boost=../libodb-boost \
 --with-mysql-host=192.168.0.5 \
 --with-mysql-client=$MYSQL \
 CPPFLAGS="$CPPFLAGS" LDFLAGS="$LDFLAGS"
diff --git a/test/windows/odb/mingw/unpack b/test/windows/odb/mingw/unpack
index 0b334b9..c7164a0 100755
--- a/test/windows/odb/mingw/unpack
+++ b/test/windows/odb/mingw/unpack
@@ -9,7 +9,7 @@ function error ()
 
 base=/t/pack
 
-rm -rf libodb libodb-mysql libodb-tracer odb-tests odb-examples
+rm -rf libodb libodb-mysql libodb-tracer libodb-boost odb-tests odb-examples
 
 v=`echo $base/libodb-?.*.zip | sed -e "s%$base/libodb-\(.*\).zip%\1%"`
 
@@ -24,6 +24,9 @@ mv libodb-tracer-$v libodb-tracer
 unzip -q $base/libodb-mysql-$v.zip
 mv libodb-mysql-$v libodb-mysql
 
+unzip -q $base/libodb-boost-$v.zip
+mv libodb-boost-$v libodb-boost
+
 unzip -q $base/odb-tests-$v.zip
 mv odb-tests-$v odb-tests
 
-- 
cgit v1.1