[Monodevelop-patches-list] r1889 - in trunk/MonoDevelop/Core: . gdldock/gdl po src/AddIns/DisplayBindings/SourceEditor src/AddIns/DisplayBindings/SourceEditor/Gui src/Libraries/MonoDevelop.Gui.Utils src/Main/Base src/Main/Base/Services

commit-watcher at mono-cvs.ximian.com commit-watcher at mono-cvs.ximian.com
Sun Jul 4 02:13:23 EDT 2004 

Author: tberman
Date: 2004-07-04 02:13:23 -0400 (Sun, 04 Jul 2004)
New Revision: 1889

Added:
   trunk/MonoDevelop/Core/gdldock/gdl/gdl-sharp.dll.config.in
   trunk/MonoDevelop/Core/src/AddIns/DisplayBindings/SourceEditor/MonoDevelop.SourceEditor.dll.config.in
   trunk/MonoDevelop/Core/src/Libraries/MonoDevelop.Gui.Utils/MonoDevelop.Gui.Utils.dll.config.in
   trunk/MonoDevelop/Core/src/Main/Base/MonoDevelop.Base.dll.config.in
Removed:
   trunk/MonoDevelop/Core/gdldock/gdl/gdl-sharp.dll.config
   trunk/MonoDevelop/Core/src/AddIns/DisplayBindings/SourceEditor/MonoDevelop.SourceEditor.dll.config
   trunk/MonoDevelop/Core/src/Libraries/MonoDevelop.Gui.Utils/MonoDevelop.Gui.Utils.dll.config
Modified:
   trunk/MonoDevelop/Core/ChangeLog
   trunk/MonoDevelop/Core/configure.in
   trunk/MonoDevelop/Core/gdldock/gdl/
   trunk/MonoDevelop/Core/gdldock/gdl/Makefile.am
   trunk/MonoDevelop/Core/po/POTFILES.in
   trunk/MonoDevelop/Core/src/AddIns/DisplayBindings/SourceEditor/
   trunk/MonoDevelop/Core/src/AddIns/DisplayBindings/SourceEditor/Gui/SourceEditorDisplayBinding.cs
   trunk/MonoDevelop/Core/src/AddIns/DisplayBindings/SourceEditor/Gui/SourceEditorView.cs
   trunk/MonoDevelop/Core/src/AddIns/DisplayBindings/SourceEditor/Makefile.am
   trunk/MonoDevelop/Core/src/Libraries/MonoDevelop.Gui.Utils/
   trunk/MonoDevelop/Core/src/Libraries/MonoDevelop.Gui.Utils/Makefile.am
   trunk/MonoDevelop/Core/src/Main/Base/
   trunk/MonoDevelop/Core/src/Main/Base/Makefile.am
   trunk/MonoDevelop/Core/src/Main/Base/Services/ResourceService.cs
Log:
fix some macosx issues, all dllmapping.


Modified: trunk/MonoDevelop/Core/ChangeLog
===================================================================
--- trunk/MonoDevelop/Core/ChangeLog	2004-07-04 04:48:06 UTC (rev 1888)
+++ trunk/MonoDevelop/Core/ChangeLog	2004-07-04 06:13:23 UTC (rev 1889)
@@ -1,3 +1,7 @@
+2004-07-04  Todd Berman  <tberman at off.net>
+
+	* *: Fixup to work on macosx OOB, at least a bit better.
+
 2004-07-03  John Luke  <jluke at cfl.rr.com>
 
 	* README: update dependency versions

Modified: trunk/MonoDevelop/Core/configure.in
===================================================================
--- trunk/MonoDevelop/Core/configure.in	2004-07-04 04:48:06 UTC (rev 1888)
+++ trunk/MonoDevelop/Core/configure.in	2004-07-04 06:13:23 UTC (rev 1889)
@@ -94,12 +94,31 @@
 AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE,"$GETTEXT_PACKAGE", [Gettext package])
 AM_GLIB_GNU_GETTEXT
 
