X-Git-Url: http://wien.tomnetworks.com/gitweb/?a=blobdiff_plain;f=mcs%2Fclass%2FSystem.Web%2FMakefile;h=54e668b15e6679e035f1b013033b09c50f1e904b;hb=9d40d6c7ae2284a8e7b9e0e631bd616c7d45b851;hp=6696af5dab9073dbdd0d505502ac71b0e93c4b98;hpb=3fe5409741be0d9a071b6465d1b49068c587bf9c;p=mono.git

diff --git a/mcs/class/System.Web/Makefile b/mcs/class/System.Web/Makefile
index 6696af5dab9..54e668b15e6 100644
--- a/mcs/class/System.Web/Makefile
+++ b/mcs/class/System.Web/Makefile
@@ -57,32 +57,86 @@ RESOURCE_FILES_2 = \
 	resources/TreeView_tminus.gif \
 	resources/TreeView_tplus.gif \
 	resources/transparent.gif \
-	resources/callback.js \
 	resources/webform.js \
+	resources/WebUIValidation_2.0.js \
 	System.Web.UI.WebControls/GridView.js \
+	System.Web.UI.WebControls/DetailsView.js \
 	System.Web.UI.WebControls/TreeView.js \
 	System.Web.UI.WebControls/Menu.js
 
 OTHER_RES = $(RESOURCE_FILES_1)
 TEST_RESOURCE_FILES = \
+	Test/mainsoft/NunitWeb/NunitWeb/Resources/Global.asax \
+	Test/mainsoft/NunitWeb/NunitWeb/Resources/Global.asax.cs \
+	Test/mainsoft/NunitWeb/NunitWeb/Resources/My.ashx \
 	Test/mainsoft/NunitWeb/NunitWeb/Resources/My.master \
 	Test/mainsoft/NunitWeb/NunitWeb/Resources/MyPage.aspx \
 	Test/mainsoft/NunitWeb/NunitWeb/Resources/MyPage.aspx.cs \
 	Test/mainsoft/NunitWeb/NunitWeb/Resources/MyPageWithMaster.aspx \
-	Test/mainsoft/NunitWeb/NunitWeb/Resources/Web.config \
+	Test/mainsoft/NunitWeb/NunitWeb/Resources/Web.mono.config \
 	Test/mainsoft/NunitWebResources/menuclass.aspx \
+	Test/mainsoft/NunitWebResources/FormView.aspx \
+	Test/mainsoft/NunitWebResources/PostBackMenuTest.aspx \
 	Test/mainsoft/NunitWebResources/PageWithStyleSheet.aspx \
 	Test/mainsoft/NunitWebResources/PageWithTheme.aspx \
 	Test/mainsoft/NunitWebResources/RunTimeSetTheme.aspx \
+	Test/mainsoft/NunitWebResources/ReadOnlyPropertyBind.aspx \
+	Test/mainsoft/NunitWebResources/ReadOnlyPropertyControl.ascx \
 	Test/mainsoft/NunitWebResources/Theme1.skin \
+	Test/mainsoft/NunitWebResources/Theme2.skin \
+	Test/mainsoft/NunitWebResources/UrlProperty.aspx \
+	Test/mainsoft/NunitWebResources/UrlProperty.ascx \
+	Test/mainsoft/NunitWebResources/UrlProperty.ascx.cs \
 	Test/mainsoft/NunitWebResources/Web.sitemap \
