diff options
| author | Boris Kolpackov <boris@codesynthesis.com> | 2011-12-06 13:46:55 +0200 |
|---|---|---|
| committer | Boris Kolpackov <boris@codesynthesis.com> | 2011-12-06 13:46:55 +0200 |
| commit | 52c97ba8b35f0eec312bde23afeabde59fd5c74f (patch) | |
| tree | 19ff99cc8f35406d4a658a97380ed28dc66f02f1 | |
| parent | 9849e5dd3c7f8609a6edd33d5be67ea6ddddf07e (diff) | |
Add support for Windows build with multiple VC++ versions on same machine1.7.0
| -rwxr-xr-x | test/windows/odb/all | 6 | ||||
| -rw-r--r-- | test/windows/odb/default.options | 6 | ||||
| -rwxr-xr-x | test/windows/odb/setenv.bat | 28 |
3 files changed, 27 insertions, 13 deletions
diff --git a/test/windows/odb/all b/test/windows/odb/all index 8d50a29..fe537b1 100755 --- a/test/windows/odb/all +++ b/test/windows/odb/all @@ -51,11 +51,11 @@ if [ "$action" == "" ]; then fi for d in $databases; do - cmd.exe /C setenv.bat build.bat "$d" "$1" "$3" "$4" "$action" + cmd.exe /C setenv.bat "$1" build.bat "$d" "$1" "$3" "$4" "$action" cd odb-tests-$d - cmd.exe /C ..\\setenv.bat test.bat "$d" + cmd.exe /C ..\\setenv.bat "$1" test.bat "$d" cd .. cd odb-examples-$d - cmd.exe /C ..\\setenv.bat test.bat "$d" + cmd.exe /C ..\\setenv.bat "$1" test.bat "$d" cd .. done diff --git a/test/windows/odb/default.options b/test/windows/odb/default.options index 4c3e944..f6d7429 100644 --- a/test/windows/odb/default.options +++ b/test/windows/odb/default.options @@ -1,3 +1,3 @@ --I C:\projects\boost --I C:\projects\qtcore\include --I C:\projects\qtcore\include\QtCore +-I C:\projects\boost-vc10 +-I C:\projects\qtcore-vc10\include +-I C:\projects\qtcore-vc10\include\QtCore diff --git a/test/windows/odb/setenv.bat b/test/windows/odb/setenv.bat index dbb8361..c8b92bd 100755 --- a/test/windows/odb/setenv.bat +++ b/test/windows/odb/setenv.bat @@ -1,24 +1,38 @@ @echo off +if "_%1_" == "__" ( + echo no VC++ vecrsion specified + goto usage +) + set ODB=c:\projects\odb set MYSQL=c:\projects\mysql set MYSQL64=c:\projects\mysql64 -set SQLITE=c:\projects\sqlite +set SQLITE=c:\projects\sqlite-vc%1 set PGSQL=c:\projects\pgsql set PGSQL64=c:\projects\pgsql64 set ORACLE=c:\projects\oracle set ORACLE64=c:\projects\oracle64 -set QTCORE=c:\projects\qtcore -set QTCORE64=c:\projects\qtcore64 +set QTCORE=c:\projects\qtcore-vc%1 +set QTCORE64=c:\projects\qtcore64-vc%1 rem 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" +if "_%1_" == "_9_" set "DEVENV=c:\Program Files (x86)\Microsoft Visual Studio 9.0\Common7\IDE\devenv.com" +if "_%1_" == "_10_" 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%;%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%;%QTCORE64%\bin;%PATH% -if "_%1_" == "__" goto end +if "_%2_" == "__" goto end + +%2 %3 %4 %5 %6 %7 %8 %9 +goto end + +:usage +echo. +echo usage: setenv.bat vc-version ... +echo. -%1 %2 %3 %4 %5 %6 %7 %8 %9 +:error +exit /b 1 :end |