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

Content Pipeline:

Browse Source 
- Added default value for target platform when reading cproj files

Compiler GUI:
- fixed issue #1143, a message box should now be displayed if project path is wrong
- added default case for empty configuration when loading projects
This commit is contained in:
SND\eagleeyestudios_cp 2013-02-09 12:01:51 +00:00 committed by Konstantin Koch
parent 6cb1714c27
commit 2d0a7b3fe0
3 changed files with 29 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ANX.Framework.Content.Pipeline/Tasks/ContentProject.cs
View File

@ -289,6 +289,10 @@ namespace ANX.Framework.Content.Pipeline.Tasks
{
project.Platform = targetPlatform;
}
else
{
project.Platform = TargetPlatform.Windows;
}
}
}
break;

34
Tools/ANXContentCompilerGUI/MainWindow.Designer.cs generated
View File

@ -67,28 +67,26 @@ namespace ANX.ContentCompiler.GUI
this.propertyGrid = new System.Windows.Forms.PropertyGrid();
this.show_timer = new System.Windows.Forms.Timer(this.components);
this.menuState = new ANX.ContentCompiler.GUI.States.MenuState();
((System.ComponentModel.ISupportInitialize)(this.splitContainerMenuLayout)).BeginInit();
this.splitContainerMenuLayout.Panel1.SuspendLayout();
this.splitContainerMenuLayout.Panel2.SuspendLayout();
this.splitContainerMenuLayout.SuspendLayout();
#if !MONO
((System.ComponentModel.ISupportInitialize)(this.splitContainerMenuLayout)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.show_pictureBoxRibbon)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.show_pictureBoxMenu)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.show_pictureBoxErrorLog)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.splitContainerFileTree)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.splitContainerProperties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.show_pictureBoxProperties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.show_pictureBoxProjectExplorer)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.show_pictureBoxMainPanel)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.show_pictureBoxSmiley)).BeginInit();
#endif
this.splitContainerFileTree.Panel1.SuspendLayout();
this.splitContainerFileTree.Panel2.SuspendLayout();
this.splitContainerFileTree.SuspendLayout();
((System.ComponentModel.ISupportInitialize)(this.show_pictureBoxSmiley)).BeginInit();
this.treeViewContextMenu.SuspendLayout();
((System.ComponentModel.ISupportInitialize)(this.splitContainerProperties)).BeginInit();
this.splitContainerProperties.Panel1.SuspendLayout();
this.splitContainerProperties.Panel2.SuspendLayout();
this.splitContainerProperties.SuspendLayout();
((System.ComponentModel.ISupportInitialize)(this.show_pictureBoxProperties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.show_pictureBoxProjectExplorer)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.show_pictureBoxMainPanel)).BeginInit();
this.SuspendLayout();
//
// splitContainerMenuLayout
@ -569,26 +567,24 @@ namespace ANX.ContentCompiler.GUI
this.Shown += new System.EventHandler(this.MainWindowShown);
this.splitContainerMenuLayout.Panel1.ResumeLayout(false);
this.splitContainerMenuLayout.Panel2.ResumeLayout(false);
((System.ComponentModel.ISupportInitialize)(this.splitContainerMenuLayout)).EndInit();
this.splitContainerMenuLayout.ResumeLayout(false);
this.splitContainerFileTree.Panel1.ResumeLayout(false);
this.splitContainerFileTree.Panel2.ResumeLayout(false);
this.splitContainerFileTree.ResumeLayout(false);
#if !MONO
((System.ComponentModel.ISupportInitialize)(this.show_pictureBoxRibbon)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.show_pictureBoxMenu)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.show_pictureBoxErrorLog)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.show_pictureBoxSmiley)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.splitContainerProperties)).EndInit();
this.splitContainerFileTree.Panel1.ResumeLayout(false);
this.splitContainerFileTree.Panel2.ResumeLayout(false);
((System.ComponentModel.ISupportInitialize)(this.splitContainerFileTree)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.splitContainerMenuLayout)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.show_pictureBoxProperties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.show_pictureBoxProjectExplorer)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.show_pictureBoxMainPanel)).EndInit();
#endif
this.splitContainerFileTree.ResumeLayout(false);
((System.ComponentModel.ISupportInitialize)(this.show_pictureBoxSmiley)).EndInit();
this.treeViewContextMenu.ResumeLayout(false);
this.splitContainerProperties.Panel1.ResumeLayout(false);
this.splitContainerProperties.Panel2.ResumeLayout(false);
((System.ComponentModel.ISupportInitialize)(this.splitContainerProperties)).EndInit();
this.splitContainerProperties.ResumeLayout(false);
((System.ComponentModel.ISupportInitialize)(this.show_pictureBoxProperties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.show_pictureBoxProjectExplorer)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.show_pictureBoxMainPanel)).EndInit();
this.ResumeLayout(false);
}

11
Tools/ANXContentCompilerGUI/MainWindow.cs
View File

@ -199,6 +199,9 @@ namespace ANX.ContentCompiler.GUI
_contentProject.InputDirectory = ProjectFolder;
ProjectImportersDir = _contentProject.ReferenceIncludeDirectory;
ProjectPath = path;
if (String.IsNullOrEmpty(_contentProject.Configuration))
_contentProject.Configuration = "Debug";
if (string.IsNullOrEmpty(_contentProject.Creator))
_contentProject.Creator = "ANX Content Compiler (4.0)";
ChangeEnvironmentOpenProject();
@ -228,8 +231,14 @@ namespace ANX.ContentCompiler.GUI
SaveProjectAs(sender, e);
foreach (var buildItem in _contentProject.BuildItems)
{
var dir = Path.GetDirectoryName(ProjectPath);
if (String.IsNullOrEmpty(dir))
{
MessageBox.Show("Error saving project: ProjectPath not set!", "Error");
return;
}
if (File.Exists(buildItem.SourceFilename))
buildItem.SourceFilename = buildItem.SourceFilename.Remove(0, Path.GetDirectoryName(ProjectPath).Count() + 1);
buildItem.SourceFilename = buildItem.SourceFilename.Remove(0, dir.Count() + 1);
}
_contentProject.InputDirectory = ""; //Clear input dir, because we do not need it anymore
_contentProject.Save(ProjectPath);