X-Git-Url: http://wien.tomnetworks.com/gitweb/?a=blobdiff_plain;f=mcs%2Fclass%2Fcorlib%2FMakefile;h=0cf61b786f3b642c727451ce5baa00ddd8afdeee;hb=0ffa570a3aff21e50c3fdfbe4e8758eed0a7c96d;hp=f2bccc23740f570a8bc202ed7a10fc4c075c4fba;hpb=29a82f09c0677209de7366a82ad99a0146fef55e;p=mono.git diff --git a/mcs/class/corlib/Makefile b/mcs/class/corlib/Makefile index f2bccc23740..0cf61b786f3 100644 --- a/mcs/class/corlib/Makefile +++ b/mcs/class/corlib/Makefile @@ -5,9 +5,25 @@ export __SECURITY_BOOTSTRAP_DB=$(topdir)/class/corlib LIBRARY = corlib.dll LIBRARY_NAME = mscorlib.dll -LIB_MCS_FLAGS = $(corlib_flags) $(RESOURCE_FILES:%=-resource:%) +LIB_MCS_FLAGS = $(RESOURCE_FILES:%=-resource:%) LIBRARY_USE_INTERMEDIATE_FILE = yes +ifeq (basic, $(PROFILE)) + +else + +ifeq (2, $(FRAMEWORK_VERSION_MAJOR)) +LIB_MCS_FLAGS += --runtime:v2 +else +ifeq (4, $(FRAMEWORK_VERSION_MAJOR)) +LIB_MCS_FLAGS += --runtime:v4 +else +$(error Unknown framework version) +endif +endif + +endif + LIBRARY_COMPILE = $(BOOT_COMPILE) LIBRARY_INSTALL_DIR = $(mono_libdir)/mono/$(FRAMEWORK_VERSION) @@ -20,19 +36,14 @@ RESOURCE_FILES = \ resources/collation.cjkKO.bin \ resources/collation.cjkKOlv2.bin -corlib_flags = -unsafe -nostdlib -LOCAL_MCS_FLAGS = -nowarn:169,612,618,649 -d:INSIDE_CORLIB - -ifneq ($(FRAMEWORK_VERSION),1.0) -LOCAL_MCS_FLAGS += -nowarn:414 -endif +LOCAL_MCS_FLAGS = -unsafe -nostdlib -nowarn:612,618 -d:INSIDE_CORLIB -d:LIBC +DEFAULT_REFERENCES = # System.IO/DirectoryInfoTest.cs needs Mono.Posix -TEST_MCS_FLAGS = -debug+ -debug:full -nowarn:168,219,618,672 -unsafe -r:$(topdir)/class/lib/$(PROFILE)/Mono.Posix.dll +TEST_MCS_FLAGS = -debug -nowarn:168,219,618,672 -unsafe -r:Mono.Posix.dll -r:System.Core.dll \ + -define:MONO_DATACONVERTER_STATIC_METHODS $(TEST_RESX_RESOURCES:%=-resource:%) EXTRA_DISTFILES = \ - corlib.dll.win32-excludes \ - Test/ms_run_test.sh \ Test/resources/MyResources.resources \ Test/resources/MyResources.de.resources \ Test/resources/Empty.resources \ @@ -40,12 +51,26 @@ EXTRA_DISTFILES = \ Test/resources/StreamTest.resources \ Test/resources/StreamTest.ja.resources \ Test/resources/bug81759.resources \ - $(RESOURCE_FILES) + Test/resources/415628.bin \ + Test/resources/Fergie.GED \ + Test/resources/culture-*.cs \ + $(RESOURCE_FILES) \ + $(TEST_RESOURCES:.resources=.resx) + +TEST_RESX_RESOURCES = \ + Test/resources/Resources.resources + +TEST_RESX_RESOURCES_SATELITE = \ + Test/resources/Resources.es-ES.resources \ + Test/resources/Resources.nn-NO.resources \ + +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 @@ -76,10 +101,58 @@ $(cmp_makefrag): $(cmp_response) $(cmp_response) $(cmp_makefrag): Makefile $(depsdir)/.stamp endif -# -# qh21 = Quick Hack for 2.1, to be used by impatient developers to get -# test builds done quickly -# -qh21: - make PROFILE=net_2_1_raw - (cd ../../tools/tuner; rm tune.stamp; make tune.stamp && make PROFILE=net_2_1 install) +$(TEST_RESX_RESOURCES) $(TEST_RESX_RESOURCES_SATELITE): %.resources: %.resx + $(RESGEN) $< || cp $@.prebuilt $@ + +TEST_RESOURCES = $(TEST_RESX_RESOURCES) $(TEST_RESX_RESOURCES_SATELITE) + +satellite_assembly1 = es-ES/$(patsubst %.dll,%.Resources.dll,$(test_lib)) +satellite_assembly2 = nn-NO/$(patsubst %.dll,%.Resources.dll,$(test_lib)) + +$(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:$@ + +$(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:$@ + +vtsdir = Test/System.Runtime.Serialization.Formatters.Binary/VersionTolerantSerialization +vtslibs = \ + $(vtsdir)/$(PROFILE)_TestLib/1.0/Address.dll \ + $(vtsdir)/$(PROFILE)_TestLib/2.0/Address.dll \ + $(vtsdir)/$(PROFILE)_TestLib/3.0/Address.dll \ + $(vtsdir)/$(PROFILE)_TestLib/4.0/Address.dll \ + $(vtsdir)/$(PROFILE)_TestLib/5.0/Address.dll \ + $(vtsdir)/$(PROFILE)_TestLib/6.0/Address.dll + +test-vts: $(vtslibs) $(vtsdir)/$(PROFILE)_TestLib/BinarySerializationOverVersions.exe + +$(vtsdir)/$(PROFILE)_TestLib/%/Address.dll: $(vtsdir)/VersionTolerantSerializationTestLib/%/Address.cs + @mkdir -p $(dir $@) + $(CSCOMPILE) -target:library -r:$(corlib) -warn:0 -out:$@ $^ + +$(vtsdir)/$(PROFILE)_TestLib/BinarySerializationOverVersions.exe: $(vtsdir)/BinarySerializationOverVersions.cs $(vtsdir)/$(PROFILE)_TestLib/1.0/Address.dll + $(CSCOMPILE) $(test_nunit_ref) -warn:0 -r:$(corlib) \ + -r:$(vtsdir)/$(PROFILE)_TestLib/1.0/Address.dll \ + $(vtsdir)/BinarySerializationOverVersions.cs -out:$@ + @cp $(vtsdir)/$(PROFILE)_TestLib/1.0/Address.dll $(vtsdir)/$(PROFILE)_TestLib + +# Need to define MONO_PATH to an absolute dir since the test is ran from a subdir +run-test-vts: test-vts + @echo Running vts tests... + PATH="$(TEST_RUNTIME_WRAPPERS_PATH):$(PATH)" $(TEST_RUNTIME) $(RUNTIME_FLAGS) $(TEST_HARNESS) -noshadow \ + $(vtsdir)/$(PROFILE)_TestLib/BinarySerializationOverVersions.exe +test: test-vts +run-test: run-test-vts + +EXTRA_DISTFILES += \ + $(vtsdir)/VersionTolerantSerializationTestLib/1.0/Address.cs \ + $(vtsdir)/VersionTolerantSerializationTestLib/2.0/Address.cs \ + $(vtsdir)/VersionTolerantSerializationTestLib/3.0/Address.cs \ + $(vtsdir)/VersionTolerantSerializationTestLib/4.0/Address.cs \ + $(vtsdir)/VersionTolerantSerializationTestLib/5.0/Address.cs \ + $(vtsdir)/VersionTolerantSerializationTestLib/6.0/Address.cs \ + $(vtsdir)/BinarySerializationOverVersions.cs