Author: mhabersack
Date: 2007-12-07 19:34:45 -0500 (Fri, 07 Dec 2007)
New Revision: 90978

Modified:
   trunk/mcs/class/System.Web/ChangeLog
   trunk/mcs/class/System.Web/Makefile
Log:
2007-12-08  Marek Habersack  <[EMAIL PROTECTED]>

        * Makefile
        Added a RESX_DIST variable which contains all the .resx files. The
        variable is used by RESX_RES and by EXTRA_DISTFILES


Modified: trunk/mcs/class/System.Web/ChangeLog
===================================================================
--- trunk/mcs/class/System.Web/ChangeLog        2007-12-08 00:03:59 UTC (rev 
90977)
+++ trunk/mcs/class/System.Web/ChangeLog        2007-12-08 00:34:45 UTC (rev 
90978)
@@ -4,6 +4,8 @@
        * Makefile: added support for compiling .resx resources.
        Added SQLiteProviders_DatabaseSchema.sql to EXTRA_DISTFILES.
        Added new resource files to EXTRA_DISTFILES
+       Added a RESX_DIST variable which contains all the .resx files. The
+       variable is used by RESX_RES and by EXTRA_DISTFILES.
 
 2007-11-23  Daniel Nauck  <[EMAIL PROTECTED]>
 

Modified: trunk/mcs/class/System.Web/Makefile
===================================================================
--- trunk/mcs/class/System.Web/Makefile 2007-12-08 00:03:59 UTC (rev 90977)
+++ trunk/mcs/class/System.Web/Makefile 2007-12-08 00:34:45 UTC (rev 90978)
@@ -135,8 +135,9 @@
        Test/mainsoft/NunitWebResources/TextBoxTestlPage.aspx \
        Test/mainsoft/MainsoftWebTest/nunitweb_config.xml 
 
+RESX_DIST =  resources/TranslationResources.resx
 ifeq (net_2_0, $(PROFILE))
-RESX_RES = resources/TranslationResources.resources
+RESX_RES = $(RESX_DIST:.resx=.resources)
 endif
 
 NUNIT_RESOURCE_FILES = $(TEST_RESOURCE_FILES)
@@ -172,7 +173,7 @@
 
 TEST_MCS_FLAGS = $(LIB_MCS_FLAGS) -doc:$(test_lib:.dll=.xml)  -nowarn:219 
-nowarn:169 $(NUNIT_RESOURCE_FILES:%=/resource:%)
 
-EXTRA_DISTFILES = $(RESOURCE_FILES_2) $(RESOURCE_FILES_1) 
$(TEST_RESOURCE_FILES) UplevelHelperDefinitions.xml 
$(RESX_RES:.resources=.resx) \
+EXTRA_DISTFILES = $(RESOURCE_FILES_2) $(RESOURCE_FILES_1) 
$(TEST_RESOURCE_FILES) UplevelHelperDefinitions.xml $(RESX_DIST) \
                  SQLiteProviders_DatabaseSchema.sql
 BUILT_SOURCES = System.Web/UplevelHelper.cs 
 

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

Reply via email to