- fixed some enumeration values

- fixed some build issues (tools) - fixed some installer issues (msi) - fixed some ANXStatusComparer issues - changed some tools icons
2012-11-20 15:27:43 +00:00 · 2012-11-20 15:27:43 +00:00 · 0d49da8822
commit 0d49da8822
parent 0f9b1f4c02
15 changed files with 82 additions and 27 deletions
--- a/ANX.Framework.Content.Pipeline/Audio/AudioFileType.cs
+++ b/ANX.Framework.Content.Pipeline/Audio/AudioFileType.cs
@ -11,8 +11,8 @@ namespace ANX.Framework.Content.Pipeline.Audio
 {
    public enum AudioFileType
    {
-        Mp3,
-        Wav,
-        Wma,
+        Wav = 0,
+        Mp3 = 1,
+        Wma = 2,
    }
 }
--- a/ANX.Framework.Content.Pipeline/Audio/ConversionFormat.cs
+++ b/ANX.Framework.Content.Pipeline/Audio/ConversionFormat.cs
@ -11,9 +11,9 @@ namespace ANX.Framework.Content.Pipeline.Audio
 {
    public enum ConversionFormat
    {
-        Adpcm,
-        Pcm,
-        WindowsMedia,
-        Xma,
+        Pcm = 0,
+        Adpcm = 1,
+        WindowsMedia = 2,
+        Xma = 3,
    }
 }
--- a/ANX.Framework.Content.Pipeline/Graphics/FontDescriptionStyle.cs
+++ b/ANX.Framework.Content.Pipeline/Graphics/FontDescriptionStyle.cs
@ -15,8 +15,8 @@ namespace ANX.Framework.Content.Pipeline.Graphics
    [Flags]
    public enum FontDescriptionStyle
    {
-        Bold,
-        Italic,
-        Regular,
+        Regular = 0,
+        Bold = 1,
+        Italic = 2,
    }
 }
--- a/ANX.Framework.Content.Pipeline/Processors/MaterialProcessorDefaultEffect.cs
+++ b/ANX.Framework.Content.Pipeline/Processors/MaterialProcessorDefaultEffect.cs
@ -11,10 +11,10 @@ namespace ANX.Framework.Content.Pipeline.Processors
 {
    public enum MaterialProcessorDefaultEffect
    {
-        AlphaTestEffect,
-        BasicEffect,
-        DualTextureEffect,
-        EnvironmentMapEffect,
-        SkinnedEffect,
+        BasicEffect = 0,
+        SkinnedEffect = 1,
+        EnvironmentMapEffect = 2,
+        DualTextureEffect = 3,
+        AlphaTestEffect = 4,
    }
 }
--- a/ANX.Framework.Content.Pipeline/Processors/TextureProcessorOutputFormat.cs
+++ b/ANX.Framework.Content.Pipeline/Processors/TextureProcessorOutputFormat.cs
@ -11,8 +11,8 @@ namespace ANX.Framework.Content.Pipeline.Processors
 {
    public enum TextureProcessorOutputFormat
    {
-        Color,
-        DxtCompressed,
-        NoChange,
+        NoChange = 0,
+        Color = 1,
+        DxtCompressed = 2,
    }
 }
--- a/Installer/anx.wxs
+++ b/Installer/anx.wxs
@ -9,6 +9,7 @@
           UpgradeCode="{7A54B375-318B-40B7-ABF7-60BB50689361}">
 		<Package InstallerVersion="200" Compressed="yes" InstallScope="perMachine" />
    <Icon Id="ANX.icon" SourceFile="..\media\anx.ico" />
+    <Property Id="ARPPRODUCTICON" Value="ANX.icon" />

    <MajorUpgrade DowngradeErrorMessage="A newer version of [ProductName] is already installed." />
    <Media Id='1' Cabinet='ANX.Framework.cab' EmbedCab='yes' />
@ -207,9 +208,9 @@
    <ComponentGroup Id="Tools" Directory="TOOLSFOLDER">
      <Component Id='ANX.Tools' Guid='{4EC562B1-DCE2-48C8-A29A-3EC6C1F588E0}'>
        <File Id='ANXStatusComparer' Name='asc.exe' DiskId='1' Source='../bin/Release/asc.exe' />
-        <File Id='ANXStatusComparerStyleSheet' Name='SummaryStyle.css' DiskId='1' Source='../bin/SummaryStyle.css' />
+        <File Id='ANXStatusComparerStyleSheet' Name='SummaryStyle.css' DiskId='1' Source='../bin/Release/SummaryStyle.css' />
        <File Id='ContentBuilder' Name='ContentBuilder.exe' DiskId='1' Source='../bin/Release/ContentBuilder.exe' />
