Skip to content
Permalink
Browse files

osgeo4w: always do a clean build

  • Loading branch information
jef-n committed Feb 21, 2014
1 parent 203d67f commit 86a1c1786c1a69d213acf80dc4b78718a45aeca1
Showing with 15 additions and 0 deletions.
  1. +8 −0 ms-windows/osgeo4w/package-nightly.cmd
  2. +7 −0 ms-windows/osgeo4w/package.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)
@@ -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)

0 comments on commit 86a1c17

Please sign in to comment.
You can’t perform that action at this time.