Skip to content

Commit 6adf256

Browse files
author
Felipe \\\"Zimmerle\\\" Costa
committed
iis: Moves installer to InstallerHelper
To organize the folder the Installer application was renamed to installer helper. It is not the real installer, it is just an helper which is executed during the installation phase.
1 parent 8c3b8d8 commit 6adf256

11 files changed

+6993
-6978
lines changed

‎iis/ModSecurityIIS/Installer/Installer.cpp renamed to ‎iis/InstallerHelper/Installer.cpp

+1,994-1,994
Large diffs are not rendered by default.

‎iis/ModSecurityIIS/Installer/Installer.vcxproj renamed to ‎iis/InstallerHelper/InstallerHelper.vcxproj

+99-95
Original file line numberDiff line numberDiff line change
@@ -1,96 +1,100 @@
1-
<?xml version="1.0" encoding="utf-8"?>
2-
<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
3-
<ItemGroup Label="ProjectConfigurations">
4-
<ProjectConfiguration Include="Debug|Win32">
5-
<Configuration>Debug</Configuration>
6-
<Platform>Win32</Platform>
7-
</ProjectConfiguration>
8-
<ProjectConfiguration Include="Release|Win32">
9-
<Configuration>Release</Configuration>
10-
<Platform>Win32</Platform>
11-
</ProjectConfiguration>
12-
</ItemGroup>
13-
<PropertyGroup Label="Globals">
14-
<ProjectGuid>{990BB195-6716-4DE3-B5E4-DCFCB1BD7D9C}</ProjectGuid>
15-
<Keyword>Win32Proj</Keyword>
16-
<RootNamespace>Installer</RootNamespace>
17-
</PropertyGroup>
18-
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
19-
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
20-
<ConfigurationType>Application</ConfigurationType>
21-
<UseDebugLibraries>true</UseDebugLibraries>
22-
<CharacterSet>Unicode</CharacterSet>
23-
</PropertyGroup>
24-
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
25-
<ConfigurationType>Application</ConfigurationType>
26-
<UseDebugLibraries>false</UseDebugLibraries>
27-
<WholeProgramOptimization>true</WholeProgramOptimization>
28-
<CharacterSet>Unicode</CharacterSet>
29-
<UseOfMfc>Static</UseOfMfc>
30-
</PropertyGroup>
31-
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
32-
<ImportGroup Label="ExtensionSettings">
33-
</ImportGroup>
34-
<ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
35-
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
36-
</ImportGroup>
37-
<ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
38-
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
39-
</ImportGroup>
40-
<PropertyGroup Label="UserMacros" />
41-
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
42-
<LinkIncremental>true</LinkIncremental>
43-
</PropertyGroup>
44-
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
45-
<LinkIncremental>false</LinkIncremental>
46-
</PropertyGroup>
47-
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
48-
<ClCompile>
49-
<PrecompiledHeader>Use</PrecompiledHeader>
50-
<WarningLevel>Level3</WarningLevel>
51-
<Optimization>Disabled</Optimization>
52-
<PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
53-
</ClCompile>
54-
<Link>
55-
<SubSystem>Console</SubSystem>
56-
<GenerateDebugInformation>true</GenerateDebugInformation>
57-
</Link>
58-
</ItemDefinitionGroup>
59-
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
60-
<ClCompile>
61-
<WarningLevel>Level3</WarningLevel>
62-
<PrecompiledHeader>Use</PrecompiledHeader>
63-
<Optimization>MaxSpeed</Optimization>
64-
<FunctionLevelLinking>true</FunctionLevelLinking>
65-
<IntrinsicFunctions>true</IntrinsicFunctions>
66-
<PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
67-
</ClCompile>
68-
<Link>
69-
<SubSystem>Console</SubSystem>
70-
<GenerateDebugInformation>true</GenerateDebugInformation>
71-
<EnableCOMDATFolding>true</EnableCOMDATFolding>
72-
<OptimizeReferences>true</OptimizeReferences>
73-
<AdditionalDependencies>ole32.lib;oleaut32.lib;advapi32.lib</AdditionalDependencies>
74-
<UACExecutionLevel>RequireAdministrator</UACExecutionLevel>
75-
</Link>
76-
</ItemDefinitionGroup>
77-
<ItemGroup>
78-
<None Include="ReadMe.txt" />
79-
</ItemGroup>
80-
<ItemGroup>
81-
<ClInclude Include="stdafx.h" />
82-
<ClInclude Include="targetver.h" />
83-
<ClInclude Include="XUnzip.h" />
84-
</ItemGroup>
85-
<ItemGroup>
86-
<ClCompile Include="Installer.cpp" />
87-
<ClCompile Include="stdafx.cpp">
88-
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Create</PrecompiledHeader>
89-
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Create</PrecompiledHeader>
90-
</ClCompile>
91-
<ClCompile Include="XUnzip.cpp" />
92-
</ItemGroup>
93-
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
94-
<ImportGroup Label="ExtensionTargets">
95-
</ImportGroup>
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<Project DefaultTargets="Build" ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
3+
<ItemGroup Label="ProjectConfigurations">
4+
<ProjectConfiguration Include="Debug|Win32">
5+
<Configuration>Debug</Configuration>
6+
<Platform>Win32</Platform>
7+
</ProjectConfiguration>
8+
<ProjectConfiguration Include="Release|Win32">
9+
<Configuration>Release</Configuration>
10+
<Platform>Win32</Platform>
11+
</ProjectConfiguration>
12+
</ItemGroup>
13+
<PropertyGroup Label="Globals">
14+
<ProjectGuid>{990BB195-6716-4DE3-B5E4-DCFCB1BD7D9C}</ProjectGuid>
15+
<Keyword>Win32Proj</Keyword>
16+
<RootNamespace>Installer</RootNamespace>
17+
<ProjectName>InstallerHelper</ProjectName>
18+
</PropertyGroup>
19+
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
20+
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
21+
<ConfigurationType>Application</ConfigurationType>
22+
<UseDebugLibraries>true</UseDebugLibraries>
23+
<CharacterSet>Unicode</CharacterSet>
24+
<PlatformToolset>v120</PlatformToolset>
25+
</PropertyGroup>
26+
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
27+
<ConfigurationType>Application</ConfigurationType>
28+
<UseDebugLibraries>false</UseDebugLibraries>
29+
<WholeProgramOptimization>true</WholeProgramOptimization>
30+
<CharacterSet>Unicode</CharacterSet>
31+
<UseOfMfc>Static</UseOfMfc>
32+
<PlatformToolset>v120</PlatformToolset>
33+
</PropertyGroup>
34+
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
35+
<ImportGroup Label="ExtensionSettings">
36+
</ImportGroup>
37+
<ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
38+
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
39+
</ImportGroup>
40+
<ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
41+
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
42+
</ImportGroup>
43+
<PropertyGroup Label="UserMacros" />
44+
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
45+
<LinkIncremental>true</LinkIncremental>
46+
</PropertyGroup>
47+
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
48+
<LinkIncremental>false</LinkIncremental>
49+
</PropertyGroup>
50+
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
51+
<ClCompile>
52+
<PrecompiledHeader>Use</PrecompiledHeader>
53+
<WarningLevel>Level3</WarningLevel>
54+
<Optimization>Disabled</Optimization>
55+
<PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
56+
<PrecompiledHeaderFile>stdafx.h</PrecompiledHeaderFile>
57+
</ClCompile>
58+
<Link>
59+
<SubSystem>Console</SubSystem>
60+
<GenerateDebugInformation>true</GenerateDebugInformation>
61+
</Link>
62+
</ItemDefinitionGroup>
63+
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
64+
<ClCompile>
65+
<WarningLevel>Level3</WarningLevel>
66+
<PrecompiledHeader>Use</PrecompiledHeader>
67+
<Optimization>MaxSpeed</Optimization>
68+
<FunctionLevelLinking>true</FunctionLevelLinking>
69+
<IntrinsicFunctions>true</IntrinsicFunctions>
70+
<PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
71+
</ClCompile>
72+
<Link>
73+
<SubSystem>Console</SubSystem>
74+
<GenerateDebugInformation>true</GenerateDebugInformation>
75+
<EnableCOMDATFolding>true</EnableCOMDATFolding>
76+
<OptimizeReferences>true</OptimizeReferences>
77+
<AdditionalDependencies>ole32.lib;oleaut32.lib;advapi32.lib</AdditionalDependencies>
78+
<UACExecutionLevel>RequireAdministrator</UACExecutionLevel>
79+
</Link>
80+
</ItemDefinitionGroup>
81+
<ItemGroup>
82+
<None Include="ReadMe.txt" />
83+
</ItemGroup>
84+
<ItemGroup>
85+
<ClInclude Include="stdafx.h" />
86+
<ClInclude Include="targetver.h" />
87+
<ClInclude Include="XUnzip.h" />
88+
</ItemGroup>
89+
<ItemGroup>
90+
<ClCompile Include="Installer.cpp" />
91+
<ClCompile Include="stdafx.cpp">
92+
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Create</PrecompiledHeader>
93+
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Create</PrecompiledHeader>
94+
</ClCompile>
95+
<ClCompile Include="XUnzip.cpp" />
96+
</ItemGroup>
97+
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
98+
<ImportGroup Label="ExtensionTargets">
99+
</ImportGroup>
96100
</Project>

