[Monodevelop-patches-list] r2145 - in trunk/MonoDevelop/Core/src/AddIns/BackendBindings/JavaBinding: . ProjectTreeBuilder
commit-watcher at mono-cvs.ximian.com
commit-watcher at mono-cvs.ximian.com
Sun Jan 16 19:25:03 EST 2005
Author: jluke
Date: 2005-01-16 19:25:02 -0500 (Sun, 16 Jan 2005)
New Revision: 2145
Added:
trunk/MonoDevelop/Core/src/AddIns/BackendBindings/JavaBinding/TODO
Modified:
trunk/MonoDevelop/Core/src/AddIns/BackendBindings/JavaBinding/ChangeLog
trunk/MonoDevelop/Core/src/AddIns/BackendBindings/JavaBinding/JavaBindingCompilerServices.cs
trunk/MonoDevelop/Core/src/AddIns/BackendBindings/JavaBinding/JavaLanguageBinding.cs
trunk/MonoDevelop/Core/src/AddIns/BackendBindings/JavaBinding/Makefile.am
trunk/MonoDevelop/Core/src/AddIns/BackendBindings/JavaBinding/ProjectTreeBuilder/JavaNodeBuilder.cs
Log:
2005-01-16 John Luke <john.luke at gmail.com>
* Makefile.am: remove FormattingStrategy from build
* JavaLanguageBinding.cs: make const LanguageName internal
* JavaBindingCompilerServices.cs: remove warnings
* ProjectTreeBuilder/JavaNodeBuilder.cs: remove some unused
code that caused warnings, use MonoDevelop.Services.Runtime
instead of old method of getting services
* TODO: add
Modified: trunk/MonoDevelop/Core/src/AddIns/BackendBindings/JavaBinding/ChangeLog
===================================================================
--- trunk/MonoDevelop/Core/src/AddIns/BackendBindings/JavaBinding/ChangeLog 2005-01-17 00:18:30 UTC (rev 2144)
+++ trunk/MonoDevelop/Core/src/AddIns/BackendBindings/JavaBinding/ChangeLog 2005-01-17 00:25:02 UTC (rev 2145)
@@ -1,3 +1,13 @@
+2005-01-16 John Luke <john.luke at gmail.com>
+
+ * Makefile.am: remove FormattingStrategy from build
+ * JavaLanguageBinding.cs: make const LanguageName internal
+ * JavaBindingCompilerServices.cs: remove warnings
+ * ProjectTreeBuilder/JavaNodeBuilder.cs: remove some unused
+ code that caused warnings, use MonoDevelop.Services.Runtime
+ instead of old method of getting services
+ * TODO: add
+
2005-01-11 Lluis Sanchez Gual <lluis at novell.com>
* JavaBindingCompilerServices.cs:
Modified: trunk/MonoDevelop/Core/src/AddIns/BackendBindings/JavaBinding/JavaBindingCompilerServices.cs
===================================================================
--- trunk/MonoDevelop/Core/src/AddIns/BackendBindings/JavaBinding/JavaBindingCompilerServices.cs 2005-01-17 00:18:30 UTC (rev 2144)
+++ trunk/MonoDevelop/Core/src/AddIns/BackendBindings/JavaBinding/JavaBindingCompilerServices.cs 2005-01-17 00:25:02 UTC (rev 2145)
@@ -42,7 +42,6 @@
if (compilerparameters == null) compilerparameters = new JavaCompilerParameters ();
string outdir = configuration.OutputDirectory;
- string exe = Path.Combine (outdir, configuration.OutputAssembly + ".class");
string options = "";
string compiler = GetCompilerName (compilerparameters);
@@ -138,7 +137,7 @@
string asm = Path.GetFileNameWithoutExtension (outclass);
// sadly I dont think we can specify the output .class name
- string args = String.Format ("{0} {1} -assembly:{2}", "*.class", "-reference:/usr/lib/IKVM.GNU.Classpath.dll", asm);
+ string args = String.Format ("{0} -assembly:{1}", "*.class", asm);
ProcessStartInfo si = new ProcessStartInfo ("ikvmc", args);
si.WorkingDirectory = outdir;
si.RedirectStandardOutput = true;
@@ -183,7 +182,7 @@
if (index1 < 0)
continue;
- string s1 = next.Substring (0, index1);
+ //string s1 = next.Substring (0, index1);
string s2 = next.Substring (index1 + 6);
int index2 = s2.IndexOf (":");
int line = Int32.Parse (next.Substring (index1 + 6, index2));
Modified: trunk/MonoDevelop/Core/src/AddIns/BackendBindings/JavaBinding/JavaLanguageBinding.cs
===================================================================
--- trunk/MonoDevelop/Core/src/AddIns/BackendBindings/JavaBinding/JavaLanguageBinding.cs 2005-01-17 00:18:30 UTC (rev 2144)
+++ trunk/MonoDevelop/Core/src/AddIns/BackendBindings/JavaBinding/JavaLanguageBinding.cs 2005-01-17 00:25:02 UTC (rev 2145)
@@ -25,10 +25,9 @@
/// </summary>
public class JavaLanguageBinding : ILanguageBinding
{
- public const string LanguageName = "Java";
+ internal const string LanguageName = "Java";
+ JavaBindingCompilerServices compilerServices = new JavaBindingCompilerServices ();
- JavaBindingCompilerServices compilerServices = new JavaBindingCompilerServices();
-
public JavaLanguageBinding ()
{
Runtime.ProjectService.DataContext.IncludeType (typeof(JavaCompilerParameters));
Modified: trunk/MonoDevelop/Core/src/AddIns/BackendBindings/JavaBinding/Makefile.am
===================================================================
--- trunk/MonoDevelop/Core/src/AddIns/BackendBindings/JavaBinding/Makefile.am 2005-01-17 00:18:30 UTC (rev 2144)
+++ trunk/MonoDevelop/Core/src/AddIns/BackendBindings/JavaBinding/Makefile.am 2005-01-17 00:25:02 UTC (rev 2145)
@@ -14,7 +14,6 @@
JavaBindingCompilerServices.cs \
JavaCompiler.cs \
JavaLanguageBinding.cs \
-FormatingStrategy/JavaFormattingStrategy.cs \
ProjectTreeBuilder/JavaNodeBuilder.cs
TEMPLATES = \
Modified: trunk/MonoDevelop/Core/src/AddIns/BackendBindings/JavaBinding/ProjectTreeBuilder/JavaNodeBuilder.cs
===================================================================
--- trunk/MonoDevelop/Core/src/AddIns/BackendBindings/JavaBinding/ProjectTreeBuilder/JavaNodeBuilder.cs 2005-01-17 00:18:30 UTC (rev 2144)
+++ trunk/MonoDevelop/Core/src/AddIns/BackendBindings/JavaBinding/ProjectTreeBuilder/JavaNodeBuilder.cs 2005-01-17 00:25:02 UTC (rev 2145)
@@ -19,14 +19,12 @@
using MonoDevelop.Gui;
using MonoDevelop.Gui.Pads.ProjectBrowser;
using MonoDevelop.Gui.Widgets;
+using MonoDevelop.Services;
namespace JavaBinding
{
public class JavaNodeBuilder : IProjectNodeBuilder
{
- FileUtilityService fileUtilityService = (FileUtilityService)ServiceManager.GetService(typeof(FileUtilityService));
- IconService iconService = (IconService)ServiceManager.GetService(typeof(IconService));
-
public bool CanBuildProjectTree(Project project)
{
DotNetProject dp = project as DotNetProject;
@@ -42,15 +40,13 @@
// create 'empty' directories
for (int i = 0; i < project.ProjectFiles.Count; ++i) {
if (project.ProjectFiles[i].Subtype == Subtype.Directory) {
- string directoryName = fileUtilityService.AbsoluteToRelativePath(project.BaseDirectory, project.ProjectFiles[i].Name);
+ string directoryName = Runtime.FileUtilityService.AbsoluteToRelativePath (project.BaseDirectory, project.ProjectFiles[i].Name);
// if directoryname starts with ./ oder .\
if (directoryName.StartsWith(".")) {
directoryName = directoryName.Substring(2);
}
- string parentDirectory = Path.GetFileName(directoryName);
-
AbstractBrowserNode currentPathNode = GetPath(directoryName, projectNode, true);
DirectoryNode newFolderNode = new DirectoryNode(project.ProjectFiles[i].Name);
@@ -58,7 +54,6 @@
//newFolderNode.ClosedImage = resourceService.GetBitmap ("Icons.16x16.ClosedFolderBitmap");
currentPathNode.Nodes.Add(newFolderNode);
-
}
}
@@ -67,18 +62,13 @@
if (project.ProjectFiles[i].Subtype != Subtype.Directory) {
ProjectFile fileInformation = project.ProjectFiles[i];
- string relativeFile = fileUtilityService.AbsoluteToRelativePath(project.BaseDirectory, fileInformation.Name);
+ string relativeFile = Runtime.FileUtilityService.AbsoluteToRelativePath (project.BaseDirectory, fileInformation.Name);
- string fileName = Path.GetFileName(fileInformation.Name);
-
switch (fileInformation.BuildAction) {
-
case BuildAction.Exclude:
break;
-
default:
AbstractBrowserNode currentPathNode = GetPath(relativeFile, projectNode, true);
-
AbstractBrowserNode newNode = new FileNode(fileInformation);
newNode.ContextmenuAddinTreePath = FileNode.ProjectFileContextMenuPath;
currentPathNode.Nodes.Add(newNode);
@@ -116,7 +106,7 @@
if (node == null) {
if (create) {
- DirectoryNode newFolderNode = new DirectoryNode(fileUtilityService.GetDirectoryNameWithSeparator(ConstructFolderName(curpathnode)) + path);
+ DirectoryNode newFolderNode = new DirectoryNode(Runtime.FileUtilityService.GetDirectoryNameWithSeparator (ConstructFolderName (curpathnode)) + path);
curpathnode.Nodes.Add(newFolderNode);
curpathnode = newFolderNode;
continue;
Added: trunk/MonoDevelop/Core/src/AddIns/BackendBindings/JavaBinding/TODO
===================================================================
--- trunk/MonoDevelop/Core/src/AddIns/BackendBindings/JavaBinding/TODO 2005-01-17 00:18:30 UTC (rev 2144)
+++ trunk/MonoDevelop/Core/src/AddIns/BackendBindings/JavaBinding/TODO 2005-01-17 00:25:02 UTC (rev 2145)
@@ -0,0 +1,7 @@
+ - fix "Class" CompileTarget from crashing us
+ - make classpath handling better
+ - support turning a jar to a dll simply
+ - support more java compilers (like ecj)
+ - automatically copy IKVM.GNU.Classpath.dll and IKVM.Runtime.dll
+ to output dir
+ - implement GenerateMakefiles perhaps
More information about the Monodevelop-patches-list
mailing list