pimhwang
/
SharpDevelop
mirror of https://github.com/icsharpcode/SharpDevelop.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
Browse Source

VB.NET backend now works. 

git-svn-id: svn://svn.sharpdevelop.net/sharpdevelop/trunk@43 1ccf3a8d-04fe-1044-b7c0-cef0b8235c61
shortcuts
Mike Krüger 22 years ago
parent
70b2f42923
commit
8f5e256db6
25 changed files with 102 additions and 77 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 34
      data/resources/image/BitmapResources/BitmapResources.res
  2. 30
      data/resources/image/BitmapResources/ImageResources.build
  3. 3
      data/resources/image/BitmapResources/build.bat
  4. 2
      data/templates/file/VBNet/VBNet.Empty.xft
  5. 2
      data/templates/file/VBNet/VBNet.EmptyClass.xft
  6. 2
      data/templates/file/VBNet/VBNet.Forms.Form.xft
  7. 2
      data/templates/file/VBNet/VBNet.Forms.UserControl.xft
  8. 2
      data/templates/file/VBNet/VBNet.Patterns.Singleton.xft
  9. 2
      data/templates/file/VBNet/VBNet.UnitTest.xft
  10. 2
      data/templates/file/VBNet/VBNet.Wizards.TypedCollection.xft
  11. 2
      data/templates/file/VBNet/VBNet.Wizards.TypedHashtable.xft
  12. 9
      data/templates/project/CSharp/Direct3DProject.xpt
  13. 10
      data/templates/project/VBNet/ConsoleProject.xpt
  14. 12
      data/templates/project/VBNet/ControlLibrary.xpt
  15. 11
      data/templates/project/VBNet/Direct3DProject.xpt
  16. 2
      data/templates/project/VBNet/EmptyProject.xpt
  17. 11
      data/templates/project/VBNet/FormsProject.xpt
  18. 11
      data/templates/project/VBNet/Library.xpt
  19. 12
      data/templates/project/VBNet/Service.xpt
  20. 1
      src/AddIns/BackendBindings/CSharpBinding/Project/Src/Project/CSharpProject.cs
  21. 5
      src/AddIns/BackendBindings/VBNetBinding/Project/Src/Project/VBNetProject.cs
  22. 4
      src/AddIns/BackendBindings/VBNetBinding/Project/Src/VBNetLanguageBinding.cs
  23. 2
      src/AddIns/BackendBindings/VBNetBinding/Project/VBNetBinding.addin
  24. 4
      src/Main/Base/Project/Src/Project/MSBuildProject.cs
  25. BIN
      src/Main/StartUp/Project/Resources/BitmapResources.resources

34
data/resources/image/BitmapResources/BitmapResources.res
Unescape View File

@ -308,23 +308,23 @@ C#.Project.WebProject = backendicons\CSharp\project\ @@ -308,23 +308,23 @@ C#.Project.WebProject = backendicons\CSharp\project\
C#.Project.Library = backendicons\CSharp\project\Library.png
C#.Project.ControlLibrary = backendicons\CSharp\project\ControlLibrary.png
VB.ProjectIcon = backendicons\VBNet\SmallProject.png
VB.FileIcon = backendicons\VBNet\SmallFile.png
VB.File.EmptyFile = backendicons\VBNet\file\EmptyFile.png
VB.File.Form = backendicons\VBNet\file\Form.png
VB.File.FullFile = backendicons\VBNet\file\FullFile.png
VB.File.NewClass = backendicons\VBNet\file\NewClass.png
VB.File.WebFile = backendicons\VBNet\file\WebFile.png
VB.Project.EmptyProject = backendicons\VBNet\project\EmptyProject.png
VB.Project.DOSProject = backendicons\VBNet\project\DOSProject.png
VB.Project.Form = backendicons\VBNet\project\Form.png
VB.Project.FullProject = backendicons\VBNet\project\FullProject.png
VB.Project.ServiceProject = backendicons\VBNet\project\ServiceProject.png
VB.Project.UserControl = backendicons\VBNet\project\UserControl.png
VB.Project.WebProject = backendicons\VBNet\project\WebProject.png
VB.Project.Library = backendicons\VBNet\project\Library.png
VB.Project.ControlLibrary = backendicons\VBNet\project\ControlLibrary.png
VBNet.ProjectIcon = backendicons\VBNet\SmallProject.png
VBNet.FileIcon = backendicons\VBNet\SmallFile.png
VBNet.File.EmptyFile = backendicons\VBNet\file\EmptyFile.png
VBNet.File.Form = backendicons\VBNet\file\Form.png
VBNet.File.FullFile = backendicons\VBNet\file\FullFile.png
VBNet.File.NewClass = backendicons\VBNet\file\NewClass.png
VBNet.File.WebFile = backendicons\VBNet\file\WebFile.png
VBNet.Project.EmptyProject = backendicons\VBNet\project\EmptyProject.png
VBNet.Project.DOSProject = backendicons\VBNet\project\DOSProject.png
VBNet.Project.Form = backendicons\VBNet\project\Form.png
VBNet.Project.FullProject = backendicons\VBNet\project\FullProject.png
VBNet.Project.ServiceProject = backendicons\VBNet\project\ServiceProject.png
VBNet.Project.UserControl = backendicons\VBNet\project\UserControl.png
VBNet.Project.WebProject = backendicons\VBNet\project\WebProject.png
VBNet.Project.Library = backendicons\VBNet\project\Library.png
VBNet.Project.ControlLibrary = backendicons\VBNet\project\ControlLibrary.png
Java.ProjectIcon = backendicons\Java\SmallProject.png
Java.FileIcon = backendicons\Java\SmallFile.png

