From 86a1c1786c1a69d213acf80dc4b78718a45aeca1 Mon Sep 17 00:00:00 2001 From: "Juergen E. Fischer" Date: Fri, 21 Feb 2014 22:39:04 +0100 Subject: [PATCH] osgeo4w: always do a clean build --- ms-windows/osgeo4w/package-nightly.cmd | 8 ++++++++ ms-windows/osgeo4w/package.cmd | 7 +++++++ 2 files changed, 15 insertions(+) diff --git a/ms-windows/osgeo4w/package-nightly.cmd b/ms-windows/osgeo4w/package-nightly.cmd index 983564236b5..7b1245e2fb4 100644 --- a/ms-windows/osgeo4w/package-nightly.cmd +++ b/ms-windows/osgeo4w/package-nightly.cmd @@ -122,12 +122,15 @@ if exist build.tmp del build.tmp goto error :build + echo Logging to %LOG% echo BEGIN: %DATE% %TIME%>>%LOG% 2>&1 if errorlevel 1 (echo "could not write to log %LOG%" & goto error) set >buildenv.log +if exist qgsversion.h del qgsversion.h + if exist CMakeCache.txt goto skipcmake echo CMAKE: %DATE% %TIME%>>%LOG% 2>&1 @@ -172,7 +175,12 @@ grep -Eq "^(Python not being built|Could not find GRASS)" %LOG% if not errorlevel 1 (echo "python or grass not found" & goto error) :skipcmake +if exist noclean goto skipclean +echo CLEAN: %DATE% %TIME%>>%LOG% 2>&1 +%DEVENV% qgis%VERSION%.sln /Project ALL_BUILD /Clean %BUILDCONF% /Out %LOG%>>%LOG% 2>&1 +if errorlevel 1 (echo "CLEAN failed" & goto error) +:skipclean echo ZERO_CHECK: %DATE% %TIME%>>%LOG% 2>&1 %DEVENV% qgis%VERSION%.sln /Project ZERO_CHECK /Build %BUILDCONF% /Out %LOG%>>%LOG% 2>&1 if errorlevel 1 (echo "ZERO_CHECK failed" & goto error) diff --git a/ms-windows/osgeo4w/package.cmd b/ms-windows/osgeo4w/package.cmd index c3ba443dd89..308095e5ef6 100644 --- a/ms-windows/osgeo4w/package.cmd +++ b/ms-windows/osgeo4w/package.cmd @@ -124,6 +124,8 @@ if errorlevel 1 (echo "could not write to log %LOG%" & goto error) set >buildenv.log +if exist qgsversion.h del qgsversion.h + if exist CMakeCache.txt goto skipcmake echo CMAKE: %DATE% %TIME%>>%LOG% 2>&1 @@ -167,7 +169,12 @@ grep -Eq "^(Python not being built|Could not find GRASS)" %LOG% if not errorlevel 1 (echo "python or grass not found" & goto error) :skipcmake +if exist noclean goto skipclean +echo CLEAN: %DATE% %TIME%>>%LOG% 2>&1 +%DEVENV% qgis%VERSION%.sln /Project ALL_BUILD /Clean %BUILDCONF% /Out %LOG%>>%LOG% 2>&1 +if errorlevel 1 (echo "CLEAN failed" & goto error) +:skipclean echo ZERO_CHECK: %DATE% %TIME%>>%LOG% 2>&1 %DEVENV% qgis%VERSION%.sln /Project ZERO_CHECK /Build %BUILDCONF% /Out %LOG%>>%LOG% 2>&1 if errorlevel 1 (echo "ZERO_CHECK failed" & goto error)