From 76108c5211713934c20fdd8a78755e5b21697e1b Mon Sep 17 00:00:00 2001 From: Boris Kolpackov Date: Tue, 1 Mar 2011 16:13:25 +0200 Subject: Add support for building only certain configurations/platforms on Windows --- INSTALL | 12 ++++++++---- boost/build.bat | 37 ++++++++++++++++++++++++++++--------- build.bat | 37 ++++++++++++++++++++++++++++--------- 3 files changed, 64 insertions(+), 22 deletions(-) diff --git a/INSTALL b/INSTALL index 10445a7..5e87eb0 100644 --- a/INSTALL +++ b/INSTALL @@ -122,10 +122,14 @@ and odb-tests\boost\ directories to build all the solutions, for all the configurations and for all the platforms automatically. The build.bat file has the following command line interface: -build.bat [/Build|/Clean|/Rebuild] - -Where is the version of Visual Studio that you are using. If no action -is specified, the default is /Build. +build.bat [/Build|/Clean|/Rebuild] + +Where is the version of Visual Studio that you are using, is the +desired configuration (e.g., Debug or Release), and is the desired +platform (e.g., Win32 or x64). For and arguments you can specify +several configurations or platforms. You can also use the 'all' value to build +all configurations and/or all platforms. If no action is specified, the +default is /Build. Once the build is completed successfully, you can run all the tests using the test.bat batch file located in the odb-tests\ directory. diff --git a/boost/build.bat b/boost/build.bat index eb43d41..9f1d742 100644 --- a/boost/build.bat +++ b/boost/build.bat @@ -5,17 +5,16 @@ rem copyright : Copyright (c) 2009-2011 Code Synthesis Tools CC rem license : GNU GPL v2; see accompanying LICENSE file rem -rem build.bat database vc-version [/Build|/Clean|/Rebuild] -rem rem Build Boost tests using the VC++ batch mode compilation. rem +rem build.bat database vc-version conf plat [/Build|/Clean|/Rebuild] +rem +rem conf: {Debug,Release}|all +rem plat: {Win32,x64}|all +rem setlocal -set "confs=__path__(configurations)" -set "plats=__path__(platforms)" -set "failed=" - if "_%1_" == "__" ( echo no database specified goto usage @@ -26,6 +25,18 @@ if "_%2_" == "__" ( goto usage ) +if "_%~3_" == "__" ( + echo no configuration specified + goto usage +) + +if "_%~4_" == "__" ( + echo no platform specified + goto usage +) + +set "failed=" + if "_%2_" == "_9_" set "vcver=9" if "_%2_" == "_10_" set "vcver=10" @@ -34,7 +45,13 @@ if "_%vcver%_" == "__" ( goto usage ) -set "action=%3" +set "confs=%~3" +set "plats=%~4" + +if "_%confs%_" == "_all_" set "confs=__path__(configurations)" +if "_%plats%_" == "_all_" set "plats=__path__(platforms)" + +set "action=%5" if "_%action%_" == "__" set "action=/Build" set "devenv=%DEVENV%" @@ -79,8 +96,10 @@ goto end :usage echo. -echo usage: build.bat database vc-version [action] -echo valid actions are /Build, /Clean, and /Rebuild +echo usage: build.bat database vc-version conf plat [action] +echo valid configurations are: {Debug,Release}|all +echo valid platforms are: {Win32,x64}|all +echo valid actions are: /Build (default), /Clean, and /Rebuild echo. :error diff --git a/build.bat b/build.bat index 319e70f..23607c1 100644 --- a/build.bat +++ b/build.bat @@ -5,17 +5,16 @@ rem copyright : Copyright (c) 2009-2011 Code Synthesis Tools CC rem license : GNU GPL v2; see accompanying LICENSE file rem -rem build.bat database vc-version [/Build|/Clean|/Rebuild] -rem rem Build tests using the VC++ batch mode compilation. rem +rem build.bat database vc-version conf plat [/Build|/Clean|/Rebuild] +rem +rem conf: {Debug,Release}|all +rem plat: {Win32,x64}|all +rem setlocal -set "confs=__path__(configurations)" -set "plats=__path__(platforms)" -set "failed=" - if "_%1_" == "__" ( echo no database specified goto usage @@ -26,6 +25,18 @@ if "_%2_" == "__" ( goto usage ) +if "_%~3_" == "__" ( + echo no configuration specified + goto usage +) + +if "_%~4_" == "__" ( + echo no platform specified + goto usage +) + +set "failed=" + if "_%2_" == "_9_" set "vcver=9" if "_%2_" == "_10_" set "vcver=10" @@ -34,7 +45,13 @@ if "_%vcver%_" == "__" ( goto usage ) -set "action=%3" +set "confs=%~3" +set "plats=%~4" + +if "_%confs%_" == "_all_" set "confs=__path__(configurations)" +if "_%plats%_" == "_all_" set "plats=__path__(platforms)" + +set "action=%5" if "_%action%_" == "__" set "action=/Build" set "devenv=%DEVENV%" @@ -85,8 +102,10 @@ goto end :usage echo. -echo usage: build.bat database vc-version [action] -echo valid actions are /Build, /Clean, and /Rebuild +echo usage: build.bat database vc-version conf plat [action] +echo valid configurations are: {Debug,Release}|all +echo valid platforms are: {Win32,x64}|all +echo valid actions are: /Build (default), /Clean, and /Rebuild echo. :error -- cgit v1.1