Skip to content

Commit 368617d

Browse files
author
Felipe \\\"Zimmerle\\\" Costa
committed
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.
1 parent cf5de78 commit 368617d

File tree

6 files changed

+18
-7
lines changed

6 files changed

+18
-7
lines changed

‎iis/ModSecurityIIS.vcxproj

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,7 @@
8383
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
8484
<ClCompile>
8585
<Optimization>Disabled</Optimization>
86-
<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>
86+
<AdditionalIncludeDirectories>dependencies\build_dir\pcre\include;dependencies\build_dir\pcre;dependencies\build_dir\libxml2\include;dependencies\build_dir\apache24\include;..\apache2;..\standalone</AdditionalIncludeDirectories>
8787
<PreprocessorDefinitions>_MBCS;%(PreprocessorDefinitions);WIN32;WINNT;inline=APR_INLINE;AP_DECLARE_STATIC;VERSION_IIS</PreprocessorDefinitions>
8888
<PrecompiledHeader>NotUsing</PrecompiledHeader>
8989
<PrecompiledHeaderFile>precomp.h</PrecompiledHeaderFile>
@@ -93,7 +93,7 @@
9393
<Link>
9494
<ModuleDefinitionFile>mymodule.def</ModuleDefinitionFile>
9595
<GenerateDebugInformation>true</GenerateDebugInformation>
96-
<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>
96+
<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>
9797
</Link>
9898
<PostBuildEvent>
9999
<Command>copy /y $(TargetPath) c:\drop\$(PlatformShortName)
@@ -104,7 +104,7 @@ copy /y $(TargetDir)$(TargetName).pdb c:\drop\$(PlatformShortName)
104104
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
105105
<ClCompile>
106106
<Optimization>Disabled</Optimization>
107-
<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>
107+
<AdditionalIncludeDirectories>dependencies\build_dir\pcre\include;dependencies\build_dir\pcre;dependencies\build_dir\libxml2\include;..\apache2;..\standalone;dependencies\build_dir\apache24\include</AdditionalIncludeDirectories>
108108
<PreprocessorDefinitions>_MBCS;%(PreprocessorDefinitions);WIN32;WINNT;inline=APR_INLINE;AP_DECLARE_STATIC</PreprocessorDefinitions>
109109
<PrecompiledHeader>NotUsing</PrecompiledHeader>
110110
<PrecompiledHeaderFile>precomp.h</PrecompiledHeaderFile>
@@ -127,11 +127,11 @@ copy /y $(TargetDir)$(TargetName).pdb c:\drop\$(PlatformShortName)
127127
<ClCompile>
128128
<PreprocessorDefinitions>_MBCS;%(PreprocessorDefinitions);WIN32;WINNT;inline=APR_INLINE;AP_DECLARE_STATIC;VERSION_IIS</PreprocessorDefinitions>
129129
<PrecompiledHeader>NotUsing</PrecompiledHeader>
130-
<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>
130+
<AdditionalIncludeDirectories>dependencies\build_dir\pcre\include;dependencies\build_dir\pcre;dependencies\build_dir\libxml2\include;..\apache2;..\standalone</AdditionalIncludeDirectories>
131131
</ClCompile>
132132
<Link>
133133
<ModuleDefinitionFile>mymodule.def</ModuleDefinitionFile>
134-
<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>
134+
<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>
135135
</Link>
136136
<PostBuildEvent>
137137
<Command>copy /y $(TargetPath) c:\drop\$(PlatformShortName)
@@ -143,7 +143,7 @@ copy /y $(TargetDir)$(TargetName).pdb c:\drop\$(PlatformShortName)
143143
<ClCompile>
144144
<PreprocessorDefinitions>_MBCS;%(PreprocessorDefinitions);WIN32;WINNT;inline=APR_INLINE;AP_DECLARE_STATIC</PreprocessorDefinitions>
145145
<PrecompiledHeader>NotUsing</PrecompiledHeader>
146-
<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>
146+
<AdditionalIncludeDirectories>dependencies\build_dir\pcre\include;dependencies\build_dir\pcre;dependencies\build_dir\libxml2\include;..\apache2;..\standalone</AdditionalIncludeDirectories>
147147
</ClCompile>
148148
<Link>
149149
<ModuleDefinitionFile>mymodule.def</ModuleDefinitionFile>
@@ -237,4 +237,4 @@ copy /y $(TargetDir)$(TargetName).pdb c:\drop\$(PlatformShortName)
237237
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
238238
<ImportGroup Label="ExtensionTargets">
239239
</ImportGroup>
240-
</Project>
240+
</Project>

‎iis/dependencies/build_curl.bat

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,8 @@ cd "%WORK_DIR%"
66

77
set CURL_DIR=%CURL:~0,-4%
88

9+
mklink /D "curl" "%CURL_DIR%"
10+
911
copy /y CMakeLists.txt "%CURL_DIR%"
1012
CD "%CURL_DIR%"
1113
CMAKE -G "NMake Makefiles" -DCMAKE_BUILD_TYPE=RelWithDebInfo -DBUILD_SHARED_LIBS=True -DCURL_ZLIB=True

‎iis/dependencies/build_libxml2.bat

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,8 @@ cd "%WORK_DIR%"
66

77
set LIBXML2_DIR=%LIBXML2:~0,-7%
88

9+
mklink /D "libxml2" "%LIBXML2_DIR%"
10+
911
fart.exe -r -i -C "%WORK_DIR%\%LIBXML2_DIR%\win32\*.*" \x2Fopt:nowin98 " "
1012
cd "%LIBXML2_DIR%\win32"
1113
CSCRIPT configure.js iconv=no vcmanifest=yes zlib=yes

‎iis/dependencies/build_lua.bat

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,8 @@ cd "%WORK_DIR%"
66

77
set LUA_DIR=%LUA:~0,-7%
88

9+
mklink /D "lua" "%LUA_DIR%"
10+
911
cd "%LUA_DIR%\src"
1012

1113
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

‎iis/dependencies/build_pcre.bat

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,8 @@ cd "%WORK_DIR%"
55
7z.exe x "%SOURCE_DIR%\%PCRE%"
66
set PCRE_DIR=%PCRE:~0,-4%
77

8+
mklink /D "pcre" "%PCRE_DIR%"
9+
810
cd "%PCRE_DIR%"
911
CMAKE -G "NMake Makefiles" -DCMAKE_BUILD_TYPE=RelWithDebInfo -DBUILD_SHARED_LIBS=True
1012
NMAKE

‎iis/dependencies/build_zlib.bat

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,13 @@ cd "%WORK_DIR%"
22

33
@if NOT EXIST "%SOURCE_DIR%\%ZLIB%" goto file_not_found_bin
44

5+
56
@7z.exe x "%SOURCE_DIR%\%ZLIB%" -so | 7z.exe x -aoa -si -ttar
67

78
set ZLIB_DIR=%ZLIB:~0,-7%
89

10+
mklink /D "zlib" "%ZLIB_DIR%"
11+
912
cd "%ZLIB_DIR%"
1013
nmake -f win32\Makefile.msc
1114
SET INCLUDE=%INCLUDE%;%WORK_DIR%\%ZLIB_DIR%

0 commit comments

Comments
 (0)