github_mirrors/ModSecurity
3
0
Fork 1
mirror of https://github.com/owasp-modsecurity/ModSecurity.git synced 2025-09-29 19:24:29 +03:00
Code Issues Packages Projects Releases Wiki Activity

iis: Relative paths on the VS project file

Browse Source 
There are a ModSecurityIIS solution and project files, those
were using hard coded paths to meet the dependencies. As
consequence of the last update in our build scripts, now we
are able to built the dependencies and load it to our Visual
Studio project using relative paths.
This commit is contained in:
Felipe \\\"Zimmerle\\\" Costa
2013-11-05 20:55:23 -06:00
committed by Felipe Zimmerle
parent cf5de78dfb
commit 368617ddb2
6 changed files with 18 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
iis/ModSecurityIIS.vcxproj
View File

@@ -83,7 +83,7 @@
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<ClCompile> <ClCompile>
<Optimization>Disabled</Optimization> <Optimization>Disabled</Optimization>
<AdditionalIncludeDirectories>C:\work\pcre-8.33\include;C:\work\pcre-8.33;C:\work\libxml2-2.9.1\include;C:\work\apache24\include;..\apache2;..\standalone</AdditionalIncludeDirectories> <AdditionalIncludeDirectories>dependencies\build_dir\pcre\include;dependencies\build_dir\pcre;dependencies\build_dir\libxml2\include;dependencies\build_dir\apache24\include;..\apache2;..\standalone</AdditionalIncludeDirectories>
<PreprocessorDefinitions>_MBCS;%(PreprocessorDefinitions);WIN32;WINNT;inline=APR_INLINE;AP_DECLARE_STATIC;VERSION_IIS</PreprocessorDefinitions> <PreprocessorDefinitions>_MBCS;%(PreprocessorDefinitions);WIN32;WINNT;inline=APR_INLINE;AP_DECLARE_STATIC;VERSION_IIS</PreprocessorDefinitions>
<PrecompiledHeader>NotUsing</PrecompiledHeader> <PrecompiledHeader>NotUsing</PrecompiledHeader>
<PrecompiledHeaderFile>precomp.h</PrecompiledHeaderFile> <PrecompiledHeaderFile>precomp.h</PrecompiledHeaderFile>
@@ -93,7 +93,7 @@
<Link> <Link>
<ModuleDefinitionFile>mymodule.def</ModuleDefinitionFile> <ModuleDefinitionFile>mymodule.def</ModuleDefinitionFile>
<GenerateDebugInformation>true</GenerateDebugInformation> <GenerateDebugInformation>true</GenerateDebugInformation>
<AdditionalDependencies>kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;ws2_32.lib;%(AdditionalDependencies);C:\work\apache24\lib\libapr-1.lib;C:\work\apache24\lib\libaprutil-1.lib;C:\work\pcre-8.33\pcre.lib;C:\work\libxml2-2.9.1\win32\bin.msvc\libxml2.lib</AdditionalDependencies> <AdditionalDependencies>kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;ws2_32.lib;%(AdditionalDependencies);dependencies\build_dir\apache24\lib\libapr-1.lib;dependencies\build_dir\apache24\lib\libaprutil-1.lib;dependencies\build_dir\pcre\pcre.lib;dependencies\build_dir\libxml2\win32\bin.msvc\libxml2.lib</AdditionalDependencies>
</Link> </Link>
<PostBuildEvent> <PostBuildEvent>
<Command>copy /y $(TargetPath) c:\drop\$(PlatformShortName) <Command>copy /y $(TargetPath) c:\drop\$(PlatformShortName)
@@ -104,7 +104,7 @@ copy /y $(TargetDir)$(TargetName).pdb c:\drop\$(PlatformShortName)
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'"> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
<ClCompile> <ClCompile>
<Optimization>Disabled</Optimization> <Optimization>Disabled</Optimization>
<AdditionalIncludeDirectories>C:\work\pcre-8.33\include;C:\work\pcre-8.33;C:\work\libxml2-2.9.1\include;C:\apache22\include;..\apache2;..\standalone;c:\work\apache24\include</AdditionalIncludeDirectories> <AdditionalIncludeDirectories>dependencies\build_dir\pcre\include;dependencies\build_dir\pcre;dependencies\build_dir\libxml2\include;..\apache2;..\standalone;dependencies\build_dir\apache24\include</AdditionalIncludeDirectories>
<PreprocessorDefinitions>_MBCS;%(PreprocessorDefinitions);WIN32;WINNT;inline=APR_INLINE;AP_DECLARE_STATIC</PreprocessorDefinitions> <PreprocessorDefinitions>_MBCS;%(PreprocessorDefinitions);WIN32;WINNT;inline=APR_INLINE;AP_DECLARE_STATIC</PreprocessorDefinitions>
<PrecompiledHeader>NotUsing</PrecompiledHeader> <PrecompiledHeader>NotUsing</PrecompiledHeader>
<PrecompiledHeaderFile>precomp.h</PrecompiledHeaderFile> <PrecompiledHeaderFile>precomp.h</PrecompiledHeaderFile>
@@ -127,11 +127,11 @@ copy /y $(TargetDir)$(TargetName).pdb c:\drop\$(PlatformShortName)
<ClCompile> <ClCompile>
<PreprocessorDefinitions>_MBCS;%(PreprocessorDefinitions);WIN32;WINNT;inline=APR_INLINE;AP_DECLARE_STATIC;VERSION_IIS</PreprocessorDefinitions> <PreprocessorDefinitions>_MBCS;%(PreprocessorDefinitions);WIN32;WINNT;inline=APR_INLINE;AP_DECLARE_STATIC;VERSION_IIS</PreprocessorDefinitions>
<PrecompiledHeader>NotUsing</PrecompiledHeader> <PrecompiledHeader>NotUsing</PrecompiledHeader>
<AdditionalIncludeDirectories>C:\work\pcre-8.33\include;C:\work\pcre-8.33;C:\work\libxml2-2.9.1\include;C:\apache22\include;..\apache2;..\standalone</AdditionalIncludeDirectories> <AdditionalIncludeDirectories>dependencies\build_dir\pcre\include;dependencies\build_dir\pcre;dependencies\build_dir\libxml2\include;..\apache2;..\standalone</AdditionalIncludeDirectories>
</ClCompile> </ClCompile>
<Link> <Link>
<ModuleDefinitionFile>mymodule.def</ModuleDefinitionFile> <ModuleDefinitionFile>mymodule.def</ModuleDefinitionFile>
<AdditionalDependencies>kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;ws2_32.lib;%(AdditionalDependencies);C:\apache22\lib\libapr-1.lib;C:\apache22\lib\libaprutil-1.lib;C:\work\pcre-8.33\pcre.lib;C:\work\libxml2-2.9.1\win32\bin.msvc\libxml2.lib</AdditionalDependencies> <AdditionalDependencies>kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;ws2_32.lib;%(AdditionalDependencies);dependencies\build_dir\pcre\pcre.lib;dependencies\build_dir\libxml2\win32\bin.msvc\libxml2.lib</AdditionalDependencies>
</Link> </Link>
<PostBuildEvent> <PostBuildEvent>
<Command>copy /y $(TargetPath) c:\drop\$(PlatformShortName) <Command>copy /y $(TargetPath) c:\drop\$(PlatformShortName)
@@ -143,7 +143,7 @@ copy /y $(TargetDir)$(TargetName).pdb c:\drop\$(PlatformShortName)
<ClCompile> <ClCompile>
<PreprocessorDefinitions>_MBCS;%(PreprocessorDefinitions);WIN32;WINNT;inline=APR_INLINE;AP_DECLARE_STATIC</PreprocessorDefinitions> <PreprocessorDefinitions>_MBCS;%(PreprocessorDefinitions);WIN32;WINNT;inline=APR_INLINE;AP_DECLARE_STATIC</PreprocessorDefinitions>
<PrecompiledHeader>NotUsing</PrecompiledHeader> <PrecompiledHeader>NotUsing</PrecompiledHeader>
<AdditionalIncludeDirectories>C:\work\pcre-8.33\include;C:\work\pcre-8.33;C:\work\libxml2-2.9.1\include;C:\apache22\include;..\apache2;..\standalone</AdditionalIncludeDirectories> <AdditionalIncludeDirectories>dependencies\build_dir\pcre\include;dependencies\build_dir\pcre;dependencies\build_dir\libxml2\include;..\apache2;..\standalone</AdditionalIncludeDirectories>
</ClCompile> </ClCompile>
<Link> <Link>
<ModuleDefinitionFile>mymodule.def</ModuleDefinitionFile> <ModuleDefinitionFile>mymodule.def</ModuleDefinitionFile>
@@ -237,4 +237,4 @@ copy /y $(TargetDir)$(TargetName).pdb c:\drop\$(PlatformShortName)
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
<ImportGroup Label="ExtensionTargets"> <ImportGroup Label="ExtensionTargets">
</ImportGroup> </ImportGroup>
</Project> </Project>

