X-Git-Url: http://wien.tomnetworks.com/gitweb/?a=blobdiff_plain;f=mcs%2Fclass%2FSystem.Web%2FMakefile;h=7f1691c32fceb94a78fc27c967166545e286eaae;hb=68337d6ca1c6fb264720970cd002081fa797d6d0;hp=f4a69906008d8bcc3dc5642bfd610d69c6ea04da;hpb=3f3fd1c424c9f96de898239a2e8eb38c94ee0491;p=mono.git diff --git a/mcs/class/System.Web/Makefile b/mcs/class/System.Web/Makefile index f4a69906008..7f1691c32fc 100644 --- a/mcs/class/System.Web/Makefile +++ b/mcs/class/System.Web/Makefile @@ -68,11 +68,22 @@ RESOURCE_FILES_2 = \ resources/transparent.gif \ resources/webform.js \ resources/WebUIValidation_2.0.js \ + resources/ErrorTemplateCommon_Top.html \ + resources/DefaultErrorTemplate_CustomErrorDefault.html \ + resources/ErrorTemplateCommon_Bottom.html \ + resources/DefaultErrorTemplate_StandardPage.html \ + resources/HtmlizedExceptionPage_Top.html \ + resources/HtmlizedExceptionPage_FileLongSource.html \ + resources/HtmlizedExceptionPage_FileShortSource.html \ + resources/HtmlizedExceptionPage_CompilerOutput.html \ System.Web.UI.WebControls/GridView.js \ System.Web.UI.WebControls/DetailsView.js \ System.Web.UI.WebControls/TreeView.js \ System.Web.UI.WebControls/Menu.js +RESOURCE_FILES_4 = \ + System.Web.UI.WebControls/MenuModern.js + OTHER_RES = $(RESOURCE_FILES_1) TEST_APP_CODE_FILES = \ Test/mainsoft/NunitWebResources/App_Code/EnumConverterControl.cs \ @@ -92,7 +103,7 @@ TEST_RESOURCE_FILES = \ Test/mainsoft/NunitWeb/NunitWeb/Resources/MyPage.aspx.cs \ Test/mainsoft/NunitWeb/NunitWeb/Resources/MyPageWithMaster.aspx \ Test/mainsoft/NunitWeb/NunitWeb/Resources/Web.mono.config \ - Test/mainsoft/NunitWeb/NunitWeb/Resources/Web.mono.config.1.1 \ + Test/mainsoft/NunitWeb/NunitWeb/Resources/Web.mono.config.4.0 \ Test/mainsoft/NunitWeb/NunitWeb/Resources/sub_map_01.sitemap \ Test/mainsoft/NunitWeb/NunitWeb/Resources/test_map_01.sitemap \ Test/mainsoft/NunitWeb/NunitWeb/Resources/test_map_02.sitemap \ @@ -123,10 +134,15 @@ TEST_RESOURCE_FILES = \ Test/mainsoft/NunitWebResources/FooterTemplateTest.aspx \ Test/mainsoft/NunitWebResources/DataGrid.aspx \ Test/mainsoft/NunitWebResources/DetailsViewTemplates.aspx \ + Test/mainsoft/NunitWebResources/DetailsViewTemplates_2.aspx \ + Test/mainsoft/NunitWebResources/DetailsViewTemplates_3.aspx \ Test/mainsoft/NunitWebResources/DetailsViewDataActions.aspx \ Test/mainsoft/NunitWebResources/DetailsViewProperties1.aspx \ Test/mainsoft/NunitWebResources/Bluehills.jpg \ Test/mainsoft/NunitWebResources/FormViewTest1.aspx \ + Test/mainsoft/NunitWebResources/FormViewTest1_2.aspx \ + Test/mainsoft/NunitWebResources/FormViewTest1_3.aspx \ + Test/mainsoft/NunitWebResources/FormViewTest1_4.aspx \ Test/mainsoft/NunitWebResources/FormViewInsertEditDelete.aspx \ Test/mainsoft/NunitWebResources/GridViewUpdate.aspx \ Test/mainsoft/NunitWebResources/XMLDataSourceTest.xml \ @@ -223,7 +239,11 @@ TEST_RESOURCE_FILES = \ Test/mainsoft/NunitWebResources/CheckBoxField_Bug595568_5.aspx \ Test/mainsoft/NunitWebResources/CheckBoxField_Bug595568_6.aspx \ Test/mainsoft/NunitWebResources/CheckBoxField_Bug595568_7.aspx \ - Test/mainsoft/NunitWebResources/GridView_Bug595567.aspx + Test/mainsoft/NunitWebResources/GridView_Bug595567.aspx \ + Test/mainsoft/NunitWebResources/CheckBoxList_Bug600415.aspx \ + Test/mainsoft/NunitWebResources/BoundField_Bug646505.aspx \ + Test/mainsoft/NunitWebResources/BoundField_Bug646505.aspx.cs \ + Test/mainsoft/NunitWebResources/HtmlTitleCodeRender_Bug662918.aspx RESX_DIST = resources/TranslationResources.resx ifneq (1, $(FRAMEWORK_VERSION_MAJOR)) @@ -239,6 +259,11 @@ OTHER_RES += $(RESOURCE_FILES_2) OTHER_LIB_MCS_FLAGS = -d:INSIDE_SYSTEM_WEB -nowarn:618 -r:System.Configuration.dll -r:Mono.Data.Sqlite.dll endif +ifeq (4, $(FRAMEWORK_VERSION_MAJOR)) +OTHER_LIB_MCS_FLAGS += -r:System.Web.ApplicationServices.dll +OTHER_RES += $(RESOURCE_FILES_4) +endif + LIB_MCS_FLAGS = \ -unsafe \ -nowarn:612,618 \ @@ -277,10 +302,11 @@ TEST_MCS_FLAGS = $(LIB_MCS_FLAGS) -doc:$(test_lib:.dll=.xml) -nowarn:219,169,159 $(foreach file,$(NUNIT_APP_GLOBALRESOURCES_FILES),$(shell echo $(file) | sed -e 's;\(.*\)/\(.*\);/resource:\1/\2,App_GlobalResources/\2 ;g')) ifeq (net_2_0, $(PROFILE)) -TEST_MCS_FLAGS += -r:System.Web.Extensions.dll +TEST_MCS_FLAGS += -r:System.Web.Extensions.dll -d:TEST endif EXTRA_DISTFILES = \ + $(RESOURCE_FILES_4) \ $(RESOURCE_FILES_2) \ $(RESOURCE_FILES_1) \ $(TEST_RESOURCE_FILES) \ @@ -346,8 +372,40 @@ STANDALONE_TEST_MCS_FLAGS = $(LIB_MCS_FLAGS) $(PROFILE_MCS_FLAGS) -debug:full -r STANDALONE_TEST_ASSEMBLY = System.Web_standalone_test_$(PROFILE).dll STANDALONE_TEST_MAKEFRAG = $(depsdir)/$(STANDALONE_TEST_ASSEMBLY).makefrag +ifeq (4, $(FRAMEWORK_VERSION_MAJOR)) +STANDALONE_TEST_COMPILABLE_TESTS = \ + ApplicationPreStartMethods/test_01 \ + ApplicationPreStartMethods/test_02 \ + ApplicationPreStartMethods/test_03 \ + ApplicationPreStartMethods/test_04 \ + ApplicationPreStartMethods/test_05 \ + ApplicationPreStartMethods/test_06 \ + ApplicationPreStartMethods/test_07 \ + ApplicationPreStartMethods/test_08 \ + EnableFormsAuthentication/Test_01 \ + EnableFormsAuthentication/Test_02 \ + EnableFormsAuthentication/Test_03 \ + EnableFormsAuthentication/Test_04 \ + EnableFormsAuthentication/Test_05 \ + EnableFormsAuthentication/Test_06 \ + EnableFormsAuthentication/Test_07 \ + EnableFormsAuthentication/Test_08 \ + EnableFormsAuthentication/Test_09 \ + RegisterBuildProvider \ + PageParserDefaultTypeProperties +endif + STANDALONE_TEST_RUNNER = Test/tools/standalone-runner.exe -RUN_STANDALONE = $(TEST_RUNTIME) $(STANDALONE_TEST_RUNNER) +ifeq (2, $(FRAMEWORK_VERSION_MAJOR)) +RUN_STANDALONE = MONO_TESTS_IN_PROGRESS=yes +endif +RUN_STANDALONE += $(TEST_RUNTIME) $(STANDALONE_TEST_RUNNER) --output=StandaloneTestResult-$(PROFILE).log +ifdef TESTNAME +RUN_STANDALONE += --test=$(TESTNAME) +endif +ifdef STANDALONE_VERBOSE +RUN_STANDALONE += --verbose +endif $(build_lib): $(RESX_RES) $(RESOURCE_FILES_2) $(RESOURCE_FILES_1) @@ -355,7 +413,7 @@ $(RESX_RES): %.resources: %.resx $(RESGEN) `echo $< | $(PLATFORM_CHANGE_SEPARATOR_CMD)` System.Web/UplevelHelper.cs: UplevelHelperDefinitions.xml - $(TEST_RUNTIME) $(topdir)/class/lib/$(BUILD_TOOLS_PROFILE)/culevel.exe -o $@ $^ + MONO_PATH="$(topdir)/class/lib/$(BOOTSTRAP_PROFILE)$(PLATFORM_PATH_SEPARATOR)$$MONO_PATH" $(RUNTIME) $(RUNTIME_FLAGS) $(topdir)/class/lib/$(BUILD_TOOLS_PROFILE)/culevel.exe -o $@ $^ run-aaa: test $(TEST_RUNTIME) $(TEST_HARNESS) $(TEST_HARNESS_FLAGS) $(LOCAL_TEST_HARNESS_FLAGS) \ @@ -392,12 +450,27 @@ $(STANDALONE_RUNNER_SUPPORT_MAKEFRAG): standalone-runner-support.dll.sources include $(STANDALONE_TEST_MAKEFRAG) include $(STANDALONE_RUNNER_SUPPORT_MAKEFRAG) -$(STANDALONE_TEST_ASSEMBLY): $(the_assembly) $(STANDALONE_RUNNER_SUPPORT_ASSEMBLY) Test/standalone-tests/Consts.cs - $(MCS) $(STANDALONE_TEST_MCS_FLAGS) -out:$@ -target:library @System.Web_standalone_test.dll.sources +$(STANDALONE_TEST_ASSEMBLY): $(the_assembly) $(STANDALONE_RUNNER_SUPPORT_ASSEMBLY) Test/standalone-tests/Consts.cs standalone-compilable-tests + $(CSCOMPILE) $(STANDALONE_TEST_MCS_FLAGS) -out:$@ -target:library @System.Web_standalone_test.dll.sources + +standalone-compilable-tests: +ifdef STANDALONE_TEST_COMPILABLE_TESTS + for d in $(STANDALONE_TEST_COMPILABLE_TESTS); do \ + $(MAKE) -C Test/standalone/$$d ; \ + done +endif $(STANDALONE_RUNNER_SUPPORT_ASSEMBLY): - $(MCS) $(STANDALONE_RUNNER_SUPPORT_MCS_FLAGS) -out:$(STANDALONE_RUNNER_SUPPORT_ASSEMBLY) -target:library @standalone-runner-support.dll.sources + $(CSCOMPILE) $(STANDALONE_RUNNER_SUPPORT_MCS_FLAGS) -out:$(STANDALONE_RUNNER_SUPPORT_ASSEMBLY) -target:library @standalone-runner-support.dll.sources Test/standalone-tests/Consts.cs: Test/standalone-tests/Consts.cs.in @sed 's,@SystemWebClassDir@,$(shell pwd),' $< > $@ +clean-local: +ifdef STANDALONE_TEST_COMPILABLE_TESTS + for d in $(STANDALONE_TEST_COMPILABLE_TESTS); do \ + $(MAKE) -C Test/standalone/$$d clean ; \ + done +endif + +