+dnl Plateform test and LIBEXT settings
+case "x${host_os}" in
+  x)
+    LIB_PREFIX=
+    LIB_SUFFIX=
+    ;;
+  xlinux*)
+    LIB_PREFIX=.so
+    LIB_SUFFIX=
+    ;;
+  x*darwin*)
+    LIB_SUFFIX=.dylib
+    LIB_PREFIX=
+    ;;
+esac
+AC_SUBST(LIB_SUFFIX)
+AC_SUBST(LIB_PREFIX)
+
 AC_OUTPUT([
 Makefile
 gdldock/Makefile
 gdldock/gdl/Makefile
 gdldock/sources/Makefile
 gdldock/sources/gdl/Makefile
+gdldock/gdl/gdl-sharp.dll.config
 libmonodevelop/Makefile
 src/Makefile
 src/AddIns/Makefile
@@ -110,16 +129,19 @@
 src/AddIns/BackendBindings/NemerleBinding/Makefile
 src/AddIns/DisplayBindings/Makefile
 src/AddIns/DisplayBindings/SourceEditor/Makefile
+src/AddIns/DisplayBindings/SourceEditor/MonoDevelop.SourceEditor.dll.config
 src/AddIns/Misc/Makefile
 src/AddIns/Misc/StartPage/Makefile
 src/AddIns/Misc/Sonata/Makefile
 src/AddIns/DebuggerAddIn/Makefile
 src/Main/Makefile
 src/Main/Base/Makefile
+src/Main/Base/MonoDevelop.Base.dll.config
 src/Main/StartUp/Makefile
 src/Libraries/Makefile
 src/Libraries/MonoDevelop.Core/Makefile
 src/Libraries/MonoDevelop.Gui.Utils/Makefile
+src/Libraries/MonoDevelop.Gui.Utils/MonoDevelop.Gui.Utils.dll.config
 src/Libraries/MonoDevelop.Gui.Widgets/Makefile
 src/Libraries/SharpAssembly/Makefile
 src/Libraries/SharpRefactory/Makefile


Property changes on: trunk/MonoDevelop/Core/gdldock/gdl
___________________________________________________________________
Name: svn:ignore
   - generated*
Makefile
Makefile.in
gdl-sharp.dll
gdl-api.xml

   + generated*
Makefile
Makefile.in
gdl-sharp.dll
gdl-api.xml
gdl-sharp.dll.config


Modified: trunk/MonoDevelop/Core/gdldock/gdl/Makefile.am
===================================================================
--- trunk/MonoDevelop/Core/gdldock/gdl/Makefile.am	2004-07-04 04:48:06 UTC (rev 1888)
+++ trunk/MonoDevelop/Core/gdldock/gdl/Makefile.am	2004-07-04 06:13:23 UTC (rev 1889)
@@ -45,7 +45,7 @@
 clean-local:
 	rm -rf generated
 
-CLEANFILES = $(ASSEMBLY) generated-stamp $(API)
+CLEANFILES = $(ASSEMBLY) generated-stamp $(API) $(ASSEMBLY).config
 
-EXTRA_DIST = $(RAWAPI) $(METADATA) $(FILES) $(CUSTOM_FILES) $(ASSEMBLY).config
+EXTRA_DIST = $(RAWAPI) $(METADATA) $(FILES) $(CUSTOM_FILES) $(ASSEMBLY).config.in
 

Deleted: trunk/MonoDevelop/Core/gdldock/gdl/gdl-sharp.dll.config
===================================================================
--- trunk/MonoDevelop/Core/gdldock/gdl/gdl-sharp.dll.config	2004-07-04 04:48:06 UTC (rev 1888)
+++ trunk/MonoDevelop/Core/gdldock/gdl/gdl-sharp.dll.config	2004-07-04 06:13:23 UTC (rev 1889)
@@ -1,6 +0,0 @@
-<configuration>
-  <dllmap dll="libglib-2.0-0.dll" target="libglib-2.0.so.0"/>
-  <dllmap dll="libgobject-2.0-0.dll" target="libgobject-2.0.so.0"/>
-  <dllmap dll="libatk-1.0-0.dll" target="libatk-1.0.so.0"/>
-  <dllmap dll="libgtk-win32-2.0-0.dll" target="libgtk-x11-2.0.so.0"/>
-</configuration>

Added: trunk/MonoDevelop/Core/gdldock/gdl/gdl-sharp.dll.config.in
===================================================================
--- trunk/MonoDevelop/Core/gdldock/gdl/gdl-sharp.dll.config.in	2004-07-04 04:48:06 UTC (rev 1888)
+++ trunk/MonoDevelop/Core/gdldock/gdl/gdl-sharp.dll.config.in	2004-07-04 06:13:23 UTC (rev 1889)
@@ -0,0 +1,7 @@
+<configuration>
+  <dllmap dll="libglib-2.0-0.dll" target="libglib-2.0 at LIB_PREFIX@.0 at LIB_SUFFIX@"/>
+  <dllmap dll="libgobject-2.0-0.dll" target="libgobject-2.0 at LIB_PREFIX@.0 at LIB_SUFFIX@"/>
+  <dllmap dll="libatk-1.0-0.dll" target="libatk-1.0 at LIB_PREFIX@.0 at LIB_SUFFIX@"/>
+  <dllmap dll="libgtk-win32-2.0-0.dll" target="libgtk-x11-2.0 at LIB_PREFIX@.0 at LIB_SUFFIX@"/>
+  <dllmap dll="gdldock" target="libgdldock at LIB_PREFIX@@LIB_SUFFIX@"/>
+</configuration>

Modified: trunk/MonoDevelop/Core/po/POTFILES.in
===================================================================
--- trunk/MonoDevelop/Core/po/POTFILES.in	2004-07-04 04:48:06 UTC (rev 1888)
+++ trunk/MonoDevelop/Core/po/POTFILES.in	2004-07-04 06:13:23 UTC (rev 1889)
@@ -101,7 +101,7 @@
 build/AddIns/AddIns/BackendBindings/templates/EmptyProject.xpt.xml
 build/AddIns/AddIns/BackendBindings/templates/EmptyResourceFile.xft.xml
 build/AddIns/AddIns/BackendBindings/templates/EmptyTextFile.xft.xml
-build/AddIns/AddIns/BackendBindings/templates/EmptyXMLFile.xft
+build/AddIns/AddIns/BackendBindings/templates/EmptyXMLFile.xft.xml
 build/AddIns/AddIns/BackendBindings/templates/GladeSharpProject.xpt.xml
 build/AddIns/AddIns/BackendBindings/templates/GnomeSharpProgram.xft.xml
 build/AddIns/AddIns/BackendBindings/templates/GnomeSharpProject.xpt.xml


Property changes on: trunk/MonoDevelop/Core/src/AddIns/DisplayBindings/SourceEditor
___________________________________________________________________
Name: svn:ignore
   - Makefile
Makefile.in
MonoDevelop.SourceEditor.dll
AssemblyInfo.cs
SourceEditor.pidb

   + Makefile
Makefile.in
MonoDevelop.SourceEditor.dll
MonoDevelop.SourceEditor.dll.config
AssemblyInfo.cs
SourceEditor.pidb


Modified: trunk/MonoDevelop/Core/src/AddIns/DisplayBindings/SourceEditor/Gui/SourceEditorDisplayBinding.cs
===================================================================
--- trunk/MonoDevelop/Core/src/AddIns/DisplayBindings/SourceEditor/Gui/SourceEditorDisplayBinding.cs	2004-07-04 04:48:06 UTC (rev 1888)
+++ trunk/MonoDevelop/Core/src/AddIns/DisplayBindings/SourceEditor/Gui/SourceEditorDisplayBinding.cs	2004-07-04 06:13:23 UTC (rev 1889)
@@ -324,7 +324,7 @@
 		}
 		
 		// WORKAROUND until we get this method returning char in gtk#
-		[DllImport("libgtk-x11-2.0.so.0")]
+		[DllImport("libgtk-win32-2.0-0.dll")]
 		static extern char gtk_text_iter_get_char (ref Gtk.TextIter raw);
 		
 		void UpdateLineCol ()

Modified: trunk/MonoDevelop/Core/src/AddIns/DisplayBindings/SourceEditor/Gui/SourceEditorView.cs
===================================================================
--- trunk/MonoDevelop/Core/src/AddIns/DisplayBindings/SourceEditor/Gui/SourceEditorView.cs	2004-07-04 04:48:06 UTC (rev 1888)
+++ trunk/MonoDevelop/Core/src/AddIns/DisplayBindings/SourceEditor/Gui/SourceEditorView.cs	2004-07-04 06:13:23 UTC (rev 1889)
@@ -459,7 +459,7 @@
 		}
 		
 		// WORKAROUND until we get this method returning char in gtk#
