From 368617ddb2443f9b6036f80a648d467d07c9a054 Mon Sep 17 00:00:00 2001 From: "Felipe \\\\\\\"Zimmerle\\\\\\\" Costa" Date: Tue, 5 Nov 2013 20:55:23 -0600 Subject: [PATCH] iis: Relative paths on the VS project file 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. --- iis/ModSecurityIIS.vcxproj | 14 +++++++------- iis/dependencies/build_curl.bat | 2 ++ iis/dependencies/build_libxml2.bat | 2 ++ iis/dependencies/build_lua.bat | 2 ++ iis/dependencies/build_pcre.bat | 2 ++ iis/dependencies/build_zlib.bat | 3 +++ 6 files changed, 18 insertions(+), 7 deletions(-) diff --git a/iis/ModSecurityIIS.vcxproj b/iis/ModSecurityIIS.vcxproj index 98406398..7a3ebb1b 100755 --- a/iis/ModSecurityIIS.vcxproj +++ b/iis/ModSecurityIIS.vcxproj @@ -83,7 +83,7 @@ Disabled - C:\work\pcre-8.33\include;C:\work\pcre-8.33;C:\work\libxml2-2.9.1\include;C:\work\apache24\include;..\apache2;..\standalone + dependencies\build_dir\pcre\include;dependencies\build_dir\pcre;dependencies\build_dir\libxml2\include;dependencies\build_dir\apache24\include;..\apache2;..\standalone _MBCS;%(PreprocessorDefinitions);WIN32;WINNT;inline=APR_INLINE;AP_DECLARE_STATIC;VERSION_IIS NotUsing precomp.h @@ -93,7 +93,7 @@ mymodule.def true - 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 + 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 copy /y $(TargetPath) c:\drop\$(PlatformShortName) @@ -104,7 +104,7 @@ copy /y $(TargetDir)$(TargetName).pdb c:\drop\$(PlatformShortName) Disabled - 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 + dependencies\build_dir\pcre\include;dependencies\build_dir\pcre;dependencies\build_dir\libxml2\include;..\apache2;..\standalone;dependencies\build_dir\apache24\include _MBCS;%(PreprocessorDefinitions);WIN32;WINNT;inline=APR_INLINE;AP_DECLARE_STATIC NotUsing precomp.h @@ -127,11 +127,11 @@ copy /y $(TargetDir)$(TargetName).pdb c:\drop\$(PlatformShortName) _MBCS;%(PreprocessorDefinitions);WIN32;WINNT;inline=APR_INLINE;AP_DECLARE_STATIC;VERSION_IIS NotUsing - C:\work\pcre-8.33\include;C:\work\pcre-8.33;C:\work\libxml2-2.9.1\include;C:\apache22\include;..\apache2;..\standalone + dependencies\build_dir\pcre\include;dependencies\build_dir\pcre;dependencies\build_dir\libxml2\include;..\apache2;..\standalone mymodule.def - 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 + 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 copy /y $(TargetPath) c:\drop\$(PlatformShortName) @@ -143,7 +143,7 @@ copy /y $(TargetDir)$(TargetName).pdb c:\drop\$(PlatformShortName) _MBCS;%(PreprocessorDefinitions);WIN32;WINNT;inline=APR_INLINE;AP_DECLARE_STATIC NotUsing - C:\work\pcre-8.33\include;C:\work\pcre-8.33;C:\work\libxml2-2.9.1\include;C:\apache22\include;..\apache2;..\standalone + dependencies\build_dir\pcre\include;dependencies\build_dir\pcre;dependencies\build_dir\libxml2\include;..\apache2;..\standalone mymodule.def @@ -237,4 +237,4 @@ copy /y $(TargetDir)$(TargetName).pdb c:\drop\$(PlatformShortName) - \ No newline at end of file + diff --git a/iis/dependencies/build_curl.bat b/iis/dependencies/build_curl.bat index 39d2117a..ed4911d1 100644 --- a/iis/dependencies/build_curl.bat +++ b/iis/dependencies/build_curl.bat @@ -6,6 +6,8 @@ cd "%WORK_DIR%" set CURL_DIR=%CURL:~0,-4% +mklink /D "curl" "%CURL_DIR%" + copy /y CMakeLists.txt "%CURL_DIR%" CD "%CURL_DIR%" CMAKE -G "NMake Makefiles" -DCMAKE_BUILD_TYPE=RelWithDebInfo -DBUILD_SHARED_LIBS=True -DCURL_ZLIB=True diff --git a/iis/dependencies/build_libxml2.bat b/iis/dependencies/build_libxml2.bat index c954aa8b..33d37e34 100644 --- a/iis/dependencies/build_libxml2.bat +++ b/iis/dependencies/build_libxml2.bat @@ -6,6 +6,8 @@ cd "%WORK_DIR%" set LIBXML2_DIR=%LIBXML2:~0,-7% +mklink /D "libxml2" "%LIBXML2_DIR%" + fart.exe -r -i -C "%WORK_DIR%\%LIBXML2_DIR%\win32\*.*" \x2Fopt:nowin98 " " cd "%LIBXML2_DIR%\win32" CSCRIPT configure.js iconv=no vcmanifest=yes zlib=yes diff --git a/iis/dependencies/build_lua.bat b/iis/dependencies/build_lua.bat index b870f75e..29872acc 100644 --- a/iis/dependencies/build_lua.bat +++ b/iis/dependencies/build_lua.bat @@ -6,6 +6,8 @@ cd "%WORK_DIR%" set LUA_DIR=%LUA:~0,-7% +mklink /D "lua" "%LUA_DIR%" + 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 diff --git a/iis/dependencies/build_pcre.bat b/iis/dependencies/build_pcre.bat index bbf3046f..bfaaad0e 100644 --- a/iis/dependencies/build_pcre.bat +++ b/iis/dependencies/build_pcre.bat @@ -5,6 +5,8 @@ cd "%WORK_DIR%" 7z.exe x "%SOURCE_DIR%\%PCRE%" set PCRE_DIR=%PCRE:~0,-4% +mklink /D "pcre" "%PCRE_DIR%" + cd "%PCRE_DIR%" CMAKE -G "NMake Makefiles" -DCMAKE_BUILD_TYPE=RelWithDebInfo -DBUILD_SHARED_LIBS=True NMAKE diff --git a/iis/dependencies/build_zlib.bat b/iis/dependencies/build_zlib.bat index 00e1b600..d57b4e41 100644 --- a/iis/dependencies/build_zlib.bat +++ b/iis/dependencies/build_zlib.bat @@ -2,10 +2,13 @@ cd "%WORK_DIR%" @if NOT EXIST "%SOURCE_DIR%\%ZLIB%" goto file_not_found_bin + @7z.exe x "%SOURCE_DIR%\%ZLIB%" -so | 7z.exe x -aoa -si -ttar set ZLIB_DIR=%ZLIB:~0,-7% +mklink /D "zlib" "%ZLIB_DIR%" + cd "%ZLIB_DIR%" nmake -f win32\Makefile.msc SET INCLUDE=%INCLUDE%;%WORK_DIR%\%ZLIB_DIR%