Browse Source

Remove unused parameter "buildServices" from IBuildable.StartBuild.

git-svn-id: svn://svn.sharpdevelop.net/sharpdevelop/trunk@5854 1ccf3a8d-04fe-1044-b7c0-cef0b8235c61
pull/1/head
Daniel Grunwald 15 years ago
parent
commit
7092ebf5b0
  1. 5
      src/AddIns/BackendBindings/CSharpBinding/Project/Src/Project/CSharpProject.cs
  2. 5
      src/AddIns/BackendBindings/VBNetBinding/Project/Src/Project/VBNetProject.cs
  3. 2
      src/Main/Base/Project/Src/Project/AbstractProject.cs
  4. 4
      src/Main/Base/Project/Src/Project/BuildEngine.cs
  5. 2
      src/Main/Base/Project/Src/Project/IProject.cs
  6. 4
      src/Main/Base/Project/Src/Project/MSBuildBasedProject.cs
  7. 6
      src/Main/Base/Project/Src/Project/MSBuildEngine/MSBuildEngine.cs
  8. 4
      src/Main/Base/Project/Src/Project/MSBuildFileProject.cs
  9. 2
      src/Main/Base/Project/Src/Project/Solution/Solution.cs
  10. 8
      src/Main/Base/Project/Src/Services/ProjectService/CompileModifiedProjectsOnly.cs

5
src/AddIns/BackendBindings/CSharpBinding/Project/Src/Project/CSharpProject.cs

@ -79,17 +79,16 @@ namespace CSharpBinding @@ -79,17 +79,16 @@ namespace CSharpBinding
return base.GetDefaultItemType(fileName);
}
public override void StartBuild(ThreadSafeServiceContainer buildServices, ProjectBuildOptions options, IBuildFeedbackSink feedbackSink)
public override void StartBuild(ProjectBuildOptions options, IBuildFeedbackSink feedbackSink)
{
if (this.MinimumSolutionVersion == Solution.SolutionVersionVS2005) {
MSBuildEngine.StartBuild(this,
buildServices,
options,
feedbackSink,
MSBuildEngine.AdditionalTargetFiles.Concat(
new [] { Path.Combine(MSBuildEngine.SharpDevelopBinPath, "SharpDevelop.CheckMSBuild35Features.targets") }));
} else {
base.StartBuild(buildServices, options, feedbackSink);
base.StartBuild(options, feedbackSink);
}
}

5
src/AddIns/BackendBindings/VBNetBinding/Project/Src/Project/VBNetProject.cs

@ -101,17 +101,16 @@ namespace VBNetBinding @@ -101,17 +101,16 @@ namespace VBNetBinding
return base.GetDefaultItemType(fileName);
}
public override void StartBuild(ThreadSafeServiceContainer buildServices, ProjectBuildOptions options, IBuildFeedbackSink feedbackSink)
public override void StartBuild(ProjectBuildOptions options, IBuildFeedbackSink feedbackSink)
{
if (this.MinimumSolutionVersion == Solution.SolutionVersionVS2005) {
MSBuildEngine.StartBuild(this,
buildServices,
options,
feedbackSink,
MSBuildEngine.AdditionalTargetFiles.Concat(
new [] { Path.Combine(MSBuildEngine.SharpDevelopBinPath, "SharpDevelop.CheckMSBuild35Features.targets") }));
} else {
base.StartBuild(buildServices, options, feedbackSink);
base.StartBuild(options, feedbackSink);
}
}

2
src/Main/Base/Project/Src/Project/AbstractProject.cs