-		[DllImport("libgtk-x11-2.0.so.0")]
+		[DllImport("libgtk-win32-2.0-0.dll")]
 		static extern char gtk_text_iter_get_char (ref Gtk.TextIter raw);
 		
 		void UnIndentLines (int y0, int y1)

Modified: trunk/MonoDevelop/Core/src/AddIns/DisplayBindings/SourceEditor/Makefile.am
===================================================================
--- trunk/MonoDevelop/Core/src/AddIns/DisplayBindings/SourceEditor/Makefile.am	2004-07-04 04:48:06 UTC (rev 1888)
+++ trunk/MonoDevelop/Core/src/AddIns/DisplayBindings/SourceEditor/Makefile.am	2004-07-04 06:13:23 UTC (rev 1889)
@@ -92,6 +92,6 @@
 assemblydir = $(libdir)/monodevelop/bin
 assembly_DATA = $(DLL) $(DLL).config
 
-CLEANFILES = $(DLL)
+CLEANFILES = $(DLL) $(DLL).config
 
-EXTRA_DIST = $(FILES) $(DLL).config
+EXTRA_DIST = $(FILES) $(DLL).config.in

Deleted: trunk/MonoDevelop/Core/src/AddIns/DisplayBindings/SourceEditor/MonoDevelop.SourceEditor.dll.config
===================================================================
--- trunk/MonoDevelop/Core/src/AddIns/DisplayBindings/SourceEditor/MonoDevelop.SourceEditor.dll.config	2004-07-04 04:48:06 UTC (rev 1888)
+++ trunk/MonoDevelop/Core/src/AddIns/DisplayBindings/SourceEditor/MonoDevelop.SourceEditor.dll.config	2004-07-04 06:13:23 UTC (rev 1889)
@@ -1,4 +0,0 @@
-<configuration>
-  <dllmap dll="libglib-2.0-0.dll" target="libglib-2.0.so.0"/>
-  <dllmap dll="gtksourceview-1.0" target="libgtksourceview-1.0.so.0"/>
-</configuration>

