[Monodevelop-patches-list] r2623 - in trunk/MonoDevelop: . Core/src/MonoDevelop.Base Core/src/MonoDevelop.Base/Internal/Project/Combine

[John Luke <jluke@cfl.rr.com>]

Author: jluke
Date: 2005-07-08 16:42:34 -0400 (Fri, 08 Jul 2005)
New Revision: 2623

Modified:
   trunk/MonoDevelop/ChangeLog
   trunk/MonoDevelop/Core/src/MonoDevelop.Base/ChangeLog
   trunk/MonoDevelop/Core/src/MonoDevelop.Base/Internal/Project/Combine/Combine.cs
   trunk/MonoDevelop/Core/src/MonoDevelop.Base/Makefile.am
   trunk/MonoDevelop/README
   trunk/MonoDevelop/configure.in
Log:
update what the deps are
and remove no longer needed Mono.Posix conditional stuff


Modified: trunk/MonoDevelop/ChangeLog
===================================================================
--- trunk/MonoDevelop/ChangeLog	2005-07-08 03:31:24 UTC (rev 2622)
+++ trunk/MonoDevelop/ChangeLog	2005-07-08 20:42:34 UTC (rev 2623)
@@ -1,3 +1,10 @@
+2005-07-08  John Luke  <john.luke at gmail.com>
+
+	* configure.in: update mono dep to >= 1.1.4
+	for various reasons and remove the MONO_POSIX_OEE
+	check
+	* README: update deps
+
 2005-06-28  John Luke  <john.luke at gmail.com>
 
 	* *.mdp:

Modified: trunk/MonoDevelop/Core/src/MonoDevelop.Base/ChangeLog
===================================================================
--- trunk/MonoDevelop/Core/src/MonoDevelop.Base/ChangeLog	2005-07-08 03:31:24 UTC (rev 2622)
+++ trunk/MonoDevelop/Core/src/MonoDevelop.Base/ChangeLog	2005-07-08 20:42:34 UTC (rev 2623)
@@ -1,3 +1,8 @@
+2005-07-08  John Luke  <john.luke at gmail.com>
+
+	* Makefile.am: remove MONO_POSIX_OEE defines
+	* Internal/Project/Combine/Combine.cs: just use Mono.Unix now
+	
 2005-07-01  Joshua Tauberer  <tauberer at for.net>
 
 	* Internal/Project/Project/Project.cs: Pre/Post build tasks

Modified: trunk/MonoDevelop/Core/src/MonoDevelop.Base/Internal/Project/Combine/Combine.cs
===================================================================
--- trunk/MonoDevelop/Core/src/MonoDevelop.Base/Internal/Project/Combine/Combine.cs	2005-07-08 03:31:24 UTC (rev 2622)
+++ trunk/MonoDevelop/Core/src/MonoDevelop.Base/Internal/Project/Combine/Combine.cs	2005-07-08 20:42:34 UTC (rev 2623)
@@ -15,13 +15,8 @@
 using System.CodeDom.Compiler;
 using System.ComponentModel;
 
-#if MONO_POSIX_OEE
 using Mono.Unix;
 using FileMode = Mono.Unix.FilePermissions;
-#else
-using Mono.Posix;
-using FileMode = Mono.Posix.FileMode;
-#endif
 
 using MonoDevelop.Core.Services;
 

Modified: trunk/MonoDevelop/Core/src/MonoDevelop.Base/Makefile.am
===================================================================
--- trunk/MonoDevelop/Core/src/MonoDevelop.Base/Makefile.am	2005-07-08 03:31:24 UTC (rev 2622)
+++ trunk/MonoDevelop/Core/src/MonoDevelop.Base/Makefile.am	2005-07-08 20:42:34 UTC (rev 2623)
@@ -525,7 +525,7 @@
 	$(PERL) -x$(srcdir)/../../../build/data/resources/icons -w $(srcdir)/Services/process-icons.pl > Services/StockIcons.cs
 
 $(ASSEMBLY): $(build_sources) $(srcdir)/Base.glade Services/StockIcons.cs
-	$(CSC) $(CSC_FLAGS) $(MONO_POSIX_OEE) -codepage:utf8 -out:$@ -target:library $(DLLS) \
+	$(CSC) $(CSC_FLAGS) -codepage:utf8 -out:$@ -target:library $(DLLS) \
 		-resource:$(srcdir)/Base.glade,Base.glade \
 		$(monodoc_libflags) $(build_sources) Services/StockIcons.cs
 

Modified: trunk/MonoDevelop/README
===================================================================
--- trunk/MonoDevelop/README	2005-07-08 03:31:24 UTC (rev 2622)
+++ trunk/MonoDevelop/README	2005-07-08 20:42:34 UTC (rev 2623)
@@ -36,12 +36,12 @@
 
 Dependencies
 ------------
-Mono >= 1.0
-Gtk# >= 1.9.3
+Mono >= 1.1.4
+Gtk# >= 1.9.5
 monodoc >= 1.0
 gtksourceview >= 1.0
-gecko-sharp >= 0.7
-gtksourceview-sharp >= 0.7
+gecko-sharp >= 0.10
+gtksourceview-sharp >= 0.10
 
 References
 ----------

Modified: trunk/MonoDevelop/configure.in
===================================================================
--- trunk/MonoDevelop/configure.in	2005-07-08 03:31:24 UTC (rev 2622)
+++ trunk/MonoDevelop/configure.in	2005-07-08 20:42:34 UTC (rev 2623)
@@ -36,10 +36,9 @@
         AC_MSG_ERROR([You need to install pkg-config])
 fi
 
-MONO_REQUIRED_VERSION=1.0
+MONO_REQUIRED_VERSION=1.1.4
 PKG_CHECK_MODULES(UNMANAGED_DEPENDENCIES_MONO,mono >= $MONO_REQUIRED_VERSION, has_mono=true, has_mono=false)
 PKG_CHECK_MODULES(UNMANAGED_DEPENDENCIES_MINT,mint >= $MONO_REQUIRED_VERSION, has_mint=true, has_mint=false)
-PKG_CHECK_MODULES(OEE_CHECK,mono >= 1.1.2.99, MONO_POSIX_OEE=-d:MONO_POSIX_OEE, MONO_POSIX_OEE=)
 
 if test "x$has_mono" = "xtrue"; then
     if test `uname -s` = "Darwin"; then
@@ -164,7 +163,6 @@
 AC_SUBST(LIB_SUFFIX)
 AC_SUBST(LIB_PREFIX)
 AC_SUBST(ASSEMBLY_VERSION)
-AC_SUBST(MONO_POSIX_OEE)
 AC_SUBST(SQLITE_XML)
 AC_SUBST(CSC_FLAGS)