Skip to content

Commit

Permalink
Installer now works
Browse files Browse the repository at this point in the history
  • Loading branch information
@davidnmbond
davidnmbond committed Mar 6, 2017
1 parent cad9e23 commit 2289856
Show file tree
Hide file tree
Showing 27 changed files with 178 additions and 54 deletions.
39 changes: 30 additions & 9 deletions Source/SomaFm.Setup/Product.wxs
View file
Original file line number Diff line number Diff line change
@@ -1,30 +1,51 @@
<?xml version="1.0" encoding="UTF-8"?>
<Wix xmlns="http://schemas.microsoft.com/wix/2006/wi">
<Product Id="*" Name="Soma FM" Language="1033" Version="1.0.0.0" Manufacturer="David Bond" UpgradeCode="33cf1d20-b823-48af-93e0-0fbd9cf8cd99">
<Product Id="*" Name="Soma FM" Language="1033" Version="!(bind.FileVersion.SomaFm.exe)" Manufacturer="David Bond" UpgradeCode="33cf1d20-b823-48af-93e0-0fbd9cf8cd99">
<Package InstallerVersion="200" Compressed="yes" InstallScope="perMachine" />

<MajorUpgrade DowngradeErrorMessage="A newer version of [ProductName] is already installed." />
<MediaTemplate />
<Media Id="1" Cabinet="cab1.cab" EmbedCab="yes" />

<Feature Id="ProductFeature" Title="SomaFm.Setup" Level="1">
<DirectoryRef Id="ApplicationProgramsFolder">
<Component Id="ApplicationShortcut" Guid="59BA36CD-349C-4D0C-80C8-E0290952F831">
<Shortcut Id="ApplicationStartMenuShortcut"
Name="Soma FM"
Description="Soma FM Tray player"
Target="[#SomaFm.exe]"
WorkingDirectory="APPLICATIONROOTDIRECTORY"/>
<RemoveFolder Id="CleanUpShortCut" Directory="ApplicationProgramsFolder" On="uninstall"/>
<RegistryValue Root="HKCU" Key="Software\Microsoft\MyApplicationName" Name="installed" Type="integer" Value="1" KeyPath="yes"/>
</Component>
</DirectoryRef>


<Feature Id="ProductFeature" Title="Soma FM Tray Icon" Level="1">
<ComponentGroupRef Id="ProductComponents" />
<ComponentRef Id="ApplicationShortcut" />
</Feature>
</Product>


<Fragment>
<Directory Id="TARGETDIR" Name="SourceDir">
<Directory Id="ProgramFilesFolder">
<Directory Id="INSTALLFOLDER" Name="SomaFm.Setup" />
<Directory Id="INSTALLFOLDER" Name="Soma FM">
</Directory>
</Directory>
<Directory Id="ProgramMenuFolder">
<Directory Id="ApplicationProgramsFolder" Name="Soma FM"/>
</Directory>
</Directory>
</Fragment>


<Fragment>
<ComponentGroup Id="ProductComponents" Directory="INSTALLFOLDER">
<!-- TODO: Remove the comments around this Component element and the ComponentRef below in order to add resources to this installer. -->
<!-- <Component Id="ProductComponent"> -->
<!-- TODO: Insert files, registry keys, and other resources here. -->
<!-- </Component> -->
<Component Id="ProductComponent">
<File Id="SomaFm.exe" Name="SomaFm.exe" Source="$(var.ProjectDir)..\SomaFm\bin\Release\SomaFm.exe" />
<File Id="Streams.ini" Name="Streams.ini" Source="$(var.ProjectDir)..\SomaFm\bin\Release\Streams.ini" />
<File Id="SomaFm.dat" Name="SomaFm.dat" Source="$(var.ProjectDir)..\SomaFm\bin\Release\SomaFm.dat" />
</Component>
</ComponentGroup>
</Fragment>
</Wix>
</Wix>
17 changes: 10 additions & 7 deletions Source/SomaFm.Setup/SomaFm.Setup.wixproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<ProductVersion>3.10</ProductVersion>
<ProjectGuid>4aaadbdb-fdc0-4783-9d2a-1360718b8c2e</ProjectGuid>
<SchemaVersion>2.0</SchemaVersion>
<OutputName>SomaFm.Setup</OutputName>
<OutputName>Soma FM</OutputName>
<OutputType>Package</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>
Expand All @@ -24,12 +24,15 @@
<Compile Include="Product.wxs" />
</ItemGroup>
<Import Project="$(WixTargetsPath)" />
<!--
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.
<Target Name="BeforeBuild">
</Target>
<PropertyGroup>
<PostBuildEvent />
</PropertyGroup>
<Target Name="AfterBuild">
<GetAssemblyIdentity AssemblyFiles="..\SomaFm\bin\$(Configuration)\SomaFm.exe">
<Output TaskParameter="Assemblies" ItemName="AssemblyVersion" />
</GetAssemblyIdentity>
<Copy SourceFiles=".\bin\$(Configuration)\$(OutputName).msi" DestinationFiles=".\bin\$(Configuration)\$(OutputName) %(AssemblyVersion.Version).msi" />
<Delete Files=".\bin\$(Configuration)\$(OutputName).msi" />
<Delete Files=".\bin\$(Configuration)\*.wixpdb" />
</Target>
-->
</Project>
Binary file added Source/SomaFm.Setup/bin/Release/Soma FM 1.0.0.0.msi
View file
Binary file not shown.
1 change: 1 addition & 0 deletions Source/SomaFm.Setup/bin/Release/Soma FM.wixpdb
View file

