2007-02-01 Atsushi Enomoto <atsushi@ximian.com>

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

diff --git a/mcs/class/corlib/Makefile b/mcs/class/corlib/Makefile
index 7a77d0e47a5a458da6c752fb00dcb61000b263ca..b8310cf9612c4fc74b34975ce4f37a27dd9fe3b5 100644 (file)
--- a/mcs/class/corlib/Makefile
+++ b/mcs/class/corlib/Makefile
@@ -3,89 +3,56 @@ SUBDIRS =
 include ../../build/rules.make
 export __SECURITY_BOOTSTRAP_DB=$(topdir)/class/corlib
 
-# corlib is crazy to build so we skip build/library.make and do stuff
-# ourselves.
-#
-# Here, we define a bunch of variables.
-
-corlib_flags = /unsafe /nostdlib
-LOCAL_MCS_FLAGS = /nowarn:649 /nowarn:169 -nowarn:612 -nowarn:618 -d:INSIDE_CORLIB
-
 LIBRARY = corlib.dll
 LIBRARY_NAME = mscorlib.dll
-LIB_MCS_FLAGS = $(corlib_flags)
+LIB_MCS_FLAGS = $(corlib_flags) $(RESOURCE_FILES:%=-resource:%)
 LIBRARY_USE_INTERMEDIATE_FILE = yes
 
-# disable, until people fix their code...
-#corlib_flags = /unsafe /nostdlib /d:INSIDE_CORLIB
-
+LIBRARY_COMPILE = $(BOOT_COMPILE)
 LIBRARY_INSTALL_DIR = $(mono_libdir)/mono/$(FRAMEWORK_VERSION)
 
-CLEAN_FILES = $(cmplib) $(reslib) $(plattestlib) $(plattestlib).sources \
-              $(cmp_response) $(cmp_makefrag) \
-              $(res_response) $(res_makefrag) \
-              $(cmppdb) $(respdb) $(plattestpdb)
-
-# If building on a non mono-native platform, default
-# to running the unit tests on its corlib, to see if
-# our tests are complaint with their (hopefully bug-free)
-# corlib. If on a mono-native platform, test our actual
-# corlib.
-#
-# You can access either one on demand with either 'make
-# run-monotest' or 'make run-plattest'.
-
-plattestlib = corlib_plattest.dll
-plattestpdb = $(patsubst %.dll,%.pdb,$(plattestlib))
-reslib = $(topdir)/class/lib/$(PROFILE)/corlib_res.dll
-cmplib = $(topdir)/class/lib/$(PROFILE)/corlib_cmp.dll
-
-$(plattestlib).sources: corlib_test.dll.sources $(plattestlib).excludes
-       sort corlib_test.dll.sources $(plattestlib).excludes | uniq -u >$@
-
-TEST_MCS_FLAGS = -debug+ -debug:full -nowarn:168 -nowarn:219 -nowarn:0618 -nowarn:0672 -unsafe -r:System.Data.dll
+RESOURCE_FILES = \
+       resources/collation.core.bin \
+       resources/collation.tailoring.bin \
+       resources/collation.cjkCHS.bin \
+       resources/collation.cjkCHT.bin \
+       resources/collation.cjkJA.bin \
+       resources/collation.cjkKO.bin \
+       resources/collation.cjkKOlv2.bin
 
-ifndef PLATFORM_MONO_NATIVE
-test_lib = $(plattestlib)
-test_against = $(PLATFORM_CORLIB)
-HAVE_CS_TESTS = $(plattestlib).sources
+corlib_flags = -unsafe -nostdlib
+LOCAL_MCS_FLAGS = -nowarn:169,612,618,649 -d:INSIDE_CORLIB
 
-## for now, compiling the testsuite with CSC causes CS0583.  So compile with internal MCS
-TEST_COMPILE = MONO_PATH="$(topdir)/class/lib/$(PROFILE)$(PLATFORM_PATH_SEPARATOR)$$MONO_PATH" $(INTERNAL_MCS) $(USE_MCS_FLAGS)
+ifneq ($(FRAMEWORK_VERSION),1.0)
+LOCAL_MCS_FLAGS += -nowarn:414
 endif
 
-ifdef PLATFORM_MONO_NATIVE
-run-monotest: run-test
-else
-run-monotest:
-       $(MAKE) $(reslib)
-       $(MAKE) test_lib=corlib_test.dll test_against=$(reslib) run-test
-
-run-plattest:
-       $(MAKE) test_lib=$(plattestlib) test_against='$(PLATFORM_CORLIB)' run-test
-endif
+TEST_MCS_FLAGS = -debug+ -debug:full -nowarn:168,219,618,672 -unsafe
 
 EXTRA_DISTFILES = \
-       corlib.dll.win32-excludes corlib_cmp.dll.excludes corlib_res.dll.excludes \
-       $(plattestlib).excludes                 \
+       corlib.dll.win32-excludes               \
        Test/ms_run_test.sh                     \
        Test/resources/MyResources.resources    \
+       Test/resources/MyResources.de.resources \
        Test/resources/Empty.resources          \
-       Test/resources/AFile.txt
+       Test/resources/AFile.txt                \
+       $(RESOURCE_FILES)
 
-LIBRARY_COMPILE = $(BOOT_COMPILE)
-
-include ../../build/library.make
+include $(topdir)/build/library.make
 
+ifdef FIXME_CORLIB_CMP
 # corlib_cmp
-
-cmppdb = $(patsubst %.dll,%.pdb,$(cmplib))
+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)
+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)
+       $(BOOT_COMPILE) $(LIBRARY_FLAGS) $(cmp_flags) -target:library -out:$@ @$(cmp_response)
 
 $(cmp_response): $(sourcefile) corlib_cmp.dll.excludes
        @echo Creating $@ ...
@@ -101,24 +68,4 @@ $(cmp_makefrag): $(cmp_response)
 # leading to a broken build.
 #
 # -include $(cmp_makefrag)
-
-# corlib_res
-
-respdb = $(patsubst %.dll,%.pdb,$(reslib))
-res_response = $(depsdir)/$(PROFILE)_corlib_res.dll.response
-res_makefrag = $(depsdir)/$(PROFILE)_corlib_res.dll.makefrag
-res_flags = /r:$(PLATFORM_CORLIB) $(corlib_flags)
-
-$(reslib): $(res_makefrag) $(res_response)
-       $(BOOT_COMPILE) $(LIBRARY_FLAGS) $(res_flags) /target:library /out:$@ @$(res_response)
-
-$(res_response): $(sourcefile) corlib_res.dll.excludes
-       @echo Creating $@ ...
-       @sort $(sourcefile) corlib_res.dll.excludes | uniq -u | $(PLATFORM_CHANGE_SEPARATOR_CMD) >$@
-
-# warning: embedded tab in the 'echo touch' line
-$(res_makefrag): $(res_response)
-       @echo Creating $@ ...
-       @sed 's,^,$(reslib): ,' $< >$@
-
--include $(res_makefrag)
+endif