X-Git-Url: http://wien.tomnetworks.com/gitweb/?a=blobdiff_plain;f=mcs%2FMakefile;h=7dbfb638917892d2637276347599b56aa8b8cfba;hb=d47f479ba48c33b7e0ea7ec8e7a1c66d4674a9a4;hp=78af02bc44f60b892ed897af08dfdabac2393803;hpb=e2812813f9cd0a9342982f42f8b8b9818132a7fb;p=mono.git diff --git a/mcs/Makefile b/mcs/Makefile index 78af02bc44f..7dbfb638917 100644 --- a/mcs/Makefile +++ b/mcs/Makefile @@ -6,73 +6,21 @@ SUBDIRS := build jay mcs class nunit24 ilasm tools tests errors docs basic_SUBDIRS := build jay mcs class build_SUBDIRS := build class mcs class/aot-compiler tools -net_2_0_SUBDIRS := build class nunit24 ilasm tools tests errors docs monodroid_SUBDIRS := build class monotouch_SUBDIRS := build class +monotouch_watch_SUBDIRS := build class +monotouch_tv_SUBDIRS := build class monotouch_runtime_SUBDIRS := build class +monotouch_watch_runtime_SUBDIRS := build class +monotouch_tv_runtime_SUBDIRS := build class xammac_SUBDIRS := build class mobile_SUBDIRS := build class -net_3_5_SUBDIRS := build class tools/xbuild -net_4_0_SUBDIRS := build class -net_4_5_SUBDIRS := build mcs class nunit24 ilasm tools tests errors docs +mobile_static_SUBDIRS := build class +binary_reference_assemblies_SUBDIRS := build class +net_4_x_SUBDIRS := build mcs class nunit24 ilasm tools tests errors docs +xammac_net_4_5_SUBDIRS := build class xbuild_12_SUBDIRS := build class tools/xbuild - -# List of test subdirs that should pass 100% -centum_tests := \ - class/corlib \ - class/System \ - class/System.XML \ - class/Commons.Xml.Relaxng \ - class/Cscompmgd \ - class/Microsoft.JScript \ - class/Mono.Posix \ - class/Mono.Security \ - class/System.Design \ - class/System.DirectoryServices \ - class/System.Drawing \ - class/System.Runtime.Remoting \ - class/System.Runtime.Serialization.Formatters.Soap \ - class/System.Security \ - class/System.ServiceProcess \ - class/System.Web \ - class/System.Web.Services \ - tests \ - errors - -default_centum_tests := \ - $(centum_tests) \ - class/System.Data - -net_2_0_centum_tests := \ - $(centum_tests) \ - class/System.Core \ - class/System.Configuration \ - class/System.Data.DataSetExtensions \ - class/System.Xml.Linq \ - class/System.Transactions \ - class/Microsoft.Build.Framework \ - class/Microsoft.Build.Utilities \ - class/Microsoft.Build.Engine \ - class/System.Runtime.Serialization \ - class/System.IdentityModel \ - class/System.ServiceModel \ - class/System.ServiceModel.Web \ - class/Mono.C5 - -# class/System.Web.Extensions -# class/Microsoft.Build.Tasks - -# note that System.Xml.Linq is here to prevent this from being empty -net_3_5_centum_tests := \ - class/System.Xml.Linq - -ifdef ONLY_CENTUM_TESTS -TEST_SUBDIRS := $($(PROFILE)_centum_tests) -endif - -ifdef TEST_SUBDIRS -$(PROFILE)_SUBDIRS := $(TEST_SUBDIRS) -endif +xbuild_14_SUBDIRS := build class tools/xbuild include build/rules.make @@ -83,11 +31,11 @@ all-local $(STD_TARGETS:=-local): @: dir-check: - @if [ "$(NO_DIR_CHECK)" = "" -a "$(PROFILE)" != "basic" ]; then make -C ../runtime; fi + @if [ "$(NO_DIR_CHECK)" = "" -a "$(PROFILE)" != "basic" ]; then $(MAKE) -C ../runtime; fi # fun specialty targets -PROFILES = net_2_0 net_3_5 net_4_0 net_4_5 xbuild_12 +PROFILES = net_4_x binary_reference_assemblies xbuild_12 xbuild_14 .PHONY: all-profiles $(STD_TARGETS:=-profiles) all-profiles $(STD_TARGETS:=-profiles): %-profiles: profiles-do--% @@ -100,22 +48,31 @@ profiles-do--%: profile-do--%: $(MAKE) PROFILE=$(subst --, ,$*) +# xbuild_12 and xbuild_14 will try to install the same files, so they need +# to be ordered +profile-do--xbuild_14--install: profile-do--xbuild_12--install + # We don't want to run the tests in parallel. We want behaviour like -k. profiles-do--run-test: ret=:; $(foreach p,$(PROFILES), { $(MAKE) PROFILE=$(p) run-test || ret=false; }; ) $$ret # Orchestrate the bootstrap here. _boot_ = all clean install -$(_boot_:%=profile-do--xbuild_12--%): profile-do--xbuild_12--%: profile-do--net_4_5--% -$(_boot_:%=profile-do--net_4_5--%): profile-do--net_4_5--%: profile-do--build--% -$(_boot_:%=profile-do--net_4_0--%): profile-do--net_4_0--%: profile-do--build--% -$(_boot_:%=profile-do--net_3_5--%): profile-do--net_3_5--%: profile-do--net_2_0--% +$(_boot_:%=profile-do--xbuild_14--%): profile-do--xbuild_14--%: profile-do--net_4_x--% +$(_boot_:%=profile-do--xbuild_12--%): profile-do--xbuild_12--%: profile-do--net_4_x--% +$(_boot_:%=profile-do--binary_reference_assemblies--%): profile-do--binary_reference_assemblies--%: profile-do--build--% +$(_boot_:%=profile-do--net_4_x--%): profile-do--net_4_x--%: profile-do--build--% $(_boot_:%=profile-do--monodroid--%): profile-do--monodroid--%: profile-do--build--% $(_boot_:%=profile-do--monotouch--%): profile-do--monotouch--%: profile-do--build--% +$(_boot_:%=profile-do--monotouch_watch--%): profile-do--monotouch_watch--%: profile-do--build--% +$(_boot_:%=profile-do--monotouch_tv--%): profile-do--monotouch_tv--%: profile-do--build--% $(_boot_:%=profile-do--monotouch_runtime--%): profile-do--monotouch_runtime--%: profile-do--build--% +$(_boot_:%=profile-do--monotouch_watch_runtime--%): profile-do--monotouch_watch_runtime--%: profile-do--build--% +$(_boot_:%=profile-do--monotouch_tv_runtime--%): profile-do--monotouch_tv_runtime--%: profile-do--build--% $(_boot_:%=profile-do--xammac--%): profile-do--xammac--%: profile-do--build--% +$(_boot_:%=profile-do--xammac_net_4_5--%): profile-do--xammac_net_4_5--%: profile-do--build--% $(_boot_:%=profile-do--mobile--%): profile-do--mobile--%: profile-do--build--% -$(_boot_:%=profile-do--net_2_0--%): profile-do--net_2_0--%: profile-do--build--% +$(_boot_:%=profile-do--mobile_static--%): profile-do--mobile_static--%: profile-do--build--% $(_boot_:%=profile-do--build--%): profile-do--build--%: profile-do--basic--% testcorlib: @@ -128,17 +85,10 @@ package := mcs-$(VERSION) DISTFILES = \ AUTHORS \ - ChangeLog \ COPYING \ - COPYING.LIB \ INSTALL.txt \ - LICENSE \ - LICENSE.GPL \ - LICENSE.LGPL \ - LICENSE.MPL \ Makefile \ mkinstalldirs \ - MIT.X11 \ MonoIcon.png \ README \ ScalableMonoIcon.svg \