Author: lluis
Date: 2007-11-21 07:19:14 -0500 (Wed, 21 Nov 2007)
New Revision: 90076
Added:
trunk/monodevelop/Core/src/MonoDevelop.Projects/MonoDevelop.Projects/Workspace.cs
Removed:
trunk/monodevelop/Core/src/MonoDevelop.Projects/MonoDevelop.Projects/IBuildStep.cs
Modified:
trunk/monodevelop/Core/src/MonoDevelop.Projects/ChangeLog
trunk/monodevelop/Core/src/MonoDevelop.Projects/Makefile.am
trunk/monodevelop/Core/src/MonoDevelop.Projects/MonoDevelop.Projects.addin.xml
trunk/monodevelop/Core/src/MonoDevelop.Projects/MonoDevelop.Projects.mdp
trunk/monodevelop/Core/src/MonoDevelop.Projects/MonoDevelop.Projects/CombineEntry.cs
trunk/monodevelop/Core/src/MonoDevelop.Projects/MonoDevelop.Projects/Project.cs
Log:
* MonoDevelop.Projects/Project.cs, MonoDevelop.Projects/IBuildStep.cs:
Removed unused stuff.
* Makefile.am, MonoDevelop.Projects.addin.xml,
MonoDevelop.Projects.mdp, MonoDevelop.Projects/CombineEntry.cs,
MonoDevelop.Projects/Workspace.cs: Added Workspace class. Used to
group independent solutions.
Modified: trunk/monodevelop/Core/src/MonoDevelop.Projects/ChangeLog
===================================================================
--- trunk/monodevelop/Core/src/MonoDevelop.Projects/ChangeLog 2007-11-21
12:15:36 UTC (rev 90075)
+++ trunk/monodevelop/Core/src/MonoDevelop.Projects/ChangeLog 2007-11-21
12:19:14 UTC (rev 90076)
@@ -1,3 +1,11 @@
+2007-11-21 Lluis Sanchez Gual <[EMAIL PROTECTED]>
+
+ * MonoDevelop.Projects/Project.cs, MonoDevelop.Projects/IBuildStep.cs:
+ Removed unused stuff.
+ * Makefile.am, MonoDevelop.Projects.addin.xml, MonoDevelop.Projects.mdp,
+ MonoDevelop.Projects/CombineEntry.cs,
MonoDevelop.Projects/Workspace.cs:
+ Added Workspace class. Used to group independent solutions.
+
2007-11-19 Michael Hutchinson <[EMAIL PROTECTED]>
* MonoDevelop.Projects/Combine.cs: Catch some potential nulls and
replace
Modified: trunk/monodevelop/Core/src/MonoDevelop.Projects/Makefile.am
===================================================================
--- trunk/monodevelop/Core/src/MonoDevelop.Projects/Makefile.am 2007-11-21
12:15:36 UTC (rev 90075)
+++ trunk/monodevelop/Core/src/MonoDevelop.Projects/Makefile.am 2007-11-21
12:19:14 UTC (rev 90076)
@@ -197,7 +197,6 @@
MonoDevelop.Projects/FileFormatManager.cs \
MonoDevelop.Projects/GenericProject.cs \
MonoDevelop.Projects/GenericProjectBinding.cs \
- MonoDevelop.Projects/IBuildStep.cs \
MonoDevelop.Projects/ICompilerResult.cs \
MonoDevelop.Projects/IConfiguration.cs \
MonoDevelop.Projects/IDotNetLanguageBinding.cs \
@@ -228,7 +227,8 @@
MonoDevelop.Projects/SharpDevelopFileFormat.cs \
MonoDevelop.Projects/TypelibImporter.cs \
MonoDevelop.Projects/UnknownCombineEntry.cs \
- MonoDevelop.Projects/UnknownProjectVersionException.cs
+ MonoDevelop.Projects/UnknownProjectVersionException.cs \
+ MonoDevelop.Projects/Workspace.cs
RES = MonoDevelop.Projects.addin.xml
Modified:
trunk/monodevelop/Core/src/MonoDevelop.Projects/MonoDevelop.Projects/CombineEntry.cs
===================================================================
---
trunk/monodevelop/Core/src/MonoDevelop.Projects/MonoDevelop.Projects/CombineEntry.cs
2007-11-21 12:15:36 UTC (rev 90075)
+++
trunk/monodevelop/Core/src/MonoDevelop.Projects/MonoDevelop.Projects/CombineEntry.cs
2007-11-21 12:19:14 UTC (rev 90076)
@@ -149,7 +149,7 @@
public virtual Combine RootCombine {
get {
- if (parentCombine != null)
+ if (parentCombine != null && !(parentCombine is
Workspace))
return parentCombine.RootCombine;
else
return this as Combine;
Deleted:
trunk/monodevelop/Core/src/MonoDevelop.Projects/MonoDevelop.Projects/IBuildStep.cs
===================================================================
---
trunk/monodevelop/Core/src/MonoDevelop.Projects/MonoDevelop.Projects/IBuildStep.cs
2007-11-21 12:15:36 UTC (rev 90075)
+++
trunk/monodevelop/Core/src/MonoDevelop.Projects/MonoDevelop.Projects/IBuildStep.cs
2007-11-21 12:19:14 UTC (rev 90076)
@@ -1,40 +0,0 @@
-//
-// IBuildStep.cs
-//
-// Author:
-// Lluis Sanchez Gual
-//
-// Copyright (C) 2006 Novell, Inc (http://www.novell.com)
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-//
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-using System;
-using MonoDevelop.Core;
-
-namespace MonoDevelop.Projects
-{
- public interface IBuildStep
- {
- ICompilerResult Build (IProgressMonitor monitor, Project
project);
- bool NeedsBuilding (Project project);
- }
-
-}
Modified:
trunk/monodevelop/Core/src/MonoDevelop.Projects/MonoDevelop.Projects/Project.cs
===================================================================
---
trunk/monodevelop/Core/src/MonoDevelop.Projects/MonoDevelop.Projects/Project.cs
2007-11-21 12:15:36 UTC (rev 90075)
+++
trunk/monodevelop/Core/src/MonoDevelop.Projects/MonoDevelop.Projects/Project.cs
2007-11-21 12:19:14 UTC (rev 90076)
@@ -59,9 +59,6 @@
[ItemProperty ("newfilesearch", DefaultValue =
NewFileSearch.None)]
protected NewFileSearch newFileSearch = NewFileSearch.None;
- [ItemProperty ("enableviewstate", DefaultValue = true)]
- protected bool enableViewState = true;
-
ProjectFileCollection projectFiles;
protected ProjectReferenceCollection projectReferences;
@@ -129,17 +126,6 @@
}
}
- [Browsable(false)]
- public bool EnableViewState {
- get {
- return enableViewState;
- }
- set {
- enableViewState = value;
- NotifyModified ();
- }
- }
-
public abstract string ProjectType {
get;
}
@@ -186,15 +172,6 @@
isDirty = false;
}
- public virtual string GetParseableFileContent(string fileName)
- {
- fileName = fileName.Replace('\\', '/'); // FIXME PEDRO
- StreamReader sr = File.OpenText(fileName);
- string content = sr.ReadToEnd();
- sr.Close();
- return content;
- }
-
internal void RenameReferences(string oldName, string newName)
{
ArrayList toBeRemoved = new ArrayList();
@@ -703,21 +680,6 @@
public event ProjectFileRenamedEventHandler
FileRenamedInProject;
public event ProjectReferenceEventHandler
ReferenceRemovedFromProject;
public event ProjectReferenceEventHandler
ReferenceAddedToProject;
-
- class MainBuildStep: IBuildStep
- {
- public ICompilerResult Build (IProgressMonitor monitor,
Project project)
- {
- monitor.Log.WriteLine (GettextCatalog.GetString
("Performing main compilation..."));
- return project.DoBuild (monitor);
- }
-
- public bool NeedsBuilding (Project project)
- {
- if (!project.isDirty) project.CheckNeedsBuild
();
- return project.isDirty;
- }
- }
}
public class UnknownProject: Project
Added:
trunk/monodevelop/Core/src/MonoDevelop.Projects/MonoDevelop.Projects/Workspace.cs
===================================================================
---
trunk/monodevelop/Core/src/MonoDevelop.Projects/MonoDevelop.Projects/Workspace.cs
2007-11-21 12:15:36 UTC (rev 90075)
+++
trunk/monodevelop/Core/src/MonoDevelop.Projects/MonoDevelop.Projects/Workspace.cs
2007-11-21 12:19:14 UTC (rev 90076)
@@ -0,0 +1,37 @@
+//
+// Workspace.cs
+//
+// Author:
+// Lluis Sanchez Gual
+//
+// Copyright (C) 2006 Novell, Inc (http://www.novell.com)
+//
+// Permission is hereby granted, free of charge, to any person obtaining
+// a copy of this software and associated documentation files (the
+// "Software"), to deal in the Software without restriction, including
+// without limitation the rights to use, copy, modify, merge, publish,
+// distribute, sublicense, and/or sell copies of the Software, and to
+// permit persons to whom the Software is furnished to do so, subject to
+// the following conditions:
+//
+// The above copyright notice and this permission notice shall be
+// included in all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+//
+
+
+using System;
+
+namespace MonoDevelop.Projects
+{
+ public class Workspace: Combine
+ {
+ }
+}
Modified:
trunk/monodevelop/Core/src/MonoDevelop.Projects/MonoDevelop.Projects.addin.xml
===================================================================
---
trunk/monodevelop/Core/src/MonoDevelop.Projects/MonoDevelop.Projects.addin.xml
2007-11-21 12:15:36 UTC (rev 90075)
+++
trunk/monodevelop/Core/src/MonoDevelop.Projects/MonoDevelop.Projects.addin.xml
2007-11-21 12:19:14 UTC (rev 90076)
@@ -89,6 +89,7 @@
<Extension path = "/MonoDevelop/ProjectModel/SerializableClasses">
<DataType class = "MonoDevelop.Projects.Combine" />
<DataType class = "MonoDevelop.Projects.Project" />
+ <DataType class = "MonoDevelop.Projects.Workspace" />
<DataType class = "MonoDevelop.Projects.DotNetProject" />
<DataType class = "MonoDevelop.Projects.GenericProject" />
<DataType class =
"MonoDevelop.Projects.GenericProjectConfiguration" />
Modified:
trunk/monodevelop/Core/src/MonoDevelop.Projects/MonoDevelop.Projects.mdp
===================================================================
--- trunk/monodevelop/Core/src/MonoDevelop.Projects/MonoDevelop.Projects.mdp
2007-11-21 12:15:36 UTC (rev 90075)
+++ trunk/monodevelop/Core/src/MonoDevelop.Projects/MonoDevelop.Projects.mdp
2007-11-21 12:19:14 UTC (rev 90076)
@@ -141,7 +141,6 @@
<File name="MonoDevelop.Projects/DotNetProjectBinding.cs" subtype="Code"
buildaction="Compile" />
<File name="MonoDevelop.Projects/DotNetProjectConfiguration.cs"
subtype="Code" buildaction="Compile" />
<File name="MonoDevelop.Projects/IConfiguration.cs" subtype="Code"
buildaction="Compile" />
- <File name="MonoDevelop.Projects/IBuildStep.cs" subtype="Code"
buildaction="Compile" />
<File name="MonoDevelop.Projects/Project.cs" subtype="Code"
buildaction="Compile" />
<File name="MonoDevelop.Projects/ProjectFile.cs" subtype="Code"
buildaction="Compile" />
<File name="MonoDevelop.Projects/ProjectFileEventArgs.cs" subtype="Code"
buildaction="Compile" />
@@ -232,6 +231,7 @@
<File name="MonoDevelop.Projects.Text/TextFileService.cs" subtype="Code"
buildaction="Compile" />
<File name="MonoDevelop.Projects.Parser/TypeNameResolver.cs"
subtype="Code" buildaction="Compile" />
<File name="MonoDevelop.Projects.Parser/ITypeNameResolver.cs"
subtype="Code" buildaction="Compile" />
+ <File name="MonoDevelop.Projects/Workspace.cs" subtype="Code"
buildaction="Compile" />
</Contents>
<References>
<ProjectReference type="Gac" localcopy="False" refto="monodoc,
Version=1.0.0.0, Culture=neutral, PublicKeyToken=0738eb9f132ed756" />
_______________________________________________
Mono-patches maillist - [email protected]
http://lists.ximian.com/mailman/listinfo/mono-patches
