X-Git-Url: http://wien.tomnetworks.com/gitweb/?a=blobdiff_plain;f=mcs%2Fbuild%2Flibrary.make;h=3d94ab9709b5ad7a0b6e4faeb59d18f15e1ba5ea;hb=73b71062a7753c95d132372275d7f521e8d82087;hp=422e8d737605d0a57d2550d6725e3c654d219ec6;hpb=48c30bf3f39caf81dcef550529d05e334c0cff62;p=mono.git

diff --git a/mcs/build/library.make b/mcs/build/library.make
index 422e8d73760..3d94ab9709b 100644
--- a/mcs/build/library.make
+++ b/mcs/build/library.make
@@ -9,11 +9,30 @@
 # munge in the library name to keep the files from clashing.
 
 sourcefile = $(LIBRARY).sources
-ifdef PLATFORM_CHANGE_SEPARATOR_CMD
-response = $(depsdir)/$(PROFILE)_$(LIBRARY).response
-else
+
+# If the directory contains the per profile include file, generate list file.
+PROFILE_sources = $(PROFILE)_$(LIBRARY).sources
+ifeq ($(wildcard $(PROFILE_sources)), $(PROFILE_sources))
+PROFILE_excludes = $(wildcard $(PROFILE)_$(LIBRARY).exclude.sources)
+COMMON_sourcefile := $(sourcefile)
+sourcefile = $(depsdir)/$(PROFILE)_$(LIBRARY).sources
+$(sourcefile): $(PROFILE_sources) $(PROFILE_excludes) $(COMMON_sourcefile)
+	@echo Creating the per profile list $@ ...
+	$(topdir)/tools/gensources.sh $(PROFILE_sources) $(PROFILE_excludes) > $@
+endif
+
+PLATFORM_excludes := $(wildcard $(LIBRARY).$(PLATFORM)-excludes)
+
+ifndef PLATFORM_excludes
+ifeq (cat,$(PLATFORM_CHANGE_SEPARATOR_CMD))
 response = $(sourcefile)
 endif
+endif
+
+ifndef response
+response = $(depsdir)/$(PROFILE)_$(LIBRARY).response
+library_CLEAN_FILES += $(response) $(LIBRARY).mdb $(BUILT_SOURCES)
+endif
 
 ifndef LIBRARY_NAME
 LIBRARY_NAME = $(LIBRARY)
@@ -21,156 +40,262 @@ endif
 
 makefrag = $(depsdir)/$(PROFILE)_$(LIBRARY).makefrag
 the_lib = $(topdir)/class/lib/$(PROFILE)/$(LIBRARY_NAME)
-the_pdb = $(patsubst %.dll,%.pdb,$(the_lib))
+the_pdb = $(the_lib:.dll=.pdb)
+the_mdb = $(the_lib).mdb
+library_CLEAN_FILES += $(makefrag) $(the_lib) $(the_pdb) $(the_mdb)
+
+ifdef LIBRARY_NEEDS_POSTPROCESSING
+build_lib = fixup/$(PROFILE)/$(LIBRARY_NAME)
+library_CLEAN_FILES += $(build_lib) $(build_lib:.dll=.pdb)
+else
+build_lib = $(the_lib)
+endif
 
 ifndef NO_TEST
-test_nunitfw = $(topdir)/class/lib/$(PROFILE)/nunit.framework.dll 
-test_nunitcore = $(topdir)/class/lib/$(PROFILE)/nunit.core.dll 
-test_nunitutil = $(topdir)/class/lib/$(PROFILE)/nunit.util.dll 
-test_nunit_dep = $(test_nunitfw) $(test_nunitcore) $(test_nunitutil)
-test_nunit_ref = -r:$(test_nunitfw) -r:$(test_nunitcore) -r:$(test_nunitutil)
-
-test_lib = $(patsubst %.dll,%_test.dll,$(LIBRARY))
-test_pdb = $(patsubst %.dll,%.pdb,$(test_lib))
-test_sourcefile = $(test_lib).sources
-test_response = $(depsdir)/$(PROFILE)_$(test_lib).response
-test_makefrag = $(depsdir)/$(PROFILE)_$(test_lib).makefrag
-test_flags = /r:$(the_lib) $(test_nunit_ref) $(TEST_MCS_FLAGS)
+test_nunit_lib = nunit.framework.dll nunit.core.dll nunit.util.dll
+test_nunit_dep = $(test_nunit_lib:%=$(topdir)/class/lib/$(PROFILE)/%)
+test_nunit_ref = $(test_nunit_dep:%=-r:%)
+library_CLEAN_FILES += TestResult*.xml
+
+ifndef test_against
+test_against = $(the_lib)
+test_dep = $(the_lib)
+endif
 
