Explorar el Código

* Makefile: Make sure mainsoft NunitWeb files are included for make dist

svn path=/trunk/mcs/; revision=61547
Wade Berrier hace 19 años
padre
commit
6daf1225a4
Se han modificado 2 ficheros con 11 adiciones y 5 borrados
  1. 4 0
      mcs/class/System.Web/ChangeLog
  2. 7 5
      mcs/class/System.Web/Makefile

+ 4 - 0
mcs/class/System.Web/ChangeLog

@@ -1,3 +1,7 @@
+2006-06-07 Wade Berrier <[email protected]>
+	
+	* Makefile: Make sure mainsoft NunitWeb files are included for make dist
+
 2006-06-05 Andrew Skiba <[email protected]>
 	
 	* Makefile, System.Web_test.dll.sources: add NunitWeb test framework

+ 7 - 5
mcs/class/System.Web/Makefile

@@ -64,10 +64,6 @@ RESOURCE_FILES_2 = \
 	System.Web.UI.WebControls/Menu.js
 
 OTHER_RES = $(RESOURCE_FILES_1)
-ifeq (net_2_0, $(PROFILE))
-OTHER_RES += $(RESOURCE_FILES_2)
-OTHER_LIB_MCS_FLAGS = -nowarn:618 -r:System.Configuration.dll
-
 TEST_RESOURCE_FILES = \
 	Test/mainsoft/NunitWeb/NunitWeb/Resources/My.master \
 	Test/mainsoft/NunitWeb/NunitWeb/Resources/MyPage.aspx \
@@ -80,6 +76,12 @@ TEST_RESOURCE_FILES = \
 	Test/mainsoft/NunitWebResources/Theme1.skin \
 	Test/mainsoft/NunitWebResources/Web.sitemap \
 	Test/mainsoft/MainsoftWebTest/nunitweb_config.xml 
+
+NUNIT_RESOURCE_FILES = 
+ifeq (net_2_0, $(PROFILE))
+OTHER_RES += $(RESOURCE_FILES_2)
+OTHER_LIB_MCS_FLAGS = -nowarn:618 -r:System.Configuration.dll
+NUNIT_RESOURCE_FILES = $(TEST_RESOURCE_FILES)
 endif
 
 LIB_MCS_FLAGS = \
@@ -106,7 +108,7 @@ echo-warning:
 endif
 endif
 
-TEST_MCS_FLAGS = $(LIB_MCS_FLAGS) -doc:$(test_lib:.dll=.xml)  -nowarn:219 -nowarn:169 $(TEST_RESOURCE_FILES:%=/resource:%)
+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)