Merge pull request #8 from n5ac/thumbDV_installer

Thumb dv installer

pc/CODEC2 GUI/CODEC2 GUI/MainForm.Designer.cs

@@ -228,7 +228,7 @@
             this.Margin = new System.Windows.Forms.Padding(4);
             this.MinimumSize = new System.Drawing.Size(200, 200);
             this.Name = "MainForm";
-            this.Text = "FLEX 6000 DSTAR";
+            this.Text = "SmartSDR DSTAR Waveform";
             this.FormClosing += new System.Windows.Forms.FormClosingEventHandler(this.Form1_FormClosing);
             this.Load += new System.EventHandler(this.Form1_Load);
             this.menuStrip1.ResumeLayout(false);

pc/CODEC2 GUI/CODEC2 GUI/Properties/AssemblyInfo.cs

@@ -5,11 +5,11 @@ using System.Runtime.InteropServices;
 // General Information about an assembly is controlled through the following 
 // set of attributes. Change these attribute values to modify the information
 // associated with an assembly.
-[assembly: AssemblyTitle("ThumbDV DSTAR GUI")]
+[assembly: AssemblyTitle("SmartSDR D-STAR Waveform")]
 [assembly: AssemblyDescription("")]
 [assembly: AssemblyConfiguration("")]
 [assembly: AssemblyCompany("FlexRadio Systems")]
-[assembly: AssemblyProduct("ThumbDV_GUI")]
+[assembly: AssemblyProduct("SmartSDR_D-STAR_Waveform")]
 [assembly: AssemblyCopyright("Copyright © FlexRadio Systems 2014-2015")]
 [assembly: AssemblyTrademark("")]
 [assembly: AssemblyCulture("")]
@@ -32,5 +32,5 @@ using System.Runtime.InteropServices;
 // You can specify all the values or you can default the Build and Revision Numbers 
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.4.0.5")]
-[assembly: AssemblyFileVersion("1.4.0.5")]
+[assembly: AssemblyVersion("1.5.0.6")]
+[assembly: AssemblyFileVersion("1.5.0.6")]

pc/CODEC2 GUI/CODEC2 GUI/ThumbDV_GUI.csproj

@@ -8,7 +8,7 @@
     <OutputType>WinExe</OutputType>
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>CODEC2_GUI</RootNamespace>
-    <AssemblyName>ThumbDV_DSTAR_GUI</AssemblyName>
+    <AssemblyName>SmartSDR_D-STAR_Waveform</AssemblyName>
     <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
     <AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
@@ -57,11 +57,16 @@
     <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="Flex.UiWpfFramework">
-      <HintPath>..\..\..\..\..\SmartSDR_1_14_21_References\Flex.UiWpfFramework.dll</HintPath>
+    <Reference Include="Flex.UiWpfFramework, Version=1.0.1.28534, Culture=neutral, processorArchitecture=x86">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>Libs\Flex.UiWpfFramework.dll</HintPath>
     </Reference>
-    <Reference Include="FlexLib">
-      <HintPath>..\..\..\..\..\SmartSDR_1_14_21_References\FlexLib.dll</HintPath>
+    <Reference Include="FlexLib, Version=1.4.25.28534, Culture=neutral, processorArchitecture=x86">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>Libs\FlexLib.dll</HintPath>
+    </Reference>
+    <Reference Include="Ionic.Zip">
+      <HintPath>Libs\Ionic.Zip.dll</HintPath>
     </Reference>
     <Reference Include="System" />
     <Reference Include="System.Core" />
@@ -73,6 +78,14 @@
     <Reference Include="System.Drawing" />
     <Reference Include="System.Windows.Forms" />
     <Reference Include="System.Xml" />
+    <Reference Include="Util, Version=1.0.1.30356, Culture=neutral, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>Libs\Util.dll</HintPath>
+    </Reference>
+    <Reference Include="Vita, Version=1.0.1.30356, Culture=neutral, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>Libs\Vita.dll</HintPath>
+    </Reference>
   </ItemGroup>
   <ItemGroup>
     <Compile Include="AssemblyInfo.cs" />

pc/CODEC2 GUI/CODEC2_GUI_INSTALLER/Flex_ThumbDV_Waveform_Inno_Install_Script.iss

