From 7366f35c1d80772d739b35da8faa972f92a72b97 Mon Sep 17 00:00:00 2001 From: "Felipe \\\"Zimmerle\\\" Costa" Date: Tue, 10 Dec 2013 10:51:30 -0200 Subject: [PATCH] Code cosmetics. Changed to reduce the number of possible fails during Build Bot compilation. --- iis/build_modsecurity.bat | 6 ++++++ iis/build_release.bat | 2 ++ 2 files changed, 8 insertions(+) diff --git a/iis/build_modsecurity.bat b/iis/build_modsecurity.bat index 393828c4..c4874bb8 100644 --- a/iis/build_modsecurity.bat +++ b/iis/build_modsecurity.bat @@ -8,19 +8,24 @@ set CURRENT_DIR=%cd% @if NOT (%1) == "" call %1 @if (%ERRORLEVEL%) == (1) goto build_wrong_vcarg +@echo Deleting old stuff... +@del *.obj *.dll *.lib +@echo apache2... cd ..\apache2 del *.obj *.dll *.lib del libinjection\*.obj libinjection\*.dll libinjection\*.lib NMAKE -f Makefile.win APACHE=..\iis\%DEPENDENCIES_DIR%\Apache24 PCRE=..\iis\%DEPENDENCIES_DIR%\pcre LIBXML2=..\iis\%DEPENDENCIES_DIR%\libxml2 LUA=..\iis\%DEPENDENCIES_DIR%\lua\src VERSION=VERSION_IIS @if NOT (%ERRORLEVEL%) == (0) goto build_failed +@echo mlogc... cd ..\mlogc del *.obj *.dll *.lib nmake -f Makefile.win clean nmake -f Makefile.win APACHE=..\iis\%DEPENDENCIES_DIR%\Apache24 PCRE=..\iis\%DEPENDENCIES_DIR%\pcre CURL=..\iis\%DEPENDENCIES_DIR%\curl VERSION=VERSION_IIS @if NOT (%ERRORLEVEL%) == (0) goto build_failed +@echo iis... cd ..\iis del *.obj *.dll *.lib nmake -f Makefile.win clean @@ -29,6 +34,7 @@ NMAKE -f Makefile.win APACHE=..\iis\%DEPENDENCIES_DIR%\Apache24 PCRE=..\iis\%DEP cd %CURRENT_DIR% +@echo Copy... copy /y ..\mlogc\mlogc.exe %OUTPUT_DIR% copy /y ..\iis\modsecurityiis.dll %OUTPUT_DIR% copy /y ..\iis\modsecurityiis.pdb %OUTPUT_DIR% diff --git a/iis/build_release.bat b/iis/build_release.bat index 99357a83..bf85182b 100644 --- a/iis/build_release.bat +++ b/iis/build_release.bat @@ -1,4 +1,6 @@ +echo "Building release..." + set RELEASE_DIR=release set OUTPUT_DIR=%cd%\dependencies\release_files set CURRENT_DIR=%cd%