2
iis/dependencies/build_curl.bat
View File

@@ -6,6 +6,8 @@ cd "%WORK_DIR%"
set CURL_DIR=%CURL:~0,-4% set CURL_DIR=%CURL:~0,-4%
mklink /D "curl" "%CURL_DIR%"
copy /y CMakeLists.txt "%CURL_DIR%" copy /y CMakeLists.txt "%CURL_DIR%"
CD "%CURL_DIR%" CD "%CURL_DIR%"
CMAKE -G "NMake Makefiles" -DCMAKE_BUILD_TYPE=RelWithDebInfo -DBUILD_SHARED_LIBS=True -DCURL_ZLIB=True CMAKE -G "NMake Makefiles" -DCMAKE_BUILD_TYPE=RelWithDebInfo -DBUILD_SHARED_LIBS=True -DCURL_ZLIB=True

2
iis/dependencies/build_libxml2.bat
View File

@@ -6,6 +6,8 @@ cd "%WORK_DIR%"
set LIBXML2_DIR=%LIBXML2:~0,-7% set LIBXML2_DIR=%LIBXML2:~0,-7%
mklink /D "libxml2" "%LIBXML2_DIR%"
fart.exe -r -i -C "%WORK_DIR%\%LIBXML2_DIR%\win32\*.*" \x2Fopt:nowin98 " " fart.exe -r -i -C "%WORK_DIR%\%LIBXML2_DIR%\win32\*.*" \x2Fopt:nowin98 " "
cd "%LIBXML2_DIR%\win32" cd "%LIBXML2_DIR%\win32"
CSCRIPT configure.js iconv=no vcmanifest=yes zlib=yes CSCRIPT configure.js iconv=no vcmanifest=yes zlib=yes