-        <File Id='ProjectConverter' Name='ProjectConverter.exe' DiskId='1' Source='../bin/tools/ProjectConverter.exe' />
+        <File Id='ProjectConverter' Name='ProjectConverter.exe' DiskId='1' Source='../bin/Release/ProjectConverter.exe' />
        <File Id='XNBInspector' Name='ANX.Tools.XNBInspector.exe' DiskId='1' Source='../bin/Release/ANX.Tools.XNBInspector.exe' />
        <File Id='AnxSampleBrowser' Name='ANXSampleBrowser.exe' DiskId='1' Source='../bin/Release/ANXSampleBrowser.exe' />

@ -294,9 +295,11 @@
      <Component Id='ANX.PlatformSystem.Windows' Guid='{0D0EBDD1-9F95-40CE-B314-7A502BC84A2F}'>
        <File Id='anx.platformsystem.windows' Name='ANX.PlatformSystem.Windows.dll' DiskId='1' Source='../bin/Release/ANX.PlatformSystem.Windows.dll' />
      </Component>
+<!--
      <Component Id='ANX.PlatformSystem.Linux' Guid='{6781BD15-B2DB-41B7-B628-CAF0D95D584D}'>
        <File Id='anx.platformsystem.linux' Name='ANX.PlatformSystem.Linux.dll' DiskId='1' Source='../bin/Release/ANX.PlatformSystem.Linux.dll' />
      </Component>
+-->      
    </ComponentGroup>
 	</Fragment>
 </Wix>
--- a/Tools/ANXStatusComparer/ANXStatusComparer.csproj
+++ b/Tools/ANXStatusComparer/ANXStatusComparer.csproj
@ -32,6 +32,9 @@
    <ErrorReport>prompt</ErrorReport>
    <WarningLevel>4</WarningLevel>
  </PropertyGroup>
+  <PropertyGroup>
+    <ApplicationIcon>anx.ico</ApplicationIcon>
+  </PropertyGroup>
  <ItemGroup>
    <Reference Include="System" />
    <Reference Include="System.Xml.Linq" />
@ -66,6 +69,9 @@
      <SubType>Designer</SubType>
    </None>
  </ItemGroup>
+  <ItemGroup>
+    <Content Include="anx.ico" />
+  </ItemGroup>
  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
       Other similar extension points exist, see Microsoft.Common.targets.
--- a/Tools/ANXStatusComparer/Configuration.cs
+++ b/Tools/ANXStatusComparer/Configuration.cs
@ -55,9 +55,10 @@ namespace ANXStatusComparer
 		#endregion

 		#region Constructor
-        public Configuration(String[] anxAssemblies, String stylesheet)
+        public Configuration(String[] anxAssemblies, String[] xnaAssemblies, String stylesheet)
        {
            this.AnxAssemblies = anxAssemblies;
+            this.XnaAssemblies = xnaAssemblies;
            this.OutputType = "html";
            this.StylesheetFile = stylesheet;
        }
--- a/Tools/ANXStatusComparer/Program.cs
+++ b/Tools/ANXStatusComparer/Program.cs
@ -3,6 +3,10 @@ using System.Diagnostics;
 using System.IO;
 using ANXStatusComparer.Data;
 using ANXStatusComparer.Output;
+using Microsoft.Win32;
+using System.Collections.Generic;
+using System.Linq;
+using System.Reflection;

 // This file is part of the ANX.Framework created by the
 // "ANX.Framework developer group" and released under the Ms-PL license.
@ -33,7 +37,14 @@ namespace ANXStatusComparer
            } 
            else
 			{
-                config = new Configuration(new String[] { Path.Combine(Environment.CurrentDirectory, "ANX.Framework.dll") }, Path.Combine(Environment.CurrentDirectory, "SummaryStyle.css"));
+                string currentAssemblyDirectoryName = Path.GetDirectoryName(Assembly.GetExecutingAssembly().Location);
+
+                config = new Configuration(new String[] { Path.Combine(currentAssemblyDirectoryName, "ANX.Framework.dll"),
+                                                          Path.Combine(currentAssemblyDirectoryName, "ANX.Framework.Content.Pipeline.dll")
+                                                        },
+                                           GetDefaultXnaAssemblies(),
+                                           Path.Combine(currentAssemblyDirectoryName, "SummaryStyle.css")
+                                          );
 			}
 			#endregion

@ -61,5 +72,31 @@ namespace ANXStatusComparer
 			}
 		}
 		#endregion