-btest_lib = $(patsubst %.dll,%_btest.dll,$(LIBRARY))
-btest_pdb = $(patsubst %.dll,%.pdb,$(btest_lib))
+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)
+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:$(the_lib) $(test_nunit_ref) $(TEST_MBAS_FLAGS)
+btest_flags = -r:$(test_against) $(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
 HAVE_CS_TESTS := $(wildcard $(test_sourcefile))
+endif
+ifndef HAVE_VB_TESTS
 HAVE_VB_TESTS := $(wildcard $(btest_sourcefile))
-
 endif
 
-gacutil = $(topdir)/tools/gacutil/gacutil.exe
-sn = $(topdir)/tools/security/sn.exe
+endif
 
-PACKAGE = 1.0
+ifdef NO_INSTALL
+GACUTIL = :
+else
+gacutil = $(topdir)/class/lib/net_1_1_bootstrap/gacutil.exe
+GACUTIL = MONO_PATH="$(topdir)/class/lib/net_1_1_bootstrap$(PLATFORM_PATH_SEPARATOR)$$MONO_PATH" $(RUNTIME) $(RUNTIME_FLAGS) $(gacutil)
+endif
 
-ifeq ($(PROFILE), net_2_0)
-PACKAGE = 2.0
+ifdef NO_SIGN_ASSEMBLY
+SN = :
+else
+sn = $(topdir)/class/lib/net_1_1_bootstrap/sn.exe
+SN = MONO_PATH="$(topdir)/class/lib/net_1_1_bootstrap$(PLATFORM_PATH_SEPARATOR)$$MONO_PATH" $(RUNTIME) $(RUNTIME_FLAGS) $(sn)
+SNFLAGS = -q -R
 endif
 
-ifndef NO_SIGN_ASSEMBLY
-sign = sign_assembly
+ifeq ($(PLATFORM), win32)
+GACDIR = `cygpath -w $(mono_libdir)`
+GACROOT = `cygpath -w $(DESTDIR)$(mono_libdir)`
+test_flags += -d:WINDOWS
 else
-sign = 
+GACDIR = $(mono_libdir)
+GACROOT = $(DESTDIR)$(mono_libdir)
 endif
 
 all-local: $(the_lib)
 
-install-local: $(the_lib) $(gacutil) $(sign)
-	$(RUNTIME)  $(gacutil) /i $(the_lib) /f /root $(DESTDIR)$(prefix)/lib /package $(PACKAGE)
+install-local: all-local
+test-local: all-local
+uninstall-local:
 
-uninstall-local: $(gacutil)
-	$(RUNTIME) $(gacutil) /u `echo $(LIBRARY_NAME) | sed 's,.dll$,,'`
+ifdef NO_INSTALL
+install-local uninstall-local:
+	@:
 
-$(gacutil):
-	cd $(topdir)/tools/gacutil && $(MAKE)
+else
 
-$(sn):
-	cd $(topdir)/tools/security && $(MAKE) sn.exe || exit 1 ;
+ifdef LIBRARY_INSTALL_DIR
+install-local:
+	$(MKINSTALLDIRS) $(DESTDIR)$(LIBRARY_INSTALL_DIR)
+	$(INSTALL_LIB) $(the_lib) $(DESTDIR)$(LIBRARY_INSTALL_DIR)/$(LIBRARY_NAME)
+	test ! -f $(the_lib).mdb || $(INSTALL_LIB) $(the_lib).mdb $(DESTDIR)$(LIBRARY_INSTALL_DIR)/$(LIBRARY_NAME).mdb
 
-sign_assembly: $(sn)
-	$(RUNTIME) $(sn) -q -R $(the_lib) $(topdir)/class/mono.snk
+uninstall-local:
+	-rm -f $(DESTDIR)$(LIBRARY_INSTALL_DIR)/$(LIBRARY_NAME) $(DESTDIR)$(LIBRARY_INSTALL_DIR)/$(LIBRARY_NAME).mdb
 
-clean-local:
-	-rm -f $(the_lib) $(makefrag) $(test_lib) \
-	       $(test_makefrag) $(test_response) \
-	       $(the_pdb) $(test_pdb) $(CLEAN_FILES) \
-	       TestResult.xml
-ifdef PLATFORM_CHANGE_SEPARATOR_CMD
-	-rm -rf $(response)
+else
+
+# If RUNTIME_HAS_CONSISTENT_GACDIR is set, it implies that the internal GACDIR
+# of the runtime is the same as the GACDIR we want.  So, we don't need to pass it
+# to gacutil.  Note that the GACDIR we want may not be the same as the value of
+# GACDIR set above, since the user could have overridden the value of $(prefix).
+#
+# This makes a difference only when we're building from the mono/ tree, since we
+# have to ensure that the internal GACDIR of the in-tree runtime matches where we
+# install the DLLs.
+
+ifndef RUNTIME_HAS_CONSISTENT_GACDIR
+gacdir_flag = /gacdir $(GACDIR)
 endif
 
+install-local: $(gacutil)
+	$(GACUTIL) /i $(the_lib) /f $(gacdir_flag) /root $(GACROOT) /package $(FRAMEWORK_VERSION)
 
-test-local: $(the_lib)
-	@:
-run-test-local:
-	@:
-run-test-ondotnet-local:
+uninstall-local: $(gacutil)
+	-$(GACUTIL) /u $(LIBRARY_NAME:.dll=) $(gacdir_flag) /root $(GACROOT) /package $(FRAMEWORK_VERSION)
+
+endif
+endif
+
+clean-local:
+	-rm -f $(library_CLEAN_FILES) $(CLEAN_FILES)
+
+test-local run-test-local run-test-ondotnet-local:
 	@:
 
 ifndef NO_TEST
-$(test_nunit_dep): $(topdir)/build/deps/nunit.stamp
+$(test_nunit_dep): $(topdir)/build/deps/nunit-$(PROFILE).stamp
 	@if test -f $@; then :; else rm -f $<; $(MAKE) $<; fi
-$(topdir)/build/deps/nunit.stamp:
+$(topdir)/build/deps/nunit-$(PROFILE).stamp:
 	cd ${topdir}/nunit20 && $(MAKE)
 	echo "stamp" >$@
+library_CLEAN_FILES += $(topdir)/build/deps/nunit-$(PROFILE).stamp
 endif
 
+test_assemblies :=
+
 ifdef HAVE_CS_TESTS
+test_assemblies += $(test_lib)
+endif
 
-test-local: $(test_lib)
+ifdef HAVE_VB_TESTS
+test_assemblies += $(btest_lib)
+endif
 
+ifdef test_assemblies
+test-local: $(test_assemblies)
 run-test-local: run-test-lib
+run-test-ondotnet-local: run-test-ondotnet-lib
 
+## FIXME: i18n problem in the 'sed' command below
 run-test-lib: test-local
-	$(TEST_RUNTIME) $(TEST_HARNESS) $(test_lib)
-
-run-test-ondotnet-local: run-test-ondotnet-lib
+	ok=:; \
+	$(TEST_RUNTIME) $(TEST_HARNESS) $(TEST_HARNESS_FLAGS) $(LOCAL_TEST_HARNESS_FLAGS) /output:TestResult-$(PROFILE).log /exclude:NotWorking,ValueAdd,CAS,InetAccess /xml:TestResult-$(PROFILE).xml $(test_assemblies) || ok=false; \
+	sed '1,/^Tests run: /d' TestResult-$(PROFILE).log; \
+	$$ok
 
 run-test-ondotnet-lib: test-local
-	$(TEST_HARNESS) $(test_lib)
+	ok=:; \
+	$(TEST_HARNESS) $(TEST_HARNESS_FLAGS) $(LOCAL_TEST_HARNESS_ONDOTNET_FLAGS) /exclude=NotDotNet,CAS /output:TestResult-ondotnet-$(PROFILE).log /xml:TestResult-ondotnet-$(PROFILE).xml $(test_assemblies) || ok=false; \
+	sed '1,/^Tests run: /d' TestResult-ondotnet-$(PROFILE).log; \
+	$$ok
 endif
 
-ifdef HAVE_VB_TESTS
-
-test-local: $(btest_lib)
+DISTFILES = $(sourcefile) $(EXTRA_DISTFILES)
 
-run-test-local: run-btest-lib
-
-run-btest-lib: test-local
-	$(TEST_RUNTIME) $(TEST_HARNESS) $(btest_lib)
-
-run-test-ondotnet-local: run-btest-ondotnet-lib
-
-run-btest-ondotnet-lib: test-local
-	$(TEST_HARNESS) $(btest_lib)
-
-endif
-
-DISTFILES = $(sourcefile) $(test_sourcefile) $(EXTRA_DISTFILES)
-
-TEST_FILES = 
+TEST_FILES =
 
 ifdef HAVE_CS_TESTS
-TEST_FILES += `sed 's,^,Test/,' $(test_sourcefile)`
+TEST_FILES += `sed -e '/^$$/d' -e 's,^,Test/,' $(test_sourcefile)`
+DISTFILES += $(test_sourcefile)
 endif
 ifdef HAVE_VB_TESTS
-TEST_FILES += `sed 's,^,Test/,' $(btest_sourcefile)`
+TEST_FILES += `sed -e '/^$$/d' -e 's,^,Test/,' $(btest_sourcefile)`
+DISTFILES += $(btest_sourcefile)
 endif
 
 dist-local: dist-default
+	subs=' ' ; \
 	for f in `cat $(sourcefile)` $(TEST_FILES) ; do \
-	    dest=`dirname $(distdir)/$$f` ; \
-	    $(MKINSTALLDIRS) $$dest && cp $$f $$dest || exit 1 ; \
-	done
+	  case $$f in \
+	  ../*) : ;; \
+	  *) dest=`dirname $$f` ; \
+	     case $$subs in *" $$dest "*) : ;; *) subs=" $$dest$$subs" ; $(MKINSTALLDIRS) $(distdir)/$$dest ;; esac ; \
+	     cp -p $$f $(distdir)/$$dest || exit 1 ;; \
+	  esac ; done ; \
+	for d in . $$subs ; do \
+	  case $$d in .) : ;; *) test ! -f $$d/ChangeLog || cp -p $$d/ChangeLog $(distdir)/$$d ;; esac ; done
+
+ifdef LIBRARY_NEEDS_POSTPROCESSING
+dist-local: dist-fixup
+FIXUP_PROFILES = default net_2_0
+dist-fixup:
+	$(MKINSTALLDIRS) $(distdir)/fixup $(FIXUP_PROFILES:%=$(distdir)/fixup/%)
+endif
 
 ifndef LIBRARY_COMPILE
 LIBRARY_COMPILE = $(CSCOMPILE)
 endif
 
-# Fun with dependency tracking
+ifndef TEST_COMPILE
+TEST_COMPILE = $(CSCOMPILE)
+endif
+
+ifndef BTEST_COMPILE
+BTEST_COMPILE = $(BASCOMPILE)
+endif
+
+ifndef LIBRARY_SNK
+LIBRARY_SNK = $(topdir)/class/mono.snk
+endif
 
-$(the_lib): $(makefrag) $(response)
-	$(LIBRARY_COMPILE) $(LIBRARY_FLAGS) $(LIB_MCS_FLAGS) /target:library /out:$@ @$(response)
+ifdef gacutil
+$(gacutil):
+	cd $(topdir) && $(MAKE) PROFILE=net_1_1_bootstrap
+endif
+
+ifdef sn
+$(sn):
+	cd $(topdir) && $(MAKE) PROFILE=net_1_1_bootstrap
+endif
+
+ifdef BUILT_SOURCES
+ifeq (cat, $(PLATFORM_CHANGE_SEPARATOR_CMD))
+BUILT_SOURCES_cmdline = $(BUILT_SOURCES)
+else
+BUILT_SOURCES_cmdline = `echo $(BUILT_SOURCES) | $(PLATFORM_CHANGE_SEPARATOR_CMD)`
+endif
+endif
+
+# The library
+
+$(build_lib): $(response) $(sn) $(BUILT_SOURCES)
+ifdef LIBRARY_USE_INTERMEDIATE_FILE
+	$(LIBRARY_COMPILE) $(LIBRARY_FLAGS) $(LIB_MCS_FLAGS) -target:library -out:$(LIBRARY_NAME) $(BUILT_SOURCES_cmdline) @$(response)
+	$(SN) $(SNFLAGS) $(LIBRARY_NAME) $(LIBRARY_SNK)
+	mv $(LIBRARY_NAME) $@
+	test ! -f $(LIBRARY_NAME).mdb || mv $(LIBRARY_NAME).mdb $@.mdb
+	test ! -f $(LIBRARY_NAME:.dll=.pdb) || mv $(LIBRARY_NAME:.dll=.pdb) $(dir $@)$(LIBRARY_NAME:.dll=.pdb)
+else
+	$(LIBRARY_COMPILE) $(LIBRARY_FLAGS) $(LIB_MCS_FLAGS) -target:library -out:$@ $(BUILT_SOURCES_cmdline) @$(response)
+	$(SN) $(SNFLAGS) $@ $(LIBRARY_SNK)
+endif
 
 $(makefrag): $(sourcefile)
 	@echo Creating $@ ...
-	@sed 's,^,$(the_lib): ,' $< >$@
+	@sed 's,^,$(build_lib): ,' $< >$@
 
-ifdef PLATFORM_CHANGE_SEPARATOR_CMD
-$(response): $(sourcefile)
+ifneq ($(response),$(sourcefile))
+$(response): $(sourcefile) $(PLATFORM_excludes)
 	@echo Creating $@ ...
-	@cat $(sourcefile) | $(PLATFORM_CHANGE_SEPARATOR_CMD) >$@
+	@sort $(sourcefile) $(PLATFORM_excludes) | uniq -u | $(PLATFORM_CHANGE_SEPARATOR_CMD) >$@
 endif
 
 -include $(makefrag)
@@ -180,16 +305,12 @@ endif
 
 ifdef HAVE_CS_TESTS
 
-$(test_lib): $(test_makefrag) $(the_lib) $(test_response) $(test_nunit_dep)
-	$(CSCOMPILE) /target:library /out:$@ $(test_flags) @$(test_response)
+$(test_lib): $(test_dep) $(test_response) $(test_nunit_dep)
+	$(TEST_COMPILE) -target:library -out:$@ $(test_flags) @$(test_response)
 
 $(test_response): $(test_sourcefile)
 	@echo Creating $@ ...
-ifdef PLATFORM_CHANGE_SEPARATOR_CMD
-	@sed 's,^,Test/,' $< |$(PLATFORM_CHANGE_SEPARATOR_CMD) >$@
-else
-	@sed 's,^,Test/,' $< >$@
-endif
+	@sed -e '/^$$/d' -e 's,^,Test/,' $(test_sourcefile) | $(PLATFORM_CHANGE_SEPARATOR_CMD) >$@
 
 $(test_makefrag): $(test_response)
 	@echo Creating $@ ...
@@ -201,16 +322,12 @@ endif
 
 ifdef HAVE_VB_TESTS
 
-$(btest_lib): $(btest_makefrag) $(the_lib) $(btest_response) $(test_nunit_dep)
-	$(BASCOMPILE) /target:library /out:$@ $(btest_flags) @$(btest_response)
+$(btest_lib): $(test_dep) $(btest_response) $(test_nunit_dep)
+	$(BTEST_COMPILE) -target:library -out:$@ $(btest_flags) @$(btest_response)
 
 $(btest_response): $(btest_sourcefile)
 	@echo Creating $@ ...
-ifdef PLATFORM_CHANGE_SEPARATOR_CMD
-	@sed 's,^,Test/,' $< |$(PLATFORM_CHANGE_SEPARATOR_CMD) >$@
-else
-	@sed 's,^,Test/,' $< >$@
-endif
+	@sed -e '/^$$/d' -e 's,^,Test/,' $(btest_sourcefile) | $(PLATFORM_CHANGE_SEPARATOR_CMD) >$@
 
 $(btest_makefrag): $(btest_response)
 	@echo Creating $@ ...
@@ -219,3 +336,6 @@ $(btest_makefrag): $(btest_response)
 -include $(btest_makefrag)
 
 endif
+
+all-local: $(makefrag) $(test_makefrag) $(btest_makefrag)
+$(makefrag) $(test_makefrag) $(btest_makefrag): $(topdir)/build/library.make