From fff3710060dea0e2b98cdebaeb6666f7dd76ff36 Mon Sep 17 00:00:00 2001 From: "Juergen E. Fischer" Date: Thu, 3 Apr 2014 09:49:53 +0200 Subject: [PATCH] osgeo4w: try ALL_BUILD twice --- ms-windows/osgeo4w/package-nightly.cmd | 1 + ms-windows/osgeo4w/package.cmd | 3 ++- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/ms-windows/osgeo4w/package-nightly.cmd b/ms-windows/osgeo4w/package-nightly.cmd index 7b1245e2fb4e..129757f757d5 100644 --- a/ms-windows/osgeo4w/package-nightly.cmd +++ b/ms-windows/osgeo4w/package-nightly.cmd @@ -187,6 +187,7 @@ if errorlevel 1 (echo "ZERO_CHECK failed" & goto error) echo ALL_BUILD: %DATE% %TIME%>>%LOG% 2>&1 %DEVENV% qgis%VERSION%.sln /Project ALL_BUILD /Build %BUILDCONF% /Out %LOG%>>%LOG% 2>&1 +if errorlevel 1 %DEVENV% qgis%VERSION%.sln /Project ALL_BUILD /Build %BUILDCONF% /Out %LOG%>>%LOG% 2>&1 if errorlevel 1 (echo "ALL_BUILD failed" & goto error) if not exist ..\skiptests ( diff --git a/ms-windows/osgeo4w/package.cmd b/ms-windows/osgeo4w/package.cmd index 308095e5ef6f..c711830cfa8f 100644 --- a/ms-windows/osgeo4w/package.cmd +++ b/ms-windows/osgeo4w/package.cmd @@ -181,7 +181,8 @@ if errorlevel 1 (echo "ZERO_CHECK failed" & goto error) echo ALL_BUILD: %DATE% %TIME%>>%LOG% 2>&1 %DEVENV% qgis%VERSION%.sln /Project ALL_BUILD /Build %BUILDCONF% /Out %LOG%>>%LOG% 2>&1 -if errorlevel 1 (echo "ALL_BUILD failed" & goto error) +if errorlevel 1 %DEVENV% qgis%VERSION%.sln /Project ALL_BUILD /Build %BUILDCONF% /Out %LOG%>>%LOG% 2>&1 +if errorlevel 1 (echo "ALL_BUILD failed twice" & goto error) set PKGDIR=%OSGEO4W_ROOT%\apps\%PACKAGENAME%