+
+        private static string[] GetDefaultXnaAssemblies()
+        {
+            HashSet<string> assemblies = new HashSet<string>();
+
+            var xna32 = Registry.GetValue(@"HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\XNA\Game Studio\v4.0", "InstallPath", null);
+            var xna64 = Registry.GetValue(@"HKEY_LOCAL_MACHINE\SOFTWARE\Wow6432Node\Microsoft\XNA\Game Studio\v4.0", "InstallPath", null);
+
+            if (xna32 != null)
+            {
+                foreach (string file in Directory.EnumerateFiles(Path.Combine(xna32.ToString(), @"References\Windows\x86"), "*.dll", SearchOption.AllDirectories))
+                {
+                    assemblies.Add(file);
+                }
+            }
+
+            if (xna64 != null)
+            {
+                foreach (string file in Directory.EnumerateFiles(Path.Combine(xna64.ToString(), @"References\Windows\x86"), "*.dll", SearchOption.AllDirectories))
+                {
+                    assemblies.Add(file);
+                }
+            }
+
+            return assemblies.ToArray();
+        }
 	}
 }
--- a/Tools/ANXStatusComparer/Properties/AssemblyInfo.cs
+++ b/Tools/ANXStatusComparer/Properties/AssemblyInfo.cs
@ -10,7 +10,7 @@ using System.Runtime.InteropServices;
 [assembly: AssemblyConfiguration("")]
 [assembly: AssemblyCompany("ANX Developer Team")]
 [assembly: AssemblyProduct("ANXStatusComparer")]
-[assembly: AssemblyCopyright("Copyright © ANX Developer Team 2011")]
+[assembly: AssemblyCopyright("Copyright © ANX Developer Team 2011 - 2012")]
 [assembly: AssemblyTrademark("")]
 [assembly: AssemblyCulture("")]

@ -32,5 +32,5 @@ using System.Runtime.InteropServices;
 // Sie können alle Werte angeben oder die standardmäßigen Build- und Revisionsnummern 
 // übernehmen, indem Sie "*" eingeben:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.0.0.0")]
-[assembly: AssemblyFileVersion("1.0.0.0")]
+[assembly: AssemblyVersion("1.0.2.*")]
+[assembly: AssemblyFileVersion("1.0.2.0")]
--- a/Tools/ANXStatusComparer/SampleConfigFile.xml
+++ b/Tools/ANXStatusComparer/SampleConfigFile.xml
@ -1,7 +1,8 @@
 <?xml version="1.0" encoding="utf-8" ?>
 <Config>
  <ANXAssemblies>
-    <Assembly>ANX.Framework.dll</Assembly>
+    <Assembly>..\bin\Debug\ANX.Framework.dll</Assembly>
+    <Assembly>..\bin\Debug\ANX.Framework.Content.Pipeline.dll</Assembly>
  </ANXAssemblies>
  <XNAAssemblies>
    <Assembly>C:\Program Files (x86)\Microsoft XNA\XNA Game Studio\v4.0\References\Windows\x86\Microsoft.Xna.Framework.dll</Assembly>
--- a/Tools/ANXStatusComparer/anx.ico
+++ b/Tools/ANXStatusComparer/anx.ico
--- a/Tools/ContentBuilder/ContentBuilder.csproj
+++ b/Tools/ContentBuilder/ContentBuilder.csproj
@ -53,6 +53,9 @@
    <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
    <WarningLevel>4</WarningLevel>
  </PropertyGroup>
+  <PropertyGroup>
+    <ApplicationIcon>anx.ico</ApplicationIcon>
+  </PropertyGroup>
  <ItemGroup>
    <Reference Include="System" />
    <Reference Include="System.Core" />
@ -77,6 +80,9 @@
      <Name>ANX.Framework</Name>
    </ProjectReference>
  </ItemGroup>
+  <ItemGroup>
+    <Content Include="anx.ico" />
+  </ItemGroup>
  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
       Other similar extension points exist, see Microsoft.Common.targets.
--- a/Tools/ContentBuilder/anx.ico
+++ b/Tools/ContentBuilder/anx.ico
--- a/build/ANX.Framework.build
+++ b/build/ANX.Framework.build
@ -405,8 +405,9 @@
      <in>
        <items basedir="../Tools/">
          <include name="**/*.csproj" />
+<!--
          <exclude name="**/ProjectConverter.csproj" />
-
+-->
          <exclude name="**/*ANX.ContentCompiler.GUI*.csproj" if="${project.anx.metro}" />
          <exclude name="**/*ContentBuilder*.csproj" if="${project.anx.metro}" />
          <exclude name="**/*ANXStatusComparer*.csproj" if="${project.anx.metro}" />