LIBRARY = System.Web.dll
-ifeq (net_2_0, $(PROFILE))
+ifneq (1, $(FRAMEWORK_VERSION_MAJOR))
LIBRARY_USE_INTERMEDIATE_FILE = yes
WEBSERVICES_DEP_FILE := $(wildcard ../lib/$(PROFILE)/$(WEBSERVICES_DEP))
MONOWEB_DEP := Mono.Web.dll
MONOWEB_DEP_FILE := $(wildcard ../lib/$(PROFILE)/$(MONOWEB_DEP))
-CYCLIC_DEPS := $(WEBSERVICES_DEP) $(MONOWEB_DEP)
+ifndef NO_SYSTEMCORE_DEP
+SYSTEMCORE_DEP := System.Core.dll
+SYSTEMCORE_DEP_FILE := $(wildcard ../lib/$(PROFILE)/$(SYSTEMCORE_DEP))
+endif
+CYCLIC_DEPS := $(WEBSERVICES_DEP) $(MONOWEB_DEP)
CYCLIC_DEP_FILES := $(WEBSERVICES_DEP_FILE) $(MONOWEB_DEP_FILE)
endif
resources/transparent.gif \
resources/webform.js \
resources/WebUIValidation_2.0.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 \
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/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/sub_map_01.sitemap \
+ Test/mainsoft/NunitWeb/NunitWeb/Resources/test_map_01.sitemap \
+ Test/mainsoft/NunitWeb/NunitWeb/Resources/test_map_02.sitemap \
+ Test/mainsoft/NunitWeb/NunitWeb/Resources/test_map_03.sitemap \
+ Test/mainsoft/NunitWeb/NunitWeb/Resources/test_map_04.sitemap \
+ Test/mainsoft/NunitWeb/NunitWeb/Resources/test_map_05.sitemap \
+ Test/mainsoft/NunitWeb/NunitWeb/Resources/test_map_06.sitemap \
+ Test/mainsoft/NunitWeb/NunitWeb/Resources/test_map_07.sitemap \
+ Test/mainsoft/NunitWeb/NunitWeb/Resources/test_map_08.sitemap \
+ Test/mainsoft/NunitWeb/NunitWeb/Resources/test_map_09.sitemap \
Test/mainsoft/NunitWebResources/menuclass.aspx \
Test/mainsoft/NunitWebResources/FormView.aspx \
Test/mainsoft/NunitWebResources/PostBackMenuTest.aspx \
Test/mainsoft/NunitWebResources/ValidPropertyBind2.aspx \
Test/mainsoft/NunitWebResources/ValidPropertyBind3.aspx \
Test/mainsoft/NunitWebResources/ValidPropertyBind4.aspx \
+ Test/mainsoft/NunitWebResources/ValidPropertyBind5.aspx \
Test/mainsoft/NunitWebResources/ReadWritePropertyControl.ascx \
Test/mainsoft/MainsoftWebTest/nunitweb_config.xml \
Test/mainsoft/NunitWebResources/TemplateControlParsingTest.aspx \
Test/mainsoft/NunitWebResources/ContentPlaceHolderInTemplate.aspx \
- Test/mainsoft/NunitWebResources/ContentPlaceHolderInTemplate.master
+ Test/mainsoft/NunitWebResources/ContentPlaceHolderInTemplate.master \
+ Test/mainsoft/NunitWebResources/MissingMasterFile.aspx \
+ Test/mainsoft/NunitWebResources/CustomSectionEmptyCollection.aspx \
+ Test/mainsoft/NunitWebResources/NoDoubleOnInitOnRemoveAdd.aspx \
+ Test/mainsoft/NunitWebResources/NoDoubleOnInitOnRemoveAdd.aspx.cs \
+ Test/mainsoft/NunitWebResources/LoginDisplayRememberMe.aspx \
+ Test/mainsoft/NunitWebResources/NoBindForMethodsWithBindInName.aspx \
+ Test/mainsoft/NunitWebResources/LinkInHeadWithEmbeddedExpression.aspx \
+ Test/mainsoft/NunitWebResources/ExpressionInListControl.aspx \
+ Test/mainsoft/NunitWebResources/ServerSideControlsInScriptBlock.aspx \
+ Test/mainsoft/NunitWebResources/ServerControlInClientSideComment.aspx \
+ Test/mainsoft/NunitWebResources/PreprocessorDirectivesInMarkup.aspx \
+ Test/mainsoft/NunitWebResources/UnquotedAngleBrackets.aspx \
+ Test/mainsoft/NunitWebResources/FullTagsInText.aspx \
+ Test/mainsoft/NunitWebResources/TagsExpressionsAndCommentsInText.aspx \
+ Test/mainsoft/NunitWebResources/NewlineInCodeExpression.aspx \
+ Test/mainsoft/NunitWebResources/DuplicateControlsInClientComment.aspx \
+ Test/mainsoft/NunitWebResources/TagsNestedInClientTag.aspx \
+ Test/mainsoft/NunitWebResources/ConditionalClientComments.aspx \
+ Test/mainsoft/NunitWebResources/OneLetterIdentifierInCodeRender.aspx
RESX_DIST = resources/TranslationResources.resx
-ifeq (net_2_0, $(PROFILE))
+ifneq (1, $(FRAMEWORK_VERSION_MAJOR))
RESX_RES = $(RESX_DIST:.resx=.resources)
endif
NUNIT_RESOURCE_FILES = $(TEST_RESOURCE_FILES)
-ifeq (net_2_0, $(PROFILE))
+ifneq (1, $(FRAMEWORK_VERSION_MAJOR))
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
ifneq ($(CYCLIC_DEPS:%=../lib/$(PROFILE)/%), $(CYCLIC_DEP_FILES))
NO_SIGN_ASSEMBLY = yes
NO_INSTALL = yes
-all-local: System.Web/UplevelHelper.cs resources/TranslationResources.resources echo-warning
-.PHONY: echo-warning
+all-local: System.Web/UplevelHelper.cs resources/TranslationResources.resources echo-warning echo-warning-systemcore
+.PHONY: echo-warning echo-warning-systemcore
ifeq (, $(strip $(CYCLIC_DEP_FILES)))
echo-warning:
endif
endif
-TEST_MCS_FLAGS = $(LIB_MCS_FLAGS) -doc:$(test_lib:.dll=.xml) -nowarn:219,169,1591 $(NUNIT_RESOURCE_FILES:%=/resource:%)
+ifeq (4, $(FRAMEWORK_VERSION_MAJOR))
+ifndef SYSTEMCORE_DEP_FILE
+echo-warning-systemcore:
+ @echo "** Warning: System.Web.dll built without parts that depend on $(SYSTEMCORE_DEP)"
+endif
+endif
+
+TEST_MCS_FLAGS = $(LIB_MCS_FLAGS) -doc:$(test_lib:.dll=.xml) -nowarn:219,169,1591 $(NUNIT_RESOURCE_FILES:%=/resource:%) -r:SystemWebTestShim.dll
ifeq (net_2_0, $(PROFILE))
TEST_MCS_FLAGS += -r:System.Web.Extensions.dll
endif
ifdef WEBSERVICES_DEP_FILE
LIB_MCS_FLAGS += -define:WEBSERVICES_DEP -r:$(WEBSERVICES_DEP)
-$(the_lib): $(WEBSERVICES_DEP_FILE)
+$(build_lib): $(WEBSERVICES_DEP_FILE)
endif
ifdef MONOWEB_DEP_FILE
LIB_MCS_FLAGS += -define:MONOWEB_DEP -r:$(MONOWEB_DEP)
-$(the_lib): $(MONOWEB_DEP_FILE)
+$(build_lib): $(MONOWEB_DEP_FILE)
+endif
+
+ifdef SYSTEMCORE_DEP_FILE
+LIB_MCS_FLAGS += -define:SYSTEMCORE_DEP -r:$(SYSTEMCORE_DEP)
+$(build_lib): $(SYSTEMCORE_DEP_FILE)
endif
ifdef DEBUG
LIB_MCS_FLAGS += -define:TRACE -define:MONO_TRACE
endif
-$(the_lib): $(RESX_RES) $(RESOURCE_FILES2) $(RESOURCE_FILES_1)
+ifdef DEVEL
+LIB_MCS_FLAGS += -define:DEVEL
+endif
+
+$(build_lib): $(RESX_RES) $(RESOURCE_FILES2) $(RESOURCE_FILES_1)
$(RESX_RES): %.resources: %.resx
$(RESGEN) `echo $< | $(PLATFORM_CHANGE_SEPARATOR_CMD)`