30
data/resources/image/BitmapResources/ImageResources.build
Unescape View File

@ -1,30 +0,0 @@ @@ -1,30 +0,0 @@
<?xml version="1.0"?>
<project name="SharpDevelop Language Resources" default="build" basedir=".">
<!-- Programs -->
<property name="resasm" value="ResAsm.exe"/>
<!-- Properties -->
<property name="destination.dir" value="..\..\SharpDevelop\Src\Main\StartUp\Resources"/>
<target name="build" depends="clean">
<echo message="Building image resource files"/>
<exec program="${resasm}" commandline="BitmapResources.res"/>
<echo message="Move compiled resource files"/>
<move todir="${destination.dir}">
<fileset>
<include name="BitmapResources.resources"/>
</fileset>
</move>
</target>
<target name="clean">
<delete>
<fileset basedir="${destination.dir}">
<include name="BitmapResources.resources"/>
</fileset>
</delete>
</target>
</project>

3
data/resources/image/BitmapResources/build.bat
Unescape View File

@ -1,4 +1,5 @@ @@ -1,4 +1,5 @@
@echo off
..\..\SharpDevelop\src\Tools\nant\bin\nant
resasm BitmapResources.res
move BitmapResources.resources ..\..\SharpDevelop\Src\Main\StartUp\Project\Resources\BitmapResources.resources
pause

2
data/templates/file/VBNet/VBNet.Empty.xft
Unescape View File

@ -3,7 +3,7 @@ @@ -3,7 +3,7 @@
<Config
name = "${res:Templates.File.EmptyFile.Name}"
icon = "VB.File.EmptyFile"
icon = "VBNet.File.EmptyFile"
category = "VB"
defaultname = "Empty${Number}.vb"
language = "VBNET"/>

2
data/templates/file/VBNet/VBNet.EmptyClass.xft
Unescape View File

@ -3,7 +3,7 @@ @@ -3,7 +3,7 @@
<Config
name = "${res:Templates.File.EmptyClass.Name}"
icon = "VB.File.NewClass"
icon = "VBNet.File.NewClass"
category = "VB"
defaultname = "Class${Number}.vb"
language = "VBNET"

2
data/templates/file/VBNet/VBNet.Forms.Form.xft
Unescape View File

@ -3,7 +3,7 @@ @@ -3,7 +3,7 @@
<Config
name = "${res:Templates.File.WindowsForm.Name}"
icon = "VB.File.Form"
icon = "VBNet.File.Form"
category = "VB"
defaultname = "Form${Number}.vb"
language = "VB"

2
data/templates/file/VBNet/VBNet.Forms.UserControl.xft
Unescape View File

@ -3,7 +3,7 @@ @@ -3,7 +3,7 @@
<Config
name = "${res:Templates.File.WindowsUserControl.Name}"
icon = "VB.File.Form"
icon = "VBNet.File.Form"
category = "VB"
defaultname = "UserControl${Number}.vb"
language = "VBNET"/>

2
data/templates/file/VBNet/VBNet.Patterns.Singleton.xft
Unescape View File

@ -3,7 +3,7 @@ @@ -3,7 +3,7 @@
<Config
name = "${res:Templates.File.SingletonClass.Name}"
icon = "VB.File.NewClass"
icon = "VBNet.File.NewClass"
category = "VB"
defaultname = "SingletonClass${Number}.vb"
language = "VBNET"/>

