Skip to content

Commit

Permalink
Add DirectX install to installer steps, resolve a few warnings
Browse files Browse the repository at this point in the history
  • Loading branch information
walshie4 committed Mar 6, 2017
1 parent 8c6157d commit e2b41a2
Show file tree
Hide file tree
Showing 6 changed files with 28 additions and 13 deletions.
8 changes: 4 additions & 4 deletions Antumbra/Antumbra.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -24,8 +24,8 @@
<UpdatePeriodically>false</UpdatePeriodically>
<UpdateRequired>false</UpdateRequired>
<MapFileExtensions>true</MapFileExtensions>
<ApplicationRevision>2</ApplicationRevision>
<ApplicationVersion>0.1.0.%2a</ApplicationVersion>
<ApplicationRevision>0</ApplicationRevision>
<ApplicationVersion>1.0.0.%2a</ApplicationVersion>
<UseApplicationTrust>false</UseApplicationTrust>
<PublishWizardCompleted>true</PublishWizardCompleted>
<BootstrapperEnabled>true</BootstrapperEnabled>
Expand Down Expand Up @@ -64,11 +64,11 @@
<TreatWarningsAsErrors>false</TreatWarningsAsErrors>
<DebugType>full</DebugType>
<PlatformTarget>x86</PlatformTarget>
<RunCodeAnalysis>false</RunCodeAnalysis>
<RunCodeAnalysis>true</RunCodeAnalysis>
<ErrorReport>prompt</ErrorReport>
<CodeAnalysisRuleSet>ManagedMinimumRules.ruleset</CodeAnalysisRuleSet>
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
<Optimize>false</Optimize>
<Optimize>true</Optimize>
<Prefer32Bit>false</Prefer32Bit>
<UseVSHostingProcess>false</UseVSHostingProcess>
</PropertyGroup>
Expand Down
15 changes: 14 additions & 1 deletion Antumbra/ExtensionFramework/Management/MEFHelper.cs
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@

namespace Antumbra.Glow.ExtensionFramework.Management {

public class MEFHelper : Loggable {
public class MEFHelper : Loggable, IDisposable {

#region Private Fields

Expand Down Expand Up @@ -50,6 +50,19 @@ public MEFHelper() {

#region Public Methods

public void Dispose()
{
foreach (var each in FullList)
{
each.Dispose();
}

if (container != null)
{
container.Dispose();
}
}

public void AttachObserver(LogMsgObserver observer) {
NewLogMsgAvail += observer.NewLogMsgAvail;
}
Expand Down
4 changes: 2 additions & 2 deletions Antumbra/Properties/AssemblyInfo.cs
Original file line number Diff line number Diff line change
Expand Up @@ -25,5 +25,5 @@
//
// 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.0.0.0")]
[assembly: AssemblyFileVersion("1.0.0.0")]
[assembly: AssemblyVersion("1.0.0")]
[assembly: AssemblyFileVersion("1.0.0")]
2 changes: 1 addition & 1 deletion FlatTabControl/FlatTabControl.cs
Original file line number Diff line number Diff line change
Expand Up @@ -463,7 +463,7 @@ private void InitializeComponent() {
}

[Browsable(true)]
new public Color myBackColor {
public Color myBackColor {
get { return mBackColor; }
set { mBackColor = value; this.Invalidate(); }
}
Expand Down
10 changes: 6 additions & 4 deletions WintumbraInstaller/WintumbraInstaller.iss
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[Setup]
AppName = "Antumbra"
AppVersion = 1.0.0.0-RC_3
AppVersion = 1.0.0
AppId = "Wintumbra"
SetupIconFile = Antumbra.ico
AppPublisher = "Antumbra Technologies Inc."
Expand All @@ -15,7 +15,8 @@ DisableProgramGroupPage = auto
Name: "{commonprograms}\Antumbra"; Filename: "{app}\Antumbra.exe"

[Files]
Source: "..\deps\wintumbra\dotNetFx45_Full_setup.exe"; DestDir: {tmp}; Flags: deleteafterinstall; Check: FrameworkIsNotInstalled
Source: "..\deps\wintumbra\dotNetFx45_Full_setup.exe"; DestDir: {tmp}; Flags: deleteafterinstall; Check: DotNetFrameworkIsNotInstalled
Source: "..\deps\wintumbra\DirectX\*"; DestDir: {tmp}; Flags: deleteafterinstall;
Source: "..\deps\libwdi\*.dll"; DestDir: {app}\DriverInstaller
Source: "..\deps\win32-libantumbra\glowdrvinst.exe"; DestDir: {app}\DriverInstaller\
Source: "dependencies\*.dll"; DestDir: {app}\Extensions
Expand All @@ -34,11 +35,12 @@ Type: files; Name: "%appdata%\Antumbra\wintumbra.log"
Type: files; Name: "{app}\Extensions\*.dll"

[Run]
Filename: "{tmp}\dotNetFx45_Full_setup.exe"; Check: FrameworkIsNotInstalled
Filename: "{tmp}\dotNetFx45_Full_setup.exe"; Check: DotNetFrameworkIsNotInstalled
Filename: "{tmp}\DXSETUP.exe";
Filename: "{app}\DriverInstaller\glowdrvinst.exe"; Parameters: "batch"

[code]
function FrameworkIsNotInstalled: Boolean;
function DotNetFrameworkIsNotInstalled: Boolean;
begin
Result := not RegKeyExists(HKEY_LOCAL_MACHINE, 'SOFTWARE\Microsoft\.NETFramework\policy\v4.5');
end;
2 changes: 1 addition & 1 deletion deps
Submodule deps updated 163 files

0 comments on commit e2b41a2

Please sign in to comment.