diff options
Diffstat (limited to 'Tools/msi/build.bat')
| -rw-r--r-- | Tools/msi/build.bat | 24 |
1 files changed, 15 insertions, 9 deletions
diff --git a/Tools/msi/build.bat b/Tools/msi/build.bat index b11579b..a61ace8 100644 --- a/Tools/msi/build.bat +++ b/Tools/msi/build.bat @@ -6,16 +6,18 @@ set PCBUILD=%D%..\..\PCBuild\ set BUILDX86=
set BUILDX64=
set BUILDDOC=
-set BUILDPX=
+set BUILDTEST=--test-marker
set BUILDPACK=
+set REBUILD=
:CheckOpts
if "%~1" EQU "-h" goto Help
if "%~1" EQU "-x86" (set BUILDX86=1) && shift && goto CheckOpts
if "%~1" EQU "-x64" (set BUILDX64=1) && shift && goto CheckOpts
if "%~1" EQU "--doc" (set BUILDDOC=1) && shift && goto CheckOpts
-if "%~1" EQU "--test-marker" (set BUILDPX=1) && shift && goto CheckOpts
+if "%~1" EQU "--no-test-marker" (set BUILDTEST=) && shift && goto CheckOpts
if "%~1" EQU "--pack" (set BUILDPACK=1) && shift && goto CheckOpts
+if "%~1" EQU "-r" (set REBUILD=-r) && shift && goto CheckOpts
if not defined BUILDX86 if not defined BUILDX64 (set BUILDX86=1) && (set BUILDX64=1)
@@ -24,15 +26,15 @@ call "%D%get_externals.bat" call "%PCBUILD%env.bat" x86
if defined BUILDX86 (
- call "%PCBUILD%build.bat" -d -e
+ call "%PCBUILD%build.bat" -d -e %REBUILD% %BUILDTEST%
if errorlevel 1 goto :eof
- call "%PCBUILD%build.bat" -e
+ call "%PCBUILD%build.bat" -e %REBUILD% %BUILDTEST%
if errorlevel 1 goto :eof
)
if defined BUILDX64 (
- call "%PCBUILD%build.bat" -p x64 -d -e
+ call "%PCBUILD%build.bat" -p x64 -d -e %REBUILD% %BUILDTEST%
if errorlevel 1 goto :eof
- call "%PCBUILD%build.bat" -p x64 -e
+ call "%PCBUILD%build.bat" -p x64 -e %REBUILD% %BUILDTEST%
if errorlevel 1 goto :eof
)
@@ -42,12 +44,15 @@ if defined BUILDDOC ( )
set BUILD_CMD="%D%bundle\snapshot.wixproj"
-if defined BUILDPX (
+if defined BUILDTEST (
set BUILD_CMD=%BUILD_CMD% /p:UseTestMarker=true
)
if defined BUILDPACK (
set BUILD_CMD=%BUILD_CMD% /p:Pack=true
)
+if defined REBUILD (
+ set BUILD_CMD=%BUILD_CMD% /t:Rebuild
+)
if defined BUILDX86 (
msbuild %BUILD_CMD%
@@ -61,10 +66,11 @@ if defined BUILDX64 ( exit /B 0
:Help
-echo build.bat [-x86] [-x64] [--doc] [-h] [--test-marker] [--pack]
+echo build.bat [-x86] [-x64] [--doc] [-h] [--no-test-marker] [--pack] [-r]
echo.
echo -x86 Build x86 installers
echo -x64 Build x64 installers
echo --doc Build CHM documentation
-echo --test-marker Build installers with 'x' markers
+echo --no-test-marker Build without test markers
echo --pack Embed core MSIs into installer
+echo -r Rebuild rather than incremental build
|