[Monodevelop-patches-list] r1250 - in trunk/MonoDevelop: . build/AddIns/AddIns/BackendBindings src/AddIns/BackendBindings src/AddIns/BackendBindings/CSharpBinding src/AddIns/BackendBindings/JavaBinding src/AddIns/BackendBindings/JavaBinding/Project
commit-watcher at mono-cvs.ximian.com
commit-watcher at mono-cvs.ximian.com
Thu Mar 25 21:46:39 EST 2004
Author: jluke
Date: 2004-03-25 21:46:39 -0500 (Thu, 25 Mar 2004)
New Revision: 1250
Modified:
trunk/MonoDevelop/build/AddIns/AddIns/BackendBindings/BackendBindings.addin
trunk/MonoDevelop/build/AddIns/AddIns/BackendBindings/Makefile.am
trunk/MonoDevelop/configure.in
trunk/MonoDevelop/src/AddIns/BackendBindings/CSharpBinding/Makefile.am
trunk/MonoDevelop/src/AddIns/BackendBindings/JavaBinding/JavaBindingExecutionServices.cs
trunk/MonoDevelop/src/AddIns/BackendBindings/JavaBinding/Project/JavaCompilerParameters.cs
trunk/MonoDevelop/src/AddIns/BackendBindings/Makefile.am
Log:
enable the JavaBinding as it works for simple things now
I don't think it will effect anything else
Modified: trunk/MonoDevelop/build/AddIns/AddIns/BackendBindings/BackendBindings.addin
===================================================================
--- trunk/MonoDevelop/build/AddIns/AddIns/BackendBindings/BackendBindings.addin 2004-03-26 02:16:04 UTC (rev 1249)
+++ trunk/MonoDevelop/build/AddIns/AddIns/BackendBindings/BackendBindings.addin 2004-03-26 02:46:39 UTC (rev 1250)
@@ -7,7 +7,7 @@
<Runtime>
<Import assembly = "CSharpBinding.dll"/>
-<!-- <Import assembly = "JavaBinding.dll"/> -->
+ <Import assembly = "JavaBinding.dll"/>
<!-- ORIGINAL #D COMMENT <Import assembly = "JScriptLanguageModule.dll"/> -->
<!-- <Import assembly = "VBNetBinding.dll"/> -->
</Runtime>
@@ -32,10 +32,10 @@
insertbefore="AllFiles"
name = "${res:SharpDevelop.FileFilter.JScriptFiles}"
extensions = "*.js"/> -->
-<!-- <FileFilter id = "Java"
+ <FileFilter id = "Java"
insertbefore="AllFiles"
name = "${res:SharpDevelop.FileFilter.JavaFiles}"
- extensions = "*.java"/>-->
+ extensions = "*.java"/>
<FileFilter id = "Assemblies"
insertbefore="AllFiles"
name = "${res:SharpDevelop.FileFilter.AssemblyFiles}"
@@ -99,13 +99,13 @@
class = "JScriptBinding.ProjectConfigurationPropertyPanel"/>
</Conditional> -->
-<!--
+
<Conditional activeproject="Java">
<DialogPanel id = "JavaProjectPanel"
label = "${res:Dialog.Options.PrjOptions.CodeGenerationPanel.PanelName}"
class = "JavaBinding.ProjectConfigurationPropertyPanel"/>
- </Conditional>-->
+ </Conditional>
</Extension>
@@ -190,18 +190,18 @@
class = "CSharpBinding.CSharpLanguageBinding" />
<!-- <LanguageBinding id = "VBNET"
supportedextensions = ".vb"
- class = "VBBinding.VBLanguageBinding" />
+ class = "VBBinding.VBLanguageBinding" />-->
<LanguageBinding id = "Java"
supportedextensions = ".java"
- class = "JavaBinding.JavaLanguageBinding" />-->
+ class = "JavaBinding.JavaLanguageBinding" />
<!--ORIGINAL #D COMMENT <LanguageBinding id = "JScript"
supportedextensions = ".js"
class = "JScriptBinding.JScriptLanguageBinding" /> -->
</Extension>
-<!-- <Extension path = "/SharpDevelop/Views/ProjectBrowser/NodeBuilders">
+ <Extension path = "/SharpDevelop/Views/ProjectBrowser/NodeBuilders">
<Class id = "JavaNodeBuilder"
insertbefore = "DefaultBuilder"
class = "JavaBinding.JavaNodeBuilder"/>
- </Extension>-->
+ </Extension>
</AddIn>
Modified: trunk/MonoDevelop/build/AddIns/AddIns/BackendBindings/Makefile.am
===================================================================
--- trunk/MonoDevelop/build/AddIns/AddIns/BackendBindings/Makefile.am 2004-03-26 02:16:04 UTC (rev 1249)
+++ trunk/MonoDevelop/build/AddIns/AddIns/BackendBindings/Makefile.am 2004-03-26 02:46:39 UTC (rev 1250)
@@ -6,5 +6,5 @@
EXTRA_DIST = $(backendbindings_DATA)
-CLEANFILES = CSharpBinding.dll
+CLEANFILES = CSharpBinding.dll JavaBinding.dll
Modified: trunk/MonoDevelop/configure.in
===================================================================
--- trunk/MonoDevelop/configure.in 2004-03-26 02:16:04 UTC (rev 1249)
+++ trunk/MonoDevelop/configure.in 2004-03-26 02:46:39 UTC (rev 1250)
@@ -121,6 +121,7 @@
src/AddIns/Makefile
src/AddIns/BackendBindings/Makefile
src/AddIns/BackendBindings/CSharpBinding/Makefile
+src/AddIns/BackendBindings/JavaBinding/Makefile
src/AddIns/DisplayBindings/Makefile
src/AddIns/DisplayBindings/SourceEditor/Makefile
src/AddIns/Misc/Makefile
Modified: trunk/MonoDevelop/src/AddIns/BackendBindings/CSharpBinding/Makefile.am
===================================================================
--- trunk/MonoDevelop/src/AddIns/BackendBindings/CSharpBinding/Makefile.am 2004-03-26 02:16:04 UTC (rev 1249)
+++ trunk/MonoDevelop/src/AddIns/BackendBindings/CSharpBinding/Makefile.am 2004-03-26 02:46:39 UTC (rev 1250)
@@ -1,4 +1,16 @@
-FILES= \
+CSC = mcs /debug
+ASSEMBLY = CSharpBinding.dll
+
+DLLS = /r:System.Drawing.dll \
+ /r:../../../../build/bin/MonoDevelop.Core.dll \
+ /r:../../../../build/bin/MonoDevelop.SourceEditor.dll \
+ /r:../../../../build/bin/MonoDevelop.Base.dll \
+ /r:../../../../build/bin/ICSharpCode.SharpRefactory.dll \
+ /r:../../../../build/bin/MonoDevelop.Gui.Widgets.dll \
+ /r:gtk-sharp \
+ /r:glade-sharp
+
+FILES = \
./Gui/ChooseRuntimePanel.cs \
./Gui/OutputOptionsPanel.cs \
./Gui/CodeGenerationPanel.cs \
@@ -27,27 +39,18 @@
build_sources = $(addprefix $(srcdir)/, $(FILES))
-DLL = CSharpBinding.dll
+all: $(ASSEMBLY)
-all: $(DLL)
-
-$(DLL): $(build_sources)
- @ mcs /debug /out:$(DLL) /target:library /r:System.Drawing \
- /r:../../../../build/bin/MonoDevelop.Core.dll \
- /r:../../../../build/bin/MonoDevelop.SourceEditor.dll \
- /r:../../../../build/bin/MonoDevelop.Base.dll \
- /r:../../../../build/bin/ICSharpCode.SharpRefactory.dll \
- /r:../../../../build/bin/MonoDevelop.Gui.Widgets.dll \
- /r:gtk-sharp \
- /r:glade-sharp \
+$(ASSEMBLY): $(build_sources)
+ @ $(CSC) /out:$(ASSEMBLY) /target:library \
/resource:$(srcdir)/../../../../data/resources/glade/CSharp.glade,CSharp.glade \
$(build_sources) \
- && cp $(DLL) ../../../../build/AddIns/AddIns/BackendBindings/.
+ && cp $(ASSEMBLY) ../../../../build/AddIns/AddIns/BackendBindings/.
csharpbindinglibdir = $(libdir)/monodevelop/AddIns/AddIns/BackendBindings
-csharpbindinglib_DATA = $(DLL)
+csharpbindinglib_DATA = $(ASSEMBLY)
-CLEANFILES = $(DLL)
+CLEANFILES = $(ASSEMBLY)
EXTRA_DIST = $(FILES)
Modified: trunk/MonoDevelop/src/AddIns/BackendBindings/JavaBinding/JavaBindingExecutionServices.cs
===================================================================
--- trunk/MonoDevelop/src/AddIns/BackendBindings/JavaBinding/JavaBindingExecutionServices.cs 2004-03-26 02:16:04 UTC (rev 1249)
+++ trunk/MonoDevelop/src/AddIns/BackendBindings/JavaBinding/JavaBindingExecutionServices.cs 2004-03-26 02:46:39 UTC (rev 1250)
@@ -53,29 +53,25 @@
ProcessStartInfo psi;
if(((JavaCompilerParameters)project.ActiveConfiguration).MainClass==null) {
//FIXME:
- psi = new ProcessStartInfo("java " + ((JavaCompilerParameters)project.ActiveConfiguration).OutputAssembly);
+ psi = new ProcessStartInfo("xterm -e \"java " + ((JavaCompilerParameters)project.ActiveConfiguration).OutputAssembly + ";read -p 'press any key to continue...' -n1\"");
} else {
if (parameters.PauseConsoleOutput) {
//FIXME:
- psi = new ProcessStartInfo("java " + ((JavaCompilerParameters)project.ActiveConfiguration).MainClass);
+ psi = new ProcessStartInfo("xterm -e \"java " + ((JavaCompilerParameters)project.ActiveConfiguration).MainClass + ";read -p 'press any key to continue...' -n1\"");
} else {
//FIXME:
- psi = new ProcessStartInfo("java " + ((JavaCompilerParameters)project.ActiveConfiguration).MainClass);
+ psi = new ProcessStartInfo("xterm -e \"java " + ((JavaCompilerParameters)project.ActiveConfiguration).MainClass + ";read -p 'press any key to continue...' -n1\"");
}
}
try {
- Console.WriteLine ("*******************");
- Console.WriteLine (parameters.OutputDirectory);
- Console.WriteLine (psi.WorkingDirectory);
psi.WorkingDirectory = parameters.OutputDirectory;
psi.UseShellExecute = false;
Process p = new Process();
p.StartInfo = psi;
p.Start();
- } catch (Exception e) {
- Console.WriteLine (e.ToString ());
+ } catch (Exception) {
throw new ApplicationException("Can not execute");
}
Modified: trunk/MonoDevelop/src/AddIns/BackendBindings/JavaBinding/Project/JavaCompilerParameters.cs
===================================================================
--- trunk/MonoDevelop/src/AddIns/BackendBindings/JavaBinding/Project/JavaCompilerParameters.cs 2004-03-26 02:16:04 UTC (rev 1249)
+++ trunk/MonoDevelop/src/AddIns/BackendBindings/JavaBinding/Project/JavaCompilerParameters.cs 2004-03-26 02:46:39 UTC (rev 1250)
@@ -56,6 +56,12 @@
CodeGeneration codeGeneration = new CodeGeneration();
Execution execution = new Execution();
+
+ public override string OutputDirectory {
+ get {
+ return base.OutputDirectory.Substring (0, base.OutputDirectory.Length - 4);
+ }
+ }
public bool GenWarnings {
get {
Modified: trunk/MonoDevelop/src/AddIns/BackendBindings/Makefile.am
===================================================================
--- trunk/MonoDevelop/src/AddIns/BackendBindings/Makefile.am 2004-03-26 02:16:04 UTC (rev 1249)
+++ trunk/MonoDevelop/src/AddIns/BackendBindings/Makefile.am 2004-03-26 02:46:39 UTC (rev 1250)
@@ -1 +1 @@
-SUBDIRS=CSharpBinding
+SUBDIRS = CSharpBinding JavaBinding
More information about the Monodevelop-patches-list
mailing list