LIBRARY = System.dll
LIBRARY_USE_INTERMEDIATE_FILE = yes
-# Because System.dll, Mono.Security.dll System.Xml.dll have a cyclic dependency, we need a two-pass build.
-# 1st pass - build System.dll without System.Xml.dll or Mono.Security.dll references
-# 2nd pass - build System.dll with System.Xml.dll and Mono.Security.dll references
+ifneq (2.1, $(FRAMEWORK_VERSION))
+RESOURCE_FILES = \
+ resources/Asterisk.wav \
+ resources/Beep.wav \
+ resources/Exclamation.wav \
+ resources/Hand.wav \
+ resources/Question.wav
+endif
TEST_RESOURCES = \
Test/System/test-uri-props.txt \
Test/System/test-uri-props-manual.txt \
Test/System/test-uri-relative-props.txt
-TEST_MCS_FLAGS = -r:System.Drawing.dll -r:Mono.Security.dll -nowarn:1595 -nowarn:0618 -nowarn:219 -nowarn:67 -nowarn:169 -nowarn:612 \
+TEST_MCS_FLAGS = -r:System.Drawing.dll -r:Mono.Security.dll -r:System.Data -nowarn:1595 -nowarn:0618 -nowarn:219 -nowarn:67 -nowarn:169 -nowarn:612 \
$(foreach f, $(TEST_RESOURCES), -resource:$(f),$(notdir $(f)))
-XML_DEP := System.Xml.dll
-XML_DEP_FILE := $(wildcard ../lib/$(PROFILE)/$(XML_DEP))
-CYCLIC_DEPS := $(XML_DEP)
-CYCLIC_DEP_FILES := $(XML_DEP_FILE)
-
-ifeq (2.0, $(FRAMEWORK_VERSION))
-# Happens on net_2_0_bootstrap and net_2_0 profiles
-SECURITY_DEP := Mono.Security.dll
-SECURITY_DEP_FILE := $(wildcard ../lib/$(PROFILE)/$(SECURITY_DEP))
-CONFIGURATION_DEP := System.Configuration.dll
-CONFIGURATION_DEP_FILE := $(wildcard ../lib/$(PROFILE)/$(CONFIGURATION_DEP))
-CYCLIC_DEPS += $(SECURITY_DEP) $(CONFIGURATION_DEP)
-CYCLIC_DEP_FILES += $(SECURITY_DEP_FILE) $(CONFIGURATION_DEP_FILE)
-LIB_MCS_FLAGS = -nowarn:618
+ifeq (2, $(FRAMEWORK_VERSION_MAJOR))
+LIB_MCS_FLAGS = -nowarn:618 -d:CONFIGURATION_2_0 -unsafe $(RESOURCE_FILES:%=-resource:%)
+TEST_MCS_FLAGS += -r:System.Configuration
endif
EXTRA_DISTFILES = \
System.Text.RegularExpressions/notes.txt \
System.ComponentModel.Design/Changelog \
Test/test-config-file \
+ Test/System.Security.Cryptography.X509Certificates/pkits/ChangeLog \
+ Test/System.Security.Cryptography.X509Certificates/pkits/Makefile \
+ Test/System.Security.Cryptography.X509Certificates/pkits/README \
+ Test/System.Security.Cryptography.X509Certificates/pkits/x509build.cs \
+ $(RESOURCE_FILES) \
$(TEST_RESOURCES)
lib_file := $(wildcard ../lib/$(PROFILE)/System.dll)
-ifndef lib_file
+ifdef lib_file
+ifeq (2.0, $(FRAMEWORK_VERSION))
+LIB_MCS_FLAGS += -r:PrebuiltSystem=$(lib_file)
+endif
+else
USE_BOOT_COMPILE = yes
endif
LIBRARY_COMPILE = $(BOOT_COMPILE)
endif
-ifneq ($(CYCLIC_DEPS:%=../lib/$(PROFILE)/%), $(CYCLIC_DEP_FILES))
-NO_SIGN_ASSEMBLY = yes
-NO_INSTALL = yes
-all-local: echo-warning
-.PHONY: echo-warning
-
-ifeq (, $(strip $(CYCLIC_DEP_FILES)))
-echo-warning:
- @echo "** Warning: System.dll built without parts that depend on: $(CYCLIC_DEPS)"
-else # defined CYCLIC_DEP_FILES
-ifdef SECURITY_DEP_FILE
-echo-warning:
- @echo "** Warning: built System.dll with 'Mono.Security.dll'-dependent parts"
- @echo "** Warning: ... without 'System.Xml.dll' present: it may not be usable"
-
-else
-echo-warning:
- @echo "** Warning: System.dll built without parts that depend on Mono.Security.dll"
-endif
+# Because System.dll, Mono.Security.dll System.Xml.dll have a cyclic dependency, we need a two-pass build.
+# 1st pass - build System.dll without System.Xml.dll or Mono.Security.dll or System.Configuration.dll references
+# 2nd pass - build System.dll with System.Xml.dll and Mono.Security.dll or System.Configuration.dll references
+
+CYCLIC_DEPS :=
+CYCLIC_DEP_FILES :=
+
+# define cyclic-dep
+# # Note the '$$' -- those are to be delayed till the eval
+# CYCLIC_DEPS += $1
+# FILE_$2 := $$(wildcard ../lib/$(PROFILE)/$1)
+# ifdef FILE_$2
+# CYCLIC_DEP_FILES += $$(FILE_$2)
+# LIB_MCS_FLAGS += -d:$2 -r:$1
+# endif
+# endef
+
+ifneq (2.1, $(FRAMEWORK_VERSION))
+# $(eval $(call cyclic-dep,System.Xml.dll,XML_DEP))
+CYCLIC_DEPS += System.Xml.dll
+FILE_XML_DEP := $(wildcard ../lib/$(PROFILE)/System.Xml.dll)
+ifdef FILE_XML_DEP
+CYCLIC_DEP_FILES += $(FILE_XML_DEP)
+LIB_MCS_FLAGS += -d:XML_DEP -r:System.Xml.dll
endif
+
endif
-include ../../build/library.make
+ifeq (2.0, $(FRAMEWORK_VERSION))
+# $(eval $(call cyclic-dep,Mono.Security.dll,SECURITY_DEP))
+CYCLIC_DEPS += Mono.Security.dll
+FILE_SECURITY_DEP := $(wildcard ../lib/$(PROFILE)/Mono.Security.dll)
+ifdef FILE_SECURITY_DEP
+CYCLIC_DEP_FILES += $(FILE_SECURITY_DEP)
+LIB_MCS_FLAGS += -d:SECURITY_DEP -r:Mono.Security.dll
+endif
-ifdef XML_DEP_FILE
-LIB_MCS_FLAGS += /define:XML_DEP /r:$(XML_DEP)
-$(the_lib): $(XML_DEP_FILE)
+# $(eval $(call cyclic-dep,System.Configuration.dll,CONFIGURATION_DEP))
+CYCLIC_DEPS += System.Configuration.dll
+FILE_CONFIGURATION_DEP := $(wildcard ../lib/$(PROFILE)/System.Configuration.dll)
+ifdef FILE_CONFIGURATION_DEP
+CYCLIC_DEP_FILES += $(FILE_CONFIGURATION_DEP)
+LIB_MCS_FLAGS += -d:CONFIGURATION_DEP -r:System.Configuration.dll
endif
-ifdef SECURITY_DEP_FILE
-LIB_MCS_FLAGS += /define:SECURITY_DEP -r:Mono.Security.dll
-$(the_lib): $(SECURITY_DEP_FILE)
endif
-ifdef CONFIGURATION_DEP_FILE
-LIB_MCS_FLAGS += /define:CONFIGURATION_DEP /r:$(CONFIGURATION_DEP)
-$(the_lib): $(CONFIGURATION_DEP_FILE)
+MISSING_DEPS := $(filter-out $(notdir $(CYCLIC_DEP_FILES)), $(CYCLIC_DEPS))
+ifdef MISSING_DEPS
+NO_SIGN_ASSEMBLY = yes
+NO_INSTALL = yes
+all-local: echo-warning
+.PHONY: echo-warning
+echo-warning:
+ @echo "** Warning: System.dll built without parts that depend on: $(MISSING_DEPS)"
endif
+include ../../build/library.make
+
+$(the_lib): $(CYCLIC_DEP_FILES)
+
$(test_lib): $(test_lib).config $(TEST_RESOURCES)
$(test_lib).config: Test/test-config-file
cp $< $@
CLEAN_FILES = $(test_lib).config
+
+# run the PKITS tests only if the data was installed/activated, otherwise ignore them
+ifeq (net_2_0, $(PROFILE))
+pkits_files := $(wildcard Test/System.Security.Cryptography.X509Certificates/pkits/hint)
+ifndef pkits_files
+TEST_HARNESS_EXCLUDES = /exclude:NotWorking,ValueAdd,CAS,InetAccess,PKITS
+TEST_HARNESS_EXCLUDES_ONDOTNET = /exclude:NotDotNet,CAS,PKITS
+endif
+endif
projects / mono.git / blobdiff