Add Oracle to dist

1 files changed, 38 insertions, 2 deletions

diff --git a/dist.sh b/dist.sh
index f6a0fa7..5bd548d 100755
--- a/dist.sh
+++ b/dist.sh
@@ -48,6 +48,11 @@ cxxp=g++-4.5
 
 CXXFLAGS="-W -Wall -Wno-unknown-pragmas"
 
+mysql_options=
+sqlite_options=
+pgsql_options=
+oracle_options="--with-oracle-host=localhost --with-oracle-service=xe"
+
 while [ $# -gt 0 ]; do
   case $1 in
     -rebuild)
@@ -91,13 +96,14 @@ while [ $# -gt 0 ]; do
 done
 
 if [ "$db" = "" ]; then
-  db="pgsql sqlite mysql"
+  db="oracle pgsql sqlite mysql"
 fi
 
 # Clean everything up if we are rebuilding.
 #
 if [ $rebuild = y ]; then
   rm -rf $out_root/libodb/*
+  rm -rf $out_root/libodb-oracle/*
   rm -rf $out_root/libodb-pgsql/*
   rm -rf $out_root/libodb-sqlite/*
   rm -rf $out_root/libodb-mysql/*
@@ -114,7 +120,8 @@ if [ $rebuild = y ]; then
   rm -rf $out_root/pack
 fi
 
-mkdir -p $out_root/libodb
+mkdir -p $out_root/libodb\
+mkdir -p $out_root/libodb-oracle
 mkdir -p $out_root/libodb-pgsql
 mkdir -p $out_root/libodb-sqlite
 mkdir -p $out_root/libodb-mysql
@@ -182,6 +189,29 @@ cp $out_root/libodb/libodb-$ver.*.zip $out_root/pack/
 cp $out_root/libodb/libodb-$ver.*.tar.gz $out_root/pack/
 cp $out_root/libodb/libodb-$ver.*.tar.bz2 $out_root/pack/
 
+# Build libodb-oracle
+#
+make -C `find_out_dir $src_root/libodb-oracle` \
+-f $src_root/libodb-oracle/makefile dist dist_prefix=$out_root/libodb-oracle
+
+cd $out_root/libodb-oracle
+
+if [ $rebuild = y ]; then
+  ./bootstrap
+  ./configure --with-libodb=../libodb \
+              --with-oci="/usr/lib/oracle/instantclient/10.2.0.3" \
+              CXX=$cxx CXXFLAGS="$CXXFLAGS"
+fi
+
+make -j 8
+make dist
+
+cd $wd
+
+cp $out_root/libodb-oracle/libodb-oracle-$ver.*.zip $out_root/pack/
+cp $out_root/libodb-oracle/libodb-oracle-$ver.*.tar.gz $out_root/pack/
+cp $out_root/libodb-oracle/libodb-oracle-$ver.*.tar.bz2 $out_root/pack/
+
 # Build libodb-pgsql
 #
 make -C `find_out_dir $src_root/libodb-pgsql` \
@@ -306,6 +336,8 @@ for d in $db; do
   mkdir -p $out_root/odb-tests-$d
   cd $out_root/odb-tests-$d
 
+  optvar=${d}_options
+
   if [ $rebuild = y ]; then
     ../odb-tests/configure \
 --with-database=$d \
@@ -313,6 +345,7 @@ for d in $db; do
 --with-libodb-$d=../libodb-$d \
 --with-libodb-boost=../libodb-boost \
 --with-libodb-qt=../libodb-qt \
+${!optvar} \
 CXX=$cxx \
 CXXFLAGS="$CXXFLAGS" \
 ODB=$odb
@@ -354,6 +387,8 @@ for d in $db; do
   mkdir -p $out_root/odb-examples-$d
   cd $out_root/odb-examples-$d
 
+  optvar=${d}_options
+
   if [ $rebuild = y ]; then
     ../odb-examples/configure \
 --with-database=$d \
@@ -361,6 +396,7 @@ for d in $db; do
 --with-libodb-$d=../libodb-$d \
 --with-libodb-boost=../libodb-boost \
 --with-libodb-qt=../libodb-qt \
+${!optvar} \
 CXX=$cxx \
 CXXFLAGS="$CXXFLAGS" \
 ODB=$odb