2
data/templates/file/VBNet/VBNet.UnitTest.xft
Unescape View File

@ -3,7 +3,7 @@ @@ -3,7 +3,7 @@
<Config
name = "${res:Templates.File.UnitTest.Name}"
icon = "VB.File.FullFile"
icon = "VBNet.File.FullFile"
category = "VB"
defaultname = "Test${Number}.vb"
language = "VBNET"/>

2
data/templates/file/VBNet/VBNet.Wizards.TypedCollection.xft
Unescape View File

@ -3,7 +3,7 @@ @@ -3,7 +3,7 @@
<Config
name = "${res:Templates.File.TypedCollection.Name}"
icon = "VB.File.FullFile"
icon = "VBNet.File.FullFile"
category = "VB"
defaultname = "TypedCollection${Number}.vb"
language = "VBNET"

2
data/templates/file/VBNet/VBNet.Wizards.TypedHashtable.xft
Unescape View File

@ -3,7 +3,7 @@ @@ -3,7 +3,7 @@
<Config
name = "${res:Templates.File.TypedHashTable.Name}"
icon = "VB.File.FullFile"
icon = "VBNet.File.FullFile"
category = "VB"
defaultname = "Class${Number}.vb"
language = "VBNET"

9
data/templates/project/CSharp/Direct3DProject.xpt
Unescape View File

@ -27,8 +27,13 @@ @@ -27,8 +27,13 @@
<Options/>
<References>
<Reference type="Gac" refto="Microsoft.DirectX, Version=1.0.2902.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35" />
<Reference type="Gac" refto="Microsoft.DirectX.Direct3D, Version=1.0.2902.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35" />
<Reference type="Gac" refto="System" />
<Reference type="Gac" refto="System.Data" />
<Reference type="Gac" refto="System.Drawing" />
<Reference type="Gac" refto="System.Windows.Forms" />
<Reference type="Gac" refto="System.Xml" />
<Reference type="Gac" refto="Microsoft.DirectX" />
<Reference type="Gac" refto="Microsoft.DirectX.Direct3D" />
</References>
<Files>

10
data/templates/project/VBNet/ConsoleProject.xpt
Unescape View File