‎iis/ModSecurityIIS/Installer/Installer.vcxproj.filters renamed to ‎iis/InstallerHelper/InstallerHelper.vcxproj.filters

+41-41
Original file line numberDiff line numberDiff line change
@@ -1,42 +1,42 @@
1-
<?xml version="1.0" encoding="utf-8"?>
2-
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
3-
<ItemGroup>
4-
<Filter Include="Source Files">
5-
<UniqueIdentifier>{4FC737F1-C7A5-4376-A066-2A32D752A2FF}</UniqueIdentifier>
6-
<Extensions>cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx</Extensions>
7-
</Filter>
8-
<Filter Include="Header Files">
9-
<UniqueIdentifier>{93995380-89BD-4b04-88EB-625FBE52EBFB}</UniqueIdentifier>
10-
<Extensions>h;hpp;hxx;hm;inl;inc;xsd</Extensions>
11-
</Filter>
12-
<Filter Include="Resource Files">
13-
<UniqueIdentifier>{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}</UniqueIdentifier>
14-
<Extensions>rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms</Extensions>
15-
</Filter>
16-
</ItemGroup>
17-
<ItemGroup>
18-
<None Include="ReadMe.txt" />
19-
</ItemGroup>
20-
<ItemGroup>
21-
<ClInclude Include="stdafx.h">
22-
<Filter>Header Files</Filter>
23-
</ClInclude>
24-
<ClInclude Include="targetver.h">
25-
<Filter>Header Files</Filter>
26-
</ClInclude>
27-
<ClInclude Include="XUnzip.h">
28-
<Filter>Header Files</Filter>
29-
</ClInclude>
30-
</ItemGroup>
31-
<ItemGroup>
32-
<ClCompile Include="stdafx.cpp">
33-
<Filter>Source Files</Filter>
34-
</ClCompile>
35-
<ClCompile Include="Installer.cpp">
36-
<Filter>Source Files</Filter>
37-
</ClCompile>
38-
<ClCompile Include="XUnzip.cpp">
39-
<Filter>Source Files</Filter>
40-
</ClCompile>
41-
</ItemGroup>
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
3+
<ItemGroup>
4+
<Filter Include="Source Files">
5+
<UniqueIdentifier>{4FC737F1-C7A5-4376-A066-2A32D752A2FF}</UniqueIdentifier>
6+
<Extensions>cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx</Extensions>
7+
</Filter>
8+
<Filter Include="Header Files">
9+
<UniqueIdentifier>{93995380-89BD-4b04-88EB-625FBE52EBFB}</UniqueIdentifier>
10+
<Extensions>h;hpp;hxx;hm;inl;inc;xsd</Extensions>
11+
</Filter>
12+
<Filter Include="Resource Files">
13+
<UniqueIdentifier>{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}</UniqueIdentifier>
14+
<Extensions>rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms</Extensions>
15+
</Filter>
16+
</ItemGroup>
17+
<ItemGroup>
18+
<None Include="ReadMe.txt" />
19+
</ItemGroup>
20+
<ItemGroup>
21+
<ClInclude Include="stdafx.h">
22+
<Filter>Header Files</Filter>
23+
</ClInclude>
24+
<ClInclude Include="targetver.h">
25+
<Filter>Header Files</Filter>
26+
</ClInclude>
27+
<ClInclude Include="XUnzip.h">
28+
<Filter>Header Files</Filter>
29+
</ClInclude>
30+
</ItemGroup>
31+
<ItemGroup>
32+
<ClCompile Include="stdafx.cpp">
33+
<Filter>Source Files</Filter>
34+
</ClCompile>
35+
<ClCompile Include="Installer.cpp">
36+
<Filter>Source Files</Filter>
37+
</ClCompile>
38+
<ClCompile Include="XUnzip.cpp">
39+
<Filter>Source Files</Filter>
40+
</ClCompile>
41+
</ItemGroup>
4242
</Project>

