Author: raja
Date: 2006-01-19 08:52:02 -0500 (Thu, 19 Jan 2006)
New Revision: 55782

Modified:
   trunk/mcs/class/System.Web/ChangeLog
   trunk/mcs/class/System.Web/Makefile
   trunk/mcs/class/System.Web/System.Web.Configuration_2.0/
Log:
* Makefile (LIBRARY_USE_INTERMEDIATE_FILE) [net_2_0]: Set, so as
to avoid sharing violations on Windows.


Modified: trunk/mcs/class/System.Web/ChangeLog
===================================================================
--- trunk/mcs/class/System.Web/ChangeLog        2006-01-19 13:32:39 UTC (rev 
55781)
+++ trunk/mcs/class/System.Web/ChangeLog        2006-01-19 13:52:02 UTC (rev 
55782)
@@ -1,3 +1,8 @@
+2006-01-19  Raja R Harinath  <[EMAIL PROTECTED]>
+
+       * Makefile (LIBRARY_USE_INTERMEDIATE_FILE) [net_2_0]: Set, so as
+       to avoid sharing violations on Windows.
+
 2006-01-18  Chris Toshok  <[EMAIL PROTECTED]>
 
        * Makefile: Add build foo to handle the System.Web.dll <->

Modified: trunk/mcs/class/System.Web/Makefile
===================================================================
--- trunk/mcs/class/System.Web/Makefile 2006-01-19 13:32:39 UTC (rev 55781)
+++ trunk/mcs/class/System.Web/Makefile 2006-01-19 13:52:02 UTC (rev 55782)
@@ -2,7 +2,12 @@
 SUBDIRS = Test
 include ../../build/rules.make
 
+LIBRARY = System.Web.dll
+
 ifeq (net_2_0, $(PROFILE))
+
+LIBRARY_USE_INTERMEDIATE_FILE = yes
+
 # Because System.Web.dll and System.Web.Services.dll have a cyclic dependency, 
we need a two-pass build.
 # 1st pass - build System.Web.dll without System.Web.Services.dll reference
 # 2nd pass - build System.Web.dll with System.Web.Services.dll reference
@@ -64,7 +69,6 @@
 endif
 
 
-LIBRARY = System.Web.dll
 LIB_MCS_FLAGS = \
        -unsafe \
        -nowarn:612,649 \
@@ -96,6 +100,6 @@
 include ../../build/library.make
 
 ifdef WEBSERVICES_DEP_FILE
-LIB_MCS_FLAGS += /define:WEBSERVICES_DEP /r:$(WEBSERVICES_DEP)
+LIB_MCS_FLAGS += -define:WEBSERVICES_DEP -r:$(WEBSERVICES_DEP)
 $(the_lib): $(WEBSERVICES_DEP_FILE)
 endif


Property changes on: trunk/mcs/class/System.Web/System.Web.Configuration_2.0
___________________________________________________________________
Name: svn:ignore
   + semantic.cache


_______________________________________________
Mono-patches maillist  -  [email protected]
http://lists.ximian.com/mailman/listinfo/mono-patches

Reply via email to