New test.

[mono.git] / mcs / class / System / Makefile

diff --git a/mcs/class/System/Makefile b/mcs/class/System/Makefile
index b3c9f75cdb665901d50f3f083072758c08cbe0f7..2031f9e0b2bd2cf08fb837ca9e6da7292e3b9c62 100644 (file)
--- a/mcs/class/System/Makefile
+++ b/mcs/class/System/Makefile
@@ -1,21 +1,21 @@
 thisdir = class/System
 SUBDIRS =
 include ../../build/rules.make
+export __SECURITY_BOOTSTRAP_DB=$(topdir)/class/lib/$(PROFILE)
 
 LIBRARY = System.dll
 LIBRARY_USE_INTERMEDIATE_FILE = yes
 
-# Because System.dll, System.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 System.Security.dll references
-# 2nd pass - build System.dll with System.Xml.dll and System.Security.dll references
+# 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
 
 TEST_RESOURCES = \
        Test/System/test-uri-props.txt \
        Test/System/test-uri-props-manual.txt \
        Test/System/test-uri-relative-props.txt
 
-LIB_MCS_FLAGS = /r:$(corlib)
-TEST_MCS_FLAGS = -nowarn:1595 -nowarn:0618 -nowarn:219 -nowarn:67 \
+TEST_MCS_FLAGS = -r:System.Drawing.dll -r:Mono.Security.dll -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
@@ -25,10 +25,14 @@ CYCLIC_DEP_FILES := $(XML_DEP_FILE)
 
 ifeq (2.0, $(FRAMEWORK_VERSION))
 # Happens on net_2_0_bootstrap and net_2_0 profiles
-SECURITY_DEP := System.Security.dll
+SECURITY_DEP := Mono.Security.dll
 SECURITY_DEP_FILE := $(wildcard ../lib/$(PROFILE)/$(SECURITY_DEP))
-CYCLIC_DEPS += $(SECURITY_DEP)
-CYCLIC_DEP_FILES += $(SECURITY_DEP_FILE)
+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 -d:CONFIGURATION_2_0 -unsafe
+TEST_MCS_FLAGS += -r:System.Configuration
 endif
 
 EXTRA_DISTFILES = \
@@ -52,6 +56,7 @@ endif
 
 ifneq ($(CYCLIC_DEPS:%=../lib/$(PROFILE)/%), $(CYCLIC_DEP_FILES))
 NO_SIGN_ASSEMBLY = yes
+NO_INSTALL = yes
 all-local: echo-warning
 .PHONY: echo-warning
 
@@ -61,12 +66,12 @@ echo-warning:
 else     # defined CYCLIC_DEP_FILES
 ifdef      SECURITY_DEP_FILE
 echo-warning:
-       @echo "** Warning: built System.dll with 'System.Security.dll'-dependent parts"
+       @echo "** Warning: built System.dll with 'Mono.Security.dll'-dependent parts"
        @echo "** Warning: ... without 'System.Xml.dll' present: it may not be usable"
-
+       @echo "** Warning: ... without 'System.Configuration.dll' present: it may not be usable"
 else
 echo-warning:
-       @echo "** Warning: System.dll built without parts that depend on System.Security.dll"
+       @echo "** Warning: System.dll built without parts that depend on Mono.Security.dll"
 endif
 endif
 endif
@@ -74,15 +79,20 @@ endif
 include ../../build/library.make
 
 ifdef XML_DEP_FILE
-LIB_MCS_FLAGS += /define:XML_DEP /r:$(XML_DEP)
+LIB_MCS_FLAGS += -define:XML_DEP -r:$(XML_DEP)
 $(the_lib): $(XML_DEP_FILE)
 endif
 
 ifdef SECURITY_DEP_FILE
-LIB_MCS_FLAGS += /define:SECURITY_DEP /r:$(SECURITY_DEP)
+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) -r:PrebuiltSystem=$(topdir)/class/lib/$(PROFILE)/System.dll
+$(the_lib): $(CONFIGURATION_DEP_FILE)
+endif
+
 $(test_lib): $(test_lib).config $(TEST_RESOURCES)
 
 $(test_lib).config: Test/test-config-file