Browse Source

New files get now a build action dependent on their file extension.

git-svn-id: svn://svn.sharpdevelop.net/sharpdevelop/trunk@417 1ccf3a8d-04fe-1044-b7c0-cef0b8235c61
shortcuts
Daniel Grunwald 21 years ago
parent
commit
e4fabdffd8
  1. 12
      src/AddIns/BackendBindings/CSharpBinding/Project/Src/Project/CSharpProject.cs
  2. 5
      src/AddIns/BackendBindings/ILAsmBinding/Project/Src/ILAsmProject.cs
  3. 5
      src/AddIns/BackendBindings/VBNetBinding/Project/Src/Project/VBNetProject.cs
  4. 6
      src/AddIns/DisplayBindings/ResourceEditor/Project/ResourceEditor.addin
  5. 2
      src/Libraries/NRefactory/Project/Src/Parser/Visitors/AbstractASTVisitor.cs
  6. 5
      src/Main/Base/Project/Src/Gui/Dialogs/ProjectOptionsView.cs
  7. 15
      src/Main/Base/Project/Src/Gui/Pads/ProjectBrowser/Commands/DefaultFileNodeCommands.cs
  8. 8
      src/Main/Base/Project/Src/Project/ConfigurationGuiHelper.cs
  9. 10
      src/Main/Base/Project/Src/Project/MSBuildProject.cs

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

@ -48,7 +48,19 @@ namespace CSharpBinding @@ -48,7 +48,19 @@ namespace CSharpBinding
{
Language = "C#";
Create(info);
}
protected override void Create(ProjectCreateInformation information)
{
base.Create(information);
imports.Add(@"$(MSBuildBinPath)\Microsoft.CSharp.Targets");
configurations["Debug|AnyCPU"]["CheckForOverflowUnderflow"] = "True";
configurations["Release|AnyCPU"]["CheckForOverflowUnderflow"] = "False";
}
public override bool CanCompile(string fileName)
{
return new CSharpLanguageBinding().CanCompile(fileName);
}
}
}

5
src/AddIns/BackendBindings/ILAsmBinding/Project/Src/ILAsmProject.cs

@ -27,5 +27,10 @@ namespace ICSharpCode.ILAsmBinding @@ -27,5 +27,10 @@ namespace ICSharpCode.ILAsmBinding
Create(info);
imports.Add(@"$(SharpDevelopBuildBinPath)\SharpDevelop.Build.MSIL.Targets");
}
public override bool CanCompile(string fileName)
{
return new ILAsmLanguageBinding().CanCompile(fileName);
}
}
}

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

@ -87,5 +87,10 @@ namespace VBNetBinding @@ -87,5 +87,10 @@ namespace VBNetBinding
LanguageProperties = ICSharpCode.SharpDevelop.Dom.LanguageProperties.VBNet;
BuildConstantSeparator = ',';
}
public override bool CanCompile(string fileName)
{
return new VBNetLanguageBinding().CanCompile(fileName);
}
}
}

6
src/AddIns/DisplayBindings/ResourceEditor/Project/ResourceEditor.addin

@ -21,7 +21,7 @@ @@ -21,7 +21,7 @@
<MenuItem id="AddStringEntry"
label="${res:ResourceEditor.ResourceEdit.ContextMenu.AddStringEntry}"
class="ResourceEditor.AddStringCommand"
shortcut = "Ins" />
shortcut = "Insert" />
<MenuItem id="AddFile"
label="${res:ResourceEditor.ResourceEdit.ContextMenu.AddFiles}"
@ -43,7 +43,7 @@ @@ -43,7 +43,7 @@
<MenuItem id="Delete"
label="${res:ResourceEditor.ResourceEdit.ContextMenu.Delete}"
class="ResourceEditor.DeleteEntryCommand"
shortcut="Del" />
shortcut="Delete" />
<MenuItem id="Separator2"
type = "Separator" />
@ -67,6 +67,6 @@ @@ -67,6 +67,6 @@
<MenuItem id="SelectAll"
label="${res:XML.MainMenu.EditMenu.SelectAll}"
class="ICSharpCode.SharpDevelop.Commands.SelectAll"
shortcut="Ctrl|A" />
shortcut="Control|A" />
</Path>
</AddIn>

2
src/Libraries/NRefactory/Project/Src/Parser/Visitors/AbstractASTVisitor.cs