‎iis/ModSecurityIIS/Installer/ReadMe.txt renamed to ‎iis/InstallerHelper/ReadMe.txt

+40-40
Original file line numberDiff line numberDiff line change
@@ -1,40 +1,40 @@
1-
========================================================================
2-
CONSOLE APPLICATION : Installer Project Overview
3-
========================================================================
4-
5-
AppWizard has created this Installer application for you.
6-
7-
This file contains a summary of what you will find in each of the files that
8-
make up your Installer application.
9-
10-
11-
Installer.vcxproj
12-
This is the main project file for VC++ projects generated using an Application Wizard.
13-
It contains information about the version of Visual C++ that generated the file, and
14-
information about the platforms, configurations, and project features selected with the
15-
Application Wizard.
16-
17-
Installer.vcxproj.filters
18-
This is the filters file for VC++ projects generated using an Application Wizard.
19-
It contains information about the association between the files in your project
20-
and the filters. This association is used in the IDE to show grouping of files with
21-
similar extensions under a specific node (for e.g. ".cpp" files are associated with the
22-
"Source Files" filter).
23-
24-
Installer.cpp
25-
This is the main application source file.
26-
27-
/////////////////////////////////////////////////////////////////////////////
28-
Other standard files:
29-
30-
StdAfx.h, StdAfx.cpp
31-
These files are used to build a precompiled header (PCH) file
32-
named Installer.pch and a precompiled types file named StdAfx.obj.
33-
34-
/////////////////////////////////////////////////////////////////////////////
35-
Other notes:
36-
37-
AppWizard uses "TODO:" comments to indicate parts of the source code you
38-
should add to or customize.
39-
40-
/////////////////////////////////////////////////////////////////////////////
1+
========================================================================
2+
CONSOLE APPLICATION : Installer Project Overview
3+
========================================================================
4+
5+
AppWizard has created this Installer application for you.
6+
7+
This file contains a summary of what you will find in each of the files that
8+
make up your Installer application.
9+
10+
11+
Installer.vcxproj
12+
This is the main project file for VC++ projects generated using an Application Wizard.
13+
It contains information about the version of Visual C++ that generated the file, and
14+
information about the platforms, configurations, and project features selected with the
15+
Application Wizard.
16+
17+
Installer.vcxproj.filters
18+
This is the filters file for VC++ projects generated using an Application Wizard.
19+
It contains information about the association between the files in your project
20+
and the filters. This association is used in the IDE to show grouping of files with
21+
similar extensions under a specific node (for e.g. ".cpp" files are associated with the
22+
"Source Files" filter).
23+
24+
Installer.cpp
25+
This is the main application source file.
26+
27+
/////////////////////////////////////////////////////////////////////////////
28+
Other standard files:
29+
30+
StdAfx.h, StdAfx.cpp
31+
These files are used to build a precompiled header (PCH) file
32+
named Installer.pch and a precompiled types file named StdAfx.obj.
33+
34+
/////////////////////////////////////////////////////////////////////////////
35+
Other notes:
36+
37+
AppWizard uses "TODO:" comments to indicate parts of the source code you
38+
should add to or customize.
39+
40+
/////////////////////////////////////////////////////////////////////////////

0 commit comments

Comments
 (0)