Skip to content
Browse files

Fixed begui.exe not being included in installer

Fixed bootstrapper having broken mshtml detection logic
  • Loading branch information...
1 parent 600519d commit bd9610fd57f4ed48686619b7fac0ba4c719cbbde Niall Douglas (s [underscore] sourceforge {at} nedprod [dot] com) committed Jul 18, 2012
View
18 BEurtleSetup32/BEurtleSetup32.wixproj
@@ -19,8 +19,8 @@
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x86' ">
<OutputPath>bin\$(Configuration)\</OutputPath>
<IntermediateOutputPath>obj\$(Configuration)\</IntermediateOutputPath>
- <DefineConstants>BE_srcdir=..\..\..\BE\dist;BEurtle_bindir=..\..\..\BEurtle\bin\Release</DefineConstants>
- <SignOutput>true</SignOutput>
+ <DefineConstants>BE_srcdir=..\..\..\BE\dist;BEurtle_bindir=..\..\..\BEurtle\bin\Release;BEgui_bindir=..\..\..\BEgui\bin\Release</DefineConstants>
+ <SignOutput>true</SignOutput>
</PropertyGroup>
<ItemGroup>
<Compile Include="BE.wxs" />
@@ -39,19 +39,19 @@
</WixExtension>
</ItemGroup>
<Import Project="$(WixTargetsPath)" />
- <PropertyGroup>
- <PreBuildEvent>set PATH=C:\Program Files (x86)\WiX Toolset v3.6\bin%3b%25PATH%25
-echo %PATH%
-heat dir ..\..\..\BE\dist -sreg -ag -cg BE -dr INSTALLDIR -var var.BE_srcdir -out ..\..\BE.wxs
-heat file ..\..\..\BEurtle\bin\Release\BEurtle.dll -ag -srd -cg BEurtle.dll -dr INSTALLDIR -var var.BEurtle_bindir -out ..\..\BEurtle.dll.wxs
-heat file ..\..\..\BEgui\bin\Release\BEgui.exe -ag -srd -cg BEgui.exe -dr INSTALLDIR -var var.BEurtle_bindir -out ..\..\BEgui.exe.wxs</PreBuildEvent>
- </PropertyGroup>
<Target Name="SignCabs">
<Exec Command="&quot;C:\Program Files (x86)\Microsoft SDKs\Windows\v7.0A\Bin\Signtool.exe&quot; sign /a &quot;%(SignCabs.FullPath)&quot;" />
</Target>
<Target Name="SignMsi">
<Exec Command="&quot;C:\Program Files (x86)\Microsoft SDKs\Windows\v7.0A\Bin\Signtool.exe&quot; sign /a &quot;%(SignMsi.FullPath)&quot;" />
</Target>
+ <PropertyGroup>
+ <PreBuildEvent>set PATH=C:\Program Files (x86)\WiX Toolset v3.6\bin%3b%25PATH%25
+echo %25PATH%25
+heat dir ..\..\..\BE\dist -sreg -ag -cg BE -dr INSTALLDIR -var var.BE_srcdir -out ..\..\BE.wxs
+heat file ..\..\..\BEurtle\bin\Release\BEurtle.dll -ag -srd -cg BEurtle.dll -dr INSTALLDIR -var var.BEurtle_bindir -out ..\..\BEurtle.dll.wxs
+heat file ..\..\..\BEgui\bin\Release\BEgui.exe -ag -srd -cg BEgui.exe -dr INSTALLDIR -var var.BEgui_bindir -out ..\..\BEgui.exe.wxs</PreBuildEvent>
+ </PropertyGroup>
<!--
To modify your build process, add your task inside one of the targets below and uncomment it.
Other similar extension points exist, see Wix.targets.
View
1 BEurtleSetup32/Product.wxs
@@ -45,6 +45,7 @@
<Feature Id="FeaturePlugin" Title="BEurtle Plugin for TortoiseXXX ($(var.Platform))" Description="A TortoiseXXX plugin for the Bugs Everywhere distributed issue tracker"
Display="expand" Level="1" ConfigurableDirectory='INSTALLDIR' AllowAdvertise='no'>
<ComponentGroupRef Id="BEurtle.dll"/>
+ <ComponentGroupRef Id="BEgui.exe"/>
<ComponentRef Id="Plugin" />
<ComponentRef Id="Readme" />
<ComponentGroupRef Id="BE" />
View
4 BEurtleSetup64/BEurtleSetup64.wixproj
@@ -19,8 +19,8 @@
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x64' ">
<OutputPath>bin\$(Configuration)\</OutputPath>
<IntermediateOutputPath>obj\$(Configuration)\</IntermediateOutputPath>
- <DefineConstants>BE_srcdir=..\..\..\..\BE\dist;BEurtle_bindir=..\..\..\..\BEurtle\bin\Release</DefineConstants>
- <SignOutput>true</SignOutput>
+ <DefineConstants>BE_srcdir=..\..\..\..\BE\dist;BEurtle_bindir=..\..\..\..\BEurtle\bin\Release;BEgui_bindir=..\..\..\..\BEgui\bin\Release</DefineConstants>
+ <SignOutput>true</SignOutput>
</PropertyGroup>
<ItemGroup>
<WixExtension Include="WixUIExtension">
View
4 Installer/Bundle.wxs
@@ -26,13 +26,15 @@
Id="Setup32"
Compressed="yes"
SourceFile="..\BEurtleSetup32\bin\Release\BEurtleSetup32.msi"
+ SuppressSignatureVerification="yes"
Vital="yes">
<MsiProperty Name="INSTALLLOCATION" Value="[ProgramFilesFolder]ned Productions Limited\BEurtle" />
</MsiPackage>
<MsiPackage
Id="Setup64"
Compressed="yes"
SourceFile="..\BEurtleSetup64\bin\Release\BEurtleSetup64.msi"
+ SuppressSignatureVerification="yes"
InstallCondition="VersionNT64"
Vital="yes">
<MsiProperty Name="INSTALLLOCATION" Value="[ProgramFiles64Folder]ned Productions Limited\BEurtle" />
@@ -42,7 +44,7 @@
<Fragment>
<util:RegistrySearch Root="HKLM" Key="SOFTWARE\Microsoft\Net Framework Setup\NDP\v2.0.50727" Value="Version" Variable="Netfx20Version" />
- <util:RegistrySearch Root="HKCR" Key="Installer\Assemblies\Global" Value="Microsoft.mshtml,Version=&quot;7.0.3300.0&quot;,PublicKeyToken=&quot;b03f5f7f11d50a3a&quot;,Culture=&quot;neutral&quot;,FileVersion=&quot;7.0.3300.0&quot;" Variable="MshtmlVersion" />
+ <util:RegistrySearch Root="HKCR" Key="Installer\Assemblies\Global" Value="Microsoft.mshtml,Version=&quot;7.0.3300.0&quot;,PublicKeyToken=&quot;b03f5f7f11d50a3a&quot;,Culture=&quot;neutral&quot;,FileVersion=&quot;7.0.3300.0&quot;" Result="exists" Variable="MshtmlVersion" />
<PackageGroup Id="Netfx20">
<!-- This embeds the .NET 3.0 web installer for virgin WinXP installs. Costs ~3Mb extra to installer size + 50Mb to download. -->
View
2 Installer/Installer.wixproj
@@ -21,7 +21,7 @@
<IntermediateOutputPath>obj\$(Configuration)\</IntermediateOutputPath>
<DefineConstants>
</DefineConstants>
- <SignOutput>true</SignOutput>
+ <SignOutput>true</SignOutput>
</PropertyGroup>
<ItemGroup>
<Compile Include="Bundle.wxs" />

0 comments on commit bd9610f

Please sign in to comment.
Something went wrong with that request. Please try again.