@@ -4,15 +4,22 @@
 ; Author: Mark Hanson, AA3RK
 ;
 
-#define MyAppName "SmartSDR DSTAR Waveform"
-#define MyAppVersion "1.5.0.5"
-#define MyAppVersionWithV "v1.5.0.5"
+; The App Versions can be passed in and will match the AssemblyInfo for the application
+#ifndef MyAppVersion
+  #define MyAppVersion "1.0.6.0"
+#endif
+
+#ifndef MyAppVersionWithV
+  #define MyAppVersionWithV "v1.0.6.0"
+#endif
+
+#define MyAppName "SmartSDR D-STAR Waveform"
 #define MyAppPublisher "FlexRadio Systems"
 #define MyAppURL "http://www.flexradio.com/"
-#define MyAppExeName "ThumbDV_DSTAR_GUI.exe"
+#define MyAppExeName "SmartSDR_D-STAR_Waveform.exe"
 
 [Setup]
-AppId={{2AA4AC17-A170-4825-9BE9-D9974CCC9444}
+AppId={{6A900659-244F-467B-94D6-F0D0B1F72B81}
 AppName={#MyAppName}
 AppVersion={#MyAppVersion}
 VersionInfoVersion={#MyAppVersion}
@@ -25,7 +32,7 @@ DefaultDirName={pf}\{#MyAppPublisher}\{#MyAppName} {#MyAppVersionWithV}
 DisableDirPage=yes
 DefaultGroupName=DSTAR Waveform
 DisableProgramGroupPage=yes
-OutputBaseFilename=DSTAR_Waveform_Installer
+OutputBaseFilename=SmartSDR_D-STAR_Waveform_Installer_{#MyAppVersionWithV}
 SetupIconFile=..\CODEC2 GUI\Images\dstar.ico
 Compression=lzma
 SolidCompression=yes
@@ -34,11 +41,11 @@ SolidCompression=yes
 Name: "english"; MessagesFile: "compiler:Default.isl"
 
 [Tasks]
-Name: "desktopicon"; Description: "{cm:CreateDesktopIcon}"; GroupDescription: "{cm:AdditionalIcons}"; Flags: unchecked
+Name: "desktopicon"; Description: "{cm:CreateDesktopIcon}"; GroupDescription: "{cm:AdditionalIcons}";
 
 [Files]
-Source: "..\CODEC2 GUI\bin\x86\Release\ThumbDV_DSTAR_GUI.exe"; DestDir: "{app}"; Flags: ignoreversion
-Source: "..\CODEC2 GUI\bin\x86\Release\ThumbDV_DSTAR_GUI.exe.config"; DestDir: "{app}"; Flags: ignoreversion
+Source: "..\CODEC2 GUI\bin\x86\Release\{#MyAppExeName}"; DestDir: "{app}"; Flags: ignoreversion
+Source: "..\CODEC2 GUI\bin\x86\Release\{#MyAppExeName}.config"; DestDir: "{app}"; Flags: ignoreversion
 Source: "..\CODEC2 GUI\bin\x86\Release\Flex.UiWpfFramework.dll"; DestDir: "{app}"; Flags: ignoreversion
 Source: "..\CODEC2 GUI\bin\x86\Release\FlexLib.dll"; DestDir: "{app}"; Flags: ignoreversion
 Source: "..\CODEC2 GUI\bin\x86\Release\Ionic.Zip.dll"; DestDir: "{app}"; Flags: ignoreversion
@@ -49,7 +56,7 @@ Source: "..\..\..\DSP_API\Waveform\ThumbDV.ssdr_waveform"; DestDir: "{userappdat
 
 [Icons]
 Name: "{commonprograms}\{#MyAppName}"; Filename: "{app}\{#MyAppExeName}"
-Name: "{commondesktop}\{#MyAppName}"; Filename: "{app}\{#MyAppExeName}"; Tasks: desktopicon
+Name: "{commondesktop}\{#MyAppName} {#MyAppVersionWithV}"; Filename: "{app}\{#MyAppExeName}"; Tasks: desktopicon
 
 [Run]
 Filename: "{app}\{#MyAppExeName}"; Description: "{cm:LaunchProgram,{#StringChange(MyAppName, '&', '&&')}}"; Flags: nowait postinstall skipifsilent