* library.make (HAVE_CS_TESTS, HAVE_VB_TESTS): Allow to be

overriden.  Useful if the tests sourcefile is generated.
(TEST_COMPILE, BTEST_COMPILE): Allow these to be customized too.

Support enough features to build mscorlib.dll.
* library.make (core_sourcefile): New renamed from $(sourcefile).
(PLATFORM_excludes): Auto-detecting define that sees if
$(LIBRARY).$(PLATFORM)-excludes file exists.
(sourcefile): New.  Possibly-built file that removes
PLATFORM_excluded files from core_sourcefile.
(test_against, test_dep): New.  Allow the test assembly to be
built against a different library.
(test_lib): Allow makefile to override the name of the test
assembly.
(LIBRARY_INSTALL_DIR): If defined, switch to using $(INSTALL_LIB)
rather than $(gacutil).
(DISTFILES, dist-local): Use core_sourcefile.
(clean-local): Remove sourcefile if it was generated.
(test_lib, btest_lib): Depend on $(test_dep).

svn path=/trunk/mcs/; revision=29338

diff --git a/mcs/build/ChangeLog b/mcs/build/ChangeLog
index 2ad926bf79c7111aedb3fdb1cffd1e3bd7846cdd..c977287d006ba2dbeaddbe60b65ac6ab34b439e9 100644 (file)
--- a/mcs/build/ChangeLog
+++ b/mcs/build/ChangeLog
@@ -2,6 +2,7 @@
 
        * library.make (HAVE_CS_TESTS, HAVE_VB_TESTS): Allow to be
        overriden.  Useful if the tests sourcefile is generated.
+       (TEST_COMPILE, BTEST_COMPILE): Allow these to be customized too.
 
        * platforms/win32.make (PLATFORM_TWEAK_CORLIB_SOURCES): Remove.
 

diff --git a/mcs/build/library.make b/mcs/build/library.make
index d2df47166370561434776f2389d543646675729e..8d67c3be66820e21c0b9a5d662f024c90abaad55 100644 (file)
--- a/mcs/build/library.make
+++ b/mcs/build/library.make
@@ -195,6 +195,14 @@ ifndef LIBRARY_COMPILE
 LIBRARY_COMPILE = $(CSCOMPILE)
 endif
 
+ifndef TEST_COMPILE
+TEST_COMPILE = $(CSCOMPILE)
+endif
+
+ifndef BTEST_COMPILE
+BTEST_COMPILE = $(BASCOMPILE)
+endif
+
 # Fun with dependency tracking
 
 $(the_lib): $(makefrag) $(response)
@@ -218,7 +226,7 @@ endif
 ifdef HAVE_CS_TESTS
 
 $(test_lib): $(test_makefrag) $(test_dep) $(test_response) $(test_nunit_dep)
-       $(CSCOMPILE) /target:library /out:$@ $(test_flags) @$(test_response)
+       $(TEST_COMPILE) /target:library /out:$@ $(test_flags) @$(test_response)
 
 $(test_response): $(test_sourcefile)
        @echo Creating $@ ...
@@ -239,7 +247,7 @@ endif
 ifdef HAVE_VB_TESTS
 
 $(btest_lib): $(btest_makefrag) $(test_dep) $(btest_response) $(test_nunit_dep)
-       $(BASCOMPILE) /target:library /out:$@ $(btest_flags) @$(btest_response)
+       $(BTEST_COMPILE) /target:library /out:$@ $(btest_flags) @$(btest_response)
 
 $(btest_response): $(btest_sourcefile)
        @echo Creating $@ ...