@ -7,7 +7,7 @@ @@ -7,7 +7,7 @@
<TemplateConfiguration>
<Name>${res:Templates.Project.ConsoleProject.Name}</Name>
<Category>VBNet</Category>
<Icon>VB.Project.DOSProject</Icon>
<Icon>VBNet.Project.DOSProject</Icon>
<LanguageName>VBNet</LanguageName>
<Description>${res:Templates.Project.ConsoleProject.Description}</Description>
</TemplateConfiguration>
@ -17,6 +17,7 @@ @@ -17,6 +17,7 @@
<Open filename = "Main.vb"/>
</Actions>
<!-- Template Content -->
<Combine name = "${ProjectName}" directory = ".">
<Options>
@ -27,6 +28,13 @@ @@ -27,6 +28,13 @@
<Options Target = "Exe" PauseConsoleOutput = "True"/>
<References>
<Reference type="Gac" refto="System" />
<Reference type="Gac" refto="System.Data" />
<Reference type="Gac" refto="System.Drawing" />
<Reference type="Gac" refto="System.Xml" />
</References>
<Files>
<File name="Main.vb">
<![CDATA[${StandardHeader.VBNET}

12
data/templates/project/VBNet/ControlLibrary.xpt
Unescape View File

@ -7,7 +7,7 @@ @@ -7,7 +7,7 @@
<TemplateConfiguration>
<Name>${res:Templates.Project.UserControlLibrary.Name}</Name>
<Category>VBNet</Category>
<Icon>VB.Project.ControlLibrary</Icon>
<Icon>VBNet.Project.ControlLibrary</Icon>
<LanguageName>VBNet</LanguageName>
<Description>${res:Templates.Project.UserControlLibrary.Description}</Description>
</TemplateConfiguration>
@ -24,6 +24,16 @@ @@ -24,6 +24,16 @@
<Project name = "${ProjectName}" directory = ".">
<Options Target = "Library" PauseConsoleOutput = "False"/>
<References>
<Reference type="Gac" refto="System" />
<Reference type="Gac" refto="System.Data" />
<Reference type="Gac" refto="System.Drawing" />
<Reference type="Gac" refto="System.Windows.Forms" />
<Reference type="Gac" refto="System.Xml" />
</References>
<Files>
<File name="UserControl1.vb"><![CDATA[${StandardHeader.VBNET}
Imports System

11
data/templates/project/VBNet/Direct3DProject.xpt
Unescape View File

@ -7,7 +7,7 @@ @@ -7,7 +7,7 @@
<TemplateConfiguration>
<Name>${res:Templates.Project.Direct3DApplication.Name}</Name>
<Category>VBNet</Category>
<Icon>VB.Project.FullProject</Icon>
<Icon>VBNet.Project.FullProject</Icon>
<LanguageName>VBNet</LanguageName>
<Description>${res:Templates.Project.Direct3DApplication.Description}</Description>
</TemplateConfiguration>
@ -27,8 +27,13 @@ @@ -27,8 +27,13 @@
<Options/>
<References>
<Reference type="Gac" refto="Microsoft.DirectX, Version=1.0.2902.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35" />
<Reference type="Gac" refto="Microsoft.DirectX.Direct3D, Version=1.0.2902.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35" />
<Reference type="Gac" refto="System" />
<Reference type="Gac" refto="System.Data" />
<Reference type="Gac" refto="System.Drawing" />
<Reference type="Gac" refto="System.Windows.Forms" />
<Reference type="Gac" refto="System.Xml" />
<Reference type="Gac" refto="Microsoft.DirectX" />
<Reference type="Gac" refto="Microsoft.DirectX.Direct3D" />
</References>
<Files>

2
data/templates/project/VBNet/EmptyProject.xpt
Unescape View File

@ -8,7 +8,7 @@ @@ -8,7 +8,7 @@
<Name>${res:Templates.Project.EmptyProject.Name}</Name>
<Category>VBNet</Category>
<LanguageName>VBNet</LanguageName>
<Icon>VB.Project.EmptyProject</Icon>
<Icon>VBNet.Project.EmptyProject</Icon>
<Description>${res:Templates.Project.EmptyProject.Description}</Description>
</TemplateConfiguration>

11
data/templates/project/VBNet/FormsProject.xpt
Unescape View File

@ -7,7 +7,7 @@ @@ -7,7 +7,7 @@
<TemplateConfiguration>
<Name>${res:Templates.Project.WindowsApplication.Name}</Name>
<Category>VBNet</Category>
<Icon>VB.Project.Form</Icon>
<Icon>VBNet.Project.Form</Icon>
<LanguageName>VBNet</LanguageName>
<Description>${res:Templates.Project.WindowsApplication.Description}</Description>
</TemplateConfiguration>
@ -27,6 +27,15 @@ @@ -27,6 +27,15 @@
<Options Target = "WinExe" PauseConsoleOutput = "False"/>
<References>
<Reference type="Gac" refto="System" />
<Reference type="Gac" refto="System.Data" />
<Reference type="Gac" refto="System.Drawing" />
<Reference type="Gac" refto="System.Windows.Forms" />
<Reference type="Gac" refto="System.Xml" />
</References>
<Files>
<File name="MainForm.vb">
<![CDATA[${StandardHeader.VBNET}

11
data/templates/project/VBNet/Library.xpt
Unescape View File

@ -7,7 +7,7 @@ @@ -7,7 +7,7 @@
<TemplateConfiguration>
<Name>${res:Templates.Project.ClassLibrary.Name}</Name>
<Category>VBNet</Category>
<Icon>VB.Project.Library</Icon>
<Icon>VBNet.Project.Library</Icon>
<LanguageName>VBNet</LanguageName>
<Description>${res:Templates.Project.ClassLibrary.Description}</Description>
</TemplateConfiguration>
@ -22,8 +22,17 @@ @@ -22,8 +22,17 @@
<StartupProject>${ProjectName}</StartupProject>
</Options>
<Project name = "${ProjectName}" directory = ".">
<Options Target = "Library" PauseConsoleOutput = "False"/>
<References>
<Reference type="Gac" refto="System" />
<Reference type="Gac" refto="System.Data" />
<Reference type="Gac" refto="System.Drawing" />
<Reference type="Gac" refto="System.Xml" />
</References>
<Files>
<File name="NewClass.vb"><![CDATA[${StandardHeader.VBNET}
Imports System

12
data/templates/project/VBNet/Service.xpt
Unescape View File

@ -7,7 +7,7 @@ @@ -7,7 +7,7 @@
<TemplateConfiguration>
<Name>${res:Templates.Project.WindowsService.Name}</Name>
<Category>VBNet</Category>
<Icon>VB.Project.ServiceProject</Icon>
<Icon>VBNet.Project.ServiceProject</Icon>
<LanguageName>VBNet</LanguageName>
<Description>${res:Templates.Project.WindowsService.Description}</Description>
</TemplateConfiguration>
@ -21,11 +21,19 @@ @@ -21,11 +21,19 @@
<Options>
<StartupProject>${ProjectName}</StartupProject>
</Options>
<Project name = "${ProjectName}" directory = ".">
<Options Target = "Library" PauseConsoleOutput = "False"/>
<References>
<Reference type="Gac" refto="System" />
<Reference type="Gac" refto="System.Data" />
<Reference type="Gac" refto="System.Drawing" />
<Reference type="Gac" refto="System.Xml" />
</References>
<Files>
<File name="MyService.vb"><![CDATA[${StandardHeader.VBNET}
Imports System

1
src/AddIns/BackendBindings/CSharpBinding/Project/Src/Project/CSharpProject.cs
Unescape View File

@ -567,6 +567,7 @@ namespace CSharpBinding @@ -567,6 +567,7 @@ namespace CSharpBinding
{
Language = "C#";
Create(info);
imports.Add(@"$(MSBuildBinPath)\Microsoft.CSHARP.Targets");
}
}
}

5
src/AddIns/BackendBindings/VBNetBinding/Project/Src/Project/VBNetProject.cs
Unescape View File

@ -585,15 +585,16 @@ namespace VBNetBinding @@ -585,15 +585,16 @@ namespace VBNetBinding
public VBNetProject(string fileName, string projectName)
{
this.Name = projectName;
Language = "VB.NET";
Language = "VBNet";
SetupProject(fileName);
IdGuid = BaseConfiguration["ProjectGuid"];
}
public VBNetProject(ProjectCreateInformation info)
{
Language = "VB.NET";
Language = "VBNet";
Create(info);
imports.Add(@"$(MSBuildBinPath)\Microsoft.VisualBasic.Targets");
}
}
}

4
src/AddIns/BackendBindings/VBNetBinding/Project/Src/VBNetLanguageBinding.cs
Unescape View File

@ -25,7 +25,7 @@ namespace VBNetBinding @@ -25,7 +25,7 @@ namespace VBNetBinding
{
public class VBNetLanguageBinding : ILanguageBinding
{
public const string LanguageName = "C#";
public const string LanguageName = "VBNet";
public string Language {
get {
@ -42,7 +42,7 @@ namespace VBNetBinding @@ -42,7 +42,7 @@ namespace VBNetBinding
if (ext == null) {
return false;
}
return ext.ToUpper() == ".CS";
return ext.ToUpper() == ".VB";
}
public string GetCompiledOutputName(string fileName)

2
src/AddIns/BackendBindings/VBNetBinding/Project/VBNetBinding.addin
Unescape View File

@ -69,7 +69,7 @@ @@ -69,7 +69,7 @@
<Path path = "/SharpDevelop/Workbench/LanguageBindings">
<LanguageBinding id = "VBNet"
guid = "{634FA0F9-5C09-48ec-9E9E-29428AE97251}"
guid = "{F184B08F-C81C-45F6-A57F-5ABD9991F28F}"
supportedextensions = ".vb"
projectfileextension = ".vbproj"
class = "VBNetBinding.VBNetLanguageBinding" />

4
src/Main/Base/Project/Src/Project/MSBuildProject.cs
Unescape View File

@ -20,7 +20,7 @@ namespace ICSharpCode.SharpDevelop.Project @@ -20,7 +20,7 @@ namespace ICSharpCode.SharpDevelop.Project
{
}
public void Create(ProjectCreateInformation information)
protected void Create(ProjectCreateInformation information)
{
Name = information.ProjectName;
configurations[""] = new PropertyGroup();
@ -42,8 +42,6 @@ namespace ICSharpCode.SharpDevelop.Project @@ -42,8 +42,6 @@ namespace ICSharpCode.SharpDevelop.Project
configurations["Release|AnyCPU"]["Optimize"] = @"true";
fileName = information.OutputProjectFileName;
imports.Add(@"$(MSBuildBinPath)\Microsoft.CSHARP.Targets");
}
public override bool CanCompile(string fileName)

BIN
src/Main/StartUp/Project/Resources/BitmapResources.resources
View File

Binary file not shown.
Write Preview
Loading…
Cancel
Save