Browse files

My, my the installer actually appears to be working!

  • Loading branch information...
1 parent d2a14b0 commit ac54a2cf4836568547b5f70254558a4b676a6a6a Niall Douglas (s [underscore] sourceforge {at} nedprod [dot] com) committed Jul 15, 2012
Showing with 15 additions and 9 deletions.
  1. +12 −7 Installer/Bundle.wxs
  2. +3 −2 Installer/Installer.wixproj
View
19 Installer/Bundle.wxs
@@ -18,20 +18,25 @@
</BootstrapperApplicationRef>
<WixVariable Id="WixStdbaLicenseUrl" Value="Licence.txt" />
<!--<WixVariable Id="WixStdbaLogo" Value="Resource\logoSmall.png" />-->
- <Variable Name="InstallFolder" Type="string" Value="[ProgramFilesFolder]ned Productions Limited\BEurtle" />
<Chain>
<PackageGroupRef Id="Netfx20" />
<RollbackBoundary />
- <!-- TODO: Install 32 bit always, but only install 64 bit on 64 bit platforms -->
<MsiPackage
- Id="Setup"
+ Id="Setup32"
Compressed="yes"
- SourceFile="$(var.Setup.TargetPath)"
+ SourceFile="..\BEurtleSetup32\bin\Release\BEurtleSetup32.msi"
Vital="yes">
- <MsiProperty Name="INSTALLLOCATION" Value="[InstallFolder]" />
+ <MsiProperty Name="INSTALLLOCATION" Value="[ProgramFilesFolder]ned Productions Limited\BEurtle" />
+ </MsiPackage>
+ <MsiPackage
+ Id="Setup64"
+ Compressed="yes"
+ SourceFile="..\BEurtleSetup64\bin\Release\BEurtleSetup64.msi"
+ Vital="yes">
+ <MsiProperty Name="INSTALLLOCATION" Value="[ProgramFiles64Folder]ned Productions Limited\BEurtle" />
</MsiPackage>
</Chain>
</Bundle>
@@ -51,8 +56,8 @@
InstallCommand="/q /norestart /lang:ENU"
RepairCommand="/q /norestart /lang:ENU"
UninstallCommand="/q /norestart /lang:ENU"
- InstallCondition="NOT Netfx20Version OR (Netfx20Version &lt; '2.0.50727.5420')"
- DetectCondition="Netfx20Version AND (Netfx20Version &gt;= '2.0.50727.5420')">
+ InstallCondition="NOT Netfx20Version OR (Netfx20Version &lt; v2.0.50727.5420)"
+ DetectCondition="Netfx20Version AND (Netfx20Version &gt;= v2.0.50727.5420)">
<ExitCode Value ="3010" Behavior="forceReboot" />
</ExePackage>
</PackageGroup>
View
5 Installer/Installer.wixproj
@@ -6,7 +6,7 @@
<ProductVersion>3.6</ProductVersion>
<ProjectGuid>{e3d6765e-f632-45ee-9b54-191115e19f14}</ProjectGuid>
<SchemaVersion>2.0</SchemaVersion>
- <OutputName>BEurtle Plugin for TortoiseXXX</OutputName>
+ <OutputName>BEurtle Plugin for TortoiseXXX %28x86 and x64%29</OutputName>
<OutputType>Bundle</OutputType>
<WixTargetsPath Condition=" '$(WixTargetsPath)' == '' AND '$(MSBuildExtensionsPath32)' != '' ">$(MSBuildExtensionsPath32)\Microsoft\WiX\v3.x\Wix.targets</WixTargetsPath>
<WixTargetsPath Condition=" '$(WixTargetsPath)' == '' ">$(MSBuildExtensionsPath)\Microsoft\WiX\v3.x\Wix.targets</WixTargetsPath>
@@ -19,7 +19,8 @@
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x86' ">
<OutputPath>bin\$(Configuration)\</OutputPath>
<IntermediateOutputPath>obj\$(Configuration)\</IntermediateOutputPath>
- <DefineConstants>Setup.TargetPath=..\BEurtleSetup\bin\Release\BEurtlePlugin.msi</DefineConstants>
+ <DefineConstants>
+ </DefineConstants>
</PropertyGroup>
<ItemGroup>
<Compile Include="Bundle.wxs" />

0 comments on commit ac54a2c

Please sign in to comment.