mono/linux-packaging-mono
0
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'upstream'

Browse Source 
Former-commit-id: ec3e0d1c513892245552ae72f54b7151d2b896b8
This commit is contained in:
Xamarin Public Jenkins (auto-signing) 2018-02-08 19:52:55 +00:00
commit c240ba09d7
60 changed files with 300 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
configure.REMOVED.git-id
View File

@ -1 +1 @@
1d308ffd3ebdc0530200bb4b02b177970f9b82b7
2f9aab488d9693102bd839af379a13a78a4ae23d

2
configure.ac.REMOVED.git-id
View File

@ -1 +1 @@
29087718843a824dda1ded1bed2a03d021775679
1c9f6eaaaa26d36b69f66c399686242efa8fd7d6

4
external/binary-reference-assemblies/Makefile vendored
View File

@ -11,6 +11,8 @@ all:
$(MAKE) -C v4.7
$(MAKE) -C v4.7.1
$(MAKE) -C mono
$(MAKE) -C build/monotouch clean
$(MAKE) -C build/monodroid clean
clean:
$(MAKE) -C v2.0 clean
@ -25,5 +27,7 @@ clean:
$(MAKE) -C v4.7 clean
$(MAKE) -C v4.7.1 clean
$(MAKE) -C mono clean
$(MAKE) -C build/monotouch clean
$(MAKE) -C build/monodroid clean
.PHONY: all clean

48
external/binary-reference-assemblies/build/monodroid/Makefile vendored Normal file
View File

