Corrections to Windows and MinGW build scripts

4 files changed, 14 insertions, 17 deletions

diff --git a/test/windows/odb/mingw/build b/test/windows/odb/mingw/build
index 79aee24..4936235 100755
--- a/test/windows/odb/mingw/build
+++ b/test/windows/odb/mingw/build
@@ -28,14 +28,14 @@ ORACLE=$ROOT/oracle-mingw32
 BOOST=$ROOT/boost-mingw32
 QTCORE=$ROOT/qtcore-mingw32
 
-CPPFLAGS="-I$BOOST -I$QTCORE/include -I$QTCORE/include/QtCore -I$ORACLE/include -I$PGSQL/include -I$SQLITE -I$MYSQL/include"
-LDFLAGS="-L$BOOST/stage/lib -L$QTCORE/lib -L$ORACLE/lib -L$PGSQL/lib -L$SQLITE -L$MYSQL/lib -Wl,--enable-auto-import"
-PATH="$QTCORE/bin:$PATH"
+CPPFLAGS="-I$BOOST -I$QTCORE/include -I$QTCORE/include/QtCore -I$ORACLE/sdk/include -I$PGSQL/include -I$SQLITE -I$MYSQL/include"
+LDFLAGS="-L$BOOST/stage/lib -L$QTCORE/lib -L$ORACLE/sdk/lib -L$PGSQL/lib -L$SQLITE -L$MYSQL/lib -Wl,--enable-auto-import"
+PATH="$QTCORE/bin:$ORACLE:$PATH"
 
 mysql_options="--with-mysql-host=192.168.0.5 --with-mysql-client=$MYSQL/bin/mysql.exe"
 sqlite_options="--with-sqlite-db=c:\\projects\\odb\\odb_test.db"
 pgsql_options="--with-pgsql-host=192.168.0.5 --with-pgsql-client=$PGSQL/bin/psql.exe"
-oracle-options="--with-oracle-host=192.168.0.5 --with-oracle-service=xe --with-oracle-client=$ORACLE/bin/sqlplus.exe"
+oracle-options="--with-oracle-host=192.168.0.5 --with-oracle-service=xe --with-oracle-client=$ORACLE/sqlplus.exe"
 
 test=n
 rebuild=n
diff --git a/test/windows/odb/oracle-driver.bat b/test/windows/odb/oracle-driver.bat
index 83662bf..6962970 100644
--- a/test/windows/odb/oracle-driver.bat
+++ b/test/windows/odb/oracle-driver.bat
@@ -13,8 +13,8 @@ rem
 
 setlocal
 
-set "options=%ORACLE_OPTIONS%"
-set "options=%options% odb_test/odb_test"
+set "options=%ORACLE_OPTIONS% -L -S"
+set "options=%options% odb_test/odb_test@//192.168.0.X:1521/xe"
 
 set "oracle=%ORACLE_CLIENT%"
 
@@ -25,7 +25,7 @@ if "_%1_" == "__" (
   goto usage
 )
 
-%oracle% %options% < %1
+%oracle% %options% @%1
 
 if errorlevel 1 goto error
 goto end
diff --git a/test/windows/odb/oracle.options b/test/windows/odb/oracle.options
index 288ef20..c4ad2bc 100644
--- a/test/windows/odb/oracle.options
+++ b/test/windows/odb/oracle.options
@@ -1,9 +1,7 @@
-# Sample Oracle options file used to run the tests. Adjust to
-# match your Oracle setup.
 #
-
+#
 --user odb_test
 --password odb_test
-# --service
-# --host 192.168.0.X
+--host 192.168.0.X
 # --port
+# --service
diff --git a/test/windows/odb/setenv.bat b/test/windows/odb/setenv.bat
index dd73cba..b4fc0db 100755
--- a/test/windows/odb/setenv.bat
+++ b/test/windows/odb/setenv.bat
@@ -10,13 +10,12 @@ set ORACLE=c:\projects\oracle
 set ORACLE64=c:\projects\oracle64
 set QTCORE=c:\projects\qtcore
 set QTCORE64=c:\projects\qtcore64
-set "ORACLE_OPTIONS=-L -S"
-set "NLSLANG=AMERICA_AMERICA.WE8MSWIN1252"
-if defined NLS_LANG SET NLSLANG=NLS_LANGset "DIFF=c:\cygwin\bin\diff.exe -ubB"
+set "NLS_LANG=AMERICA_AMERICA.WE8MSWIN1252"
+set "DIFF=c:\cygwin\bin\diff.exe -ubB"
 rem set "DEVENV=c:\Program Files (x86)\Microsoft Visual Studio 9.0\Common7\IDE\devenv.com"
 set "DEVENV=c:\Program Files (x86)\Microsoft Visual Studio 10.0\Common7\IDE\devenv.com"
-set PATH=%ODB%\libodb\bin;%ODB%\libodb-sqlite\bin;%ODB%\libodb-mysql\bin;%ODB%\libodb-pgsql\bin;%ODB%\libodb-oracle\bin;%ODB%\libodb-boost\bin;%ODB%\libodb-qt\bin;%MYSQL%\bin;%SQLITE%\bin;%PGSQL%\bin;%ORACLE%\bin;%QTCORE%\bin;%PATH%
-set PATH=%ODB%\libodb\bin64;%ODB%\libodb-sqlite\bin64;%ODB%\libodb-mysql\bin64;%ODB%\libodb-pgsql\bin64;%ODB%\libodb-oracle\bin64;%ODB%\libodb-boost\bin64;%ODB%\libodb-qt\bin64;%MYSQL64%\bin;%SQLITE%\bin64;%PGSQL64%\bin;%ORACLE64%\bin;%QTCORE64%\bin;%PATH%
+set PATH=%ODB%\libodb\bin;%ODB%\libodb-sqlite\bin;%ODB%\libodb-mysql\bin;%ODB%\libodb-pgsql\bin;%ODB%\libodb-oracle\bin;%ODB%\libodb-boost\bin;%ODB%\libodb-qt\bin;%MYSQL%\bin;%SQLITE%\bin;%PGSQL%\bin;%ORACLE%;%QTCORE%\bin;%PATH%
+set PATH=%ODB%\libodb\bin64;%ODB%\libodb-sqlite\bin64;%ODB%\libodb-mysql\bin64;%ODB%\libodb-pgsql\bin64;%ODB%\libodb-oracle\bin64;%ODB%\libodb-boost\bin64;%ODB%\libodb-qt\bin64;%MYSQL64%\bin;%SQLITE%\bin64;%PGSQL64%\bin;%ORACLE64%\bin;%QTCORE64%;%PATH%
 
 if "_%1_" == "__" goto end