@ -490,7 +490,7 @@ namespace ICSharpCode.SharpDevelop.Project @@ -490,7 +490,7 @@ namespace ICSharpCode.SharpDevelop.Project
{
}
public virtual void StartBuild(ThreadSafeServiceContainer buildServices, ProjectBuildOptions options, IBuildFeedbackSink feedbackSink)
public virtual void StartBuild(ProjectBuildOptions options, IBuildFeedbackSink feedbackSink)
{
feedbackSink.ReportError(new BuildError { ErrorText = "Building project " + Name + " is not supported.", IsWarning = true });
// we don't know how to build anything, report that we're done.

4
src/Main/Base/Project/Src/Project/BuildEngine.cs

@ -272,7 +272,7 @@ namespace ICSharpCode.SharpDevelop.Project @@ -272,7 +272,7 @@ namespace ICSharpCode.SharpDevelop.Project
public void DoStartBuild(object state)
{
project.StartBuild(engine.serviceContainer, options, this);
project.StartBuild(options, this);
}
public void ReportError(BuildError error)
@ -315,7 +315,6 @@ namespace ICSharpCode.SharpDevelop.Project @@ -315,7 +315,6 @@ namespace ICSharpCode.SharpDevelop.Project
BuildNode rootNode;
readonly IBuildable rootProject;
readonly BuildResults results = new BuildResults();
readonly ThreadSafeServiceContainer serviceContainer = new ThreadSafeServiceContainer();
DateTime buildStart;
readonly List<BuildNode> projectsCurrentlyBuilding = new List<BuildNode>();
@ -538,7 +537,6 @@ namespace ICSharpCode.SharpDevelop.Project @@ -538,7 +537,6 @@ namespace ICSharpCode.SharpDevelop.Project
/// </summary>
void ReportDone()
{
serviceContainer.Dispose();
if (combinedBuildFeedbackSink != null) {
if (combinedBuildFeedbackSink is MessageViewSink) {
// Special case GUI-builds so that they have more information available:

2
src/Main/Base/Project/Src/Project/IProject.cs

@ -274,7 +274,7 @@ namespace ICSharpCode.SharpDevelop.Project @@ -274,7 +274,7 @@ namespace ICSharpCode.SharpDevelop.Project
/// Starts building the project using the specified options.
/// This member must be implemented thread-safe.
/// </summary>
void StartBuild(ThreadSafeServiceContainer buildServices, ProjectBuildOptions buildOptions, IBuildFeedbackSink feedbackSink);
void StartBuild(ProjectBuildOptions buildOptions, IBuildFeedbackSink feedbackSink);
/// <summary>
/// Gets the name of the buildable item.

4
src/Main/Base/Project/Src/Project/MSBuildBasedProject.cs

@ -1076,9 +1076,9 @@ namespace ICSharpCode.SharpDevelop.Project @@ -1076,9 +1076,9 @@ namespace ICSharpCode.SharpDevelop.Project
return result;
}
public override void StartBuild(ThreadSafeServiceContainer buildServices, ProjectBuildOptions options, IBuildFeedbackSink feedbackSink)
public override void StartBuild(ProjectBuildOptions options, IBuildFeedbackSink feedbackSink)
{
MSBuildEngine.StartBuild(this, buildServices, options, feedbackSink, MSBuildEngine.AdditionalTargetFiles);
MSBuildEngine.StartBuild(this, options, feedbackSink, MSBuildEngine.AdditionalTargetFiles);
}
public override ProjectBuildOptions CreateProjectBuildOptions(BuildOptions options, bool isRootBuildable)

6
src/Main/Base/Project/Src/Project/MSBuildEngine/MSBuildEngine.cs

@ -93,12 +93,10 @@ namespace ICSharpCode.SharpDevelop.Project @@ -93,12 +93,10 @@ namespace ICSharpCode.SharpDevelop.Project
MSBuildLoggerFilters = AddInTree.BuildItems<IMSBuildLoggerFilter>(LoggerFiltersPath, null, false);
}
public static void StartBuild(IProject project, ThreadSafeServiceContainer serviceContainer, ProjectBuildOptions options, IBuildFeedbackSink feedbackSink, IEnumerable<string> additionalTargetFiles)
public static void StartBuild(IProject project, ProjectBuildOptions options, IBuildFeedbackSink feedbackSink, IEnumerable<string> additionalTargetFiles)
{
if (project == null)
throw new ArgumentNullException("project");
if (serviceContainer == null)
throw new ArgumentNullException("serviceContainer");
if (options == null)
throw new ArgumentNullException("options");
if (feedbackSink == null)
@ -111,7 +109,6 @@ namespace ICSharpCode.SharpDevelop.Project @@ -111,7 +109,6 @@ namespace ICSharpCode.SharpDevelop.Project
if (project.MinimumSolutionVersion >= Solution.SolutionVersionVS2010) {
engine.additionalTargetFiles.Add(Path.Combine(Path.GetDirectoryName(typeof(MSBuildEngine).Assembly.Location), "SharpDevelop.TargetingPack.targets"));
}
engine.serviceContainer = serviceContainer;
engine.StartBuild();
}
@ -120,7 +117,6 @@ namespace ICSharpCode.SharpDevelop.Project @@ -120,7 +117,6 @@ namespace ICSharpCode.SharpDevelop.Project
ProjectBuildOptions options;
IBuildFeedbackSink feedbackSink;
List<string> additionalTargetFiles;
ThreadSafeServiceContainer serviceContainer;
private MSBuildEngine(IProject project, ProjectBuildOptions options, IBuildFeedbackSink feedbackSink)
{

4
src/Main/Base/Project/Src/Project/MSBuildFileProject.cs

@ -22,9 +22,9 @@ namespace ICSharpCode.SharpDevelop.Project @@ -22,9 +22,9 @@ namespace ICSharpCode.SharpDevelop.Project
TypeGuid = "{00000000-0000-0000-0000-000000000000}";
}
public override void StartBuild(ThreadSafeServiceContainer buildServices, ProjectBuildOptions options, IBuildFeedbackSink feedbackSink)
public override void StartBuild(ProjectBuildOptions options, IBuildFeedbackSink feedbackSink)
{
MSBuildEngine.StartBuild(this, buildServices, options, feedbackSink, MSBuildEngine.AdditionalTargetFiles);
MSBuildEngine.StartBuild(this, options, feedbackSink, MSBuildEngine.AdditionalTargetFiles);
}
}
}