@ -755,7 +755,9 @@ namespace ICSharpCode.NRefactory.Parser @@ -755,7 +755,9 @@ namespace ICSharpCode.NRefactory.Parser
public virtual object Visit(LockStatement lockStatement, object data)
{
Debug.Assert(lockStatement != null);
Debug.Assert(lockStatement.LockExpression != null);
Debug.Assert(lockStatement.EmbeddedStatement != null);
lockStatement.LockExpression.AcceptVisitor(this, data);
return lockStatement.EmbeddedStatement.AcceptVisitor(this, data);
}

5
src/Main/Base/Project/Src/Gui/Dialogs/ProjectOptionsView.cs

@ -117,6 +117,11 @@ namespace ICSharpCode.SharpDevelop.Project.Dialogs @@ -117,6 +117,11 @@ namespace ICSharpCode.SharpDevelop.Project.Dialogs
public override void Save(string fileName)
{
foreach (IDialogPanelDescriptor pane in descriptors) {
ICanBeDirty dirtyable = pane.DialogPanel as ICanBeDirty;
if (dirtyable != null) {
if (!dirtyable.IsDirty)
continue; // skip unchanged panels
}
pane.DialogPanel.ReceiveDialogMessage(DialogMessage.OK);
}
project.Save();

15
src/Main/Base/Project/Src/Gui/Pads/ProjectBrowser/Commands/DefaultFileNodeCommands.cs

@ -121,7 +121,20 @@ namespace ICSharpCode.SharpDevelop.Project.Commands @@ -121,7 +121,20 @@ namespace ICSharpCode.SharpDevelop.Project.Commands
}
}
ItemType type = fileNode.Project.CanCompile(fileNode.FileName) ? ItemType.Compile : ItemType.Content;
ItemType type;
if (fileNode.Project.CanCompile(fileNode.FileName)) {
type = ItemType.Compile;
} else {
switch (Path.GetExtension(fileNode.FileName).ToLower()) {
case ".resx":
case ".resources":
type = ItemType.EmbeddedResource;
break;
default:
type = ItemType.Content;
break;
}
}
FileProjectItem newItem = new FileProjectItem(fileNode.Project, type);
newItem.Include = FileUtility.GetRelativePath(fileNode.Project.Directory, fileNode.FileName);

8
src/Main/Base/Project/Src/Project/ConfigurationGuiHelper.cs

@ -194,7 +194,13 @@ namespace ICSharpCode.SharpDevelop.Project @@ -194,7 +194,13 @@ namespace ICSharpCode.SharpDevelop.Project
public override bool Save()
{
Set(control.Checked ? "true" : "false");
string oldValue = Get("True");
if (oldValue == "true" || oldValue == "false") {
// keep value in lower case
Set(control.Checked.ToString().ToLower());
} else {
Set(control.Checked.ToString());
}
return true;
}
}

10
src/Main/Base/Project/Src/Project/MSBuildProject.cs

@ -29,7 +29,7 @@ namespace ICSharpCode.SharpDevelop.Project @@ -29,7 +29,7 @@ namespace ICSharpCode.SharpDevelop.Project
protected char BuildConstantSeparator = ';';
protected void Create(ProjectCreateInformation information)
protected virtual void Create(ProjectCreateInformation information)
{
Name = information.ProjectName;
configurations[""] = new PropertyGroup();
@ -44,13 +44,17 @@ namespace ICSharpCode.SharpDevelop.Project @@ -44,13 +44,17 @@ namespace ICSharpCode.SharpDevelop.Project
configurations["Debug|AnyCPU"] = new PropertyGroup();
configurations["Debug|AnyCPU"]["OutputPath"] = @"bin\Debug\";
configurations["Debug|AnyCPU"]["Optimize"] = "false";
configurations["Debug|AnyCPU"]["Optimize"] = "False";
configurations["Debug|AnyCPU"]["DefineConstants"] = "DEBUG" + BuildConstantSeparator + "TRACE";
configurations["Debug|AnyCPU"]["DebugSymbols"] = "True";
configurations["Debug|AnyCPU"]["DebugType"] = "Full";
configurations["Release|AnyCPU"] = new PropertyGroup();
configurations["Release|AnyCPU"]["OutputPath"] = @"bin\Release\";
configurations["Release|AnyCPU"]["Optimize"] = "true";
configurations["Release|AnyCPU"]["Optimize"] = "True";
configurations["Release|AnyCPU"]["DefineConstants"] = "TRACE";
configurations["Release|AnyCPU"]["DebugSymbols"] = "False";
configurations["Release|AnyCPU"]["DebugType"] = "None";
fileName = information.OutputProjectFileName;
}

Loading…
Cancel
Save