projects / mono.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
Visual studio upgrade did not work well.
[mono.git] / mcs / class / System.Web / Makefile
diff --git a/mcs/class/System.Web/Makefile b/mcs/class/System.Web/Makefile
index 245e1edabb7f33b07637295ea18bad5626ee8c25..a3445db27f5a3caf089bb1fb1c4a7f855aecc735 100644 (file)
--- a/mcs/class/System.Web/Makefile
+++ b/mcs/class/System.Web/Makefile
@@ -14,14 +14,19 @@ LIBRARY_USE_INTERMEDIATE_FILE = yes
 
 WEBSERVICES_DEP := System.Web.Services.dll
 WEBSERVICES_DEP_FILE := $(wildcard ../lib/$(PROFILE)/$(WEBSERVICES_DEP))
-CYCLIC_DEPS := $(WEBSERVICES_DEP)
-CYCLIC_DEP_FILES := $(WEBSERVICES_DEP_FILE)
+MONOWEB_DEP := Mono.Web.dll
+MONOWEB_DEP_FILE := $(wildcard ../lib/$(PROFILE)/$(MONOWEB_DEP))
+CYCLIC_DEPS := $(WEBSERVICES_DEP) $(MONOWEB_DEP)
+CYCLIC_DEP_FILES := $(WEBSERVICES_DEP_FILE) $(MONOWEB_DEP_FILE)
 endif
 
 RESOURCE_FILES_1= \
        resources/WebUIValidation.js
 
 RESOURCE_FILES_2 = \
+       resources/folder.gif \
+       resources/file.gif \
+       resources/computer.gif \
        resources/arrow_minus.gif \
        resources/arrow_noexpand.gif \
        resources/arrow_plus.gif \
@@ -57,10 +62,9 @@ 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 \
-       resources/MaintainScrollPositionOnPostBack.js \
+       System.Web.Configuration_2.0/RandomRoboBotKeywords.txt \
        System.Web.UI.WebControls/GridView.js \
        System.Web.UI.WebControls/DetailsView.js \
        System.Web.UI.WebControls/TreeView.js \
@@ -68,6 +72,9 @@ RESOURCE_FILES_2 = \
 
 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 \
@@ -78,22 +85,27 @@ TEST_RESOURCE_FILES = \
        Test/mainsoft/NunitWebResources/PostBackMenuTest.aspx \
        Test/mainsoft/NunitWebResources/PageWithStyleSheet.aspx \
        Test/mainsoft/NunitWebResources/PageWithTheme.aspx \
+       Test/mainsoft/NunitWebResources/ResolveUrl.ascx \
+       Test/mainsoft/NunitWebResources/ResolveUrl.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 \
@@ -101,6 +113,7 @@ TEST_RESOURCE_FILES = \
        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 \
@@ -120,12 +133,27 @@ TEST_RESOURCE_FILES = \
        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/NunitWebResources/ClearErrorOnError.aspx \
+       Test/mainsoft/NunitWebResources/RedirectOnError.aspx \
+       Test/mainsoft/NunitWebResources/TestCapability.browser \
+       Test/mainsoft/NunitWebResources/PageWithAdapter.aspx \
        Test/mainsoft/MainsoftWebTest/nunitweb_config.xml 
 
+RESX_DIST =  resources/TranslationResources.resx
+ifeq (net_2_0, $(PROFILE))
+RESX_RES = $(RESX_DIST:.resx=.resources)
+endif
+
 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 -r:System.Windows.Forms.dll
+OTHER_LIB_MCS_FLAGS = -nowarn:618 -r:System.Configuration.dll -r:System.Windows.Forms.dll -r:Mono.Data.Sqlite.dll
 endif
 
 LIB_MCS_FLAGS = \
@@ -138,12 +166,13 @@ LIB_MCS_FLAGS = \
        -r:System.Xml.dll               \
        -r:System.EnterpriseServices.dll \
        $(OTHER_LIB_MCS_FLAGS) \
+       $(RESX_RES:%=/resource:%) \
        $(OTHER_RES:%=/resource:%)
 
 ifneq ($(CYCLIC_DEPS:%=../lib/$(PROFILE)/%), $(CYCLIC_DEP_FILES))
 NO_SIGN_ASSEMBLY = yes
 NO_INSTALL = yes
-all-local: echo-warning
+all-local: System.Web/UplevelHelper.cs resources/TranslationResources.resources echo-warning
 .PHONY: echo-warning
 
 ifeq   (, $(strip $(CYCLIC_DEP_FILES)))
@@ -154,7 +183,9 @@ endif
 
 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)
+EXTRA_DISTFILES = $(RESOURCE_FILES_2) $(RESOURCE_FILES_1) $(TEST_RESOURCE_FILES) UplevelHelperDefinitions.xml $(RESX_DIST) \
+                 SQLiteProviders_DatabaseSchema.sql
+BUILT_SOURCES = System.Web/UplevelHelper.cs 
 
 include ../../build/library.make
 
@@ -163,17 +194,30 @@ LIB_MCS_FLAGS += -define:WEBSERVICES_DEP -r:$(WEBSERVICES_DEP)
 $(the_lib): $(WEBSERVICES_DEP_FILE)
 endif
 
+ifdef MONOWEB_DEP_FILE
+LIB_MCS_FLAGS += -define:MONOWEB_DEP -r:$(MONOWEB_DEP)
+$(the_lib): $(MONOWEB_DEP_FILE)
+endif
+
+$(the_lib): $(RESX_RES) $(RESOURCE_FILES2) $(RESOURCE_FILES_1)
+
+$(RESX_RES): %.resources: %.resx
+       $(RESGEN) `echo $< | $(PLATFORM_CHANGE_SEPARATOR_CMD)`
+
+System.Web/UplevelHelper.cs: UplevelHelperDefinitions.xml
+       $(TEST_RUNTIME) $(topdir)/class/lib/net_1_1_bootstrap/culevel.exe -o $@ $^
+
 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) \
my mono mirror. check out Moved to http://github.com/mono/mono