Author: raja
Date: 2006-01-19 06:43:51 -0500 (Thu, 19 Jan 2006)
New Revision: 55775
Removed:
trunk/mcs/class/corlib/corlib_plattest.dll.excludes
trunk/mcs/class/corlib/corlib_res.dll.excludes
Modified:
trunk/mcs/build/ChangeLog
trunk/mcs/build/library.make
trunk/mcs/class/corlib/ChangeLog
trunk/mcs/class/corlib/Makefile
trunk/mcs/class/corlib/System.Security.Cryptography/
Log:
In build:
* library.make (test_lib): Don't allow to be overridden.
(test_against, test_dep): Remove.
In class/corlib:
* Makefile: Simplify. Remove support for corlib_plattest and reslib.
* corlib_plattest.dll.excludes, corlib_res.dll.excludes: remove.
Modified: trunk/mcs/build/ChangeLog
===================================================================
--- trunk/mcs/build/ChangeLog 2006-01-19 09:47:00 UTC (rev 55774)
+++ trunk/mcs/build/ChangeLog 2006-01-19 11:43:51 UTC (rev 55775)
@@ -1,3 +1,8 @@
+2006-01-19 Raja R Harinath <[EMAIL PROTECTED]>
+
+ * library.make (test_lib): Don't allow to be overridden.
+ (test_against, test_dep): Remove.
+
2006-01-11 Gonzalo Paniagua Javier <[EMAIL PROTECTED]>
* executable.make: allow installing a different .config file for
Modified: trunk/mcs/build/library.make
===================================================================
--- trunk/mcs/build/library.make 2006-01-19 09:47:00 UTC (rev 55774)
+++ trunk/mcs/build/library.make 2006-01-19 11:43:51 UTC (rev 55775)
@@ -63,33 +63,20 @@
test_nunit_ref = $(test_nunit_dep:%=-r:%)
library_CLEAN_FILES += TestResult*.xml
-ifndef test_against
-test_against = $(the_lib)
-test_dep = $(the_lib)
-endif
-
-ifndef test_lib
test_lib = $(LIBRARY:.dll=_test_$(PROFILE).dll)
test_sourcefile = $(LIBRARY:.dll=_test.dll.sources)
-else
-test_sourcefile = $(test_lib).sources
-endif
test_pdb = $(test_lib:.dll=.pdb)
test_response = $(depsdir)/$(test_lib).response
test_makefrag = $(depsdir)/$(test_lib).makefrag
-test_flags = -r:$(test_against) $(test_nunit_ref) $(TEST_MCS_FLAGS)
+test_flags = -r:$(the_lib) $(test_nunit_ref) $(TEST_MCS_FLAGS)
library_CLEAN_FILES += $(LIBRARY:.dll=_test*.dll) $(LIBRARY:.dll=_test*.pdb)
$(test_response) $(test_makefrag)
-ifndef btest_lib
btest_lib = $(LIBRARY:.dll=_btest_$(PROFILE).dll)
btest_sourcefile = $(LIBRARY:.dll=_btest.dll.sources)
-else
-btest_sourcefile = $(btest_lib).sources
-endif
btest_pdb = $(btest_lib:.dll=.pdb)
btest_response = $(depsdir)/$(btest_lib).response
btest_makefrag = $(depsdir)/$(btest_lib).makefrag
-btest_flags = -r:$(test_against) $(test_nunit_ref) $(TEST_MBAS_FLAGS)
+btest_flags = -r:$(the_lib) $(test_nunit_ref) $(TEST_MBAS_FLAGS)
library_CLEAN_FILES += $(LIBRARY:.dll=_btest*.dll) $(LIBRARY:.dll=_btest*.pdb)
$(btest_response) $(btest_makefrag)
ifndef HAVE_CS_TESTS
@@ -319,7 +306,7 @@
ifdef HAVE_CS_TESTS
-$(test_lib): $(test_dep) $(test_response) $(test_nunit_dep)
+$(test_lib): $(the_lib) $(test_response) $(test_nunit_dep)
$(TEST_COMPILE) -target:library -out:$@ $(test_flags) @$(test_response)
$(test_response): $(test_sourcefile)
@@ -336,7 +323,7 @@
ifdef HAVE_VB_TESTS
-$(btest_lib): $(test_dep) $(btest_response) $(test_nunit_dep)
+$(btest_lib): $(the_lib) $(btest_response) $(test_nunit_dep)
$(BTEST_COMPILE) -target:library -out:$@ $(btest_flags)
@$(btest_response)
$(btest_response): $(btest_sourcefile)
Modified: trunk/mcs/class/corlib/ChangeLog
===================================================================
--- trunk/mcs/class/corlib/ChangeLog 2006-01-19 09:47:00 UTC (rev 55774)
+++ trunk/mcs/class/corlib/ChangeLog 2006-01-19 11:43:51 UTC (rev 55775)
@@ -1,3 +1,8 @@
+2006-01-19 Raja R Harinath <[EMAIL PROTECTED]>
+
+ * Makefile: Simplify. Remove support for corlib_plattest and reslib.
+ * corlib_plattest.dll.excludes, corlib_res.dll.excludes: remove.
+
2006-01-18 Atsushi Enomoto <[EMAIL PROTECTED]>
* Makefile : corlib_plattest dll is now profile-aware.
Modified: trunk/mcs/class/corlib/Makefile
===================================================================
--- trunk/mcs/class/corlib/Makefile 2006-01-19 09:47:00 UTC (rev 55774)
+++ trunk/mcs/class/corlib/Makefile 2006-01-19 11:43:51 UTC (rev 55775)
@@ -3,6 +3,14 @@
include ../../build/rules.make
export __SECURITY_BOOTSTRAP_DB=$(topdir)/class/corlib
+LIBRARY = corlib.dll
+LIBRARY_NAME = mscorlib.dll
+LIB_MCS_FLAGS = $(corlib_flags) $(RESOURCE_FILES:%=-resource:%)
+LIBRARY_USE_INTERMEDIATE_FILE = yes
+
+LIBRARY_COMPILE = $(BOOT_COMPILE)
+LIBRARY_INSTALL_DIR = $(mono_libdir)/mono/$(FRAMEWORK_VERSION)
+
RESOURCE_FILES = \
resources/collation.core.bin \
resources/collation.tailoring.bin \
@@ -19,68 +27,19 @@
LOCAL_MCS_FLAGS += -nowarn:414
endif
-LIBRARY = corlib.dll
-LIBRARY_NAME = mscorlib.dll
-LIB_MCS_FLAGS = $(corlib_flags) $(RESOURCE_FILES:%=/resource:%)
-LIBRARY_USE_INTERMEDIATE_FILE = yes
+TEST_MCS_FLAGS = -debug+ -debug:full -nowarn:168,219,618,672 -unsafe
-LIBRARY_COMPILE = $(BOOT_COMPILE)
-LIBRARY_INSTALL_DIR = $(mono_libdir)/mono/$(FRAMEWORK_VERSION)
-
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/Empty.resources \
- Test/resources/AFile.txt \
+ Test/resources/AFile.txt \
$(RESOURCE_FILES)
-CLEAN_FILES = $(cmplib) $(reslib) $(plattestverlib) $(plattestverlib).sources \
- $(cmp_response) $(cmp_makefrag) \
- $(res_response) $(res_makefrag) \
- $(cmppdb) $(respdb) $(plattestpdb)
+include $(topdir)/build/library.make
-# 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
-plattestverlib = corlib_plattest_$(PROFILE).dll
-plattestpdb = $(patsubst %.dll,%.pdb,$(plattestverlib))
-$(plattestverlib).sources: corlib_test.dll.sources $(plattestlib).excludes
- sort corlib_test.dll.sources $(plattestlib).excludes | uniq -u >$@
-
-TEST_MCS_FLAGS = -debug+ -debug:full -nowarn:168,219,618,672 -unsafe
-
-ifndef PLATFORM_MONO_NATIVE
-test_lib = $(plattestverlib)
-test_against = $(PLATFORM_CORLIB)
-HAVE_CS_TESTS = $(plattestverlib).sources
-
-## 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)
-endif
-
-include ../../build/library.make
-
-ifndef PLATFORM_MONO_NATIVE
-run-monotest:
- $(MAKE) $(reslib)
- $(MAKE) test_lib=$(plattestverlib) test_against=$(reslib) run-test
-
-run-plattest:
- $(MAKE) test_lib=$(plattestverlib) test_against='$(PLATFORM_CORLIB)'
run-test
-
-else
-run-monotest: run-test
-endif
-
+ifdef FIXME_CORLIB_CMP
# corlib_cmp
cmplib = $(topdir)/class/lib/$(PROFILE)/corlib_cmp.dll
cmppdb = $(cmplib:.dll=.pdb)
@@ -88,6 +47,9 @@
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)
@@ -105,24 +67,4 @@
# leading to a broken build.
#
# -include $(cmp_makefrag)
-
-# corlib_res
-reslib = $(topdir)/class/lib/$(PROFILE)/corlib_res.dll
-respdb = $(reslib:.dll=.pdb)
-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
Property changes on: trunk/mcs/class/corlib/System.Security.Cryptography
___________________________________________________________________
Name: svn:ignore
+ semantic.cache
Deleted: trunk/mcs/class/corlib/corlib_plattest.dll.excludes
===================================================================
Deleted: trunk/mcs/class/corlib/corlib_res.dll.excludes
===================================================================
--- trunk/mcs/class/corlib/corlib_res.dll.excludes 2006-01-19 09:47:00 UTC
(rev 55774)
+++ trunk/mcs/class/corlib/corlib_res.dll.excludes 2006-01-19 11:43:51 UTC
(rev 55775)
@@ -1,22 +0,0 @@
-System/Object.cs
-System/ValueType.cs
-System/Enum.cs
-System/Delegate.cs
-System/MulticastDelegate.cs
-System.Runtime.CompilerServices/RuntimeHelpers.cs
-System/Decimal.cs
-System/DecimalFormatter.cs
-System/MonoType.cs
-System/Array.cs
-System/String.cs
-System/Console.cs
-System/RuntimeTypeHandle.cs
-System/ArgIterator.cs
-System/ICloneable.cs
-System.Collections/Queue.cs
-System.Collections/ICollection.cs
-System.Collections/IEnumerator.cs
-System.Collections/IEnumerable.cs
-System.Collections/IList.cs
-System.Reflection/TargetInvocationException.cs
-System.Security.Permissions/SecurityPermissionAttribute.cs
_______________________________________________
Mono-patches maillist - [email protected]
http://lists.ximian.com/mailman/listinfo/mono-patches