Improved MakeAnxFramework build script starter:

- better error handling
- obtaining Visual Studio directory from registry or program files path (thx to Razer)
This commit is contained in:
Glatzemann 2012-10-29 08:32:35 +00:00 committed by Konstantin Koch
parent 3c5e98b783
commit cf5cef5d09
17 changed files with 42 additions and 18 deletions

View File

@ -14,7 +14,7 @@ using ANX.Framework.NonXNA.Development;
namespace ANX.Framework.Graphics namespace ANX.Framework.Graphics
{ {
[PercentageComplete(100)] [PercentageComplete(100)]
[Developer("AstrorEnales")] [Developer("Glatzemann")]
[TestState(TestStateAttribute.TestState.InProgress)] [TestState(TestStateAttribute.TestState.InProgress)]
public sealed class EffectAnnotationCollection : IEnumerable<EffectAnnotation> public sealed class EffectAnnotationCollection : IEnumerable<EffectAnnotation>
{ {

View File

@ -14,7 +14,7 @@ using ANX.Framework.NonXNA.Development;
namespace ANX.Framework.Graphics namespace ANX.Framework.Graphics
{ {
[PercentageComplete(100)] [PercentageComplete(100)]
[Developer("???, AstrorEnales")] [Developer("Glatzemann, GinieDP, AstrorEnales")]
[TestState(TestStateAttribute.TestState.Tested)] [TestState(TestStateAttribute.TestState.Tested)]
public sealed class ModelBoneCollection : ReadOnlyCollection<ModelBone> public sealed class ModelBoneCollection : ReadOnlyCollection<ModelBone>
{ {

View File

@ -10,7 +10,7 @@ using ANX.Framework.NonXNA.Development;
namespace ANX.Framework.Graphics namespace ANX.Framework.Graphics
{ {
[PercentageComplete(100)] [PercentageComplete(100)]
[Developer("AstrorEnales, Glatzemann")] [Developer("Glatzemann")]
[TestState(TestStateAttribute.TestState.Untested)] [TestState(TestStateAttribute.TestState.Untested)]
public class RasterizerState : GraphicsResource public class RasterizerState : GraphicsResource
{ {

View File

@ -9,6 +9,7 @@ using ANX.Framework.NonXNA.Development;
namespace ANX.Framework.Graphics namespace ANX.Framework.Graphics
{ {
[PercentageComplete(0)] [PercentageComplete(0)]
[Developer("Glatzemann")]
[TestState(TestStateAttribute.TestState.Untested)] [TestState(TestStateAttribute.TestState.Untested)]
public class RenderTargetCube : TextureCube, IDynamicGraphicsResource public class RenderTargetCube : TextureCube, IDynamicGraphicsResource
{ {

View File

@ -7,7 +7,7 @@ using ANX.Framework.NonXNA.Development;
namespace ANX.Framework.Graphics namespace ANX.Framework.Graphics
{ {
[PercentageComplete(100)] [PercentageComplete(100)]
[Developer("AstrorEnales")] [Developer("Glatzemann")]
[TestState(TestStateAttribute.TestState.Tested)] [TestState(TestStateAttribute.TestState.Tested)]
public enum RenderTargetUsage public enum RenderTargetUsage
{ {

View File

@ -7,7 +7,7 @@ using ANX.Framework.NonXNA.Development;
namespace ANX.Framework.Graphics namespace ANX.Framework.Graphics
{ {
[PercentageComplete(100)] [PercentageComplete(100)]
[Developer("AstrorEnales")] [Developer("Glatzemann")]
[TestState(TestStateAttribute.TestState.Tested)] [TestState(TestStateAttribute.TestState.Tested)]
public enum SetDataOptions public enum SetDataOptions
{ {

View File

@ -12,7 +12,7 @@ namespace ANX.Framework.Graphics
{ {
[PercentageComplete(100)] [PercentageComplete(100)]
[TestState(TestStateAttribute.TestState.Untested)] [TestState(TestStateAttribute.TestState.Untested)]
[Developer("Glatzemann, AstrorEnales")] [Developer("Glatzemann")]
public class SpriteBatch : GraphicsResource public class SpriteBatch : GraphicsResource
{ {
private const int InitialBatchSize = 1024; private const int InitialBatchSize = 1024;

View File

@ -9,7 +9,7 @@ namespace ANX.Framework.Graphics
{ {
[Flags] [Flags]
[PercentageComplete(100)] [PercentageComplete(100)]
[Developer("AstrorEnales")] [Developer("Glatzemann")]
[TestState(TestStateAttribute.TestState.Tested)] [TestState(TestStateAttribute.TestState.Tested)]
public enum SpriteEffects public enum SpriteEffects
{ {

View File

@ -1,4 +1,8 @@
#region Using Statements
using System; using System;
using ANX.Framework.NonXNA.Development;
#endregion
// This file is part of the ANX.Framework created by the // This file is part of the ANX.Framework created by the
// "ANX.Framework developer group" and released under the Ms-PL license. // "ANX.Framework developer group" and released under the Ms-PL license.
@ -6,6 +10,9 @@ using System;
namespace ANX.Framework.Graphics namespace ANX.Framework.Graphics
{ {
[PercentageComplete(100)]
[TestState(TestStateAttribute.TestState.Untested)]
[Developer("Glatzemann")]
internal struct SpriteInfo internal struct SpriteInfo
{ {
public Vector2[] Corners; public Vector2[] Corners;

View File

@ -7,7 +7,7 @@ using ANX.Framework.NonXNA.Development;
namespace ANX.Framework.Graphics namespace ANX.Framework.Graphics
{ {
[PercentageComplete(100)] [PercentageComplete(100)]
[Developer("AstrorEnales")] [Developer("Glatzemann")]
[TestState(TestStateAttribute.TestState.Tested)] [TestState(TestStateAttribute.TestState.Tested)]
public enum SpriteSortMode public enum SpriteSortMode
{ {

View File

@ -7,7 +7,7 @@ using ANX.Framework.NonXNA.Development;
namespace ANX.Framework.Graphics namespace ANX.Framework.Graphics
{ {
[PercentageComplete(100)] [PercentageComplete(100)]
[Developer("AstrorEnales")] [Developer("Glatzemann")]
[TestState(TestStateAttribute.TestState.Tested)] [TestState(TestStateAttribute.TestState.Tested)]
public enum StencilOperation public enum StencilOperation
{ {

View File

@ -7,7 +7,7 @@ using ANX.Framework.NonXNA.Development;
namespace ANX.Framework.Graphics namespace ANX.Framework.Graphics
{ {
[PercentageComplete(100)] [PercentageComplete(100)]
[Developer("AstrorEnales")] [Developer("Glatzemann")]
[TestState(TestStateAttribute.TestState.Tested)] [TestState(TestStateAttribute.TestState.Tested)]
public enum SurfaceFormat public enum SurfaceFormat
{ {

View File

@ -8,7 +8,8 @@ using ANX.Framework.NonXNA.Development;
namespace ANX.Framework.Graphics namespace ANX.Framework.Graphics
{ {
[PercentageComplete(0)] [PercentageComplete(10)]
[Developer("Glatzemann")]
[TestState(TestStateAttribute.TestState.Untested)] [TestState(TestStateAttribute.TestState.Untested)]
public class TextureCube : Texture, IGraphicsResource public class TextureCube : Texture, IGraphicsResource
{ {

View File

@ -7,7 +7,7 @@ using ANX.Framework.NonXNA.Development;
namespace ANX.Framework.Graphics namespace ANX.Framework.Graphics
{ {
[PercentageComplete(100)] [PercentageComplete(100)]
[Developer("AstrorEnales")] [Developer("Glatzemann")]
[TestState(TestStateAttribute.TestState.Tested)] [TestState(TestStateAttribute.TestState.Tested)]
public enum TextureFilter public enum TextureFilter
{ {

View File

@ -7,7 +7,7 @@ using ANX.Framework.NonXNA.Development;
namespace ANX.Framework.Graphics namespace ANX.Framework.Graphics
{ {
[PercentageComplete(100)] [PercentageComplete(100)]
[Developer("AstrorEnales")] [Developer("Glatzemann")]
[TestState(TestStateAttribute.TestState.Tested)] [TestState(TestStateAttribute.TestState.Tested)]
public enum VertexElementFormat public enum VertexElementFormat
{ {

View File

@ -7,7 +7,7 @@ using ANX.Framework.NonXNA.Development;
namespace ANX.Framework.Graphics namespace ANX.Framework.Graphics
{ {
[PercentageComplete(100)] [PercentageComplete(100)]
[Developer("AstrorEnales")] [Developer("Glatzemann")]
[TestState(TestStateAttribute.TestState.Tested)] [TestState(TestStateAttribute.TestState.Tested)]
public enum VertexElementUsage public enum VertexElementUsage
{ {

View File

@ -3,23 +3,33 @@ setlocal
set ProgRoot=%ProgramFiles% set ProgRoot=%ProgramFiles%
if not "%ProgramFiles(x86)%" == "" set ProgRoot=%ProgramFiles(x86)% if not "%ProgramFiles(x86)%" == "" set ProgRoot=%ProgramFiles(x86)%
if EXIST "%ProgRoot%\Microsoft Visual Studio 11.0\vc\vcvarsall.bat" goto vs2011 FOR /F "tokens=2* delims= " %%A IN ('REG QUERY "HKEY_USERS\.DEFAULT\Software\Microsoft\VisualStudio\11.0_Config" /v ShellFolder') DO SET vs11dir=%%B
if EXIST "%ProgRoot%\Microsoft Visual Studio 10.0\vc\vcvarsall.bat" goto vs2010 FOR /F "tokens=2* delims= " %%A IN ('REG QUERY "HKEY_USERS\.DEFAULT\Software\Microsoft\VisualStudio\10.0_Config" /v ShellFolder') DO SET vs10dir=%%B
if EXIST "%vs11dir%\vc\vcvarsall.bat" goto vs2011
if EXIST "%ProgRoot%\Microsoft Visual Studio 11.0\vc\vcvarsall.bat" goto vs2011pf
if EXIST "%vs10dir%\vc\vcvarsall.bat" goto vs2010
if EXIST "%ProgRoot%\Microsoft Visual Studio 10.0\vc\vcvarsall.bat" goto vs2010pf
goto error_msg goto error_msg
:vs2011pf
SET vs11dir = %ProgRoot%\Microsoft Visual Studio 11.0\
:vs2011 :vs2011
echo Visual Studio 2011 build environment echo Visual Studio 2011 build environment
call "%ProgRoot%\Microsoft Visual Studio 11.0\vc\vcvarsall.bat" x86 call "%vs11dir%\vc\vcvarsall.bat" x86
SET ENV=VS2011 SET ENV=VS2011
goto start_nant goto start_nant
:vs2011pf
SET vs10dir = %ProgRoot%\Microsoft Visual Studio 10.0\
:vs2010 :vs2010
echo Visual Studio 2010 build environment echo Visual Studio 2010 build environment
call "%ProgRoot%\Microsoft Visual Studio 10.0\vc\vcvarsall.bat" x86 call "%vs10dir%\vc\vcvarsall.bat" x86
SET ENV=VS2010 SET ENV=VS2010
goto start_nant goto start_nant
:start_nant :start_nant
if NOT EXIST "../build" goto error_msg_working_dir
set PATH=../lib/nant-0.91/bin;../Tools/bin;%PATH% set PATH=../lib/nant-0.91/bin;../Tools/bin;%PATH%
if "%1"=="" ( if "%1"=="" (
@ -34,6 +44,11 @@ goto pause
:error_msg :error_msg
echo Couldn't find Visual Studio 2010 or 2011. Exiting. echo Couldn't find Visual Studio 2010 or 2011. Exiting.
goto pause
:error_msg_working_dir
echo Please start MakeAnxFramework from the build directory. (use CD to change directory)
goto pause
:pause :pause
pause pause