diff options
| -rwxr-xr-x | dist.sh | 72 |
1 files changed, 64 insertions, 8 deletions
@@ -9,6 +9,8 @@ # -odb <odb-compiler-path> # -cxx <c++-compiler> # -cxxp <g++-plugin-compiler> +# -<db>-options <options> +# -<db>-test-options <options> # trap 'exit 1' ERR @@ -49,9 +51,13 @@ cxxp=g++-4.5 CXXFLAGS="-W -Wall -Wno-unknown-pragmas" mysql_options= +mysql_test_options= sqlite_options= +sqlite_test_options= pgsql_options= -oracle_options="--with-oracle-host=localhost --with-oracle-service=xe" +pgsql_test_option= +oracle_options= +oracle_tests_options= while [ $# -gt 0 ]; do case $1 in @@ -88,6 +94,46 @@ while [ $# -gt 0 ]; do cxxp=$1 shift ;; + -mysql-options) + shift + mysql_options=$1 + shift + ;; + -mysql-test-options) + shift + mysql_test_options=$1 + shift + ;; + -sqlite-options) + shift + sqlite_options=$1 + shift + ;; + -sqlite-test-options) + shift + sqlite_test_options=$1 + shift + ;; + -pgsql-options) + shift + pgsql_options=$1 + shift + ;; + -pgsql-test-options) + shift + pgsql_test_options=$1 + shift + ;; + -oracle-options) + shift + oracle_options=$1 + shift + ;; + -oracle-test-options) + shift + oracle_test_options=$1 + shift + ;; *) error "unknown option: $1" exit 1 @@ -199,8 +245,9 @@ 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" + CXX=$cxx \ + CXXFLAGS="$CXXFLAGS" \ + $oracle_options fi make -j 8 @@ -221,7 +268,10 @@ cd $out_root/libodb-pgsql if [ $rebuild = y ]; then ./bootstrap - ./configure --with-libodb=../libodb CXX=$cxx CXXFLAGS="$CXXFLAGS" + ./configure --with-libodb=../libodb \ + CXX=$cxx \ + CXXFLAGS="$CXXFLAGS" \ + $pgsql_options fi make -j 8 @@ -242,7 +292,10 @@ cd $out_root/libodb-sqlite if [ $rebuild = y ]; then ./bootstrap - ./configure --with-libodb=../libodb CXX=$cxx CXXFLAGS="$CXXFLAGS" + ./configure --with-libodb=../libodb \ + CXX=$cxx \ + CXXFLAGS="$CXXFLAGS" \ + $sqlite_options fi make -j 8 @@ -263,7 +316,10 @@ cd $out_root/libodb-mysql if [ $rebuild = y ]; then ./bootstrap - ./configure --with-libodb=../libodb CXX=$cxx CXXFLAGS="$CXXFLAGS" + ./configure --with-libodb=../libodb \ + CXX=$cxx \ + CXXFLAGS="$CXXFLAGS" \ + $mysql_options fi make -j 8 @@ -336,7 +392,7 @@ for d in $db; do mkdir -p $out_root/odb-tests-$d cd $out_root/odb-tests-$d - optvar=${d}_options + optvar=${d}_test_options if [ $rebuild = y ]; then ../odb-tests/configure \ @@ -387,7 +443,7 @@ for d in $db; do mkdir -p $out_root/odb-examples-$d cd $out_root/odb-examples-$d - optvar=${d}_options + optvar=${d}_test_options if [ $rebuild = y ]; then ../odb-examples/configure \ |