+	Test/mainsoft/NunitWebResources/WizardTest.skin \
+	Test/mainsoft/NunitWebResources/FooterTemplateTest.aspx \
+	Test/mainsoft/NunitWebResources/DataGrid.aspx \
+	Test/mainsoft/NunitWebResources/DetailsViewTemplates.aspx \
+	Test/mainsoft/NunitWebResources/DetailsViewDataActions.aspx \
+	Test/mainsoft/NunitWebResources/DetailsViewProperties1.aspx \
+	Test/mainsoft/NunitWebResources/Bluehills.jpg \
+	Test/mainsoft/NunitWebResources/FormViewTest1.aspx \
+	Test/mainsoft/NunitWebResources/FormViewInsertEditDelete.aspx \
+	Test/mainsoft/NunitWebResources/GridViewUpdate.aspx \
+	Test/mainsoft/NunitWebResources/XMLDataSourceTest.xml \
+	Test/mainsoft/NunitWebResources/XMLDataSourceTest.xsl \
+	Test/mainsoft/NunitWebResources/XMLDataSourceTest1.aspx \
+	Test/mainsoft/NunitWebResources/XMLDataSourceTest2.aspx \
+	Test/mainsoft/NunitWebResources/XMLDataSourceTest3.aspx \
+	Test/mainsoft/NunitWebResources/XMLDataSourceTest4.aspx \
+	Test/mainsoft/NunitWebResources/LoginViewTest1.aspx \
+	Test/mainsoft/NunitWebResources/WebControl.config \
+	Test/mainsoft/NunitWebResources/WebLogin.config \
+	Test/mainsoft/NunitWebResources/CallbackTest1.aspx \
+	Test/mainsoft/NunitWebResources/CallbackTest2.aspx \
+	Test/mainsoft/NunitWebResources/EventValidationTest2.aspx \
+	Test/mainsoft/NunitWebResources/EventValidationTest1.aspx \
+	Test/mainsoft/NunitWebResources/ClientScript.js \
+	Test/mainsoft/NunitWebResources/EvalTest.aspx \
+	Test/mainsoft/NunitWebResources/TemplateUserControl.ascx \
+	Test/mainsoft/NunitWebResources/WebMapping.config \
+	Test/mainsoft/NunitWebResources/Mapping.aspx \
+	Test/mainsoft/NunitWebResources/Mapping1.aspx \
+	Test/mainsoft/NunitWebResources/CrossPagePosting1.aspx \
+	Test/mainsoft/NunitWebResources/CrossPagePosting2.aspx \
+	Test/mainsoft/NunitWebResources/MyDerived.master \
+	Test/mainsoft/NunitWebResources/MyPageWithDerivedMaster.aspx \
+	Test/mainsoft/NunitWebResources/MasterTypeTest1.aspx \
+	Test/mainsoft/NunitWebResources/MasterTypeTest2.aspx \
+	Test/mainsoft/NunitWebResources/PageLifecycleTest.aspx \
+	Test/mainsoft/NunitWebResources/PageValidationTest.aspx \
+	Test/mainsoft/NunitWebResources/AsyncPage.aspx \
+	Test/mainsoft/NunitWebResources/PageCultureTest.aspx \
+	Test/mainsoft/NunitWebResources/adapters.browser \
+	Test/mainsoft/NunitWebResources/NoEventValidation.aspx \
+	Test/mainsoft/NunitWebResources/ListControlPage.aspx \
+	Test/mainsoft/NunitWebResources/TextBoxTestlPage.aspx \
 	Test/mainsoft/MainsoftWebTest/nunitweb_config.xml 
 
-NUNIT_RESOURCE_FILES = 
+NUNIT_RESOURCE_FILES = $(TEST_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)
+OTHER_LIB_MCS_FLAGS = -nowarn:618 -r:System.Configuration.dll -r:System.Windows.Forms.dll
 endif
 
 LIB_MCS_FLAGS = \
@@ -123,14 +177,14 @@ endif
 run-aaa: test
 	$(TEST_RUNTIME) $(TEST_HARNESS) $(TEST_HARNESS_FLAGS) $(LOCAL_TEST_HARNESS_FLAGS) \
 	/output:TestResult-$(PROFILE).log /include:aaa /xml:TestResult-$(PROFILE).xml $(test_assemblies) || ok=false; \
- 	(echo ''; cat TestResult-$(PROFILE).log) | sed '1,/^Tests run: /d'; \
- 	$$ok
+	(echo ''; cat TestResult-$(PROFILE).log) | sed '1,/^Tests run: /d'; \
+	$$ok
 
 run-nunitweb: test
 	$(TEST_RUNTIME) $(TEST_HARNESS) $(TEST_HARNESS_FLAGS) $(LOCAL_TEST_HARNESS_FLAGS) \
 	/output:TestResult-$(PROFILE).log /include:NunitWeb /xml:TestResult-$(PROFILE).xml $(test_assemblies) || ok=false; \
- 	(echo ''; cat TestResult-$(PROFILE).log) | sed '1,/^Tests run: /d'; \
- 	$$ok
+	(echo ''; cat TestResult-$(PROFILE).log) | sed '1,/^Tests run: /d'; \
+	$$ok
 
 run-nunitweb-ondotnet: test
 	$(TEST_HARNESS) $(TEST_HARNESS_FLAGS) $(LOCAL_TEST_HARNESS_FLAGS) \