@ -0,0 +1,48 @@
PROFILE := monodroid
SOURCEDIR := ../../src/$(PROFILE)/
CSC ?= csc
CSC_COMMON_ARGS := -nologo -noconfig -optimize -nostdlib -unsafe -deterministic -publicsign -debug- -target:library -nowarn:612,618,809
Q_CSC = $(if $(V),,@echo "CSC [$(PROFILE)] $(1)";)
ASSEMBLIES := mscorlib System System.Xml System.Numerics System.Core System.Net.Http
ASSEMBLIES += bare/System bare/System.Xml
# generated with (and then slightly tweaked):
# for i in *.dll; do ikdasm --assemblyref $i | grep Name= | sed 's/.*Name=//g' | sed -e $'s/$/\\\n/g' | sed -e ':a' -e 'N' -e '$!ba' -e 's/\n/ /g' -e "s/^/${i%.*}_REFS := /"; done
System.Core_REFS := mscorlib System
System.Net.Http_REFS := mscorlib System
System.Numerics_REFS := mscorlib
System_REFS := mscorlib bare/System.Xml
System.Xml_REFS := mscorlib System
bare/System_REFS := mscorlib
bare/System.Xml_REFS := mscorlib bare/System
mscorlib_CSC_ARGS := -runtimemetadataversion:v4.0.30319
ECMA_KEY := ../../../mono/mcs/class/ecma.pub # Public Key Token: b77a5c561934e089
ECMA_KEY_ASSEMBLIES := System.Core System.Net.Http System.Numerics System.Xml System mscorlib \
bare/System bare/System.Xml
all: $(addsuffix .dll, $(ASSEMBLIES))
clean:
rm -f *.dll
rm -f bare/*.dll
define KEYFILE_TEMPLATE
$(1)_KEYFILE := $(2)
endef
define ASSEMBLY_TEMPLATE
$(1).dll: $(addprefix $(SOURCEDIR),$(subst bare/,,$(1)).cs) $(wildcard $(SOURCEDIR)$(1).extra.cs) $(addsuffix .dll, $($(1)_REFS)) $($(1)_KEYFILE)
@mkdir -p bare/
$(Q_CSC) $(CSC) -out:$(1).dll $(CSC_COMMON_ARGS) -keyfile:$($(1)_KEYFILE) $($(1)_CSC_ARGS) $(addprefix -r:, $(addsuffix .dll, $($(1)_REFS))) $(wildcard $(SOURCEDIR)$(1).extra.cs) $$<
endef
$(foreach asm, $(ECMA_KEY_ASSEMBLIES), $(eval $(call KEYFILE_TEMPLATE,$(asm), $(ECMA_KEY))))
$(foreach asm, $(ASSEMBLIES), $(eval $(call ASSEMBLY_TEMPLATE,$(asm))))

2
external/binary-reference-assemblies/build/monodroid/System.Core.dll.REMOVED.git-id vendored
View File

@ -1 +1 @@
b7d5412e62d6c806925f45ce5333cfc86dd77d86
9e6dab74bb4e7f114920f63c92ca9c8882a98bc9

BIN
external/binary-reference-assemblies/build/monodroid/System.Net.Http.dll vendored
View File

Binary file not shown.

BIN
external/binary-reference-assemblies/build/monodroid/System.Numerics.dll vendored
View File

Binary file not shown.

1
external/binary-reference-assemblies/build/monodroid/System.Xml.dll.REMOVED.git-id vendored Normal file
View File

@ -0,0 +1 @@
fda0b23237512ee638ff7f71d934b0c6ecc2ca4e

2
external/binary-reference-assemblies/build/monodroid/System.dll.REMOVED.git-id vendored
View File

@ -1 +1 @@
e0ad6056d5db3df5d135a154b1b4008b6e6157b9
ab4c9433b3b63fe16e478cc37a18ea453bc19ff1

2
external/binary-reference-assemblies/build/monodroid/mscorlib.dll.REMOVED.git-id vendored
View File

@ -1 +1 @@
aee20813f648653163f86ec38e8c8b07ab1e55bb
477b92f02d4eed63e750f3a1300f658f6d35cd73

48
external/binary-reference-assemblies/build/monotouch/Makefile vendored Normal file
View File

@ -0,0 +1,48 @@
PROFILE := monotouch
SOURCEDIR := ../../src/$(PROFILE)/
CSC ?= csc
CSC_COMMON_ARGS := -nologo -noconfig -optimize -nostdlib -unsafe -deterministic -publicsign -debug- -target:library -nowarn:612,618,809
Q_CSC = $(if $(V),,@echo "CSC [$(PROFILE)] $(1)";)
ASSEMBLIES := mscorlib System System.Xml System.Numerics System.Core System.Net.Http
ASSEMBLIES += bare/System bare/System.Xml
# generated with (and then slightly tweaked):
# for i in *.dll; do ikdasm --assemblyref $i | grep Name= | sed 's/.*Name=//g' | sed -e $'s/$/\\\n/g' | sed -e ':a' -e 'N' -e '$!ba' -e 's/\n/ /g' -e "s/^/${i%.*}_REFS := /"; done
System.Core_REFS := mscorlib System
System.Net.Http_REFS := mscorlib System
System.Numerics_REFS := mscorlib
System_REFS := mscorlib bare/System.Xml
System.Xml_REFS := mscorlib System
bare/System_REFS := mscorlib
bare/System.Xml_REFS := mscorlib bare/System
mscorlib_CSC_ARGS := -runtimemetadataversion:v4.0.30319
ECMA_KEY := ../../../mono/mcs/class/ecma.pub # Public Key Token: b77a5c561934e089
ECMA_KEY_ASSEMBLIES := System.Core System.Net.Http System.Numerics System.Xml System mscorlib \
bare/System bare/System.Xml
all: $(addsuffix .dll, $(ASSEMBLIES))
clean:
rm -f *.dll
rm -f bare/*.dll
define KEYFILE_TEMPLATE
$(1)_KEYFILE := $(2)
endef
define ASSEMBLY_TEMPLATE
$(1).dll: $(addprefix $(SOURCEDIR),$(subst bare/,,$(1)).cs) $(wildcard $(SOURCEDIR)$(1).extra.cs) $(addsuffix .dll, $($(1)_REFS)) $($(1)_KEYFILE)
@mkdir -p bare/
$(Q_CSC) $(CSC) -out:$(1).dll $(CSC_COMMON_ARGS) -keyfile:$($(1)_KEYFILE) $($(1)_CSC_ARGS) $(addprefix -r:, $(addsuffix .dll, $($(1)_REFS))) $(wildcard $(SOURCEDIR)$(1).extra.cs) $$<
endef
$(foreach asm, $(ECMA_KEY_ASSEMBLIES), $(eval $(call KEYFILE_TEMPLATE,$(asm), $(ECMA_KEY))))
$(foreach asm, $(ASSEMBLIES), $(eval $(call ASSEMBLY_TEMPLATE,$(asm))))

2
external/binary-reference-assemblies/build/monotouch/System.Core.dll.REMOVED.git-id vendored
View File

@ -1 +1 @@
ccbd12b051399f2f8e07bd15fef473c0e2479e5d
017028776b0688971391ac5e1e75f5b90cbc3d6b

BIN
external/binary-reference-assemblies/build/monotouch/System.Net.Http.dll vendored
View File

Binary file not shown.

BIN
external/binary-reference-assemblies/build/monotouch/System.Numerics.dll vendored
View File

Binary file not shown.

1
external/binary-reference-assemblies/build/monotouch/System.Xml.dll.REMOVED.git-id vendored Normal file
View File

@ -0,0 +1 @@
fda0b23237512ee638ff7f71d934b0c6ecc2ca4e

2
external/binary-reference-assemblies/build/monotouch/System.dll.REMOVED.git-id vendored
View File

@ -1 +1 @@
fc992f59d8a96ed747a04e484fe6a08cc23b8f2b
c10bd54a5cd051a2a47e5599bb382bf9db02da79

2
external/binary-reference-assemblies/build/monotouch/mscorlib.dll.REMOVED.git-id vendored
View File

@ -1 +1 @@
68b2f6d06b515d8cb9e48c7470402595924d35cf
477b92f02d4eed63e750f3a1300f658f6d35cd73

1
external/binary-reference-assemblies/src/monodroid/System.Xml.cs.REMOVED.git-id vendored Normal file
View File

@ -0,0 +1 @@
18fd42f83e863e9a7bf87ab8602ee718cce6066a

2
external/binary-reference-assemblies/src/monodroid/System.cs.REMOVED.git-id vendored
View File

@ -1 +1 @@
6276c46020f5d881970a04b436c4d2f8285baf9c
e52de27d8006a7d4bc6aae6c29fac35a4c0cd96e

1
external/binary-reference-assemblies/src/monotouch/System.Xml.cs.REMOVED.git-id vendored Normal file
View File

@ -0,0 +1 @@
18fd42f83e863e9a7bf87ab8602ee718cce6066a

Some files were not shown because too many files have changed in this diff Show More