You've already forked linux-packaging-mono
Imported Upstream version 5.8.0.22
Former-commit-id: df344e34b07851d296efb3e6604c8db42b6f7aa3
This commit is contained in:
Xamarin Public Jenkins (auto-signing)
parent
5f4a27cc8a
commit
7d05485754
@@ -7,6 +7,7 @@ SUBDIRS := build jay mcs class nunit24 ilasm tools tests errors docs packages
|
||||
basic_SUBDIRS := build jay class
|
||||
build_SUBDIRS := build class class/aot-compiler tools ilasm
|
||||
monodroid_SUBDIRS := build class
|
||||
monodroid_tools_SUBDIRS := build class tools
|
||||
monotouch_SUBDIRS := build class
|
||||
monotouch_watch_SUBDIRS := build class
|
||||
monotouch_tv_SUBDIRS := build class
|
||||
@@ -23,6 +24,7 @@ xbuild_12_SUBDIRS := build class tools/xbuild
|
||||
xbuild_14_SUBDIRS := build class tools/xbuild
|
||||
winaot_SUBDIRS := build class
|
||||
orbis_SUBDIRS := build class
|
||||
unreal_SUBDIRS := build class
|
||||
|
||||
include build/rules.make
|
||||
|
||||
@@ -65,6 +67,7 @@ $(_boot_:%=profile-do--xbuild_12--%): profile-do--xbuild_12--%:
|
||||
$(_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--monodroid_tools--%): profile-do--monodroid_tools--%: 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--%
|
||||
@@ -77,6 +80,7 @@ $(_boot_:%=profile-do--testing_aot_hybrid--%): profile-do--testing_aot_hy
|
||||
$(_boot_:%=profile-do--testing_aot_full--%): profile-do--testing_aot_full--%: profile-do--build--%
|
||||
$(_boot_:%=profile-do--winaot--%): profile-do--winaot--%: profile-do--build--%
|
||||
$(_boot_:%=profile-do--orbis--%): profile-do--orbis--%: profile-do--build--%
|
||||
$(_boot_:%=profile-do--unreal--%): profile-do--unreal--%: profile-do--build--%
|
||||
$(_boot_:%=profile-do--build--%): profile-do--build--%: profile-do--basic--%
|
||||
|
||||
testcorlib:
|
||||
@@ -142,7 +146,7 @@ distcheck: dist-tarball
|
||||
MONO_API_SNAPSHOT_PATH := $(topdir)../external/api-snapshot/
|
||||
GENAPI := $(MONO_API_SNAPSHOT_PATH)tools/genapi/GenAPI.exe
|
||||
MONO_API_SNAPSHOT_PROFILE_PATH := $(MONO_API_SNAPSHOT_PATH)profiles/$(PROFILE)/
|
||||
MONO_API_ASSEMBLIES_IGNORED := $(addprefix $(topdir)class/lib/$(PROFILE)/, Mono.CSharp.dll SystemWebTestShim.dll standalone-runner-support.dll nunit.core.dll nunit.core.extensions.dll nunit.core.interfaces.dll nunit.framework.dll nunit.framework.extensions.dll nunit.mocks.dll nunit.util.dll nunit-console-runner.dll nunitlite.dll)
|
||||
MONO_API_ASSEMBLIES_IGNORED := $(addprefix $(topdir)class/lib/$(PROFILE)/, Mono.CSharp.dll SystemWebTestShim.dll standalone-runner-support.dll nunit.core.dll nunit.core.extensions.dll nunit.core.interfaces.dll nunit.framework.dll nunit.framework.extensions.dll nunit.mocks.dll nunit.util.dll nunit-console-runner.dll nunitlite.dll Mono.Profiler.Log.dll)
|
||||
MONO_API_ASSEMBLIES := $(filter-out $(MONO_API_ASSEMBLIES_IGNORED), $(wildcard $(topdir)class/lib/$(PROFILE)/*.dll)) $(wildcard $(topdir)class/lib/$(PROFILE)/Facades/*.dll)
|
||||
MONO_API_ASSEMBLIES_CS := $(MONO_API_ASSEMBLIES:$(topdir)class/lib/$(PROFILE)/%.dll=$(MONO_API_SNAPSHOT_PROFILE_PATH)%.cs)
|
||||
|
||||
|
||||
@@ -34,11 +34,11 @@ static class Consts
|
||||
// Use these assembly version constants to make code more maintainable.
|
||||
//
|
||||
|
||||
public const string MonoVersion = "5.4.0.201";
|
||||
public const string MonoVersion = "5.8.0.22";
|
||||
public const string MonoCompany = "Mono development team";
|
||||
public const string MonoProduct = "Mono Common Language Infrastructure";
|
||||
public const string MonoCopyright = "(c) Various Mono authors";
|
||||
public const int MonoCorlibVersion = 1050400003;
|
||||
public const int MonoCorlibVersion = 1050800000;
|
||||
|
||||
#if MOBILE
|
||||
// Versions of .NET Framework for Silverlight 4.0
|
||||
|
||||
@@ -40,7 +40,14 @@ class X {
|
||||
if (!Version.TryParse (field.GetValue (null) as string, out version))
|
||||
return 4;
|
||||
|
||||
if (version < new Version (4, 9))
|
||||
Version min_mono_version;
|
||||
#if __MonoCS__
|
||||
min_mono_version = new Version (5, 5);
|
||||
#else
|
||||
min_mono_version = new Version (4, 9);
|
||||
#endif
|
||||
|
||||
if (version < min_mono_version)
|
||||
return 5;
|
||||
|
||||
return 0;
|
||||
|
||||
@@ -42,8 +42,20 @@ executable_CLEAN_FILES += $(build_lib) $(build_lib).so $(build_lib).mdb $(build_
|
||||
|
||||
makefrag = $(depsdir)/$(PROFILE)_$(base_prog).makefrag
|
||||
|
||||
ifdef TARGET_NET_REFERENCE
|
||||
# System.*.dll references come from the TARGET_NET_REFERENCE dir, others from the profile dir
|
||||
LIB_REFS_MONO = $(call _FILTER_OUT,System,$(LIB_REFS))
|
||||
LIB_REFS_SYSTEM = $(filter-out $(LIB_REFS_MONO),$(LIB_REFS))
|
||||
|
||||
MCS_REFERENCES = $(patsubst %,-r:$(topdir)/../external/binary-reference-assemblies/$(TARGET_NET_REFERENCE)/%.dll,$(LIB_REFS_SYSTEM))
|
||||
MCS_REFERENCES += $(patsubst %,-r:$(topdir)/class/lib/$(PROFILE_DIRECTORY)/%.dll,$(LIB_REFS_MONO))
|
||||
else
|
||||
MCS_REFERENCES = $(patsubst %,-r:$(topdir)/class/lib/$(PROFILE_DIRECTORY)/%.dll,$(LIB_REFS))
|
||||
MCS_REFERENCES += $(patsubst %,-r:$(topdir)/class/lib/$(PROFILE_DIRECTORY)/%.exe,$(EXE_REFS))
|
||||
endif
|
||||
|
||||
ifdef KEYFILE
|
||||
LIB_MCS_FLAGS += /keyfile:$(KEYFILE)
|
||||
endif
|
||||
|
||||
ifndef NO_BUILD
|
||||
all-local: $(the_lib) $(PROGRAM_config)
|
||||
|
||||
@@ -18,13 +18,30 @@
|
||||
# Have to rename to handle differences between assembly/directory names
|
||||
DEP_LIBS=$(patsubst System.Xml,System.XML,$(LIB_REFS))
|
||||
|
||||
_FILTER_OUT = $(foreach x,$(2),$(if $(findstring $(1),$(x)),,$(x)))
|
||||
|
||||
LIB_REFS_FULL = $(call _FILTER_OUT,=, $(LIB_REFS))
|
||||
LIB_REFS_ALIAS = $(filter-out $(LIB_REFS_FULL),$(LIB_REFS))
|
||||
|
||||
ifdef TARGET_NET_REFERENCE
|
||||
# System.*.dll references come from the TARGET_NET_REFERENCE dir, others from the profile dir
|
||||
LIB_REFS_MONO_FULL = $(call _FILTER_OUT,System,$(LIB_REFS_FULL))
|
||||
LIB_REFS_MONO_ALIAS = $(call _FILTER_OUT,System,$(LIB_REFS_ALIAS))
|
||||
|
||||
LIB_REFS_SYSTEM_FULL = $(filter-out $(LIB_REFS_MONO_FULL),$(LIB_REFS_FULL))
|
||||
LIB_REFS_SYSTEM_ALIAS = $(filter-out $(LIB_REFS_MONO_ALIAS),$(LIB_REFS_ALIAS))
|
||||
|
||||
LIB_MCS_FLAGS += $(patsubst %,-r:$(topdir)/../external/binary-reference-assemblies/$(TARGET_NET_REFERENCE)/%.dll,$(LIB_REFS_SYSTEM_FULL))
|
||||
LIB_MCS_FLAGS += $(patsubst %,-r:%.dll, $(subst =,=$(topdir)/../external/binary-reference-assemblies/$(TARGET_NET_REFERENCE)/,$(LIB_REFS_SYSTEM_ALIAS)))
|
||||
|
||||
LIB_MCS_FLAGS += $(patsubst %,-r:$(topdir)/class/lib/$(PROFILE_DIRECTORY)/%.dll,$(LIB_REFS_MONO_FULL))
|
||||
LIB_MCS_FLAGS += $(patsubst %,-r:%.dll, $(subst =,=$(topdir)/class/lib/$(PROFILE_DIRECTORY)/,$(LIB_REFS_MONO_ALIAS)))
|
||||
else
|
||||
LIB_MCS_FLAGS += $(patsubst %,-r:$(topdir)/class/lib/$(PROFILE_DIRECTORY)/%.dll,$(LIB_REFS_FULL))
|
||||
LIB_MCS_FLAGS += $(patsubst %,-r:%.dll, $(subst =,=$(topdir)/class/lib/$(PROFILE_DIRECTORY)/,$(LIB_REFS_ALIAS)))
|
||||
endif
|
||||
|
||||
ifdef KEYFILE
|
||||
KEYFILE_MCS_FLAGS += /keyfile:$(KEYFILE)
|
||||
endif
|
||||
|
||||
ifndef LIBRARY_NAME
|
||||
LIBRARY_NAME = $(LIBRARY)
|
||||
@@ -104,7 +121,7 @@ csproj-library:
|
||||
case "$(thisdir)" in *"Facades"*) config_file=Facades_$$config_file;; *"legacy"*) config_file=legacy_$$config_file;; esac; \
|
||||
echo $(thisdir):$$config_file >> $(topdir)/../msvc/scripts/order; \
|
||||
(echo $(is_boot); \
|
||||
echo $(USE_MCS_FLAGS) $(LIBRARY_FLAGS) $(LIB_MCS_FLAGS); \
|
||||
echo $(USE_MCS_FLAGS) $(LIBRARY_FLAGS) $(LIB_MCS_FLAGS) $(KEYFILE_MCS_FLAGS); \
|
||||
echo $(LIBRARY_NAME); \
|
||||
echo $(BUILT_SOURCES_cmdline); \
|
||||
echo $(build_lib); \
|
||||
@@ -308,7 +325,7 @@ endif
|
||||
ifndef NO_BUILD
|
||||
|
||||
$(build_lib): $(response) $(sn) $(BUILT_SOURCES) $(build_libdir)/.stamp $(GEN_RESOURCE_DEPS)
|
||||
$(LIBRARY_COMPILE) $(LIBRARY_FLAGS) $(LIB_MCS_FLAGS) $(GEN_RESOURCE_FLAGS) -target:library -out:$@ $(BUILT_SOURCES_cmdline) @$(response)
|
||||
$(LIBRARY_COMPILE) $(LIBRARY_FLAGS) $(LIB_MCS_FLAGS) $(KEYFILE_MCS_FLAGS) $(GEN_RESOURCE_FLAGS) -target:library -out:$@ $(BUILT_SOURCES_cmdline) @$(response)
|
||||
ifdef RESOURCE_STRINGS_FILES
|
||||
$(Q) $(STRING_REPLACER) $(RESOURCE_STRINGS_FILES) $@
|
||||
endif
|
||||
|
||||
@@ -34,7 +34,7 @@ PROFILE_MCS_FLAGS = -d:NET_4_0 -d:NET_4_5 -d:MONO -d:WIN_PLATFORM -d:BOOTSTRAP_B
|
||||
NO_SIGN_ASSEMBLY = yes
|
||||
NO_TEST = yes
|
||||
NO_INSTALL = yes
|
||||
FRAMEWORK_VERSION = 4.0
|
||||
FRAMEWORK_VERSION = 4.5
|
||||
|
||||
# Compiler all using same bootstrap compiler
|
||||
LIBRARY_COMPILE = $(BOOT_COMPILE)
|
||||
|
||||
@@ -9,6 +9,7 @@
|
||||
|
||||
empty :=
|
||||
space := $(empty) $(empty)
|
||||
_FILTER_OUT = $(foreach x,$(2),$(if $(findstring $(1),$(x)),,$(x)))
|
||||
|
||||
# given $(thisdir), we compute the path to the top directory
|
||||
#
|
||||
|
||||
@@ -72,8 +72,6 @@ ifndef HAVE_CS_TESTS
|
||||
HAVE_CS_TESTS := $(wildcard $(test_sourcefile))
|
||||
endif
|
||||
|
||||
HAVE_SOURCE_EXCLUDES := $(wildcard $(test_sourcefile_excludes))
|
||||
|
||||
HAVE_CS_XTESTS := $(wildcard $(xtest_sourcefile))
|
||||
|
||||
endif # !NO_TEST
|
||||
@@ -104,7 +102,7 @@ test-local: $(test_assemblies)
|
||||
run-test-local: run-test-lib
|
||||
run-test-ondotnet-local: run-test-ondotnet-lib
|
||||
|
||||
TEST_HARNESS_EXCLUDES = -exclude=$(PLATFORM_TEST_HARNESS_EXCLUDES)$(PROFILE_TEST_HARNESS_EXCLUDES)NotWorking,ValueAdd,CAS,InetAccess
|
||||
TEST_HARNESS_EXCLUDES = -exclude=$(PLATFORM_TEST_HARNESS_EXCLUDES)$(PROFILE_TEST_HARNESS_EXCLUDES)NotWorking,CAS
|
||||
TEST_HARNESS_EXCLUDES_ONDOTNET = /exclude:$(PLATFORM_TEST_HARNESS_EXCLUDES)$(PROFILE_TEST_HARNESS_EXCLUDES)NotDotNet,CAS
|
||||
|
||||
NOSHADOW_FLAG =
|
||||
@@ -173,7 +171,7 @@ test_response_preprocessed = $(test_response)_preprocessed
|
||||
|
||||
# This handles .excludes/.sources pairs, as well as resolving the
|
||||
# includes that occur in .sources files
|
||||
$(test_response_preprocessed): $(test_sourcefile)
|
||||
$(test_response_preprocessed): $(test_sourcefile) $(wildcard $(test_sourcefile_excludes))
|
||||
$(SHELL) $(topdir)/build/gensources.sh $@ '$(test_sourcefile)' '$(test_sourcefile_excludes)'
|
||||
|
||||
$(test_response): $(test_response_preprocessed)
|
||||
@@ -212,9 +210,9 @@ run-xunit-test: run-xunit-test-local
|
||||
xunit-test-local: $(xunit_test_lib)
|
||||
run-xunit-test-local: run-xunit-test-lib
|
||||
|
||||
# ln -s is a HACK for xunit runner to require xunit.execution.desktop.dll file in local folder on .net only
|
||||
# cp -rf is a HACK for xunit runner to require xunit.execution.desktop.dll file in local folder on .net only
|
||||
run-xunit-test-lib: xunit-test-local
|
||||
@ln -fs $(XTEST_HARNESS_PATH)/xunit.execution.desktop.dll xunit.execution.desktop.dll
|
||||
@cp -rf $(XTEST_HARNESS_PATH)/xunit.execution.desktop.dll xunit.execution.desktop.dll
|
||||
ok=:; \
|
||||
PATH="$(TEST_RUNTIME_WRAPPERS_PATH):$(PATH)" $(TEST_RUNTIME) $(RUNTIME_FLAGS) $(AOT_RUN_FLAGS) $(XTEST_HARNESS) $(xunit_test_lib) $(XTEST_HARNESS_FLAGS) $(XTEST_TRAIT) || ok=false; \
|
||||
$$ok
|
||||
@@ -227,7 +225,7 @@ xtest_response_preprocessed = $(xtest_response)_preprocessed
|
||||
|
||||
# This handles .excludes/.sources pairs, as well as resolving the
|
||||
# includes that occur in .sources files
|
||||
$(xtest_response): $(xtest_sourcefile)
|
||||
$(xtest_response): $(xtest_sourcefile) $(wildcard $(xtest_sourcefile_excludes))
|
||||
$(SHELL) $(topdir)/build/gensources.sh $@ '$(xtest_sourcefile)' '$(xtest_sourcefile_excludes)'
|
||||
|
||||
$(xtest_makefrag): $(xtest_response)
|
||||
|
||||
@@ -56,7 +56,6 @@ using System.Runtime.InteropServices;
|
||||
[assembly: AllowPartiallyTrustedCallers]
|
||||
|
||||
[assembly: AssemblyDelaySign (true)]
|
||||
[assembly: AssemblyKeyFile ("../msfinal.pub")]
|
||||
|
||||
[assembly: ImportedFromTypeLib ("Accessibility")]
|
||||
|
||||
|
||||
@@ -3,6 +3,7 @@ SUBDIRS =
|
||||
include ../../build/rules.make
|
||||
|
||||
LIBRARY = Accessibility.dll
|
||||
KEYFILE = ../msfinal.pub
|
||||
LIB_MCS_FLAGS =
|
||||
NO_TEST = yes
|
||||
|
||||
|
||||
@@ -44,5 +44,4 @@ using System.Runtime.InteropServices;
|
||||
[assembly: ComVisible (false)]
|
||||
|
||||
[assembly: AssemblyDelaySign (true)]
|
||||
[assembly: AssemblyKeyFile ("../mono.pub")]
|
||||
|
||||
|
||||
@@ -8,6 +8,7 @@ OTHER_RES = $(RESOURCE_FILES)
|
||||
|
||||
LIBRARY = Commons.Xml.Relaxng.dll
|
||||
LIB_REFS = System System.Xml
|
||||
KEYFILE = ../mono.pub
|
||||
LIB_MCS_FLAGS = \
|
||||
$(foreach r, $(OTHER_RES), /resource:$(r),$(notdir $(r)))
|
||||
TEST_MCS_FLAGS = $(LIB_MCS_FLAGS) -nowarn:0618 -nowarn:219 -nowarn:169
|
||||
|
||||
@@ -45,7 +45,6 @@ using System.Runtime.InteropServices;
|
||||
[assembly: ComVisible (false)]
|
||||
|
||||
[assembly: AssemblyDelaySign (true)]
|
||||
[assembly: AssemblyKeyFile ("../msfinal.pub")]
|
||||
|
||||
[assembly: AssemblyTitle ("cscompmgd.dll")]
|
||||
[assembly: AssemblyDefaultAlias ("cscompmgd.dll")]
|
||||
|
||||
@@ -4,6 +4,7 @@ include ../../build/rules.make
|
||||
|
||||
LIBRARY = Cscompmgd.dll
|
||||
LIB_REFS = System
|
||||
KEYFILE = ../msfinal.pub
|
||||
LIB_MCS_FLAGS =
|
||||
TEST_MCS_FLAGS = $(LIB_MCS_FLAGS) -nowarn:0618 -nowarn:219 -nowarn:169
|
||||
LIBRARY_NAME = cscompmgd.dll
|
||||
|
||||
@@ -39,7 +39,6 @@ using System.Runtime.InteropServices;
|
||||
[assembly: NeutralResourcesLanguage ("en-US")]
|
||||
|
||||
[assembly: AssemblyDelaySign (true)]
|
||||
[assembly: AssemblyKeyFile ("../msfinal.pub")]
|
||||
|
||||
[assembly: AssemblyTitle ("CustomMarshalers.dll")]
|
||||
[assembly: AssemblyDescription ("CustomMarshalers.dll")]
|
||||
|
||||
@@ -4,6 +4,7 @@ include ../../build/rules.make
|
||||
|
||||
LIBRARY = CustomMarshalers.dll
|
||||
LIB_REFS = System
|
||||
KEYFILE = ../msfinal.pub
|
||||
LIB_MCS_FLAGS =
|
||||
NO_TEST = yes
|
||||
|
||||
|
||||
@@ -9,8 +9,8 @@ LIBRARY_INSTALL_DIR = $(mono_libdir)/mono/$(FRAMEWORK_VERSION)/Facades
|
||||
|
||||
LIBRARY = Microsoft.Win32.Primitives.dll
|
||||
|
||||
KEY_FILE = ../../msfinal.pub
|
||||
SIGN_FLAGS = /delaysign /keyfile:$(KEY_FILE) /nowarn:1616,1699
|
||||
KEYFILE = ../../msfinal.pub
|
||||
SIGN_FLAGS = /delaysign /nowarn:1616,1699
|
||||
LIB_REFS = System
|
||||
LIB_MCS_FLAGS = $(SIGN_FLAGS)
|
||||
|
||||
|
||||
@@ -9,8 +9,8 @@ LIBRARY_INSTALL_DIR = $(mono_libdir)/mono/$(FRAMEWORK_VERSION)/Facades
|
||||
|
||||
LIBRARY = Microsoft.Win32.Registry.AccessControl.dll
|
||||
|
||||
KEY_FILE = ../../msfinal.pub
|
||||
SIGN_FLAGS = /delaysign /keyfile:$(KEY_FILE) /nowarn:1616,1699
|
||||
KEYFILE = ../../msfinal.pub
|
||||
SIGN_FLAGS = /delaysign /nowarn:1616,1699
|
||||
LIB_REFS = System
|
||||
LIB_MCS_FLAGS = $(SIGN_FLAGS)
|
||||
|
||||
|
||||
@@ -9,8 +9,8 @@ LIBRARY_INSTALL_DIR = $(mono_libdir)/mono/$(FRAMEWORK_VERSION)/Facades
|
||||
|
||||
LIBRARY = Microsoft.Win32.Registry.dll
|
||||
|
||||
KEY_FILE = ../../msfinal.pub
|
||||
SIGN_FLAGS = /delaysign /keyfile:$(KEY_FILE) /nowarn:1616,1699
|
||||
KEYFILE = ../../msfinal.pub
|
||||
SIGN_FLAGS = /delaysign /nowarn:1616,1699
|
||||
LIB_REFS = System
|
||||
LIB_MCS_FLAGS = $(SIGN_FLAGS)
|
||||
|
||||
|
||||
@@ -9,8 +9,8 @@ LIBRARY_INSTALL_DIR = $(mono_libdir)/mono/$(FRAMEWORK_VERSION)/Facades
|
||||
|
||||
LIBRARY = System.AppContext.dll
|
||||
|
||||
KEY_FILE = ../../msfinal.pub
|
||||
SIGN_FLAGS = /delaysign /keyfile:$(KEY_FILE) /nowarn:1616,1699
|
||||
KEYFILE = ../../msfinal.pub
|
||||
SIGN_FLAGS = /delaysign /nowarn:1616,1699
|
||||
LIB_REFS = System
|
||||
LIB_MCS_FLAGS = $(SIGN_FLAGS)
|
||||
|
||||
|
||||
Some files were not shown because too many files have changed in this diff Show More
Reference in New Issue
Block a user