Change build - will probably go away

This commit is contained in:
Ed Gonzalez 2015-08-26 14:52:41 -05:00
parent 253ab84a34
commit 10fe766b62
7 changed files with 342 additions and 41 deletions

View file

@ -10,6 +10,9 @@ EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Vita", "..\..\..\smartsdr-win\Vita\Vita.csproj", "{6ED364FB-7444-44DA-9196-1D8679425B3E}"
EndProject
Project("{54435603-DBB4-11D2-8724-00A0C9A8B90C}") = "CODEC2_GUI_INSTALLER", "CODEC2_GUI_INSTALLER\CODEC2_GUI_INSTALLER.vdproj", "{AABE6A3C-F038-4448-981F-F68A6D5069C3}"
ProjectSection(ProjectDependencies) = postProject
{19634B34-7569-4D1D-8182-B10AC27E13FF} = {19634B34-7569-4D1D-8182-B10AC27E13FF}
EndProjectSection
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "CODEC2 GUI", "CODEC2 GUI\CODEC2 GUI.csproj", "{19634B34-7569-4D1D-8182-B10AC27E13FF}"
EndProject
@ -62,6 +65,7 @@ Global
{19634B34-7569-4D1D-8182-B10AC27E13FF}.Debug|x86.ActiveCfg = Debug|x86
{19634B34-7569-4D1D-8182-B10AC27E13FF}.Debug|x86.Build.0 = Debug|x86
{19634B34-7569-4D1D-8182-B10AC27E13FF}.Release|Any CPU.ActiveCfg = Release|x86
{19634B34-7569-4D1D-8182-B10AC27E13FF}.Release|Any CPU.Build.0 = Release|x86
{19634B34-7569-4D1D-8182-B10AC27E13FF}.Release|x86.ActiveCfg = Release|x86
{19634B34-7569-4D1D-8182-B10AC27E13FF}.Release|x86.Build.0 = Release|x86
EndGlobalSection

View file

@ -38,7 +38,7 @@
this.label1.Name = "label1";
this.label1.Size = new System.Drawing.Size(123, 13);
this.label1.TabIndex = 0;
this.label1.Text = "No DSTAR (D*FM) Slice";
this.label1.Text = "No DSTAR (DSTR) Slice";
//
// Form1
//

View file