2
src/Main/Base/Project/Src/Project/Solution/Solution.cs

@ -1202,7 +1202,7 @@ namespace ICSharpCode.SharpDevelop.Project @@ -1202,7 +1202,7 @@ namespace ICSharpCode.SharpDevelop.Project
return result;
}
void IBuildable.StartBuild(ThreadSafeServiceContainer buildServices, ProjectBuildOptions buildOptions, IBuildFeedbackSink feedbackSink)
void IBuildable.StartBuild(ProjectBuildOptions buildOptions, IBuildFeedbackSink feedbackSink)
{
// building a solution finishes immediately: we only care for the dependencies
feedbackSink.Done(true);

8
src/Main/Base/Project/Src/Services/ProjectService/CompileModifiedProjectsOnly.cs

@ -151,7 +151,7 @@ namespace ICSharpCode.SharpDevelop.Project @@ -151,7 +151,7 @@ namespace ICSharpCode.SharpDevelop.Project
return new IBuildable[0];
}
public void StartBuild(ThreadSafeServiceContainer buildServices, ProjectBuildOptions buildOptions, IBuildFeedbackSink feedbackSink)
public void StartBuild(ProjectBuildOptions buildOptions, IBuildFeedbackSink feedbackSink)
{
}
}
@ -245,11 +245,11 @@ namespace ICSharpCode.SharpDevelop.Project @@ -245,11 +245,11 @@ namespace ICSharpCode.SharpDevelop.Project
return lastCompilationPass.Index > comparisonPass.Index;
}
public void StartBuild(ThreadSafeServiceContainer buildServices, ProjectBuildOptions buildOptions, IBuildFeedbackSink feedbackSink)
public void StartBuild(ProjectBuildOptions buildOptions, IBuildFeedbackSink feedbackSink)
{
IProject p = wrapped as IProject;
if (p == null) {
wrapped.StartBuild(buildServices, buildOptions, feedbackSink);
wrapped.StartBuild(buildOptions, feedbackSink);
} else {
lock (unmodifiedProjects) {
if (!unmodifiedProjects.TryGetValue(p, out lastCompilationPass)) {
@ -272,7 +272,7 @@ namespace ICSharpCode.SharpDevelop.Project @@ -272,7 +272,7 @@ namespace ICSharpCode.SharpDevelop.Project
feedbackSink.Done(true);
} else {
lastCompilationPass = factory.CurrentPass;
wrapped.StartBuild(buildServices, buildOptions, new BuildFeedbackSink(p, feedbackSink, factory.CurrentPass));
wrapped.StartBuild(buildOptions, new BuildFeedbackSink(p, feedbackSink, factory.CurrentPass));
}
}
}

Loading…
Cancel
Save