Improve Windows installer

- Unify x86 and x64 installer files
- Get rid of version program
- Clean up .iss file
- Only allow one installation
This commit is contained in:
TingPing
2013-10-05 15:55:56 -04:00
parent 1f06922803
commit 111a58f1ef
7 changed files with 56 additions and 583 deletions

View File

@@ -50,7 +50,7 @@
<OutDir>$(HexChatBin)</OutDir>
<IntDir>$(HexChatObj)$(ProjectName)\</IntDir>
</PropertyGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
<ItemDefinitionGroup Condition="'$(Configuration)'=='Release'">
<ClCompile>
<FunctionLevelLinking>true</FunctionLevelLinking>
<IntrinsicFunctions>true</IntrinsicFunctions>
@@ -61,46 +61,16 @@
<OptimizeReferences>true</OptimizeReferences>
</Link>
<PreBuildEvent>
<Command>echo [Setup] &gt; "$(OutDir)\hexchat-x86.iss"
echo WizardImageFile="$(ProjectDir)\wizardimage.bmp" &gt;&gt; "$(OutDir)\hexchat-x86.iss"
echo WizardSmallImageFile="$(ProjectDir)\wizardsmallimage.bmp" &gt;&gt; "$(OutDir)\hexchat-x86.iss"
"$(OutDir)\version" -a &gt;&gt; "$(OutDir)\hexchat-x86.iss"
"$(OutDir)\version" -v &gt;&gt; "$(OutDir)\hexchat-x86.iss"
"$(OutDir)\version" -i &gt;&gt; "$(OutDir)\hexchat-x86.iss"
"$(OutDir)\version" -o &gt;&gt; "$(OutDir)\hexchat-x86.iss"
echo SetupIconFile="$(DataDir)icons\hexchat.ico" &gt;&gt; "$(OutDir)\hexchat-x86.iss"
type hexchat-x86.skel.iss &gt;&gt; "$(OutDir)\hexchat-x86.iss"
"$(ProgramFiles)\Inno Setup 5\compil32" /cc "$(OutDir)\hexchat-x86.iss"</Command>
</PreBuildEvent>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
<ClCompile>
<FunctionLevelLinking>true</FunctionLevelLinking>
<IntrinsicFunctions>true</IntrinsicFunctions>
</ClCompile>
<Link>
<GenerateDebugInformation>true</GenerateDebugInformation>
<EnableCOMDATFolding>true</EnableCOMDATFolding>
<OptimizeReferences>true</OptimizeReferences>
</Link>
<PreBuildEvent>
<Command>echo [Setup] &gt; "$(OutDir)\hexchat-x64.iss"
echo WizardImageFile="$(ProjectDir)\wizardimage.bmp" &gt;&gt; "$(OutDir)\hexchat-x64.iss"
echo WizardSmallImageFile="$(ProjectDir)\wizardsmallimage.bmp" &gt;&gt; "$(OutDir)\hexchat-x64.iss"
"$(OutDir)\version" -a &gt;&gt; "$(OutDir)\hexchat-x64.iss"
"$(OutDir)\version" -v &gt;&gt; "$(OutDir)\hexchat-x64.iss"
"$(OutDir)\version" -i &gt;&gt; "$(OutDir)\hexchat-x64.iss"
"$(OutDir)\version" -o &gt;&gt; "$(OutDir)\hexchat-x64.iss"
echo SetupIconFile="$(DataDir)icons\hexchat.ico" &gt;&gt; "$(OutDir)\hexchat-x64.iss"
type hexchat-x64.skel.iss &gt;&gt; "$(OutDir)\hexchat-x64.iss"
"$(ProgramFiles)\Inno Setup 5\compil32" /cc "$(OutDir)\hexchat-x64.iss"</Command>
<Command>
del "$(OutDir)hexchat.iss"
type hexchat.iss &gt;&gt; "$(OutDir)hexchat.iss"
"$(ProgramFiles)\Inno Setup 5\iscc.exe" /dPROJECTDIR="$(ProjectDir)" /dAPPARCH="$(Platform)" "$(OutDir)hexchat.iss"</Command>
</PreBuildEvent>
</ItemDefinitionGroup>
<ItemGroup>
<None Include="wizardimage.bmp" />
<None Include="wizardsmallimage.bmp" />
<None Include="hexchat-x64.skel.iss" />
<None Include="hexchat-x86.skel.iss" />
<None Include="hexchat.iss" />
</ItemGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
<ImportGroup Label="ExtensionTargets">