Added: trunk/MonoDevelop/Core/src/AddIns/DisplayBindings/SourceEditor/MonoDevelop.SourceEditor.dll.config.in
===================================================================
--- trunk/MonoDevelop/Core/src/AddIns/DisplayBindings/SourceEditor/MonoDevelop.SourceEditor.dll.config.in	2004-07-04 04:48:06 UTC (rev 1888)
+++ trunk/MonoDevelop/Core/src/AddIns/DisplayBindings/SourceEditor/MonoDevelop.SourceEditor.dll.config.in	2004-07-04 06:13:23 UTC (rev 1889)
@@ -0,0 +1,5 @@
+<configuration>
+  <dllmap dll="libglib-2.0-0.dll" target="libglib-2.0 at LIB_PREFIX@.0 at LIB_SUFFIX@" />
+  <dllmap dll="gtksourceview-1.0" target="libgtksourceview-1.0 at LIB_PREFIX@.0 at LIB_SUFFIX@" />
+  <dllmap dll="libgtk-win32-2.0-0.dll" target="libgtk-x11-2.0 at LIB_PREFIX@.0 at LIB_SUFFIX@" />
+</configuration>


Property changes on: trunk/MonoDevelop/Core/src/Libraries/MonoDevelop.Gui.Utils
___________________________________________________________________
Name: svn:ignore
   - Makefile
Makefile.in
MonoDevelop.Gui.Utils.dll
AssemblyInfo.cs
MonoDevelop.Gui.Utils.pidb

   + Makefile
Makefile.in
MonoDevelop.Gui.Utils.dll
MonoDevelop.Gui.Utils.dll.config
AssemblyInfo.cs
MonoDevelop.Gui.Utils.pidb


Modified: trunk/MonoDevelop/Core/src/Libraries/MonoDevelop.Gui.Utils/Makefile.am
===================================================================
--- trunk/MonoDevelop/Core/src/Libraries/MonoDevelop.Gui.Utils/Makefile.am	2004-07-04 04:48:06 UTC (rev 1888)
+++ trunk/MonoDevelop/Core/src/Libraries/MonoDevelop.Gui.Utils/Makefile.am	2004-07-04 06:13:23 UTC (rev 1889)
@@ -26,7 +26,7 @@
 assemblydir = $(libdir)/monodevelop/bin
 assembly_DATA = $(DLL) $(DLL).config
 
-CLEANFILES=$(DLL)
+CLEANFILES=$(DLL) $(DLL).config
 
-EXTRA_DIST = $(FILES) $(DLL).config
+EXTRA_DIST = $(FILES) $(DLL).config.in
 

Deleted: trunk/MonoDevelop/Core/src/Libraries/MonoDevelop.Gui.Utils/MonoDevelop.Gui.Utils.dll.config
===================================================================
--- trunk/MonoDevelop/Core/src/Libraries/MonoDevelop.Gui.Utils/MonoDevelop.Gui.Utils.dll.config	2004-07-04 04:48:06 UTC (rev 1888)
+++ trunk/MonoDevelop/Core/src/Libraries/MonoDevelop.Gui.Utils/MonoDevelop.Gui.Utils.dll.config	2004-07-04 06:13:23 UTC (rev 1889)
@@ -1,4 +0,0 @@
-<configuration>
-	<dllmap dll="libgtk-2.0-0.dll" target="libgtk-x11-2.so.0"/> 
-	<dllmap dll="gnomevfs-2" target="libgnomevfs-2.so.0"/> 
-</configuration>

