[Monodevelop-patches-list] r1507 - in trunk/MonoDevelop: . src/AddIns/BackendBindings/CSharpBinding src/AddIns/BackendBindings/ILAsmBinding src/AddIns/BackendBindings/JavaBinding src/AddIns/BackendBindings/NemerleBinding src/AddIns/DebuggerAddIn src/AddIns/DisplayBindings/SourceEditor src/AddIns/DisplayBindings/SourceEditor/Gui src/AddIns/Misc/StartPage src/AddIns/Nunit src/Libraries/MonoDevelop.Core src/Libraries/MonoDevelop.Gui.Utils src/Libraries/MonoDevelop.Gui.Widgets src/Main/Base src/Main/StartUp
commit-watcher at mono-cvs.ximian.com
commit-watcher at mono-cvs.ximian.com
Mon Apr 26 00:07:49 EDT 2004
Author: tberman
Date: 2004-04-26 00:07:49 -0400 (Mon, 26 Apr 2004)
New Revision: 1507
Modified:
trunk/MonoDevelop/configure.in
trunk/MonoDevelop/src/AddIns/BackendBindings/CSharpBinding/Makefile.am
trunk/MonoDevelop/src/AddIns/BackendBindings/ILAsmBinding/Makefile.am
trunk/MonoDevelop/src/AddIns/BackendBindings/JavaBinding/Makefile.am
trunk/MonoDevelop/src/AddIns/BackendBindings/NemerleBinding/Makefile.am
trunk/MonoDevelop/src/AddIns/DebuggerAddIn/Makefile.am
trunk/MonoDevelop/src/AddIns/DisplayBindings/SourceEditor/Gui/SourceEditorView.cs
trunk/MonoDevelop/src/AddIns/DisplayBindings/SourceEditor/Makefile.am
trunk/MonoDevelop/src/AddIns/Misc/StartPage/Makefile.am
trunk/MonoDevelop/src/AddIns/Nunit/Makefile.am
trunk/MonoDevelop/src/Libraries/MonoDevelop.Core/Makefile.am
trunk/MonoDevelop/src/Libraries/MonoDevelop.Gui.Utils/Makefile.am
trunk/MonoDevelop/src/Libraries/MonoDevelop.Gui.Widgets/Makefile.am
trunk/MonoDevelop/src/Main/Base/Makefile.am
trunk/MonoDevelop/src/Main/StartUp/Makefile.am
Log:
use proper lib values from pkg-config, and return to the days of verbose building, we no longer hide the mcs commandline we use to build. (why the hell did we ever do that anyway?)
Modified: trunk/MonoDevelop/configure.in
===================================================================
--- trunk/MonoDevelop/configure.in 2004-04-26 03:46:19 UTC (rev 1506)
+++ trunk/MonoDevelop/configure.in 2004-04-26 04:07:49 UTC (rev 1507)
@@ -42,6 +42,7 @@
glade-sharp >= $GTKSHARP_REQUIRED_VERSION
gconf-sharp >= $GTKSHARP_REQUIRED_VERSION
gnome-sharp >= $GTKSHARP_REQUIRED_VERSION
+gtkhtml-sharp >= $GTKSHARP_REQUIRED_VERSION
gtksourceview-1.0 >= $GTKSOURCEVIEW_REQUIRED_VERSION
gtksourceview-sharp >= $GTKSOURCEVIEWSHARP_REQUIRED_VERSION
gecko-sharp >= $GECKOSHARP_REQUIRED_VERSION
@@ -56,6 +57,16 @@
AC_SUBST(GECKO_SHARP)
MONODOC="`pkg-config --libs monodoc`"
AC_SUBST(MONODOC)
+GTKSHARP="`pkg-config --libs gtk-sharp`"
+AC_SUBST(GTKSHARP)
+GLADESHARP="`pkg-config --libs glade-sharp`"
+AC_SUBST(GLADESHARP)
+GNOMESHARP="`pkg-config --libs gnome-sharp`"
+AC_SUBST(GNOMESHARP)
+GCONFSHARP="`pkg-config --libs gconf-sharp`"
+AC_SUBST(GCONFSHARP)
+GTKHTMLSHARP="`pkg-config --libs gtkhtml-sharp`"
+AC_SUBST(GTKHTMLSHARP)
dnl GdlDock requirements and configuration
GTK_REQUIRED=2.2.0
Modified: trunk/MonoDevelop/src/AddIns/BackendBindings/CSharpBinding/Makefile.am
===================================================================
--- trunk/MonoDevelop/src/AddIns/BackendBindings/CSharpBinding/Makefile.am 2004-04-26 03:46:19 UTC (rev 1506)
+++ trunk/MonoDevelop/src/AddIns/BackendBindings/CSharpBinding/Makefile.am 2004-04-26 04:07:49 UTC (rev 1507)
@@ -7,9 +7,8 @@
/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 \
- /r:glib-sharp \
+ @GTKSHARP@ \
+ @GLADESHARP@ \
$(GTKSOURCEVIEW_SHARP)
FILES = \
@@ -45,7 +44,7 @@
all: $(ASSEMBLY)
$(ASSEMBLY): $(build_sources)
- @ $(CSC) /out:$(ASSEMBLY) /target:library $(DLLS) \
+ $(CSC) /out:$(ASSEMBLY) /target:library $(DLLS) \
/resource:$(srcdir)/../../../../data/resources/glade/CSharp.glade,CSharp.glade \
$(build_sources) \
&& cp $(ASSEMBLY) ../../../../build/AddIns/AddIns/BackendBindings/.
Modified: trunk/MonoDevelop/src/AddIns/BackendBindings/ILAsmBinding/Makefile.am
===================================================================
--- trunk/MonoDevelop/src/AddIns/BackendBindings/ILAsmBinding/Makefile.am 2004-04-26 03:46:19 UTC (rev 1506)
+++ trunk/MonoDevelop/src/AddIns/BackendBindings/ILAsmBinding/Makefile.am 2004-04-26 04:07:49 UTC (rev 1507)
@@ -6,7 +6,7 @@
/r:../../../../build/bin/MonoDevelop.Base.dll \
/r:../../../../build/bin/MonoDevelop.SourceEditor.dll \
/r:../../../../build/bin/MonoDevelop.Gui.Widgets.dll \
- /r:gtk-sharp.dll
+ @GTKSHARP@
FILES = \
./Gui/CompilerParametersPanel.cs \
Modified: trunk/MonoDevelop/src/AddIns/BackendBindings/JavaBinding/Makefile.am
===================================================================
--- trunk/MonoDevelop/src/AddIns/BackendBindings/JavaBinding/Makefile.am 2004-04-26 03:46:19 UTC (rev 1506)
+++ trunk/MonoDevelop/src/AddIns/BackendBindings/JavaBinding/Makefile.am 2004-04-26 04:07:49 UTC (rev 1507)
@@ -7,7 +7,7 @@
/r:../../../../build/bin/MonoDevelop.SourceEditor.dll \
/r:../../../../build/bin/MonoDevelop.Base.dll \
/r:../../../../build/bin/MonoDevelop.Gui.Widgets.dll \
- /r:gtk-sharp.dll
+ @GTKSHARP@
FILES = ./Gui/ProjectConfigurationPropertyPanel.cs \
./Project/JavaCompilerParameters.cs \
Modified: trunk/MonoDevelop/src/AddIns/BackendBindings/NemerleBinding/Makefile.am
===================================================================
--- trunk/MonoDevelop/src/AddIns/BackendBindings/NemerleBinding/Makefile.am 2004-04-26 03:46:19 UTC (rev 1506)
+++ trunk/MonoDevelop/src/AddIns/BackendBindings/NemerleBinding/Makefile.am 2004-04-26 04:07:49 UTC (rev 1507)
@@ -8,8 +8,8 @@
/r:../../../../build/bin/MonoDevelop.Base.dll \
/r:../../../../build/bin/ICSharpCode.SharpRefactory.dll \
/r:../../../../build/bin/MonoDevelop.Gui.Widgets.dll \
- /r:gtk-sharp.dll \
- /r:glade-sharp.dll
+ @GTKSHARP@ \
+ @GLADESHARP@
FILES = \
./Gui/CodeGenerationPanel.cs \
Modified: trunk/MonoDevelop/src/AddIns/DebuggerAddIn/Makefile.am
===================================================================
--- trunk/MonoDevelop/src/AddIns/DebuggerAddIn/Makefile.am 2004-04-26 03:46:19 UTC (rev 1506)
+++ trunk/MonoDevelop/src/AddIns/DebuggerAddIn/Makefile.am 2004-04-26 04:07:49 UTC (rev 1507)
@@ -3,7 +3,7 @@
ASSEMBLY = MonoDevelop.Debugger.dll
ADDIN = $(srcdir)/MonoDevelopDebugger.addin.xml
-DLLS = /r:gtk-sharp /r:glib-sharp \
+DLLS = @GTKSHARP@ \
/r:$(debugger_prefix)/lib/Mono.Debugger.dll \
/r:../../../build/bin/MonoDevelop.Base.dll \
/r:../../../build/bin/MonoDevelop.Core.dll
Modified: trunk/MonoDevelop/src/AddIns/DisplayBindings/SourceEditor/Gui/SourceEditorView.cs
===================================================================
--- trunk/MonoDevelop/src/AddIns/DisplayBindings/SourceEditor/Gui/SourceEditorView.cs 2004-04-26 03:46:19 UTC (rev 1506)
+++ trunk/MonoDevelop/src/AddIns/DisplayBindings/SourceEditor/Gui/SourceEditorView.cs 2004-04-26 04:07:49 UTC (rev 1507)
@@ -1,5 +1,6 @@
using Gtk;
using Gdk;
+using Global = Gtk.Global;
using System;
using System.IO;
@@ -136,7 +137,7 @@
public void SimulateKeyPress (ref Gdk.EventKey evnt)
{
- Gtk.Global.PropagateEvent (this, evnt);
+ Global.PropagateEvent (this, evnt);
}
void DeleteLine ()
Modified: trunk/MonoDevelop/src/AddIns/DisplayBindings/SourceEditor/Makefile.am
===================================================================
--- trunk/MonoDevelop/src/AddIns/DisplayBindings/SourceEditor/Makefile.am 2004-04-26 03:46:19 UTC (rev 1506)
+++ trunk/MonoDevelop/src/AddIns/DisplayBindings/SourceEditor/Makefile.am 2004-04-26 04:07:49 UTC (rev 1507)
@@ -78,13 +78,15 @@
mcs $(build_sources) /debug /out:$(DLL) /t:library \
/resource:$(srcdir)/../../../../data/resources/glade/EditorBindings.glade,EditorBindings.glade \
/resource:$(srcdir)/../../../../data/resources/glade/texteditoraddin.glade,texteditoraddin.glade \
- /r:gtk-sharp /r:gdk-sharp $(GTKSOURCEVIEW_SHARP) /r:glib-sharp \
/r:../../../../build/bin/MonoDevelop.Core.dll \
/r:../../../../build/bin/MonoDevelop.Base.dll \
/r:../../../../build/bin/MonoDevelop.Gui.Utils.dll \
/r:../../../../build/bin/MonoDevelop.Gui.Widgets.dll \
- /r:pango-sharp /r:gnome-sharp /r:glade-sharp \
- /r:gconf-sharp \
+ @GTKSHARP@ \
+ @GLADESHARP@ \
+ @GNOMESHARP@ \
+ @GCONFSHARP@ \
+ $(GTKSOURCEVIEW_SHARP) \
/r:System.Drawing \
&& cp $(DLL) ../../../../build/bin/.
Modified: trunk/MonoDevelop/src/AddIns/Misc/StartPage/Makefile.am
===================================================================
--- trunk/MonoDevelop/src/AddIns/Misc/StartPage/Makefile.am 2004-04-26 03:46:19 UTC (rev 1506)
+++ trunk/MonoDevelop/src/AddIns/Misc/StartPage/Makefile.am 2004-04-26 04:07:49 UTC (rev 1507)
@@ -11,11 +11,11 @@
all: $(DLL)
$(DLL): $(build_sources)
- @ mcs /debug /out:$(DLL) /target:library /r:System.Drawing \
+ mcs /debug /out:$(DLL) /target:library /r:System.Drawing \
/r:../../../../build/bin/MonoDevelop.Core.dll \
/r:../../../../build/bin/MonoDevelop.Base.dll \
@GECKO_SHARP@ \
- /r:gtk-sharp \
+ @GTKSHARP@ \
$(build_sources) \
&& cp $(DLL) ../../../../build/AddIns/AddIns/Misc/StartPage/.
Modified: trunk/MonoDevelop/src/AddIns/Nunit/Makefile.am
===================================================================
--- trunk/MonoDevelop/src/AddIns/Nunit/Makefile.am 2004-04-26 03:46:19 UTC (rev 1506)
+++ trunk/MonoDevelop/src/AddIns/Nunit/Makefile.am 2004-04-26 04:07:49 UTC (rev 1507)
@@ -4,7 +4,7 @@
ADDIN = $(srcdir)/MonoDevelopNunit.addin.xml
DLLS = /r:NUnit.Framework.dll \
- /r:gtk-sharp.dll /r:glib-sharp.dll /r:gdk-sharp.dll \
+ @GTKSHARP@ \
/r:../../../build/bin/MonoDevelop.Core.dll \
/r:../../../build/bin/MonoDevelop.Base.dll
Modified: trunk/MonoDevelop/src/Libraries/MonoDevelop.Core/Makefile.am
===================================================================
--- trunk/MonoDevelop/src/Libraries/MonoDevelop.Core/Makefile.am 2004-04-26 03:46:19 UTC (rev 1506)
+++ trunk/MonoDevelop/src/Libraries/MonoDevelop.Core/Makefile.am 2004-04-26 04:07:49 UTC (rev 1507)
@@ -66,7 +66,7 @@
all: $(DLL)
$(DLL): $(build_sources)
- @ mcs /debug /out:$(DLL) /target:library /r:System.Drawing.dll /define:LINUX /resource:$(srcdir)/../../../data/resources/AddIn.xsd,AddIn.xsd \
+ mcs /debug /out:$(DLL) /target:library /r:System.Drawing.dll /define:LINUX /resource:$(srcdir)/../../../data/resources/AddIn.xsd,AddIn.xsd \
$(build_sources) && cp $(DLL) ../../../build/bin/.
assemblydir = $(libdir)/monodevelop/bin
Modified: trunk/MonoDevelop/src/Libraries/MonoDevelop.Gui.Utils/Makefile.am
===================================================================
--- trunk/MonoDevelop/src/Libraries/MonoDevelop.Gui.Utils/Makefile.am 2004-04-26 03:46:19 UTC (rev 1506)
+++ trunk/MonoDevelop/src/Libraries/MonoDevelop.Gui.Utils/Makefile.am 2004-04-26 04:07:49 UTC (rev 1507)
@@ -17,12 +17,12 @@
all: $(DLL)
$(DLL): $(build_sources)
- @ mcs /debug /out:$(DLL) /target:library $(REFERENCES) $(build_sources) \
+ mcs /debug /out:$(DLL) /target:library $(REFERENCES) $(build_sources) \
&& cp $(DLL) ../../../build/bin/.
assemblydir = $(libdir)/monodevelop/bin
assembly_DATA = $(DLL)
-
+
CLEANFILES=$(DLL)
EXTRA_DIST = $(FILES)
Modified: trunk/MonoDevelop/src/Libraries/MonoDevelop.Gui.Widgets/Makefile.am
===================================================================
--- trunk/MonoDevelop/src/Libraries/MonoDevelop.Gui.Widgets/Makefile.am 2004-04-26 03:46:19 UTC (rev 1506)
+++ trunk/MonoDevelop/src/Libraries/MonoDevelop.Gui.Widgets/Makefile.am 2004-04-26 04:07:49 UTC (rev 1507)
@@ -3,7 +3,7 @@
DLL = MonoDevelop.Gui.Widgets.dll
-REFERENCES = /r:System.Drawing /r:gtk-sharp /r:gdk-sharp /r:pango-sharp /r:gnome-sharp /r:glib-sharp /r:glade-sharp /r:../../../build/bin/MonoDevelop.Core.dll /r:../../../build/bin/MonoDevelop.Gui.Utils.dll
+REFERENCES = /r:System.Drawing @GTKSHARP@ @GNOMESHARP@ @GLADESHARP@ /r:../../../build/bin/MonoDevelop.Core.dll /r:../../../build/bin/MonoDevelop.Gui.Utils.dll
FILES = ./Tree/TreeView.cs \
./Tree/TreeNodeCollection.cs \
@@ -26,7 +26,7 @@
all: $(DLL)
$(DLL): $(build_sources)
- @ $(MCS) /debug /out:$(DLL) /target:library $(REFERENCES) $(build_sources) \
+ $(MCS) /debug /out:$(DLL) /target:library $(REFERENCES) $(build_sources) \
&& cp $(DLL) ../../../build/bin/.
assemblydir = $(libdir)/monodevelop/bin
Modified: trunk/MonoDevelop/src/Main/Base/Makefile.am
===================================================================
--- trunk/MonoDevelop/src/Main/Base/Makefile.am 2004-04-26 03:46:19 UTC (rev 1506)
+++ trunk/MonoDevelop/src/Main/Base/Makefile.am 2004-04-26 04:07:49 UTC (rev 1507)
@@ -8,9 +8,11 @@
/r:../../../build/bin/MonoDevelop.Gui.Utils.dll \
/r:../../../build/bin/MonoDevelop.Gui.Widgets.dll \
/r:System.Data /r:System.Web.Services \
- /r:gtk-sharp /r:gdk-sharp /r:glib-sharp /r:pango-sharp \
+ @GTKSHARP@ \
/r:../../../build/bin/gdl-sharp.dll \
- /r:glade-sharp /r:gnome-sharp /r:gtkhtml-sharp \
+ @GLADESHARP@ \
+ @GNOMESHARP@ \
+ @GTKHTMLSHARP@ \
$(GECKO_SHARP) $(MONODOC)
FILES= \
@@ -375,7 +377,7 @@
all: $(ASSEMBLY)
$(ASSEMBLY): $(build_sources) ../../../data/resources/glade/Base.glade
- @ $(CSC) -codepage:utf8 /out:$(ASSEMBLY) /target:library $(DLLS) \
+ $(CSC) -codepage:utf8 /out:$(ASSEMBLY) /target:library $(DLLS) \
/resource:$(srcdir)/../../../data/resources/glade/Base.glade,Base.glade \
$(monodoc_libflags) \
$(build_sources) \
Modified: trunk/MonoDevelop/src/Main/StartUp/Makefile.am
===================================================================
--- trunk/MonoDevelop/src/Main/StartUp/Makefile.am 2004-04-26 03:46:19 UTC (rev 1506)
+++ trunk/MonoDevelop/src/Main/StartUp/Makefile.am 2004-04-26 04:07:49 UTC (rev 1507)
@@ -13,12 +13,12 @@
all: $(DLL)
$(DLL): $(build_sources)
- @ mcs /debug /out:$(DLL) /r:System.Drawing \
+ mcs /debug /out:$(DLL) /r:System.Drawing \
/r:../../../build/bin/MonoDevelop.Core.dll \
/r:../../../build/bin/MonoDevelop.Base.dll \
- /r:glib-sharp \
- /define:GTK /r:gtk-sharp /r:gdk-sharp \
- /r:gnome-sharp \
+ /define:GTK \
+ @GTKSHARP@ \
+ @GNOMESHARP@ \
$(build_sources) \
/resource:$(BASEDIR)/data/resources/StringResources.resources,StringResources.resources \
/resource:$(BASEDIR)/data/resources/SplashScreen.png,SplashScreen.png \
More information about the Monodevelop-patches-list
mailing list