2
iis/dependencies/build_lua.bat
View File

@@ -6,6 +6,8 @@ cd "%WORK_DIR%"
set LUA_DIR=%LUA:~0,-7% set LUA_DIR=%LUA:~0,-7%
mklink /D "lua" "%LUA_DIR%"
cd "%LUA_DIR%\src" cd "%LUA_DIR%\src"
CL /Ox /arch:SSE2 /GF /GL /Gy /FD /EHsc /MD /Zi /TC /wd4005 /D "_MBCS" /D "LUA_CORE" /D "LUA_BUILD_AS_DLL" /D "_CRT_SECURE_NO_WARNINGS" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_WIN32" /D "_WINDLL" /c *.c CL /Ox /arch:SSE2 /GF /GL /Gy /FD /EHsc /MD /Zi /TC /wd4005 /D "_MBCS" /D "LUA_CORE" /D "LUA_BUILD_AS_DLL" /D "_CRT_SECURE_NO_WARNINGS" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_WIN32" /D "_WINDLL" /c *.c

2
iis/dependencies/build_pcre.bat
View File

@@ -5,6 +5,8 @@ cd "%WORK_DIR%"
7z.exe x "%SOURCE_DIR%\%PCRE%" 7z.exe x "%SOURCE_DIR%\%PCRE%"
set PCRE_DIR=%PCRE:~0,-4% set PCRE_DIR=%PCRE:~0,-4%
mklink /D "pcre" "%PCRE_DIR%"
cd "%PCRE_DIR%" cd "%PCRE_DIR%"
CMAKE -G "NMake Makefiles" -DCMAKE_BUILD_TYPE=RelWithDebInfo -DBUILD_SHARED_LIBS=True CMAKE -G "NMake Makefiles" -DCMAKE_BUILD_TYPE=RelWithDebInfo -DBUILD_SHARED_LIBS=True
NMAKE NMAKE

3
iis/dependencies/build_zlib.bat
View File

@@ -2,10 +2,13 @@ cd "%WORK_DIR%"
@if NOT EXIST "%SOURCE_DIR%\%ZLIB%" goto file_not_found_bin @if NOT EXIST "%SOURCE_DIR%\%ZLIB%" goto file_not_found_bin
@7z.exe x "%SOURCE_DIR%\%ZLIB%" -so | 7z.exe x -aoa -si -ttar @7z.exe x "%SOURCE_DIR%\%ZLIB%" -so | 7z.exe x -aoa -si -ttar
set ZLIB_DIR=%ZLIB:~0,-7% set ZLIB_DIR=%ZLIB:~0,-7%
mklink /D "zlib" "%ZLIB_DIR%"
cd "%ZLIB_DIR%" cd "%ZLIB_DIR%"
nmake -f win32\Makefile.msc nmake -f win32\Makefile.msc
SET INCLUDE=%INCLUDE%;%WORK_DIR%\%ZLIB_DIR% SET INCLUDE=%INCLUDE%;%WORK_DIR%\%ZLIB_DIR%