Large diffs are not rendered by default.

1 change: 1 addition & 0 deletions Source/SomaFm.Setup/obj/Debug/Product.wixobj
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
<?xml version="1.0" encoding="utf-8"?><wixObject version="3.0.2002.0" xmlns="http://schemas.microsoft.com/wix/2006/objects"><section id="*" type="product"><table name="_SummaryInformation"><row sourceLineNumber="F:\Projects\SomaFm\Source\SomaFm.Setup\Product.wxs*4"><field>1</field><field>1252</field></row><row sourceLineNumber="F:\Projects\SomaFm\Source\SomaFm.Setup\Product.wxs*4"><field>2</field><field>Installation Database</field></row><row sourceLineNumber="F:\Projects\SomaFm\Source\SomaFm.Setup\Product.wxs*4"><field>3</field><field>Soma FM</field></row><row sourceLineNumber="F:\Projects\SomaFm\Source\SomaFm.Setup\Product.wxs*4"><field>4</field><field>David Bond</field></row><row sourceLineNumber="F:\Projects\SomaFm\Source\SomaFm.Setup\Product.wxs*4"><field>5</field><field>Installer</field></row><row sourceLineNumber="F:\Projects\SomaFm\Source\SomaFm.Setup\Product.wxs*4"><field>6</field><field>This installer database contains the logic and data required to install Soma FM.</field></row><row sourceLineNumber="F:\Projects\SomaFm\Source\SomaFm.Setup\Product.wxs*4"><field>7</field><field>Intel;1033</field></row><row sourceLineNumber="F:\Projects\SomaFm\Source\SomaFm.Setup\Product.wxs*4"><field>9</field><field>*</field></row><row sourceLineNumber="F:\Projects\SomaFm\Source\SomaFm.Setup\Product.wxs*4"><field>14</field><field>200</field></row><row sourceLineNumber="F:\Projects\SomaFm\Source\SomaFm.Setup\Product.wxs*4"><field>15</field><field>2</field></row><row sourceLineNumber="F:\Projects\SomaFm\Source\SomaFm.Setup\Product.wxs*4"><field>19</field><field>2</field></row></table><table name="Feature"><row sourceLineNumber="F:\Projects\SomaFm\Source\SomaFm.Setup\Product.wxs*9"><field>ProductFeature</field><field /><field>SomaFm.Setup</field><field /><field>2</field><field>1</field><field /><field>0</field></row></table><table name="LaunchCondition"><row sourceLineNumber="F:\Projects\SomaFm\Source\SomaFm.Setup\Product.wxs*6"><field>NOT WIX_DOWNGRADE_DETECTED</field><field>A newer version of [ProductName] is already installed.</field></row></table><table name="Media"><row sourceLineNumber="F:\Projects\SomaFm\Source\SomaFm.Setup\Product.wxs*7"><field>1</field><field /><field /><field /><field /><field /></row></table><table name="Property"><row sourceLineNumber="F:\Projects\SomaFm\Source\SomaFm.Setup\Product.wxs*4"><field>ALLUSERS</field><field>1</field></row></table><table name="Upgrade"><row sourceLineNumber="F:\Projects\SomaFm\Source\SomaFm.Setup\Product.wxs*6"><field>{33CF1D20-B823-48AF-93E0-0FBD9CF8CD99}</field><field /><field>1.0.0.0</field><field /><field>1</field><field /><field>WIX_UPGRADE_DETECTED</field></row><row sourceLineNumber="F:\Projects\SomaFm\Source\SomaFm.Setup\Product.wxs*6"><field>{33CF1D20-B823-48AF-93E0-0FBD9CF8CD99}</field><field>1.0.0.0</field><field /><field /><field>2</field><field /><field>WIX_DOWNGRADE_DETECTED</field></row></table><table name="WixAction"><row sourceLineNumber="F:\Projects\SomaFm\Source\SomaFm.Setup\Product.wxs*6"><field>InstallExecuteSequence</field><field>RemoveExistingProducts</field><field /><field /><field /><field>InstallValidate</field><field>0</field></row></table><table name="WixComplexReference"><row sourceLineNumber="F:\Projects\SomaFm\Source\SomaFm.Setup\Product.wxs*10"><field>ProductFeature</field><field>1</field><field /><field>ProductComponents</field><field>3</field><field>0</field></row><row sourceLineNumber="F:\Projects\SomaFm\Source\SomaFm.Setup\Product.wxs*9"><field>*</field><field>5</field><field /><field>ProductFeature</field><field>2</field><field>0</field></row></table><table name="WixGroup"><row sourceLineNumber="F:\Projects\SomaFm\Source\SomaFm.Setup\Product.wxs*10"><field>ProductFeature</field><field>Feature</field><field>ProductComponents</field><field>ComponentGroup</field></row><row sourceLineNumber="F:\Projects\SomaFm\Source\SomaFm.Setup\Product.wxs*9"><field>*</field><field>Product</field><field>ProductFeature</field><field>Feature</field></row></table><table name="WixMediaTemplate"><row sourceLineNumber="F:\Projects\SomaFm\Source\SomaFm.Setup\Product.wxs*7"><field>cab{0}.cab</field><field /><field /><field /><field>200</field><field>0</field></row></table><table name="WixSimpleReference"><row sourceLineNumber="F:\Projects\SomaFm\Source\SomaFm.Setup\Product.wxs*3"><field>Property</field><field>Manufacturer</field></row><row sourceLineNumber="F:\Projects\SomaFm\Source\SomaFm.Setup\Product.wxs*3"><field>Property</field><field>ProductCode</field></row><row sourceLineNumber="F:\Projects\SomaFm\Source\SomaFm.Setup\Product.wxs*3"><field>Property</field><field>ProductLanguage</field></row><row sourceLineNumber="F:\Projects\SomaFm\Source\SomaFm.Setup\Product.wxs*3"><field>Property</field><field>ProductName</field></row><row sourceLineNumber="F:\Projects\SomaFm\Source\SomaFm.Setup\Product.wxs*3"><field>Property</field><field>ProductVersion</field></row><row sourceLineNumber="F:\Projects\SomaFm\Source\SomaFm.Setup\Product.wxs*3"><field>Property</field><field>UpgradeCode</field></row><row sourceLineNumber="F:\Projects\SomaFm\Source\SomaFm.Setup\Product.wxs*10"><field>WixComponentGroup</field><field>ProductComponents</field></row></table></section><section id="*.Manufacturer" type="fragment"><table name="Property"><row sourceLineNumber="F:\Projects\SomaFm\Source\SomaFm.Setup\Product.wxs*3"><field>Manufacturer</field><field>David Bond</field></row></table></section><section id="*.ProductCode" type="fragment"><table name="Property"><row sourceLineNumber="F:\Projects\SomaFm\Source\SomaFm.Setup\Product.wxs*3"><field>ProductCode</field><field>*</field></row></table></section><section id="*.ProductLanguage" type="fragment"><table name="Property"><row sourceLineNumber="F:\Projects\SomaFm\Source\SomaFm.Setup\Product.wxs*3"><field>ProductLanguage</field><field>1033</field></row></table></section><section id="*.ProductName" type="fragment"><table name="Property"><row sourceLineNumber="F:\Projects\SomaFm\Source\SomaFm.Setup\Product.wxs*3"><field>ProductName</field><field>Soma FM</field></row></table></section><section id="*.ProductVersion" type="fragment"><table name="Property"><row sourceLineNumber="F:\Projects\SomaFm\Source\SomaFm.Setup\Product.wxs*3"><field>ProductVersion</field><field>1.0.0.0</field></row></table></section><section id="*.UpgradeCode" type="fragment"><table name="Property"><row sourceLineNumber="F:\Projects\SomaFm\Source\SomaFm.Setup\Product.wxs*3"><field>UpgradeCode</field><field>{33CF1D20-B823-48AF-93E0-0FBD9CF8CD99}</field></row></table></section><section type="fragment"><table name="Directory"><row sourceLineNumber="F:\Projects\SomaFm\Source\SomaFm.Setup\Product.wxs*17"><field>INSTALLFOLDER</field><field>ProgramFilesFolder</field><field>endlhqg-|SomaFm.Setup</field></row><row sourceLineNumber="F:\Projects\SomaFm\Source\SomaFm.Setup\Product.wxs*16"><field>ProgramFilesFolder</field><field>TARGETDIR</field><field>.</field></row><row sourceLineNumber="F:\Projects\SomaFm\Source\SomaFm.Setup\Product.wxs*15"><field>TARGETDIR</field><field /><field>SourceDir</field></row></table></section><section type="fragment"><table name="Component"><row sourceLineNumber="F:\Projects\SomaFm\Source\SomaFm.Setup\Product.wxs*24"><field>ProductComponent</field><field>*</field><field>INSTALLFOLDER</field><field>0</field><field /><field>SomaFm.exe</field></row></table><table name="File"><row sourceLineNumber="F:\Projects\SomaFm\Source\SomaFm.Setup\Product.wxs*25"><field>SomaFm.exe</field><field>ProductComponent</field><field>SomaFm.exe</field><field>0</field><field /><field /><field>512</field><field /></row><row sourceLineNumber="F:\Projects\SomaFm\Source\SomaFm.Setup\Product.wxs*26"><field>Streams.ini</field><field>ProductComponent</field><field>Streams.ini</field><field>0</field><field /><field /><field>512</field><field /></row></table><table name="WixComplexReference"><row sourceLineNumber="F:\Projects\SomaFm\Source\SomaFm.Setup\Product.wxs*24"><field>ProductComponents</field><field>2</field><field /><field>ProductComponent</field><field>1</field><field>0</field></row></table><table name="WixComponentGroup"><row sourceLineNumber="F:\Projects\SomaFm\Source\SomaFm.Setup\Product.wxs*23"><field>ProductComponents</field></row></table><table name="WixFile"><row sourceLineNumber="F:\Projects\SomaFm\Source\SomaFm.Setup\Product.wxs*25"><field>SomaFm.exe</field><field /><field /><field /><field>INSTALLFOLDER</field><field>1</field><field>F:\Projects\SomaFm\Source\SomaFm.Setup\..\SomaFm\bin\Release\SomaFm.exe</field><field /><field>-1</field><field>0</field><field>0</field><field /><field /><field /><field /></row><row sourceLineNumber="F:\Projects\SomaFm\Source\SomaFm.Setup\Product.wxs*26"><field>Streams.ini</field><field /><field /><field /><field>INSTALLFOLDER</field><field>1</field><field>F:\Projects\SomaFm\Source\SomaFm.Setup\..\SomaFm\bin\Release\Streams.ini</field><field /><field>-1</field><field>0</field><field>0</field><field /><field /><field /><field /></row></table><table name="WixGroup"><row sourceLineNumber="F:\Projects\SomaFm\Source\SomaFm.Setup\Product.wxs*24"><field>ProductComponents</field><field>ComponentGroup</field><field>ProductComponent</field><field>Component</field></row></table><table name="WixSimpleReference"><row sourceLineNumber="F:\Projects\SomaFm\Source\SomaFm.Setup\Product.wxs*23"><field>Directory</field><field>INSTALLFOLDER</field></row><row sourceLineNumber="F:\Projects\SomaFm\Source\SomaFm.Setup\Product.wxs*25"><field>Media</field><field>1</field></row><row sourceLineNumber="F:\Projects\SomaFm\Source\SomaFm.Setup\Product.wxs*26"><field>Media</field><field>1</field></row></table></section></wixObject>
1 change: 1 addition & 0 deletions Source/SomaFm.Setup/obj/Debug/SomaFm.Setup.wixproj.FileList.txt
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
obj\Debug\Product.wixobj
Loading

0 comments on commit 2289856

Please sign in to comment.