@ -179,7 +179,7 @@ namespace CODEC2_GUI
private void CheckDemodMode(Slice slc)
{
if (slc.DemodMode == "D*FM")
if (slc.DemodMode == "DSTR")
{
// yes -- is this Slice already in the list?
if (!_waveformSlices.Contains(slc))

View file

@ -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("CODEC2 GUI")]
[assembly: AssemblyTitle("ThumbDV_DSTAR")]
[assembly: AssemblyDescription("")]
[assembly: AssemblyConfiguration("")]
[assembly: AssemblyCompany("FlexRadio Systems")]
[assembly: AssemblyProduct("CODEC2 GUI")]
[assembly: AssemblyProduct("ThumbDV_DSTAR")]
[assembly: AssemblyCopyright("Copyright © FlexRadio Systems 2014")]
[assembly: AssemblyTrademark("")]
[assembly: AssemblyCulture("")]

View file

@ -1,14 +1,14 @@
//------------------------------------------------------------------------------
// <auto-generated>
// This code was generated by a tool.
// Runtime Version:4.0.30319.34209
// Runtime Version:4.0.30319.42000
//
// Changes to this file may cause incorrect behavior and will be lost if
// the code is regenerated.
// </auto-generated>
//------------------------------------------------------------------------------
namespace FreeDV.Properties {
namespace ThumbDV_DSTAR_GUI.Properties {
using System;
@ -39,7 +39,7 @@ namespace FreeDV.Properties {
internal static global::System.Resources.ResourceManager ResourceManager {
get {
if (object.ReferenceEquals(resourceMan, null)) {
global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("FreeDV.Properties.Resources", typeof(Resources).Assembly);
global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("ThumbDV_DSTAR_GUI.Properties.Resources", typeof(Resources).Assembly);
resourceMan = temp;
}
return resourceMan;

View file

@ -1,14 +1,14 @@
//------------------------------------------------------------------------------
// <auto-generated>
// This code was generated by a tool.
// Runtime Version:4.0.30319.34209
// Runtime Version:4.0.30319.42000
//
// Changes to this file may cause incorrect behavior and will be lost if
// the code is regenerated.
// </auto-generated>
//------------------------------------------------------------------------------
namespace FreeDV.Properties {
namespace ThumbDV_DSTAR_GUI.Properties {
[global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]

View file

@ -13,6 +13,24 @@
"SccProvider" = "8:"
"Hierarchy"
{
"Entry"
{
"MsmKey" = "8:_0766D6B5F67085FA6951B8F3A110AC52"
"OwnerKey" = "8:_6B67ECD422687C0C1F634130CF5E98FB"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
"MsmKey" = "8:_0766D6B5F67085FA6951B8F3A110AC52"
"OwnerKey" = "8:_52F2E5C82F5A468DB0A14958DABC010C"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
"MsmKey" = "8:_37A07FD6839A484AB728FA94B1083955"
"OwnerKey" = "8:_UNDEFINED"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
"MsmKey" = "8:_44FE594CB4324BE091F300EB9369B6CC"
@ -21,14 +39,62 @@
}
"Entry"
{
"MsmKey" = "8:_52F2E5C82F5A468DB0A14958DABC010C"
"OwnerKey" = "8:_UNDEFINED"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
"MsmKey" = "8:_5841366F13AC47E5B678DCF7F7152F4E"
"OwnerKey" = "8:_UNDEFINED"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
"MsmKey" = "8:_88C1D5A632F74D7EBC8A5FDC131505EE"
"OwnerKey" = "8:_UNDEFINED"
"MsmKey" = "8:_6B67ECD422687C0C1F634130CF5E98FB"
"OwnerKey" = "8:_52F2E5C82F5A468DB0A14958DABC010C"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
"MsmKey" = "8:_BF7C891FD48893917AC2212F0D71946D"
"OwnerKey" = "8:_6B67ECD422687C0C1F634130CF5E98FB"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
"MsmKey" = "8:_BF7C891FD48893917AC2212F0D71946D"
"OwnerKey" = "8:_52F2E5C82F5A468DB0A14958DABC010C"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
"MsmKey" = "8:_BF7C891FD48893917AC2212F0D71946D"
"OwnerKey" = "8:_E01867FA37CD77344818571B20736D3B"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
"MsmKey" = "8:_DCE4F5BEF3314462167194E11CDFA3C0"
"OwnerKey" = "8:_6B67ECD422687C0C1F634130CF5E98FB"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
"MsmKey" = "8:_DCE4F5BEF3314462167194E11CDFA3C0"
"OwnerKey" = "8:_52F2E5C82F5A468DB0A14958DABC010C"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
"MsmKey" = "8:_E01867FA37CD77344818571B20736D3B"
"OwnerKey" = "8:_6B67ECD422687C0C1F634130CF5E98FB"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
"MsmKey" = "8:_E01867FA37CD77344818571B20736D3B"
"OwnerKey" = "8:_52F2E5C82F5A468DB0A14958DABC010C"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
@ -37,6 +103,42 @@
"OwnerKey" = "8:_UNDEFINED"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
"MsmKey" = "8:_UNDEFINED"
"OwnerKey" = "8:_52F2E5C82F5A468DB0A14958DABC010C"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
"MsmKey" = "8:_UNDEFINED"
"OwnerKey" = "8:_6B67ECD422687C0C1F634130CF5E98FB"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
"MsmKey" = "8:_UNDEFINED"
"OwnerKey" = "8:_0766D6B5F67085FA6951B8F3A110AC52"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
"MsmKey" = "8:_UNDEFINED"
"OwnerKey" = "8:_E01867FA37CD77344818571B20736D3B"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
"MsmKey" = "8:_UNDEFINED"
"OwnerKey" = "8:_BF7C891FD48893917AC2212F0D71946D"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
"MsmKey" = "8:_UNDEFINED"
"OwnerKey" = "8:_DCE4F5BEF3314462167194E11CDFA3C0"
"MsmSig" = "8:_UNDEFINED"
}
}
"Configurations"
{
@ -62,6 +164,19 @@
"PrerequisitesLocation" = "2:1"
"Url" = "8:"
"ComponentsUrl" = "8:"
"Items"
{
"{EDC2488A-8267-493A-A98E-7D9C3B36CDF3}:.NETFramework,Version=v4.0,Profile=Client"
{
"Name" = "8:Microsoft .NET Framework 4 Client Profile (x86 and x64)"
"ProductCode" = "8:.NETFramework,Version=v4.0,Profile=Client"
}
"{EDC2488A-8267-493A-A98E-7D9C3B36CDF3}:Microsoft.Windows.Installer.3.1"
{
"Name" = "8:Windows Installer 3.1"
"ProductCode" = "8:Microsoft.Windows.Installer.3.1"
}
}
}
}
"Release"
@ -69,7 +184,7 @@
"DisplayName" = "8:Release"
"IsDebugOnly" = "11:FALSE"
"IsReleaseOnly" = "11:TRUE"
"OutputFilename" = "8:Release\\FreeDV.msi"
"OutputFilename" = "8:Release\\ThumbDV_DSTAR.msi"
"PackageFilesAs" = "3:2"
"PackageFileSize" = "3:-2147483648"
"CabType" = "3:1"
@ -86,6 +201,19 @@
"PrerequisitesLocation" = "2:1"
"Url" = "8:"
"ComponentsUrl" = "8:"
"Items"
{
"{EDC2488A-8267-493A-A98E-7D9C3B36CDF3}:.NETFramework,Version=v4.0,Profile=Client"
{
"Name" = "8:Microsoft .NET Framework 4 Client Profile (x86 and x64)"
"ProductCode" = "8:.NETFramework,Version=v4.0,Profile=Client"
}
"{EDC2488A-8267-493A-A98E-7D9C3B36CDF3}:Microsoft.Windows.Installer.3.1"
{
"Name" = "8:Windows Installer 3.1"
"ProductCode" = "8:Microsoft.Windows.Installer.3.1"
}
}
}
}
}
@ -116,6 +244,57 @@
}
"File"
{
"{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_0766D6B5F67085FA6951B8F3A110AC52"
{
"AssemblyRegister" = "3:1"
"AssemblyIsInGAC" = "11:FALSE"
"AssemblyAsmDisplayName" = "8:Flex.UiWpfFramework, Version=1.0.1.24789, Culture=neutral, processorArchitecture=MSIL"
"ScatterAssemblies"
{
"_0766D6B5F67085FA6951B8F3A110AC52"
{
"Name" = "8:Flex.UiWpfFramework.dll"
"Attributes" = "3:512"
}
}
"SourcePath" = "8:Flex.UiWpfFramework.dll"
"TargetName" = "8:"
"Tag" = "8:"
"Folder" = "8:_40196D409E904F29B144A3CC2149E747"
"Condition" = "8:"
"Transitive" = "11:FALSE"
"Vital" = "11:TRUE"
"ReadOnly" = "11:FALSE"
"Hidden" = "11:FALSE"
"System" = "11:FALSE"
"Permanent" = "11:FALSE"
"SharedLegacy" = "11:FALSE"
"PackageAs" = "3:1"
"Register" = "3:1"
"Exclude" = "11:FALSE"
"IsDependency" = "11:TRUE"
"IsolateTo" = "8:"
}
"{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_37A07FD6839A484AB728FA94B1083955"
{
"SourcePath" = "8:..\\..\\..\\..\\..\\ThumbDV.ssdr_waveform"
"TargetName" = "8:ThumbDV.ssdr_waveform"
"Tag" = "8:"
"Folder" = "8:_377DE1BBED84443D8A1631B8496FDC4E"
"Condition" = "8:"
"Transitive" = "11:FALSE"
"Vital" = "11:TRUE"
"ReadOnly" = "11:FALSE"
"Hidden" = "11:FALSE"
"System" = "11:FALSE"
"Permanent" = "11:FALSE"
"SharedLegacy" = "11:FALSE"
"PackageAs" = "3:1"
"Register" = "3:1"
"Exclude" = "11:FALSE"
"IsDependency" = "11:FALSE"
"IsolateTo" = "8:"
}
"{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_44FE594CB4324BE091F300EB9369B6CC"
{
"SourcePath" = "8:..\\CODEC2 GUI\\Images\\FDVLogo.ico"
@ -156,12 +335,23 @@
"IsDependency" = "11:FALSE"
"IsolateTo" = "8:"
}
"{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_88C1D5A632F74D7EBC8A5FDC131505EE"
"{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_6B67ECD422687C0C1F634130CF5E98FB"
{
"SourcePath" = "8:FreeDV_Release.ssdr_waveform"
"TargetName" = "8:FreeDV_Release.ssdr_waveform"
"AssemblyRegister" = "3:1"
"AssemblyIsInGAC" = "11:FALSE"
"AssemblyAsmDisplayName" = "8:FlexLib, Version=1.4.23.24790, Culture=neutral, processorArchitecture=MSIL"
"ScatterAssemblies"
{
"_6B67ECD422687C0C1F634130CF5E98FB"
{
"Name" = "8:FlexLib.dll"
"Attributes" = "3:512"
}
}
"SourcePath" = "8:FlexLib.dll"
"TargetName" = "8:"
"Tag" = "8:"
"Folder" = "8:_377DE1BBED84443D8A1631B8496FDC4E"
"Folder" = "8:_40196D409E904F29B144A3CC2149E747"
"Condition" = "8:"
"Transitive" = "11:FALSE"
"Vital" = "11:TRUE"
@ -173,7 +363,100 @@
"PackageAs" = "3:1"
"Register" = "3:1"
"Exclude" = "11:FALSE"
"IsDependency" = "11:FALSE"
"IsDependency" = "11:TRUE"
"IsolateTo" = "8:"
}
"{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_BF7C891FD48893917AC2212F0D71946D"
{
"AssemblyRegister" = "3:1"
"AssemblyIsInGAC" = "11:FALSE"
"AssemblyAsmDisplayName" = "8:Util, Version=1.0.1.24789, Culture=neutral, processorArchitecture=MSIL"
"ScatterAssemblies"
{
"_BF7C891FD48893917AC2212F0D71946D"
{
"Name" = "8:Util.dll"
"Attributes" = "3:512"
}
}
"SourcePath" = "8:Util.dll"
"TargetName" = "8:"
"Tag" = "8:"
"Folder" = "8:_40196D409E904F29B144A3CC2149E747"
"Condition" = "8:"
"Transitive" = "11:FALSE"
"Vital" = "11:TRUE"
"ReadOnly" = "11:FALSE"
"Hidden" = "11:FALSE"
"System" = "11:FALSE"
"Permanent" = "11:FALSE"
"SharedLegacy" = "11:FALSE"
"PackageAs" = "3:1"
"Register" = "3:1"
"Exclude" = "11:FALSE"
"IsDependency" = "11:TRUE"
"IsolateTo" = "8:"
}
"{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_DCE4F5BEF3314462167194E11CDFA3C0"
{
"AssemblyRegister" = "3:1"
"AssemblyIsInGAC" = "11:FALSE"
"AssemblyAsmDisplayName" = "8:Ionic.Zip, Version=1.9.1.8, Culture=neutral, PublicKeyToken=edbe51ad942a3f5c, processorArchitecture=MSIL"
"ScatterAssemblies"
{
"_DCE4F5BEF3314462167194E11CDFA3C0"
{
"Name" = "8:Ionic.Zip.dll"
"Attributes" = "3:512"
}
}
"SourcePath" = "8:Ionic.Zip.dll"
"TargetName" = "8:"
"Tag" = "8:"
"Folder" = "8:_40196D409E904F29B144A3CC2149E747"
"Condition" = "8:"
"Transitive" = "11:FALSE"
"Vital" = "11:TRUE"
"ReadOnly" = "11:FALSE"
"Hidden" = "11:FALSE"
"System" = "11:FALSE"
"Permanent" = "11:FALSE"
"SharedLegacy" = "11:FALSE"
"PackageAs" = "3:1"
"Register" = "3:1"
"Exclude" = "11:FALSE"
"IsDependency" = "11:TRUE"
"IsolateTo" = "8:"
}
"{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_E01867FA37CD77344818571B20736D3B"
{
"AssemblyRegister" = "3:1"
"AssemblyIsInGAC" = "11:FALSE"
"AssemblyAsmDisplayName" = "8:Vita, Version=1.0.1.24789, Culture=neutral, processorArchitecture=MSIL"
"ScatterAssemblies"
{
"_E01867FA37CD77344818571B20736D3B"
{
"Name" = "8:Vita.dll"
"Attributes" = "3:512"
}
}
"SourcePath" = "8:Vita.dll"
"TargetName" = "8:"
"Tag" = "8:"
"Folder" = "8:_40196D409E904F29B144A3CC2149E747"
"Condition" = "8:"
"Transitive" = "11:FALSE"
"Vital" = "11:TRUE"
"ReadOnly" = "11:FALSE"
"Hidden" = "11:FALSE"
"System" = "11:FALSE"
"Permanent" = "11:FALSE"
"SharedLegacy" = "11:FALSE"
"PackageAs" = "3:1"
"Register" = "3:1"
"Exclude" = "11:FALSE"
"IsDependency" = "11:TRUE"
"IsolateTo" = "8:"
}
"{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_F5493E84A58F4E0D993B24BAD4694555"
@ -284,20 +567,20 @@
"Product"
{
"Name" = "8:Microsoft Visual Studio"
"ProductName" = "8:FreeDV"
"ProductCode" = "8:{31966E85-47C4-49D4-80B5-3051D960ADC0}"
"PackageCode" = "8:{4151C606-CE2E-419B-B8A3-5EA149790371}"
"UpgradeCode" = "8:{BA448748-24DA-43CE-BAA7-FC4F549589E8}"
"ProductName" = "8:ThumbDV DSTAR"
"ProductCode" = "8:{0A72FD89-CF75-4368-8DCF-20719A4EF565}"
"PackageCode" = "8:{7B138403-B258-48E4-9991-7DDD5FFDFC50}"
"UpgradeCode" = "8:{A727F8A2-D15B-45F4-9728-19541BB04667}"
"AspNetVersion" = "8:4.0.30319.0"
"RestartWWWService" = "11:FALSE"
"RemovePreviousVersions" = "11:TRUE"
"DetectNewerInstalledVersion" = "11:TRUE"
"InstallAllUsers" = "11:TRUE"
"ProductVersion" = "8:1.0.0"
"ProductVersion" = "8:1.0.4"
"Manufacturer" = "8:FlexRadio Systems"
"ARPHELPTELEPHONE" = "8:"
"ARPHELPLINK" = "8:"
"Title" = "8:FreeDV"
"Title" = "8:ThumbDV DSTAR"
"Subject" = "8:"
"ARPCONTACT" = "8:"
"Keywords" = "8:"
@ -406,32 +689,18 @@
}
"Shortcut"
{
"{970C0BB2-C7D0-45D7-ABFA-7EC378858BC0}:_1AA7F5078E9B42FB8E16D82998B06E10"
"{970C0BB2-C7D0-45D7-ABFA-7EC378858BC0}:_0CB4C29272694A3C8B3AD5BF0F25047C"
{
"Name" = "8:FreeDV"
"Name" = "8:ThumbDV DSTAR"
"Arguments" = "8:"
"Description" = "8:"
"ShowCmd" = "3:1"
"IconIndex" = "3:0"
"Transitive" = "11:FALSE"
"Target" = "8:"
"Folder" = "8:_28A6D54432764B34ABC7E36F336A6762"
"WorkingFolder" = "8:_40196D409E904F29B144A3CC2149E747"
"Icon" = "8:_44FE594CB4324BE091F300EB9369B6CC"
"Feature" = "8:"
}
"{970C0BB2-C7D0-45D7-ABFA-7EC378858BC0}:_A4D147B0B4B04223B55728F898826A49"
{
"Name" = "8:CODEC2 GUI"
"Arguments" = "8:"
"Description" = "8:"
"ShowCmd" = "3:1"
"IconIndex" = "3:0"
"Transitive" = "11:FALSE"
"Target" = "8:"
"Target" = "8:_52F2E5C82F5A468DB0A14958DABC010C"
"Folder" = "8:_01E98CA335E74C1385F704CA49E431C5"
"WorkingFolder" = "8:_40196D409E904F29B144A3CC2149E747"
"Icon" = "8:_44FE594CB4324BE091F300EB9369B6CC"
"Icon" = "8:"
"Feature" = "8:"
}
}
@ -833,6 +1102,34 @@
}
"ProjectOutput"
{
"{5259A561-127C-4D43-A0A1-72F10C7B3BF8}:_52F2E5C82F5A468DB0A14958DABC010C"
{
"SourcePath" = "8:..\\CODEC2 GUI\\obj\\x86\\Release\\ThumbDV_DSTAR_GUI.exe"
"TargetName" = "8:"
"Tag" = "8:"
"Folder" = "8:_40196D409E904F29B144A3CC2149E747"
"Condition" = "8:"
"Transitive" = "11:FALSE"
"Vital" = "11:TRUE"
"ReadOnly" = "11:FALSE"
"Hidden" = "11:FALSE"
"System" = "11:FALSE"
"Permanent" = "11:FALSE"
"SharedLegacy" = "11:FALSE"
"PackageAs" = "3:1"
"Register" = "3:1"
"Exclude" = "11:FALSE"
"IsDependency" = "11:FALSE"
"IsolateTo" = "8:"
"ProjectOutputGroupRegister" = "3:1"
"OutputConfiguration" = "8:"
"OutputGroupCanonicalName" = "8:Built"
"OutputProjectGuid" = "8:{19634B34-7569-4D1D-8182-B10AC27E13FF}"
"ShowKeyOutput" = "11:TRUE"
"ExcludeFilters"
{
}
}
}
}
}