osgeo4w: remove package directory before installing

jef-n · jef-n · commit 1e52c7dd65cb · 2013-09-21T14:18:25.000+02:00
diff --git a/ms-windows/osgeo4w/package-nightly.cmd b/ms-windows/osgeo4w/package-nightly.cmd
@@ -154,6 +154,10 @@ echo RUN_TESTS: %DATE% %TIME%>>%LOG% 2>&1
 %DEVENV% qgis%VERSION%.sln /Project Nightly /Build %BUILDCONF% /Out %LOG%>>%LOG% 2>&1
 REM if errorlevel 1 echo "TESTS WERE NOT SUCCESSFUL."
 
+echo RMDIR: %DATE% %TIME%>>%LOG% 2>&1
+rmdir /s /q %OSGEO4W_ROOT%\apps\%PACKAGENAME%
+if errorlevel 1 goto error
+
 echo INSTALL: %DATE% %TIME%>>%LOG% 2>&1
 %DEVENV% qgis%VERSION%.sln /Project INSTALL /Build %BUILDCONF% /Out %LOG%>>%LOG% 2>&1
 if errorlevel 1 goto error
diff --git a/ms-windows/osgeo4w/package-nightly64.cmd b/ms-windows/osgeo4w/package-nightly64.cmd
@@ -151,6 +151,10 @@ echo RUN_TESTS: %DATE% %TIME%>>%LOG% 2>&1
 %DEVENV% qgis%VERSION%.sln /Project Nightly /Build %BUILDCONF% /Out %LOG%>>%LOG% 2>&1
 REM if errorlevel 1 echo "TESTS WERE NOT SUCCESSFUL."
 
+echo RMDIR: %DATE% %TIME%>>%LOG% 2>&1
+rmdir /s /q %OSGEO4W_ROOT%\apps\%PACKAGENAME%
+if errorlevel 1 goto error
+
 echo INSTALL: %DATE% %TIME%>>%LOG% 2>&1
 %DEVENV% qgis%VERSION%.sln /Project INSTALL /Build %BUILDCONF% /Out %LOG%>>%LOG% 2>&1
 if errorlevel 1 goto error
diff --git a/ms-windows/osgeo4w/package.cmd b/ms-windows/osgeo4w/package.cmd
@@ -147,6 +147,10 @@ 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 goto error
 
+echo REMOVE: %DATE% %TIME%>>%LOG% 2>&1
+rmdir /s /q %OSGEO4W_ROOT%\apps\%PACKAGENAME%
+if errorlevel 1 goto error
+
 echo INSTALL: %DATE% %TIME%>>%LOG% 2>&1
 %DEVENV% qgis%VERSION%.sln /Project INSTALL /Build %BUILDCONF% /Out %LOG%>>%LOG% 2>&1
 if errorlevel 1 goto error
diff --git a/ms-windows/osgeo4w/package64.cmd b/ms-windows/osgeo4w/package64.cmd
@@ -144,6 +144,10 @@ 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 goto error
 
+echo RMDIR: %DATE% %TIME%>>%LOG% 2>&1
+rmdir /s /q %OSGEO4W_ROOT%\apps\%PACKAGENAME%
+if errorlevel 1 goto error
+
 echo INSTALL: %DATE% %TIME%>>%LOG% 2>&1
 %DEVENV% qgis%VERSION%.sln /Project INSTALL /Build %BUILDCONF% /Out %LOG%>>%LOG% 2>&1
 if errorlevel 1 goto error
