summaryrefslogtreecommitdiff
path: root/test/windows
diff options
context:
space:
mode:
Diffstat (limited to 'test/windows')
-rw-r--r--test/windows/README4
-rwxr-xr-xtest/windows/odb/build.bat2
-rwxr-xr-xtest/windows/odb/mingw/build13
-rwxr-xr-xtest/windows/odb/setenv.bat4
-rwxr-xr-xtest/windows/odb/unpack5
5 files changed, 6 insertions, 22 deletions
diff --git a/test/windows/README b/test/windows/README
index 1dc7244..b2ee0d3 100644
--- a/test/windows/README
+++ b/test/windows/README
@@ -24,9 +24,9 @@ Steps:
boost
qtcore
odb/libodb
- odb/libodb-tracer
- odb/libodb-sqlite
odb/libodb-mysql
+ odb/libodb-pgsql
+ odb/libodb-sqlite
odb/libodb-boost
odb/libodb-qt
diff --git a/test/windows/odb/build.bat b/test/windows/odb/build.bat
index 4169c36..ca97d9e 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 libodb-qt) do (
+for %%d in (libodb 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
diff --git a/test/windows/odb/mingw/build b/test/windows/odb/mingw/build
index bf65db2..35748c9 100755
--- a/test/windows/odb/mingw/build
+++ b/test/windows/odb/mingw/build
@@ -72,7 +72,6 @@ if [ $rebuild = y ]; then
clean libodb-pgsql
clean libodb-sqlite
clean libodb-mysql
- clean libodb-tracer
clean libodb-boost
clean libodb-qt
@@ -106,17 +105,6 @@ for d in $db; do
cd ..
done
-# Build libodb-tracer
-#
-cd libodb-tracer
-
-if [ $rebuild = y -o ! -f Makefile ]; then
- ./configure --with-libodb=../libodb CPPFLAGS="$CPPFLAGS" LDFLAGS="$LDFLAGS"
-fi
-
-make
-cd ..
-
# Build libodb-boost
#
cd libodb-boost
@@ -152,7 +140,6 @@ for d in $db; do
--with-database=$d \
--with-libodb=../libodb \
--with-libodb-$d=../libodb-$d \
---with-libodb-tracer=../libodb-tracer \
--with-libodb-boost=../libodb-boost \
--with-libodb-qt=../libodb-qt \
${!optvar} \
diff --git a/test/windows/odb/setenv.bat b/test/windows/odb/setenv.bat
index f346b59..dafba20 100755
--- a/test/windows/odb/setenv.bat
+++ b/test/windows/odb/setenv.bat
@@ -11,8 +11,8 @@ set QTCORE64=c:\projects\qtcore64
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-tracer\bin;%ODB%\libodb-boost\bin;%ODB%\libodb-qt\bin;%MYSQL%\bin;%SQLITE%\bin;%PGSQL%\bin;%QTCORE%\bin;%PATH%
-set PATH=%ODB%\libodb\bin64;%ODB%\libodb-sqlite\bin64;%ODB%\libodb-mysql\bin64;%ODB%\libodb-pgsql\bin64;%ODB%\libodb-tracer\bin64;%ODB%\libodb-boost\bin64;%ODB%\libodb-qt\bin64;%MYSQL64%\bin;%SQLITE%\bin64;%PGSQL64%\bin;%QTCORE64%\bin;%PATH%
+set PATH=%ODB%\libodb\bin;%ODB%\libodb-sqlite\bin;%ODB%\libodb-mysql\bin;%ODB%\libodb-pgsql\bin;%ODB%\libodb-boost\bin;%ODB%\libodb-qt\bin;%MYSQL%\bin;%SQLITE%\bin;%PGSQL%\bin;%QTCORE%\bin;%PATH%
+set PATH=%ODB%\libodb\bin64;%ODB%\libodb-sqlite\bin64;%ODB%\libodb-mysql\bin64;%ODB%\libodb-pgsql\bin64;%ODB%\libodb-boost\bin64;%ODB%\libodb-qt\bin64;%MYSQL64%\bin;%SQLITE%\bin64;%PGSQL64%\bin;%QTCORE64%\bin;%PATH%
if "_%1_" == "__" goto end
diff --git a/test/windows/odb/unpack b/test/windows/odb/unpack
index eff9504..c45bd6c 100755
--- a/test/windows/odb/unpack
+++ b/test/windows/odb/unpack
@@ -34,7 +34,7 @@ else
base=/cygdrive/t/pack
fi
-rm -rf libodb libodb-pgsql libodb-sqlite libodb-mysql libodb-tracer libodb-boost \
+rm -rf libodb libodb-pgsql libodb-sqlite libodb-mysql libodb-boost \
libodb-qt odb odb-tests odb-examples odb-tests-* odb-examples-*
v=`echo $base/libodb-?.*.zip | sed -e "s%$base/libodb-\(.*\).zip%\1%"`
@@ -44,9 +44,6 @@ echo unpacking $v from $base
unzip -q $base/libodb-$v.zip
mv libodb-$v libodb
-unzip -q $base/libodb-tracer-$v.zip
-mv libodb-tracer-$v libodb-tracer
-
unzip -q $base/libodb-pgsql-$v.zip
mv libodb-pgsql-$v libodb-pgsql