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

[commit-watcher at mono-cvs.ximian.com]

Author: tberman
Date: 2004-11-11 15:07:48 -0500 (Thu, 11 Nov 2004)
New Revision: 2024

Modified:
   trunk/MonoDevelop/Core/ChangeLog
   trunk/MonoDevelop/Core/configure.in
   trunk/MonoDevelop/Core/src/Main/Base/ChangeLog
   trunk/MonoDevelop/Core/src/Main/Base/Internal/Project/Combine/Combine.cs
   trunk/MonoDevelop/Core/src/Main/Base/Makefile.am
Log:
2004-11-11  Todd Berman  <tberman at off.net>

	* src/Main/Base/Makefile.am: Add $(MONO_POSIX_OEE)
	* src/Main/Base/Internal/Project/Combine/Combine.cs: #ifdef around
	FileMode using. This should fix cvs HEAD users.

2004-11-11  Todd Berman  <tberman at off.net>

	* configure.in: Check for OEE Mono.Posix



Modified: trunk/MonoDevelop/Core/ChangeLog
===================================================================
--- trunk/MonoDevelop/Core/ChangeLog	2004-11-10 18:03:32 UTC (rev 2023)
+++ trunk/MonoDevelop/Core/ChangeLog	2004-11-11 20:07:48 UTC (rev 2024)
@@ -1,3 +1,7 @@
+2004-11-11  Todd Berman  <tberman at off.net>
+
+	* configure.in: Check for OEE Mono.Posix
+
 2004-11-05  Levi Bard  <taktaktaktaktaktaktaktaktaktak at gmail.com>
 
 	* *: Large changeset, adds project management, compilation, and

Modified: trunk/MonoDevelop/Core/configure.in
===================================================================
--- trunk/MonoDevelop/Core/configure.in	2004-11-10 18:03:32 UTC (rev 2023)
+++ trunk/MonoDevelop/Core/configure.in	2004-11-11 20:07:48 UTC (rev 2024)
@@ -43,6 +43,7 @@
 MONO_REQUIRED_VERSION=1.0
 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
@@ -142,6 +143,7 @@
 AC_SUBST(LIB_SUFFIX)
 AC_SUBST(LIB_PREFIX)
 AC_SUBST(ASSEMBLY_VERSION)
+AC_SUBST(MONO_POSIX_OEE)
 
 AC_OUTPUT([
 Makefile

Modified: trunk/MonoDevelop/Core/src/Main/Base/ChangeLog
===================================================================
--- trunk/MonoDevelop/Core/src/Main/Base/ChangeLog	2004-11-10 18:03:32 UTC (rev 2023)
+++ trunk/MonoDevelop/Core/src/Main/Base/ChangeLog	2004-11-11 20:07:48 UTC (rev 2024)
@@ -1,3 +1,9 @@
+2004-11-11  Todd Berman  <tberman at off.net>
+
+	* src/Main/Base/Makefile.am: Add $(MONO_POSIX_OEE)
+	* src/Main/Base/Internal/Project/Combine/Combine.cs: #ifdef around
+	FileMode using. This should fix cvs HEAD users.
+
 2004-11-05  Levi Bard  <taktaktaktaktaktaktaktaktaktak at gmail.com>
 
 	* src/Main/Base/Internal/Parser/IParser.cs: Added

Modified: trunk/MonoDevelop/Core/src/Main/Base/Internal/Project/Combine/Combine.cs
===================================================================
--- trunk/MonoDevelop/Core/src/Main/Base/Internal/Project/Combine/Combine.cs	2004-11-10 18:03:32 UTC (rev 2023)
+++ trunk/MonoDevelop/Core/src/Main/Base/Internal/Project/Combine/Combine.cs	2004-11-11 20:07:48 UTC (rev 2024)
@@ -16,7 +16,11 @@
 using System.ComponentModel;
 
 using Mono.Posix;
+#if MONO_POSIX_OEE
+using FileMode = Mono.Posix.FilePermissions;
+#else
 using FileMode = Mono.Posix.FileMode;
+#endif
 
 using MonoDevelop.Core.Services;
 

Modified: trunk/MonoDevelop/Core/src/Main/Base/Makefile.am
===================================================================
--- trunk/MonoDevelop/Core/src/Main/Base/Makefile.am	2004-11-10 18:03:32 UTC (rev 2023)
+++ trunk/MonoDevelop/Core/src/Main/Base/Makefile.am	2004-11-11 20:07:48 UTC (rev 2024)
@@ -375,7 +375,7 @@
 all: $(ASSEMBLY)
 
 $(ASSEMBLY): $(build_sources) ../../../data/resources/glade/Base.glade
-	$(CSC) -codepage:utf8 /out:$(ASSEMBLY) /target:library $(DLLS) \
+	$(CSC) $(MONO_POSIX_OEE) -codepage:utf8 /out:$(ASSEMBLY) /target:library $(DLLS) \
 		/resource:$(srcdir)/../../../data/resources/glade/Base.glade,Base.glade \
 		$(monodoc_libflags) \
 		$(build_sources) \