[Monodevelop-patches-list] r1701 - in trunk/MonoDevelop/src: . AddIns/BackendBindings/JavaBinding/Project Libraries/Gdl Libraries/MonoDevelop.Core/Services Libraries/MonoDevelop.Gui.Utils Libraries/MonoDevelop.Gui.Widgets Libraries/SharpRefactory Libraries/SharpRefactory/src/Lexer Libraries/SharpRefactory/src/Parser/AST Main/Base
commit-watcher at mono-cvs.ximian.com
commit-watcher at mono-cvs.ximian.com
Mon Jun 7 00:15:05 EDT 2004
Author: jluke
Date: 2004-06-07 00:15:04 -0400 (Mon, 07 Jun 2004)
New Revision: 1701
Modified:
trunk/MonoDevelop/src/AddIns/BackendBindings/JavaBinding/Project/JavaCompilerParameters.cs
trunk/MonoDevelop/src/Libraries/Gdl/Dock.cs
trunk/MonoDevelop/src/Libraries/Gdl/DockMaster.cs
trunk/MonoDevelop/src/Libraries/Gdl/DockObject.cs
trunk/MonoDevelop/src/Libraries/Gdl/Gdl.prjx
trunk/MonoDevelop/src/Libraries/Gdl/Makefile.Gdl
trunk/MonoDevelop/src/Libraries/MonoDevelop.Core/Services/FileUtilityService.cs
trunk/MonoDevelop/src/Libraries/MonoDevelop.Core/Services/SaveErrorChooseDialog.cs
trunk/MonoDevelop/src/Libraries/MonoDevelop.Core/Services/SaveErrorInformDialog.cs
trunk/MonoDevelop/src/Libraries/MonoDevelop.Gui.Utils/MonoDevelop.Gui.Utils.prjx
trunk/MonoDevelop/src/Libraries/MonoDevelop.Gui.Widgets/Makefile.MonoDevelop.Gui.Widgets
trunk/MonoDevelop/src/Libraries/MonoDevelop.Gui.Widgets/MonoDevelop.Gui.Widgets.prjx
trunk/MonoDevelop/src/Libraries/SharpRefactory/Makefile.SharpRefactory
trunk/MonoDevelop/src/Libraries/SharpRefactory/SharpRefactory.prjx
trunk/MonoDevelop/src/Libraries/SharpRefactory/src/Lexer/Lexer.cs
trunk/MonoDevelop/src/Libraries/SharpRefactory/src/Parser/AST/AbstractASTVisitor.cs
trunk/MonoDevelop/src/Main/Base/Makefile.MonoDevelop.Base
trunk/MonoDevelop/src/Main/Base/MonoDevelop.Base.prjx
trunk/MonoDevelop/src/MonoDevelop.cmbx
Log:
compile fixes
Modified: trunk/MonoDevelop/src/AddIns/BackendBindings/JavaBinding/Project/JavaCompilerParameters.cs
===================================================================
--- trunk/MonoDevelop/src/AddIns/BackendBindings/JavaBinding/Project/JavaCompilerParameters.cs 2004-06-07 02:08:56 UTC (rev 1700)
+++ trunk/MonoDevelop/src/AddIns/BackendBindings/JavaBinding/Project/JavaCompilerParameters.cs 2004-06-07 04:15:04 UTC (rev 1701)
@@ -46,7 +46,7 @@
public JavaRuntime runtime = JavaRuntime.Ikvm;
[XmlAttribute("compilerpath")]
- public string compilerpath = "javac";
+ public string compilerpath = "gcj";
[XmlAttribute("genwarnings")]
public bool genwarnings = false;
Modified: trunk/MonoDevelop/src/Libraries/Gdl/Dock.cs
===================================================================
--- trunk/MonoDevelop/src/Libraries/Gdl/Dock.cs 2004-06-07 02:08:56 UTC (rev 1700)
+++ trunk/MonoDevelop/src/Libraries/Gdl/Dock.cs 2004-06-07 04:15:04 UTC (rev 1701)
@@ -261,7 +261,7 @@
my_request.Rect = req_rect;
} else if (rel_y > alloc.Height - bw) {
my_request.Position = DockPlacement.Bottom;
- req_rect.y += req_rect.Height * (1 - 0.3;
+ req_rect.y += req_rect.Height * (1 - 0.3);
req_rect.Height *= 0.3;
my_request.Rect = req_rect;
} else {
@@ -434,4 +434,4 @@
}
}
}
-}
\ No newline at end of file
+}
Modified: trunk/MonoDevelop/src/Libraries/Gdl/DockMaster.cs
===================================================================
--- trunk/MonoDevelop/src/Libraries/Gdl/DockMaster.cs 2004-06-07 02:08:56 UTC (rev 1700)
+++ trunk/MonoDevelop/src/Libraries/Gdl/DockMaster.cs 2004-06-07 04:15:04 UTC (rev 1701)
@@ -37,7 +37,7 @@
return -1;
}
set {
- if (int >= 0)
+ if (value >= 0)
this.LockUnlock (value > 0);
}
}
@@ -282,7 +282,7 @@
}
if (objekt is Dock) {
- if (this.toplevel_docks.Contains (objekt)
+ if (this.toplevel_docks.Contains (objekt))
this.toplevel_docks.Remove (objekt);
if (objekt == this.controller) {
DockObject new_controller = null;
Modified: trunk/MonoDevelop/src/Libraries/Gdl/DockObject.cs
===================================================================
--- trunk/MonoDevelop/src/Libraries/Gdl/DockObject.cs 2004-06-07 02:08:56 UTC (rev 1700)
+++ trunk/MonoDevelop/src/Libraries/Gdl/DockObject.cs 2004-06-07 04:15:04 UTC (rev 1701)
@@ -86,7 +86,7 @@
public virtual void Reduce ()
{
if (!this.IsCompound)
- return
+ return;
Gdl.DockObject parent = this.ParentObject;
Gtk.Widget[] children = this.Children ();
@@ -238,4 +238,4 @@
set { this.flags = value; }
}
}
-}
\ No newline at end of file
+}
Modified: trunk/MonoDevelop/src/Libraries/Gdl/Gdl.prjx
===================================================================
--- trunk/MonoDevelop/src/Libraries/Gdl/Gdl.prjx 2004-06-07 02:08:56 UTC (rev 1700)
+++ trunk/MonoDevelop/src/Libraries/Gdl/Gdl.prjx 2004-06-07 04:15:04 UTC (rev 1701)
@@ -1,4 +1,4 @@
-<Project name="Gdl" description="" newfilesearch="None" enableviewstate="True" version="1.1" projecttype="C#">
+<Project name="Gdl" description="" newfilesearch="OnLoad" enableviewstate="True" version="1.1" projecttype="C#">
<Contents>
<File name="./DockObject.cs" subtype="Code" buildaction="Compile" dependson="" data="" />
<File name="./AssemblyInfo.cs" subtype="Code" buildaction="Compile" dependson="" data="" />
Modified: trunk/MonoDevelop/src/Libraries/Gdl/Makefile.Gdl
===================================================================
--- trunk/MonoDevelop/src/Libraries/Gdl/Makefile.Gdl 2004-06-07 02:08:56 UTC (rev 1700)
+++ trunk/MonoDevelop/src/Libraries/Gdl/Makefile.Gdl 2004-06-07 04:15:04 UTC (rev 1701)
@@ -28,7 +28,7 @@
Gdl.dll: $(SOURCES)
mcs $(MCS_OPTIONS) -target:library -out:"Gdl.dll" $(PKG_REFERENCES_BUILD) $(SOURCES) \
- && cp "Gdl.dll" ./build/bin
+ && cp "Gdl.dll" ../../build/bin
clean:
rm -f Gdl.dll
Modified: trunk/MonoDevelop/src/Libraries/MonoDevelop.Core/Services/FileUtilityService.cs
===================================================================
--- trunk/MonoDevelop/src/Libraries/MonoDevelop.Core/Services/FileUtilityService.cs 2004-06-07 02:08:56 UTC (rev 1700)
+++ trunk/MonoDevelop/src/Libraries/MonoDevelop.Core/Services/FileUtilityService.cs 2004-06-07 04:15:04 UTC (rev 1701)
@@ -234,7 +234,7 @@
public FileOperationResult ObservedSave(FileOperationDelegate saveFile, string fileName, string message, FileErrorPolicy policy)
{
Debug.Assert(IsValidFileName(fileName));
-#if !LINUX
+#if false
try {
saveFile();
return FileOperationResult.OK;
@@ -288,7 +288,7 @@
public FileOperationResult ObservedSave(NamedFileOperationDelegate saveFileAs, string fileName, string message, FileErrorPolicy policy)
{
Debug.Assert(IsValidFileName(fileName));
-#if !LINUX
+#if false
try {
fileName = System.IO.Path.GetFullPath (fileName);
saveFileAs(fileName);
@@ -356,7 +356,7 @@
public FileOperationResult ObservedLoad(FileOperationDelegate saveFile, string fileName, string message, FileErrorPolicy policy)
{
Debug.Assert(IsValidFileName(fileName));
-#if !LINUX
+#if false
try {
saveFile();
return FileOperationResult.OK;
Modified: trunk/MonoDevelop/src/Libraries/MonoDevelop.Core/Services/SaveErrorChooseDialog.cs
===================================================================
--- trunk/MonoDevelop/src/Libraries/MonoDevelop.Core/Services/SaveErrorChooseDialog.cs 2004-06-07 02:08:56 UTC (rev 1700)
+++ trunk/MonoDevelop/src/Libraries/MonoDevelop.Core/Services/SaveErrorChooseDialog.cs 2004-06-07 04:15:04 UTC (rev 1701)
@@ -5,7 +5,7 @@
// <version value="$version"/>
// </file>
-#if !LINUX
+#if false
using System;
using System.IO;
Modified: trunk/MonoDevelop/src/Libraries/MonoDevelop.Core/Services/SaveErrorInformDialog.cs
===================================================================
--- trunk/MonoDevelop/src/Libraries/MonoDevelop.Core/Services/SaveErrorInformDialog.cs 2004-06-07 02:08:56 UTC (rev 1700)
+++ trunk/MonoDevelop/src/Libraries/MonoDevelop.Core/Services/SaveErrorInformDialog.cs 2004-06-07 04:15:04 UTC (rev 1701)
@@ -5,7 +5,7 @@
// <version value="$version"/>
// </file>
-#if !LINUX
+#if false
using System;
using System.IO;
Modified: trunk/MonoDevelop/src/Libraries/MonoDevelop.Gui.Utils/MonoDevelop.Gui.Utils.prjx
===================================================================
--- trunk/MonoDevelop/src/Libraries/MonoDevelop.Gui.Utils/MonoDevelop.Gui.Utils.prjx 2004-06-07 02:08:56 UTC (rev 1700)
+++ trunk/MonoDevelop/src/Libraries/MonoDevelop.Gui.Utils/MonoDevelop.Gui.Utils.prjx 2004-06-07 04:15:04 UTC (rev 1701)
@@ -19,6 +19,8 @@
<Reference type="Gac" refto="gtk-sharp, Version=1.0.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f" localcopy="True" />
<Reference type="Gac" refto="ICSharpCode.SharpZipLib, Version=0.6.0.0, Culture=neutral, PublicKeyToken=1b03e6acf1164f73" localcopy="True" />
<Reference type="Gac" refto="System.Drawing, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" localcopy="True" />
+ <Reference type="Gac" refto="gdk-sharp, Version=1.0.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f" localcopy="True" />
+ <Reference type="Gac" refto="glib-sharp, Version=1.0.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f" localcopy="True" />
</References>
<DeploymentInformation target="" script="" strategy="File" />
<Configuration runwithwarnings="False" name="Debug">
Modified: trunk/MonoDevelop/src/Libraries/MonoDevelop.Gui.Widgets/Makefile.MonoDevelop.Gui.Widgets
===================================================================
--- trunk/MonoDevelop/src/Libraries/MonoDevelop.Gui.Widgets/Makefile.MonoDevelop.Gui.Widgets 2004-06-07 02:08:56 UTC (rev 1700)
+++ trunk/MonoDevelop/src/Libraries/MonoDevelop.Gui.Widgets/Makefile.MonoDevelop.Gui.Widgets 2004-06-07 04:15:04 UTC (rev 1701)
@@ -21,7 +21,8 @@
PKG_REFERENCES = \
glade-sharp \
-gtk-sharp
+gtk-sharp \
+gnome-sharp
PKG_REFERENCES_BUILD = $(addprefix -pkg:, $(PKG_REFERENCES))
Modified: trunk/MonoDevelop/src/Libraries/MonoDevelop.Gui.Widgets/MonoDevelop.Gui.Widgets.prjx
===================================================================
--- trunk/MonoDevelop/src/Libraries/MonoDevelop.Gui.Widgets/MonoDevelop.Gui.Widgets.prjx 2004-06-07 02:08:56 UTC (rev 1700)
+++ trunk/MonoDevelop/src/Libraries/MonoDevelop.Gui.Widgets/MonoDevelop.Gui.Widgets.prjx 2004-06-07 04:15:04 UTC (rev 1701)
@@ -27,6 +27,8 @@
<Reference type="Gac" refto="System.Drawing, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" localcopy="True" />
<Reference type="Project" refto="MonoDevelop.Gui.Utils" localcopy="True" />
<Reference type="Project" refto="MonoDevelop.Core" localcopy="True" />
+ <Reference type="Gac" refto="glib-sharp, Version=1.0.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f" localcopy="True" />
+ <Reference type="Gac" refto="gnome-sharp, Version=1.0.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f" localcopy="True" />
</References>
<DeploymentInformation target="" script="" strategy="File" />
<Configuration runwithwarnings="False" name="Debug">
Modified: trunk/MonoDevelop/src/Libraries/SharpRefactory/Makefile.SharpRefactory
===================================================================
--- trunk/MonoDevelop/src/Libraries/SharpRefactory/Makefile.SharpRefactory 2004-06-07 02:08:56 UTC (rev 1700)
+++ trunk/MonoDevelop/src/Libraries/SharpRefactory/Makefile.SharpRefactory 2004-06-07 04:15:04 UTC (rev 1701)
@@ -5,7 +5,6 @@
./src/AssemblyInfo.cs \
./src/CodeDOM/CodeDOMVisitor.cs \
./src/Lexer/Lexer.cs \
-./src/Lexer/Tokens.cs \
./src/Lexer/Reader/FileReader.cs \
./src/Lexer/Reader/IReader.cs \
./src/Lexer/Reader/StringReader.cs \
Modified: trunk/MonoDevelop/src/Libraries/SharpRefactory/SharpRefactory.prjx
===================================================================
--- trunk/MonoDevelop/src/Libraries/SharpRefactory/SharpRefactory.prjx 2004-06-07 02:08:56 UTC (rev 1700)
+++ trunk/MonoDevelop/src/Libraries/SharpRefactory/SharpRefactory.prjx 2004-06-07 04:15:04 UTC (rev 1701)
@@ -5,7 +5,6 @@
<File name="./src/Main.cs" subtype="Code" buildaction="Exclude" dependson="" data="" />
<File name="./src/CodeDOM/CodeDOMVisitor.cs" subtype="Code" buildaction="Compile" dependson="" data="" />
<File name="./src/Lexer/Lexer.cs" subtype="Code" buildaction="Compile" dependson="" data="" />
- <File name="./src/Lexer/Tokens.cs" subtype="Code" buildaction="Compile" dependson="" data="" />
<File name="./src/Lexer/Reader/FileReader.cs" subtype="Code" buildaction="Compile" dependson="" data="" />
<File name="./src/Lexer/Reader/IReader.cs" subtype="Code" buildaction="Compile" dependson="" data="" />
<File name="./src/Lexer/Reader/StringReader.cs" subtype="Code" buildaction="Compile" dependson="" data="" />
Modified: trunk/MonoDevelop/src/Libraries/SharpRefactory/src/Lexer/Lexer.cs
===================================================================
--- trunk/MonoDevelop/src/Libraries/SharpRefactory/src/Lexer/Lexer.cs 2004-06-07 02:08:56 UTC (rev 1700)
+++ trunk/MonoDevelop/src/Libraries/SharpRefactory/src/Lexer/Lexer.cs 2004-06-07 04:15:04 UTC (rev 1701)
@@ -823,7 +823,7 @@
if (ch == '\n') {
++line;
col = 1;
- return sb.ToString();;
+ return sb.ToString();
} else {
sb.Append(ch);
}
Modified: trunk/MonoDevelop/src/Libraries/SharpRefactory/src/Parser/AST/AbstractASTVisitor.cs
===================================================================
--- trunk/MonoDevelop/src/Libraries/SharpRefactory/src/Parser/AST/AbstractASTVisitor.cs 2004-06-07 02:08:56 UTC (rev 1700)
+++ trunk/MonoDevelop/src/Libraries/SharpRefactory/src/Parser/AST/AbstractASTVisitor.cs 2004-06-07 04:15:04 UTC (rev 1701)
@@ -509,7 +509,7 @@
public virtual object Visit(BinaryOperatorExpression binaryOperatorExpression, object data)
{
binaryOperatorExpression.Left.AcceptVisitor(this, data);
- return binaryOperatorExpression.Right.AcceptVisitor(this, data);;
+ return binaryOperatorExpression.Right.AcceptVisitor(this, data);
}
public virtual object Visit(ParenthesizedExpression parenthesizedExpression, object data)
{
Modified: trunk/MonoDevelop/src/Main/Base/Makefile.MonoDevelop.Base
===================================================================
--- trunk/MonoDevelop/src/Main/Base/Makefile.MonoDevelop.Base 2004-06-07 02:08:56 UTC (rev 1700)
+++ trunk/MonoDevelop/src/Main/Base/Makefile.MonoDevelop.Base 2004-06-07 04:15:04 UTC (rev 1701)
@@ -129,9 +129,7 @@
./Gui/ErrorHandlers/GenericError.cs \
./Gui/HtmlControl/BrowserNavigateEventArgs.cs \
./Gui/HtmlControl/ControlType.cs \
-./Gui/HtmlControl/GtkHtmlControl.cs \
./Gui/HtmlControl/HtmlControl.cs \
-./Gui/HtmlControl/IEControl.cs \
./Gui/HtmlControl/IHTMLDocument2.cs \
./Gui/HtmlControl/IHTMLElement.cs \
./Gui/HtmlControl/IWebBrowser.cs \
@@ -403,12 +401,18 @@
SYSTEM_REFERENCES_CHECK = $(addsuffix .check, $(SYSTEM_REFERENCES))
+PROJECT_REFERENCES = \
+"../../Libraries/MonoDevelop.Core/MonoDevelop.Core.dll" \
+"../../Libraries/MonoDevelop.Gui.Widgets/MonoDevelop.Gui.Widgets.dll"
+
+PROJECT_REFERENCES_BUILD = $(addprefix -r:, $(PROJECT_REFERENCES))
+
MCS_OPTIONS =
all: MonoDevelop.Base.dll
MonoDevelop.Base.dll: $(SOURCES) $(RESOURCES)
- mcs $(MCS_OPTIONS) -target:library -out:"MonoDevelop.Base.dll" $(RESOURCES_BUILD) $(PKG_REFERENCES_BUILD) $(SYSTEM_REFERENCES_BUILD) $(SOURCES) \
+ mcs $(MCS_OPTIONS) -target:library -out:"MonoDevelop.Base.dll" $(RESOURCES_BUILD) $(PKG_REFERENCES_BUILD) $(PROJECT_REFERENCES_BUILD) $(SYSTEM_REFERENCES_BUILD) $(SOURCES) \
&& cp "MonoDevelop.Base.dll" ../../build/bin
clean:
Modified: trunk/MonoDevelop/src/Main/Base/MonoDevelop.Base.prjx
===================================================================
--- trunk/MonoDevelop/src/Main/Base/MonoDevelop.Base.prjx 2004-06-07 02:08:56 UTC (rev 1700)
+++ trunk/MonoDevelop/src/Main/Base/MonoDevelop.Base.prjx 2004-06-07 04:15:04 UTC (rev 1701)
@@ -131,9 +131,7 @@
<File name="./Gui/ErrorHandlers/GenericError.cs" subtype="Code" buildaction="Compile" dependson="" data="" />
<File name="./Gui/HtmlControl/BrowserNavigateEventArgs.cs" subtype="Code" buildaction="Compile" dependson="" data="" />
<File name="./Gui/HtmlControl/ControlType.cs" subtype="Code" buildaction="Compile" dependson="" data="" />
- <File name="./Gui/HtmlControl/GtkHtmlControl.cs" subtype="Code" buildaction="Compile" dependson="" data="" />
<File name="./Gui/HtmlControl/HtmlControl.cs" subtype="Code" buildaction="Compile" dependson="" data="" />
- <File name="./Gui/HtmlControl/IEControl.cs" subtype="Code" buildaction="Compile" dependson="" data="" />
<File name="./Gui/HtmlControl/IHTMLDocument2.cs" subtype="Code" buildaction="Compile" dependson="" data="" />
<File name="./Gui/HtmlControl/IHTMLElement.cs" subtype="Code" buildaction="Compile" dependson="" data="" />
<File name="./Gui/HtmlControl/IWebBrowser.cs" subtype="Code" buildaction="Compile" dependson="" data="" />
@@ -399,6 +397,8 @@
<Reference type="Gac" refto="monodoc, Version=1.0.0.0, Culture=neutral, PublicKeyToken=0738eb9f132ed756" localcopy="True" />
<Reference type="Gac" refto="pango-sharp, Version=1.0.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f" localcopy="True" />
<Reference type="Gac" refto="ICSharpCode.SharpZipLib, Version=0.6.0.0, Culture=neutral, PublicKeyToken=1b03e6acf1164f73" localcopy="True" />
+ <Reference type="Project" refto="MonoDevelop.Core" localcopy="True" />
+ <Reference type="Project" refto="MonoDevelop.Gui.Widgets" localcopy="True" />
</References>
<DeploymentInformation target="" script="" strategy="File" />
<Configuration runwithwarnings="False" name="Debug">
Modified: trunk/MonoDevelop/src/MonoDevelop.cmbx
===================================================================
--- trunk/MonoDevelop/src/MonoDevelop.cmbx 2004-06-07 02:08:56 UTC (rev 1700)
+++ trunk/MonoDevelop/src/MonoDevelop.cmbx 2004-06-07 04:15:04 UTC (rev 1701)
@@ -14,6 +14,7 @@
<Execute entry="ILAsmBinding" type="None" />
<Execute entry="StartPage" type="None" />
<Execute entry="Prj2MakeSharp" type="None" />
+ <Execute entry="Gdl" type="None" />
</StartMode>
<Entries>
<Entry filename="./Libraries/SharpAssembly/SharpAssembly.prjx" />
@@ -30,6 +31,7 @@
<Entry filename="./AddIns/BackendBindings/ILAsmBinding/ILAsmBinding.prjx" />
<Entry filename="./AddIns/Misc/StartPage/StartPage.prjx" />
<Entry filename="./AddIns/prj2make-sharp-lib/Prj2MakeSharp.prjx" />
+ <Entry filename="./Libraries/Gdl/Gdl.prjx" />
</Entries>
<Configurations active="Debug">
<Configuration name="Release">
@@ -47,6 +49,7 @@
<Entry name="ILAsmBinding" configurationname="Debug" build="False" />
<Entry name="StartPage" configurationname="Debug" build="False" />
<Entry name="Prj2MakeSharp" configurationname="Debug" build="False" />
+ <Entry name="Gdl" configurationname="Debug" build="False" />
</Configuration>
<Configuration name="Debug">
<Entry name="SharpAssembly" configurationname="Debug" build="False" />
@@ -63,6 +66,7 @@
<Entry name="ILAsmBinding" configurationname="Debug" build="False" />
<Entry name="StartPage" configurationname="Debug" build="False" />
<Entry name="Prj2MakeSharp" configurationname="Debug" build="False" />
+ <Entry name="Gdl" configurationname="Debug" build="False" />
</Configuration>
</Configurations>
</Combine>
\ No newline at end of file
More information about the Monodevelop-patches-list
mailing list