backup/anx.framework
1
0
Fork 0
Code Issues Pull Requests Projects Releases Activity

extended msi installer

Browse Source 
fixed CurveKey operator == and !=
This commit is contained in:
Glatzemann 2011-11-22 11:59:35 +00:00
parent a548658b68
commit 1896545e0c
4 changed files with 92 additions and 60 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
ANX.Framework/CurveKey.cs
View File

@ -151,6 +151,16 @@ namespace ANX.Framework
#region Equality
public static bool operator ==(CurveKey a, CurveKey b)
{
if (null == a as Object)
{
return null == b as Object;
}
if (null == b as Object)
{
return null == a as Object;
}
return a.Position == b.Position &&
a.Value == b.Value &&
a.TangentIn == b.TangentIn &&
@ -162,6 +172,16 @@ namespace ANX.Framework
#region Inequality
public static bool operator !=(CurveKey a, CurveKey b)
{
if (null == a as Object)
{
return null != b as Object;
}
if (null == b as Object)
{
return null != a as Object;
}
return a.Position != b.Position ||
a.Value != b.Value ||
a.TangentIn != b.TangentIn ||

4
ANX.Framework/Properties/AssemblyInfo.cs
View File

@ -31,8 +31,8 @@ using System.Runtime.InteropServices;
//
// Sie können alle Werte angeben oder die standardmäßigen Build- und Revisionsnummern
// übernehmen, indem Sie "*" eingeben:
[assembly: AssemblyVersion("0.4.22.*")]
[assembly: AssemblyFileVersion("0.4.22.0")]
[assembly: AssemblyVersion("0.4.23.*")]
[assembly: AssemblyFileVersion("0.4.23.0")]
[assembly:InternalsVisibleTo("ANX.Framework.Windows.DX10")]
[assembly:InternalsVisibleTo("ANX.Framework.Windows.DX11.1")]

127
Installer/anx.wxs
View File

@ -1,60 +1,71 @@
<?xml version='1.0'?>
<Wix xmlns='http://schemas.microsoft.com/wix/2006/wi'>
<Product Id='{B7ABDA84-7163-4892-9AA1-814C6CDAAF54}' Name='ANX.Framework' Language='1033'
Version='1.0.0.0' Manufacturer='ANX.Framework Developer Team' UpgradeCode='{7A54B375-318B-40B7-ABF7-60BB50689361}' >
<Package Description='My first Windows Installer package'
Comments='This is my first attempt at creating a Windows Installer database'
Manufacturer='Microsoft Corporation' InstallerVersion='200' Compressed='yes' />
<?xml version="1.0" encoding="utf-8"?>
<Wix xmlns="http://schemas.microsoft.com/wix/2006/wi">
<Product Id="{B7ABDA84-7163-4892-9AA1-814C6CDAAF54}"
Name="ANX.Framework"
Language="1033"
Version="1.0.0.0"
Manufacturer="ANX.Framework Developer Team"
UpgradeCode="{7A54B375-318B-40B7-ABF7-60BB50689361}">
<Package InstallerVersion="200" Compressed="yes" InstallScope="perMachine" />
<Media Id='1' Cabinet='ANX.Framework.cab' EmbedCab='yes' />
<Directory Id='TARGETDIR' Name='SourceDir'>
<Directory Id='ProgramFilesFolder' Name='PFiles'>
<Directory Id='MyDir' Name='ANX.Framework'>
<Component Id='ANX.Framework' Guid='{8A3AA04E-9325-441E-B16A-731676449C0B}'>
<File Id='license' Name='license.txt' DiskId='1' Source='../doc/license.txt' />
<File Id='anx.framework' Name='ANX.Framework.dll' DiskId='1' Source='../bin/Release/ANX.Framework.dll' />
<File Id='anx.framework.contentpipeline' Name='ANX.Framework.ContentPipeline.dll' DiskId='1' Source='../bin/Release/ANX.Framework.ContentPipeline.dll' />
<File Id='nlog' Name='NLog.dll' DiskId='1' Source='../bin/Release/NLog.dll' />
</Component>
<Component Id='SharpDX' Guid='{D6D751D7-A339-4DBB-81BC-D9AC084936C5}'>
<File Id='sharpdx.d3dcompiler' Name='ShaprDX.D3DCompiler.dll' DiskId='1' Source='../bin/Release/SharpDX.D3DCompiler.dll' />
<File Id='sharpdx.direct3d10' Name='SharpDX.Direct3D10.dll' DiskId='1' Source='../bin/Release/SharpDX.Direct3D10.dll' />
<File Id='sharpdx.direct3d11' Name='SharpDX.Direct3D11.dll' DiskId='1' Source='../bin/Release/SharpDX.Direct3D11.dll' />
<File Id='sharpdx.directinput' Name='SharpDX.DirectInput.dll' DiskId='1' Source='../bin/Release/SharpDX.DirectInput.dll' />
<File Id='sharpdx' Name='SharpDX.dll' DiskId='1' Source='../bin/Release/SharpDX.dll' />
<File Id='sharpdx.dxgi' Name='ShaprDX.DXGI.dll' DiskId='1' Source='../bin/Release/SharpDX.DXGI.dll' />
<File Id='sharpdx.xapo' Name='ShaprDX.XAPO.dll' DiskId='1' Source='../bin/Release/SharpDX.XAPO.dll' />
<File Id='sharpdx.xaudio2' Name='SharpDX.XAudio2.dll' DiskId='1' Source='../bin/Release/SharpDX.XAudio2.dll' />
<File Id='sharpdx.xinput' Name='SharpDX.XInput.dll' DiskId='1' Source='../bin/Release/SharpDX.XInput.dll' />
</Component>
<Component Id='OpenTK' Guid='{132664CF-8DD6-4B6A-A200-88D4BE5F2AE9}'>
<File Id='opentk' Name='OpenTK.dll' DiskId='1' Source='../bin/Release/OpenTK.dll' />
</Component>
<Component Id='ANX.Framework.Windows.DX10' Guid='{34DD167E-084B-464F-9633-B0220E8C4683}'>
<File Id='anx.framework.windows.dx10' Name='ANX.Framework.Windows.DX10.dll' DiskId='1' Source='../bin/Release/ANX.Framework.Windows.DX10.dll' />
</Component>
<Component Id='ANX.Framework.Windows.GL3' Guid='{67D57889-559F-4762-95D1-B91014D8D55E}'>
<File Id='anx.framework.windows.gl3' Name='ANX.Framework.Windows.GL3.dll' DiskId='1' Source='../bin/Release/ANX.Framework.Windows.GL3.dll' />
</Component>
<Component Id='ANX.InputSystem.Windows.XInput' Guid='{825A36A3-5071-46C5-B195-E0EB469EDA51}'>
<File Id='anx.inputsystem.windows.xinput' Name='ANX.InputSystem.Windows.XInput.dll' DiskId='1' Source='../bin/Release/ANX.InputSystem.Windows.XInput.dll' />
</Component>
<Component Id='ANX.SoundSystem.Windows.XAudio' Guid='{4C4EDC2B-BF6B-437C-874C-1573373DB55E}'>
<File Id='anx.soundsystem.windows.xaudio' Name='ANX.SoundSystem.Windows.XAudio.dll' DiskId='1' Source='../bin/Release/ANX.SoundSystem.Windows.XAudio.dll' />
</Component>
</Directory>
</Directory>
</Directory>
<MajorUpgrade DowngradeErrorMessage="A newer version of [ProductName] is already installed." />
<Media Id='1' Cabinet='ANX.Framework.cab' EmbedCab='yes' />
<Feature Id='ANX.Framework' Title='ANX.Framework assemblies' Level='1'>
<ComponentRef Id='ANX.Framework' />
<ComponentRef Id='SharpDX' />
<ComponentRef Id='OpenTK' />
<ComponentRef Id='ANX.Framework.Windows.DX10' />
<ComponentRef Id='ANX.Framework.Windows.GL3' />
<ComponentRef Id='ANX.InputSystem.Windows.XInput' />
<ComponentRef Id='ANX.SoundSystem.Windows.XAudio' />
</Feature>
</Product>
</Wix>
<Feature Id="ProductFeature" Title="ANX.Framework assemblies" Level="1">
<ComponentGroupRef Id="ProductComponents" />
</Feature>
<Property Id="WIXUI_INSTALLDIR" Value="INSTALLFOLDER" />
<WixVariable Id="WixUILicenseRtf" Value="../doc/license.rtf" />
<WixVariable Id="WixUIBannerBmp" Value="../media/ANX.Framework.Logo_493x58.bmp" />
<WixVariable Id="WixUIDialogBmp" Value="../media/Installer_493x312.bmp" />
<UIRef Id="WixUI_InstallDir" />
</Product>
<Fragment>
<Directory Id="TARGETDIR" Name="SourceDir">
<Directory Id="ProgramFilesFolder">
<Directory Id="INSTALLFOLDER" Name="ANX.Framework" />
</Directory>
</Directory>
</Fragment>
<Fragment>
<ComponentGroup Id="ProductComponents" Directory="INSTALLFOLDER">
<Component Id='ANX.Framework' Guid='{8A3AA04E-9325-441E-B16A-731676449C0B}'>
<File Id='license' Name='license.txt' DiskId='1' Source='../doc/license.txt' />
<File Id='anx.framework' Name='ANX.Framework.dll' DiskId='1' Source='../bin/Release/ANX.Framework.dll' />
<File Id='anx.framework.contentpipeline' Name='ANX.Framework.ContentPipeline.dll' DiskId='1' Source='../bin/Release/ANX.Framework.ContentPipeline.dll' />
<File Id='nlog' Name='NLog.dll' DiskId='1' Source='../bin/Release/NLog.dll' />
</Component>
<Component Id='SharpDX' Guid='{D6D751D7-A339-4DBB-81BC-D9AC084936C5}'>
<File Id='sharpdx.d3dcompiler' Name='ShaprDX.D3DCompiler.dll' DiskId='1' Source='../bin/Release/SharpDX.D3DCompiler.dll' />
<File Id='sharpdx.direct3d10' Name='SharpDX.Direct3D10.dll' DiskId='1' Source='../bin/Release/SharpDX.Direct3D10.dll' />
<File Id='sharpdx.direct3d11' Name='SharpDX.Direct3D11.dll' DiskId='1' Source='../bin/Release/SharpDX.Direct3D11.dll' />
<File Id='sharpdx.directinput' Name='SharpDX.DirectInput.dll' DiskId='1' Source='../bin/Release/SharpDX.DirectInput.dll' />
<File Id='sharpdx' Name='SharpDX.dll' DiskId='1' Source='../bin/Release/SharpDX.dll' />
<File Id='sharpdx.dxgi' Name='ShaprDX.DXGI.dll' DiskId='1' Source='../bin/Release/SharpDX.DXGI.dll' />
<File Id='sharpdx.xapo' Name='ShaprDX.XAPO.dll' DiskId='1' Source='../bin/Release/SharpDX.XAPO.dll' />
<File Id='sharpdx.xaudio2' Name='SharpDX.XAudio2.dll' DiskId='1' Source='../bin/Release/SharpDX.XAudio2.dll' />
<File Id='sharpdx.xinput' Name='SharpDX.XInput.dll' DiskId='1' Source='../bin/Release/SharpDX.XInput.dll' />
</Component>
<Component Id='OpenTK' Guid='{132664CF-8DD6-4B6A-A200-88D4BE5F2AE9}'>
<File Id='opentk' Name='OpenTK.dll' DiskId='1' Source='../bin/Release/OpenTK.dll' />
</Component>
<Component Id='ANX.Framework.Windows.DX10' Guid='{34DD167E-084B-464F-9633-B0220E8C4683}'>
<File Id='anx.framework.windows.dx10' Name='ANX.Framework.Windows.DX10.dll' DiskId='1' Source='../bin/Release/ANX.Framework.Windows.DX10.dll' />
</Component>
<Component Id='ANX.Framework.Windows.GL3' Guid='{67D57889-559F-4762-95D1-B91014D8D55E}'>
<File Id='anx.framework.windows.gl3' Name='ANX.Framework.Windows.GL3.dll' DiskId='1' Source='../bin/Release/ANX.Framework.Windows.GL3.dll' />
</Component>
<Component Id='ANX.InputSystem.Windows.XInput' Guid='{825A36A3-5071-46C5-B195-E0EB469EDA51}'>
<File Id='anx.inputsystem.windows.xinput' Name='ANX.InputSystem.Windows.XInput.dll' DiskId='1' Source='../bin/Release/ANX.InputSystem.Windows.XInput.dll' />
</Component>
<Component Id='ANX.SoundSystem.Windows.XAudio' Guid='{4C4EDC2B-BF6B-437C-874C-1573373DB55E}'>
<File Id='anx.soundsystem.windows.xaudio' Name='ANX.SoundSystem.Windows.XAudio.dll' DiskId='1' Source='../bin/Release/ANX.SoundSystem.Windows.XAudio.dll' />
</Component>
</ComponentGroup>
</Fragment>
</Wix>

1
build/ANX.Framework.build
View File

@ -39,6 +39,7 @@
<delete>
<fileset>
<include name="../bin/**" />
<include name="${build.dir}/${build.configuration}/installer/**" />
<include name="${project.anx.path}/obj/**" />
<include name="${project.anx.path.inputsystem.xinput}/obj/**" />
<include name="${project.anx.path.inputsystem.kinect}/obj/**" />