Added: trunk/MonoDevelop/Core/src/Libraries/MonoDevelop.Gui.Utils/MonoDevelop.Gui.Utils.dll.config.in
===================================================================
--- trunk/MonoDevelop/Core/src/Libraries/MonoDevelop.Gui.Utils/MonoDevelop.Gui.Utils.dll.config.in	2004-07-04 04:48:06 UTC (rev 1888)
+++ trunk/MonoDevelop/Core/src/Libraries/MonoDevelop.Gui.Utils/MonoDevelop.Gui.Utils.dll.config.in	2004-07-04 06:13:23 UTC (rev 1889)
@@ -0,0 +1,4 @@
+<configuration>
+	<dllmap dll="libgtk-2.0-0.dll" target="libgtk-x11-2.0 at LIB_PREFIX@.0 at LIB_SUFFIX@" />
+	<dllmap dll="gnomevfs-2" target="libgnomevfs-2 at LIB_PREFIX@.0 at LIB_SUFFIX@"/>
+</configuration>


Property changes on: trunk/MonoDevelop/Core/src/Main/Base
___________________________________________________________________
Name: svn:ignore
   - Makefile
Makefile.in
MonoDevelop.Base.dll
AssemblyInfo.cs
MonoDevelop.Base.pidb

   + Makefile
Makefile.in
MonoDevelop.Base.dll
MonoDevelop.Base.dll.config
AssemblyInfo.cs
MonoDevelop.Base.pidb


Modified: trunk/MonoDevelop/Core/src/Main/Base/Makefile.am
===================================================================
--- trunk/MonoDevelop/Core/src/Main/Base/Makefile.am	2004-07-04 04:48:06 UTC (rev 1888)
+++ trunk/MonoDevelop/Core/src/Main/Base/Makefile.am	2004-07-04 06:13:23 UTC (rev 1889)
@@ -381,7 +381,8 @@
 		/resource:$(srcdir)/../../../data/resources/glade/Base.glade,Base.glade \
 		$(monodoc_libflags) \
 		$(build_sources) \
-	&& cp $(ASSEMBLY) ../../../build/bin/.
+	&& cp $(ASSEMBLY) ../../../build/bin/. \
+	&& cp $(ASSEMBLY).config ../../../build/bin/.
 
 Services/StockIcons.cs : ./Services/process-icons.pl ../../../build/data/resources/icons
 	perl  -x$(srcdir)/../../../build/data/resources/icons -w $(srcdir)/./Services/process-icons.pl > $(srcdir)/Services/StockIcons.cs
@@ -389,7 +390,7 @@
 assemblydir = $(libdir)/monodevelop/bin
 assembly_DATA = $(ASSEMBLY)
 
-CLEANFILES = $(ASSEMBLY)
+CLEANFILES = $(ASSEMBLY) $(ASSEMBLY).config
 
-EXTRA_DIST = $(FILES) ./Services/process-icons.pl
+EXTRA_DIST = $(FILES) ./Services/process-icons.pl $(ASSEMBLY).config.in
 

Added: trunk/MonoDevelop/Core/src/Main/Base/MonoDevelop.Base.dll.config.in
===================================================================
--- trunk/MonoDevelop/Core/src/Main/Base/MonoDevelop.Base.dll.config.in	2004-07-04 04:48:06 UTC (rev 1888)
+++ trunk/MonoDevelop/Core/src/Main/Base/MonoDevelop.Base.dll.config.in	2004-07-04 06:13:23 UTC (rev 1889)
@@ -0,0 +1,3 @@
+<configuration>
+	<dllmap dll="libgtk-win32-2.0-0.dll" target="libgtk-x11-2.0 at LIB_PREFIX@.0 at LIB_SUFFIX@" />
+</configuration>

Modified: trunk/MonoDevelop/Core/src/Main/Base/Services/ResourceService.cs
===================================================================
--- trunk/MonoDevelop/Core/src/Main/Base/Services/ResourceService.cs	2004-07-04 04:48:06 UTC (rev 1888)
+++ trunk/MonoDevelop/Core/src/Main/Base/Services/ResourceService.cs	2004-07-04 06:13:23 UTC (rev 1889)
@@ -119,7 +119,7 @@
 		}
 		
 		// use P/Invoke to be able to pass some NULL parameters
-		[DllImport("libgtk-x11-2.0.so.0")]
+		[DllImport("libgtk-win32-2.0-0.dll")]
 		static extern IntPtr
 		gtk_icon_set_render_icon (IntPtr raw, IntPtr style, int direction,
 		                          int state, int size, IntPtr widget,

More information about the Monodevelop-patches-list mailing list