X-Git-Url: http://wien.tomnetworks.com/gitweb/?a=blobdiff_plain;f=mcs%2Fclass%2Fcorlib%2FMakefile;h=95b3bc8d33703c3e3ba1bee382763bebd35f5267;hb=8527bb09ec2d7b63af40770af38c83ed6bc68d75;hp=1162bf54f786093cca6184fc168e7324459f3c18;hpb=9900f812e2fc72b1e9389c4e7a0602007f256718;p=mono.git diff --git a/mcs/class/corlib/Makefile b/mcs/class/corlib/Makefile index 1162bf54f78..95b3bc8d337 100644 --- a/mcs/class/corlib/Makefile +++ b/mcs/class/corlib/Makefile @@ -1,6 +1,7 @@ thisdir = class/corlib SUBDIRS = include ../../build/rules.make +include CommonCrypto/Makefile.include export __SECURITY_BOOTSTRAP_DB=$(topdir)/class/corlib LIBRARY = corlib.dll @@ -51,12 +52,23 @@ REFERENCE_SOURCES_FLAGS += -d:MONO_FEATURE_THREAD_SUSPEND_RESUME TEST_MCS_FLAGS += -d:MONO_FEATURE_THREAD_SUSPEND_RESUME endif +ifndef NO_MULTIPLE_APPDOMAINS +REFERENCE_SOURCES_FLAGS += -d:MONO_FEATURE_MULTIPLE_APPDOMAINS +TEST_MCS_FLAGS += -d:MONO_FEATURE_MULTIPLE_APPDOMAINS +endif + WARNING_ABOUT_DISABLED_WARNING=1635 LOCAL_MCS_FLAGS = -unsafe -nostdlib -nowarn:612,618,$(WARNING_ABOUT_DISABLED_WARNING) -d:INSIDE_CORLIB,MONO_CULTURE_DATA -d:LIBC $(REFERENCE_SOURCES_FLAGS) DEFAULT_REFERENCES = +TEST_LIB_REFS = System.Core System + +ifndef MOBILE_STATIC +TEST_LIB_REFS += Mono.Posix +endif + # System.IO/DirectoryInfoTest.cs needs Mono.Posix -TEST_MCS_FLAGS += -debug -nowarn:168,219,618,672 -unsafe -r:Mono.Posix.dll -r:System.Core.dll \ +TEST_MCS_FLAGS += -debug -nowarn:168,219,618,672 -unsafe \ -define:MONO_DATACONVERTER_STATIC_METHODS $(TEST_RESX_RESOURCES:%=-resource:%) EXTRA_DISTFILES = \ @@ -84,39 +96,6 @@ CLEAN_FILES += $(TEST_RESX_RESOURCES) include $(topdir)/build/library.make -ifdef FIXME_CORLIB_CMP -# corlib_cmp -corlib_flags = -unsafe -nostdlib -cmplib = $(topdir)/class/lib/$(PROFILE)/corlib_cmp.dll -cmppdb = $(cmplib:.dll=.pdb) -cmp_response = $(depsdir)/$(PROFILE)_corlib_cmp.dll.response -cmp_makefrag = $(depsdir)/$(PROFILE)_corlib_cmp.dll.makefrag -cmp_flags = -r:$(PLATFORM_CORLIB) $(corlib_flags) - -EXTRA_DISTFILES += corlib_cmp.dll.excludes -CLEAN_FILES += $(cmplib) $(cmp_response) $(cmp_makefrag) $(cmppdb) - -$(cmplib): $(cmp_makefrag) $(cmp_response) - $(BOOT_COMPILE) $(LIBRARY_FLAGS) $(cmp_flags) -target:library -out:$@ @$(cmp_response) - -$(cmp_response): $(sourcefile) corlib_cmp.dll.excludes - @echo Creating $@ ... - @sort $(sourcefile) corlib_cmp.dll.excludes | uniq -u | $(PLATFORM_CHANGE_SEPARATOR_CMD) >$@ - -$(cmp_makefrag): $(cmp_response) - @echo Creating $@ ... - @sed 's,^,$(cmplib): ,' $< >$@ - -# Since we make corlib_cmp on demand, there isn't a real need -# to have full dep tracking for it. Also, the generation of this -# file is busted on Win32 ('sort' seems to mess up line endings), -# leading to a broken build. -# -# -include $(cmp_makefrag) - -$(cmp_response) $(cmp_makefrag): Makefile $(depsdir)/.stamp -endif - $(TEST_RESX_RESOURCES) $(TEST_RESX_RESOURCES_SATELITE): %.resources: %.resx $(RESGEN) $< || cp $@.prebuilt $@ @@ -129,11 +108,11 @@ $(test_lib): $(TEST_RESOURCES) $(satellite_assembly1) $(satellite_assembly2) $(satellite_assembly1): Test/resources/culture-es-ES.cs Test/resources/Resources.es-ES.resources @mkdir -p es-ES - $(CSCOMPILE) -target:library -r:$(corlib) Test/resources/culture-es-ES.cs -resource:Test/resources/Resources.es-ES.resources -out:$@ + $(CSCOMPILE) -target:library -r:$(topdir)/class/lib/$(PROFILE)/mscorlib.dll Test/resources/culture-es-ES.cs -resource:Test/resources/Resources.es-ES.resources -out:$@ $(satellite_assembly2): Test/resources/culture-nn-NO.cs Test/resources/Resources.nn-NO.resources @mkdir -p nn-NO - $(CSCOMPILE) -target:library -r:$(corlib) Test/resources/culture-nn-NO.cs -resource:Test/resources/Resources.nn-NO.resources -out:$@ + $(CSCOMPILE) -target:library -r:$(topdir)/class/lib/$(PROFILE)/mscorlib.dll Test/resources/culture-nn-NO.cs -resource:Test/resources/Resources.nn-NO.resources -out:$@ vtsdir = Test/System.Runtime.Serialization.Formatters.Binary/VersionTolerantSerialization vtslibs = \ @@ -148,11 +127,13 @@ test-vts: $(vtslibs) $(vtsdir)/$(PROFILE)_TestLib/BinarySerializationOverVersion $(vtsdir)/$(PROFILE)_TestLib/%/Address.dll: $(vtsdir)/VersionTolerantSerializationTestLib/%/Address.cs @mkdir -p $(dir $@) - $(CSCOMPILE) -target:library -r:$(corlib) -warn:0 -out:$@ $^ + $(CSCOMPILE) -target:library -warn:0 -r:$(topdir)/class/lib/$(PROFILE)/mscorlib.dll -out:$@ $^ $(vtsdir)/$(PROFILE)_TestLib/BinarySerializationOverVersions.exe: $(vtsdir)/BinarySerializationOverVersions.cs $(vtsdir)/$(PROFILE)_TestLib/1.0/Address.dll $(test_nunit_dep) - $(CSCOMPILE) $(test_nunit_ref) -warn:0 -r:$(corlib) \ + $(CSCOMPILE) $(test_nunit_ref) -warn:0 \ -r:$(vtsdir)/$(PROFILE)_TestLib/1.0/Address.dll \ + -r:$(topdir)/class/lib/$(PROFILE)/mscorlib.dll \ + -r:$(topdir)/class/lib/$(PROFILE)/System.dll \ $(vtsdir)/BinarySerializationOverVersions.cs -out:$@ @cp $(vtsdir)/$(PROFILE)_TestLib/1.0/Address.dll $(vtsdir)/$(PROFILE)_TestLib @@ -161,11 +142,19 @@ TEST_MONO_PATH=$(PWD)/../lib/$(PROFILE) run-test-vts: test-vts @echo Running vts tests... - PATH="$(TEST_RUNTIME_WRAPPERS_PATH):$(PATH)" $(TEST_RUNTIME) $(RUNTIME_FLAGS) $(TEST_HARNESS) -noshadow \ + PATH="$(TEST_RUNTIME_WRAPPERS_PATH):$(PATH)" $(TEST_RUNTIME) $(RUNTIME_FLAGS) $(TEST_HARNESS) $(NOSHADOW_FLAG) \ $(vtsdir)/$(PROFILE)_TestLib/BinarySerializationOverVersions.exe -ifndef NO_TEST + +ifdef NO_TEST +NO_VTS_TEST = yes +endif + +ifndef NO_VTS_TEST test: test-vts run-test: run-test-vts +else +test: +run-test: endif EXTRA_DISTFILES += \ @@ -177,6 +166,9 @@ EXTRA_DISTFILES += \ $(vtsdir)/VersionTolerantSerializationTestLib/6.0/Address.cs \ $(vtsdir)/BinarySerializationOverVersions.cs +EXTRA_DISTFILES += \ + CommonCrypto/Makefile.include + # # Android TimeZoneInfo testing.... #