ifdef LIBRARY_NEEDS_POSTPROCESSING
build_libdir = fixup/$(PROFILE)/
-build_lib = $(build_libdir)$(LIBRARY_NAME)
-library_CLEAN_FILES += $(build_lib) $(build_lib:.dll=.pdb)
else
-build_lib = $(the_lib)
-endif
-
-ifndef NO_TEST
-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
-
-test_lib = $(LIBRARY:.dll=_test_$(PROFILE).dll)
-test_sourcefile = $(LIBRARY:.dll=_test.dll.sources)
-test_pdb = $(test_lib:.dll=.pdb)
-test_response = $(depsdir)/$(test_lib).response
-test_makefrag = $(depsdir)/$(test_lib).makefrag
-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)
-
-btest_lib = $(LIBRARY:.dll=_btest_$(PROFILE).dll)
-btest_sourcefile = $(LIBRARY:.dll=_btest.dll.sources)
-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)
-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))
+ifdef LIBRARY_USE_INTERMEDIATE_FILE
+build_libdir = $(the_libdir)tmp/
+else
+build_libdir = $(the_libdir)
endif
-ifndef HAVE_VB_TESTS
-HAVE_VB_TESTS := $(wildcard $(btest_sourcefile))
endif
-endif
+build_lib = $(build_libdir)$(LIBRARY_NAME)
+library_CLEAN_FILES += $(build_lib) $(build_lib:.dll=.pdb)
ifdef NO_SIGN_ASSEMBLY
SN = :
else
sn = $(topdir)/class/lib/net_1_1_bootstrap/sn.exe
SN = $(Q) MONO_PATH="$(topdir)/class/lib/net_1_1_bootstrap$(PLATFORM_PATH_SEPARATOR)$$MONO_PATH" $(RUNTIME) $(RUNTIME_FLAGS) $(sn)
-SNFLAGS = -q -R
+SNFLAGS = -q
endif
ifeq ($(PLATFORM), win32)
GACROOT = $(DESTDIR)$(mono_libdir)
endif
-all-local: $(the_lib)
+all-local: $(the_lib) $(extra_targets)
+
+ifeq ($(LIBRARY_COMPILE),$(BOOT_COMPILE))
+is_boot=true
+else
+is_boot=false
+endif
+
+csproj-local:
+ config_file=`basename $(LIBRARY_NAME) .dll`-$(PROFILE).input; \
+ echo $(thisdir):$$config_file >> $(topdir)/../mono/msvc/scripts/order; \
+ (echo $(is_boot); \
+ echo $(MCS); \
+ echo $(USE_MCS_FLAGS) $(LIBRARY_FLAGS) $(LIB_MCS_FLAGS); \
+ echo $(LIBRARY_NAME); \
+ echo $(BUILT_SOURCES_cmdline); \
+ echo $(build_lib); \
+ echo $(response)) > $(topdir)/../mono/msvc/scripts/inputs/$$config_file
+
install-local: all-local
test-local: all-local
uninstall-local: $(gacutil)
-$(GACUTIL) /u $(LIBRARY_NAME:.dll=) $(gacdir_flag) /root $(GACROOT) $(package_flag)
-endif
-endif
+endif # LIBRARY_INSTALL_DIR
+endif # NO_INSTALL
clean-local:
- -rm -f $(library_CLEAN_FILES) $(CLEAN_FILES)
+ -rm -f $(tests_CLEAN_FILES) $(library_CLEAN_FILES) $(CLEAN_FILES)
test-local run-test-local run-test-ondotnet-local:
@:
-ifndef NO_TEST
-$(test_nunit_dep): $(topdir)/build/deps/nunit-$(PROFILE).stamp
- @if test -f $@; then :; else rm -f $<; $(MAKE) $<; fi
-$(topdir)/build/deps/nunit-$(PROFILE).stamp:
- cd ${topdir}/nunit24 && $(MAKE)
- echo "stamp" >$@
-library_CLEAN_FILES += $(topdir)/build/deps/nunit-$(PROFILE).stamp
-endif
-
-test_assemblies :=
-
-ifdef HAVE_CS_TESTS
-test_assemblies += $(test_lib)
-endif
-
-ifdef HAVE_VB_TESTS
-test_assemblies += $(btest_lib)
-endif
-
-ifdef test_assemblies
-check: run-test
-test-local: $(test_assemblies)
-run-test-local: run-test-lib
-run-test-ondotnet-local: run-test-ondotnet-lib
-
-TEST_HARNESS_EXCLUDES = -exclude=NotWorking,ValueAdd,CAS,InetAccess
-TEST_HARNESS_EXCLUDES_ONDOTNET = /exclude:NotDotNet,CAS
-
-ifdef TEST_HARNESS_VERBOSE
-TEST_HARNESS_OUTPUT = /labels
-TEST_HARNESS_OUTPUT_ONDOTNET = /labels
-TEST_HARNESS_POSTPROC = :
-TEST_HARNESS_POSTPROC_ONDOTNET = :
-else
-TEST_HARNESS_OUTPUT = -output=TestResult-$(PROFILE).log
-TEST_HARNESS_OUTPUT_ONDOTNET = -output=TestResult-ondotnet-$(PROFILE).log
-TEST_HARNESS_POSTPROC = (echo ''; cat TestResult-$(PROFILE).log) | sed '1,/^Tests run: /d'; xsltproc $(topdir)/build/nunit-summary.xsl TestResult-$(PROFILE).xml >> TestResult-$(PROFILE).log
-TEST_HARNESS_POSTPROC_ONDOTNET = (echo ''; cat TestResult-ondotnet-$(PROFILE).log) | sed '1,/^Tests run: /d'; xsltproc $(topdir)/build/nunit-summary.xsl TestResult-ondotnet-$(PROFILE).xml >> TestResult-ondotnet-$(PROFILE).log
-endif
-
-ifdef FIXTURE
-FIXTURE_ARG = -fixture=MonoTests.$(FIXTURE)
-endif
-
-ifdef TESTNAME
-TESTNAME_ARG = -run=MonoTests.$(TESTNAME)
-endif
-
-## FIXME: i18n problem in the 'sed' command below
-run-test-lib: test-local
- ok=:; \
- MONO_REGISTRY_PATH="$(HOME)/.mono/registry" $(TEST_RUNTIME) $(RUNTIME_FLAGS) $(TEST_HARNESS) $(test_assemblies) -noshadow $(TEST_HARNESS_FLAGS) $(LOCAL_TEST_HARNESS_FLAGS) $(TEST_HARNESS_EXCLUDES) $(TEST_HARNESS_OUTPUT) -xml=TestResult-$(PROFILE).xml $(FIXTURE_ARG) $(TESTNAME_ARG)|| ok=false; \
- $(TEST_HARNESS_POSTPROC) ; $$ok
-
-run-test-ondotnet-lib: test-local
- ok=:; \
- $(TEST_HARNESS) $(test_assemblies) -noshadow $(TEST_HARNESS_FLAGS) $(LOCAL_TEST_HARNESS_ONDOTNET_FLAGS) $(TEST_HARNESS_EXCLUDES_ONDOTNET) $(TEST_HARNESS_OUTPUT_ONDOTNET) -xml=TestResult-ondotnet-$(PROFILE).xml || ok=false; \
- $(TEST_HARNESS_POSTPROC_ONDOTNET) ; $$ok
-endif
-
DISTFILES = $(wildcard *$(LIBRARY)*.sources) $(EXTRA_DISTFILES)
-TEST_FILES =
+ASSEMBLY = $(LIBRARY)
+ASSEMBLY_EXT = .dll
+the_assembly = $(the_lib)
+include $(topdir)/build/tests.make
ifdef HAVE_CS_TESTS
-TEST_FILES += `sed -e '/^$$/d' -e 's,^../,,' -et -e 's,^,Test/,' $(test_sourcefile)`
DISTFILES += $(test_sourcefile)
endif
-ifdef HAVE_VB_TESTS
-TEST_FILES += `sed -e '/^$$/d' -e 's,^../,,' -et -e 's,^,Test/,' $(btest_sourcefile)`
-DISTFILES += $(btest_sourcefile)
-endif
# make dist will collect files in .sources files from all profiles
dist-local: dist-default
LIBRARY_COMPILE = $(CSCOMPILE)
endif
-ifndef TEST_COMPILE
-TEST_COMPILE = $(CSCOMPILE)
-endif
-
-ifndef BTEST_COMPILE
-BTEST_COMPILE = $(BASCOMPILE)
-endif
-
ifndef LIBRARY_SNK
LIBRARY_SNK = $(topdir)/class/mono.snk
endif
endif
endif
-Q_AOT=$(if $(V),,@echo "AOT [$(PROFILE)] $(notdir $(@))";)
-
# The library
$(the_lib): $(the_libdir)/.stamp
$(build_lib): $(response) $(sn) $(BUILT_SOURCES) $(build_libdir:=/.stamp)
-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)
- $(Q) mv $(LIBRARY_NAME) $@
- $(Q) test ! -f $(LIBRARY_NAME).mdb || mv $(LIBRARY_NAME).mdb $@.mdb
- $(Q) 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)
+ $(SN) $(SNFLAGS) -R $@ $(LIBRARY_SNK)
+
+ifdef LIBRARY_USE_INTERMEDIATE_FILE
+$(the_lib): $(build_lib)
+ $(Q) cp $(build_lib) $@
+ $(SN) $(SNFLAGS) -v $@
+ $(Q) test ! -f $(build_lib).mdb || mv $(build_lib).mdb $@.mdb
+ $(Q) test ! -f $(build_lib:.dll=.pdb) || mv $(build_lib:.dll=.pdb) $(the_lib:.dll=.pdb)
+endif
+
+ifdef PLATFORM_AOT_SUFFIX
+Q_AOT=$(if $(V),,@echo "AOT [$(PROFILE)] $(notdir $(@))";)
+$(the_lib)$(PLATFORM_AOT_SUFFIX): $(the_lib)
+ $(Q_AOT) MONO_PATH='$(the_libdir)' > $(PROFILE)_aot.log 2>&1 $(RUNTIME) --aot=bind-to-runtime-version $(the_lib)
endif
+
ifdef ENABLE_AOT
ifneq (,$(filter $(AOT_IN_PROFILES), $(PROFILE)))
- $(Q_AOT) MONO_PATH=$(the_libdir) $(RUNTIME) --aot=bind-to-runtime-version $@ > $(PROFILE)_aot.log 2>&1
+
+all-local: $(the_lib)$(PLATFORM_AOT_SUFFIX)
+
endif
endif
# for now, don't give any /lib flags or set MONO_PATH, since we
# give a full path to the assembly.
-ifdef HAVE_CS_TESTS
-
-$(test_lib): $(the_lib) $(test_response) $(test_nunit_dep)
- $(TEST_COMPILE) -target:library -out:$@ $(test_flags) @$(test_response)
-
-$(test_response): $(test_sourcefile)
- @echo Creating $@ ...
- @sed -e '/^$$/d' -e 's,^,Test/,' $(test_sourcefile) | $(PLATFORM_CHANGE_SEPARATOR_CMD) >$@
-
-$(test_makefrag): $(test_response)
- @echo Creating $@ ...
- @sed 's,^,$(test_lib): ,' $< >$@
-
--include $(test_makefrag)
-
-endif
-
-ifdef HAVE_VB_TESTS
-
-$(btest_lib): $(the_lib) $(btest_response) $(test_nunit_dep)
- $(BTEST_COMPILE) -target:library -out:$@ $(btest_flags) @$(btest_response)
-
-$(btest_response): $(btest_sourcefile)
- @echo Creating $@ ...
- @sed -e '/^$$/d' -e 's,^,Test/,' $(btest_sourcefile) | $(PLATFORM_CHANGE_SEPARATOR_CMD) >$@
-
-$(btest_makefrag): $(btest_response)
- @echo Creating $@ ...
- @sed 's,^,$(btest_lib): ,' $< >$@
-
--include $(btest_makefrag)
-
-endif
-
## Include corcompare stuff
include $(topdir)/build/corcompare.make
projects / mono.git / blobdiff