diff options
| -rwxr-xr-x | dist.sh | 6 | ||||
| -rwxr-xr-x | test/windows/odb/build.bat | 26 | ||||
| -rwxr-xr-x | test/windows/odb/mingw/build | 6 |
3 files changed, 15 insertions, 23 deletions
@@ -245,14 +245,13 @@ for d in $db; do mkdir -p $out_root/odb-tests-$d cd $out_root/odb-tests-$d -# @@ --with-libodb-boost=../libodb-boost \ - if [ $rebuild = y ]; then ../odb-tests/configure \ --with-database=$d \ --with-libodb=../libodb \ --with-libodb-tracer=../libodb-tracer \ --with-libodb-$d=../libodb-$d \ +--with-libodb-boost=../libodb-boost \ CXXFLAGS="$CXXFLAGS" \ ODB=$odb fi @@ -293,13 +292,12 @@ for d in $db; do mkdir -p $out_root/odb-examples-$d cd $out_root/odb-examples-$d -# @@ --with-libodb-boost=../libodb-boost \ - if [ $rebuild = y ]; then ../odb-examples/configure \ --with-database=$d \ --with-libodb=../libodb \ --with-libodb-$d=../libodb-$d \ +--with-libodb-boost=../libodb-boost \ CXXFLAGS="$CXXFLAGS" \ ODB=$odb fi diff --git a/test/windows/odb/build.bat b/test/windows/odb/build.bat index 93d9251..323ec99 100755 --- a/test/windows/odb/build.bat +++ b/test/windows/odb/build.bat @@ -89,13 +89,11 @@ for %%c in (%confs%) do ( if not "_%failed%_" == "__" goto error -rem @@ enable -rem -rem for %%c in (%confs%) do ( -rem for %%p in (%plats%) do ( -rem call :run_build odb-examples-%1/boost/boost-%1-vc%vcver%.sln %%c %%p -rem ) -rem ) +for %%c in (%confs%) do ( + for %%p in (%plats%) do ( + call :run_build odb-examples-%1/boost/boost-%1-vc%vcver%.sln %%c %%p + ) +) if not "_%failed%_" == "__" goto error @@ -106,14 +104,12 @@ if errorlevel 1 ( goto error ) -rem @@ enable -rem -rem cd boost -rem call build.bat %1 %2 %3 %4 %action% -rem if errorlevel 1 ( -rem cd ..\.. -rem goto error -rem ) +cd boost +call build.bat %1 %2 %3 %4 %action% +if errorlevel 1 ( + cd ..\.. + goto error +) echo. echo ALL BUILDS SUCCEEDED diff --git a/test/windows/odb/mingw/build b/test/windows/odb/mingw/build index b5c6ad0..256d06c 100755 --- a/test/windows/odb/mingw/build +++ b/test/windows/odb/mingw/build @@ -130,14 +130,13 @@ for d in $db; do optvar=${d}_options -# @@ --with-libodb-boost=../libodb-boost \ - if [ $rebuild = y -o ! -f Makefile ]; then ../odb-tests/configure \ --with-database=$d \ --with-libodb=../libodb \ --with-libodb-$d=../libodb-$d \ --with-libodb-tracer=../libodb-tracer \ +--with-libodb-boost=../libodb-boost \ ${!optvar} \ CPPFLAGS="$CPPFLAGS" LDFLAGS="$LDFLAGS" DIFFFLAGS=-ubB fi @@ -157,13 +156,12 @@ for d in $db; do optvar=${d}_options -# @@ --with-libodb-boost=../libodb-boost \ - if [ $rebuild = y -o ! -f Makefile ]; then ../odb-examples/configure \ --with-database=$d \ --with-libodb=../libodb \ --with-libodb-$d=../libodb-$d \ +--with-libodb-boost=../libodb-boost \ ${!optvar} \ CPPFLAGS="$CPPFLAGS" LDFLAGS="$LDFLAGS" DIFFFLAGS=-ubB fi |