Commit7366f35

Felipe \"Zimmerle\" Costa

committed

Code cosmetics.

Changed to reduce the number of possible fails duringBuild Bot compilation.

1 parent9bf2959 commit7366f35Copy full SHA for 7366f35

File tree

-0

lines changed

-0

lines changed

Lines changed: 6 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -8,19 +8,24 @@ set CURRENT_DIR=%cd%`
`8`	`8`	`@ifNOT (%1)==""call%1`
`9`	`9`	`@if (%ERRORLEVEL%)== (1)goto build_wrong_vcarg`
`10`	`10`
	`11`	`+@echo Deleting old stuff...`
	`12`	`+@del .obj .dll *.lib`
`11`	`13`
	`14`	`+@echo apache2...`
`12`	`15`	`cd ..\apache2`
`13`	`16`	`del .obj .dll *.lib`
`14`	`17`	`del libinjection\.obj libinjection\.dll libinjection\*.lib`
`15`	`18`	`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`
`16`	`19`	`@ifNOT (%ERRORLEVEL%)== (0)goto build_failed`
`17`	`20`
	`21`	`+@echo mlogc...`
`18`	`22`	`cd ..\mlogc`
`19`	`23`	`del .obj .dll *.lib`
`20`	`24`	`nmake -f Makefile.win clean`
`21`	`25`	`nmake -f Makefile.win APACHE=..\iis\%DEPENDENCIES_DIR%\Apache24 PCRE=..\iis\%DEPENDENCIES_DIR%\pcre CURL=..\iis\%DEPENDENCIES_DIR%\curl VERSION=VERSION_IIS`
`22`	`26`	`@ifNOT (%ERRORLEVEL%)== (0)goto build_failed`
`23`	`27`
	`28`	`+@echo iis...`
`24`	`29`	`cd ..\iis`
`25`	`30`	`del .obj .dll *.lib`
`26`	`31`	`nmake -f Makefile.win clean`
`@@ -29,6 +34,7 @@ NMAKE -f Makefile.win APACHE=..\iis\%DEPENDENCIES_DIR%\Apache24 PCRE=..\iis\%DEP`
`29`	`34`
`30`	`35`	`cd%CURRENT_DIR%`
`31`	`36`
	`37`	`+@echo Copy...`
`32`	`38`	`copy /y ..\mlogc\mlogc.exe%OUTPUT_DIR%`
`33`	`39`	`copy /y ..\iis\modsecurityiis.dll%OUTPUT_DIR%`
`34`	`40`	`copy /y ..\iis\modsecurityiis.pdb%OUTPUT_DIR%`

Lines changed: 2 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,6 @@`
`1`	`1`
	`2`	`+echo"Building release..."`
	`3`	`+`
`2`	`4`	`setRELEASE_DIR=release`
`3`	`5`	`setOUTPUT_DIR=%cd%\dependencies\release_files`
`4`	`6`	`setCURRENT_DIR=%cd%`

Comments

(0)