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: fbd7fb38d36676782181486a77a6138332a1fa77
This commit is contained in:
Xamarin Public Jenkins (auto-signing) 2019-07-02 09:12:53 +00:00
commit fd81fc3270
47 changed files with 53 additions and 43 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
configure.REMOVED.git-id
View File

@ -1 +1 @@
74b9f93bfedcdd2c965b8b0bf314618e8e19d771
084195687ddc7dd4048f9b2c604bb03a37c620ed

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

@ -1 +1 @@
81afb4f21a9c222ab3e329deb7de7f25e370eca6
2d00c0223998ca8b8589ca54b3d207eb5fcd9df8

16
external/bockbuild/bockbuild/package.py vendored
View File

@ -337,8 +337,18 @@ class Package:
return clean_archive
def get_download_dest(url):
return os.path.join(source_cache_dir, os.path.basename(url))
def get_download_dest(url,version):
if version is not None:
dest_dir = '%s-%s' % (self.name, version)
else:
dest_dir = self.name
try:
os.makedirs (os.path.join(source_cache_dir, dest_dir))
except OSError, e:
if e.errno != os.errno.EEXIST:
raise
pass
return os.path.join(source_cache_dir, dest_dir, os.path.basename(url))
def get_git_cache_path():
if self.organization is None:
@ -370,7 +380,7 @@ class Package:
# raise Exception ('HTTP downloads are no longer allowed: %s', source)
if source.startswith(('http://', 'https://', 'ftp://')):
cache = get_download_dest(source)
cache = get_download_dest(source, self.version)
if self.profile.cache_host is not None:
cached_source = os.path.join(
self.profile.cache_host, os.path.basename(source))

2
mcs/build/common/Consts.cs
View File

@ -41,7 +41,7 @@ static partial class Consts
// Use these assembly version constants to make code more maintainable.
//
public const string MonoVersion = "6.0.0.310";
public const string MonoVersion = "6.0.0.311";
public const string MonoCompany = "Mono development team";
public const string MonoProduct = "Mono Common Language Infrastructure";
public const string MonoCopyright = "(c) Various Mono authors";

2
mcs/class/lib/monolite-linux/d0aa6798-834d-11e9-b38a-3b0d70487d01/Mono.Security.dll.REMOVED.git-id
View File

@ -1 +1 @@
436cd54aa59ef12d83c181f3d1b238e80ae1b43a
80e579fd992ef82df5e59d94a2d778fb731082fb

2
mcs/class/lib/monolite-linux/d0aa6798-834d-11e9-b38a-3b0d70487d01/System.Configuration.dll.REMOVED.git-id
View File

@ -1 +1 @@
2e2f5cc4ad8225d1d3874aadeb050777c745bb6f
fcdae2f4574bf8b726570d38ca6e929941e4bdf9

2
mcs/class/lib/monolite-linux/d0aa6798-834d-11e9-b38a-3b0d70487d01/System.Core.dll.REMOVED.git-id
View File

@ -1 +1 @@
29329048737e825912df6bbaf196c9078526ba4a
4086e7ec5e22612eeceeec7c20769bd55770118d

BIN
mcs/class/lib/monolite-linux/d0aa6798-834d-11e9-b38a-3b0d70487d01/System.IO.Compression.dll
View File

Binary file not shown.

2
mcs/class/lib/monolite-linux/d0aa6798-834d-11e9-b38a-3b0d70487d01/System.Numerics.dll.REMOVED.git-id
View File

@ -1 +1 @@
84b9ce2081b922fc053118de1fd3c5a4173bd210
911466bd000987842c68074f2e079e0f9860cb30

2
mcs/class/lib/monolite-linux/d0aa6798-834d-11e9-b38a-3b0d70487d01/System.Xml.dll.REMOVED.git-id
View File

@ -1 +1 @@
add2614210a79ad6cfd0a24b851e17ad1d32ab82
9175f1d500927237ace77d22eaf368f9d710ee9f

2
mcs/class/lib/monolite-linux/d0aa6798-834d-11e9-b38a-3b0d70487d01/mcs.exe.REMOVED.git-id
View File

@ -1 +1 @@
8aa76c71cef9546ca5eb93400f97c92b01ad945a
04fc2bd9bf4f0e84c87b5f691c700725dc00896b

2
mcs/class/lib/monolite-linux/d0aa6798-834d-11e9-b38a-3b0d70487d01/mscorlib.dll.REMOVED.git-id
View File

@ -1 +1 @@
7024287df064bbdb438f0b8020401924602f85ac
5a70c345349d440397d8e7502578e33a813ffb8c

2
mcs/class/lib/monolite-macos/d0aa6798-834d-11e9-b38a-3b0d70487d01/Mono.Security.dll.REMOVED.git-id
View File

@ -1 +1 @@
436cd54aa59ef12d83c181f3d1b238e80ae1b43a
80e579fd992ef82df5e59d94a2d778fb731082fb

2
mcs/class/lib/monolite-macos/d0aa6798-834d-11e9-b38a-3b0d70487d01/System.Configuration.dll.REMOVED.git-id
View File

@ -1 +1 @@
2e2f5cc4ad8225d1d3874aadeb050777c745bb6f
fcdae2f4574bf8b726570d38ca6e929941e4bdf9

2
mcs/class/lib/monolite-macos/d0aa6798-834d-11e9-b38a-3b0d70487d01/System.Core.dll.REMOVED.git-id
View File

@ -1 +1 @@
29329048737e825912df6bbaf196c9078526ba4a
4086e7ec5e22612eeceeec7c20769bd55770118d

BIN
mcs/class/lib/monolite-macos/d0aa6798-834d-11e9-b38a-3b0d70487d01/System.IO.Compression.dll
View File

Binary file not shown.

2
mcs/class/lib/monolite-macos/d0aa6798-834d-11e9-b38a-3b0d70487d01/System.Numerics.dll.REMOVED.git-id
View File

@ -1 +1 @@
84b9ce2081b922fc053118de1fd3c5a4173bd210
911466bd000987842c68074f2e079e0f9860cb30

2
mcs/class/lib/monolite-macos/d0aa6798-834d-11e9-b38a-3b0d70487d01/System.Xml.dll.REMOVED.git-id
View File

@ -1 +1 @@
add2614210a79ad6cfd0a24b851e17ad1d32ab82
9175f1d500927237ace77d22eaf368f9d710ee9f

2
mcs/class/lib/monolite-macos/d0aa6798-834d-11e9-b38a-3b0d70487d01/mcs.exe.REMOVED.git-id
View File

@ -1 +1 @@
8aa76c71cef9546ca5eb93400f97c92b01ad945a
04fc2bd9bf4f0e84c87b5f691c700725dc00896b

2
mcs/class/lib/monolite-macos/d0aa6798-834d-11e9-b38a-3b0d70487d01/mscorlib.dll.REMOVED.git-id
View File

@ -1 +1 @@
7024287df064bbdb438f0b8020401924602f85ac
5a70c345349d440397d8e7502578e33a813ffb8c

2
mcs/class/lib/monolite-unix/d0aa6798-834d-11e9-b38a-3b0d70487d01/Mono.Security.dll.REMOVED.git-id
View File

@ -1 +1 @@
436cd54aa59ef12d83c181f3d1b238e80ae1b43a
80e579fd992ef82df5e59d94a2d778fb731082fb

2
mcs/class/lib/monolite-unix/d0aa6798-834d-11e9-b38a-3b0d70487d01/System.Configuration.dll.REMOVED.git-id
View File

@ -1 +1 @@
2e2f5cc4ad8225d1d3874aadeb050777c745bb6f
fcdae2f4574bf8b726570d38ca6e929941e4bdf9

2
mcs/class/lib/monolite-unix/d0aa6798-834d-11e9-b38a-3b0d70487d01/System.Core.dll.REMOVED.git-id
View File

@ -1 +1 @@
29329048737e825912df6bbaf196c9078526ba4a
4086e7ec5e22612eeceeec7c20769bd55770118d

BIN
mcs/class/lib/monolite-unix/d0aa6798-834d-11e9-b38a-3b0d70487d01/System.IO.Compression.dll
View File

Binary file not shown.

2
mcs/class/lib/monolite-unix/d0aa6798-834d-11e9-b38a-3b0d70487d01/System.Numerics.dll.REMOVED.git-id
View File

@ -1 +1 @@
84b9ce2081b922fc053118de1fd3c5a4173bd210
911466bd000987842c68074f2e079e0f9860cb30

2
mcs/class/lib/monolite-unix/d0aa6798-834d-11e9-b38a-3b0d70487d01/System.Xml.dll.REMOVED.git-id
View File

@ -1 +1 @@
add2614210a79ad6cfd0a24b851e17ad1d32ab82
9175f1d500927237ace77d22eaf368f9d710ee9f

2
mcs/class/lib/monolite-unix/d0aa6798-834d-11e9-b38a-3b0d70487d01/mcs.exe.REMOVED.git-id
View File

@ -1 +1 @@
8aa76c71cef9546ca5eb93400f97c92b01ad945a
04fc2bd9bf4f0e84c87b5f691c700725dc00896b

2
mcs/class/lib/monolite-unix/d0aa6798-834d-11e9-b38a-3b0d70487d01/mscorlib.dll.REMOVED.git-id
View File

@ -1 +1 @@
7024287df064bbdb438f0b8020401924602f85ac
5a70c345349d440397d8e7502578e33a813ffb8c

2
mcs/class/lib/monolite-win32/d0aa6798-834d-11e9-b38a-3b0d70487d01/Mono.Security.dll.REMOVED.git-id
View File

@ -1 +1 @@
436cd54aa59ef12d83c181f3d1b238e80ae1b43a
80e579fd992ef82df5e59d94a2d778fb731082fb

2
mcs/class/lib/monolite-win32/d0aa6798-834d-11e9-b38a-3b0d70487d01/System.Configuration.dll.REMOVED.git-id
View File

@ -1 +1 @@
2e2f5cc4ad8225d1d3874aadeb050777c745bb6f
fcdae2f4574bf8b726570d38ca6e929941e4bdf9

2
mcs/class/lib/monolite-win32/d0aa6798-834d-11e9-b38a-3b0d70487d01/System.Core.dll.REMOVED.git-id
View File

@ -1 +1 @@
b368bb771d2c09cf5a249edd98bc950beb42d252
99ccdd5f591bd216b11cc87e1fbc59bafc67883c

BIN
mcs/class/lib/monolite-win32/d0aa6798-834d-11e9-b38a-3b0d70487d01/System.IO.Compression.dll
View File

Binary file not shown.

2
mcs/class/lib/monolite-win32/d0aa6798-834d-11e9-b38a-3b0d70487d01/System.Numerics.dll.REMOVED.git-id
View File

@ -1 +1 @@
84b9ce2081b922fc053118de1fd3c5a4173bd210
911466bd000987842c68074f2e079e0f9860cb30

2
mcs/class/lib/monolite-win32/d0aa6798-834d-11e9-b38a-3b0d70487d01/System.Xml.dll.REMOVED.git-id
View File

@ -1 +1 @@
add2614210a79ad6cfd0a24b851e17ad1d32ab82
9175f1d500927237ace77d22eaf368f9d710ee9f

2
mcs/class/lib/monolite-win32/d0aa6798-834d-11e9-b38a-3b0d70487d01/mcs.exe.REMOVED.git-id
View File

@ -1 +1 @@
8aa76c71cef9546ca5eb93400f97c92b01ad945a
04fc2bd9bf4f0e84c87b5f691c700725dc00896b

2
mcs/class/lib/monolite-win32/d0aa6798-834d-11e9-b38a-3b0d70487d01/mscorlib.dll.REMOVED.git-id
View File

@ -1 +1 @@
1e9ff20800b5bec5a8b08756ab3e4798ba3aee39
2dc304cb01fb6c4a69c6eae6e98e34bd0c23e675

2
mono/mini/version.h
View File

@ -1 +1 @@
#define FULL_VERSION "explicit/e6f5369"
#define FULL_VERSION "explicit/494641b"

4
mono/unit-tests/Makefile.in
View File

@ -1443,10 +1443,10 @@ distclean-generic:
maintainer-clean-generic:
@echo "This command is intended for maintainers to use"
@echo "it deletes files that may require special tools to rebuild."
@CROSS_COMPILE_TRUE@clean-local:
@HOST_WIN32_TRUE@clean-local:
@CROSS_COMPILE_TRUE@test-local:
@HOST_WIN32_TRUE@test-local:
@CROSS_COMPILE_TRUE@clean-local:
@HOST_WIN32_TRUE@clean-local:
clean: clean-am
clean-am: clean-checkPROGRAMS clean-generic clean-libtool clean-local \

BIN
po/mcs/de.gmo
View File

Binary file not shown.

2
po/mcs/de.po.REMOVED.git-id
View File

@ -1 +1 @@
b8883a770d220c61b699febccf2fb65196bc877b
5b073f4108cc8f5440d57a3e6dfd1314e8d66ad9

BIN
po/mcs/es.gmo
View File

Binary file not shown.

2
po/mcs/es.po.REMOVED.git-id
View File

@ -1 +1 @@
92478994af1acbfb95fd4f7d240a34cab20c6234
1e512410023eca435a5c04d7dc125aec14e6fd87

BIN
po/mcs/ja.gmo
View File

Binary file not shown.

2
po/mcs/ja.po.REMOVED.git-id
View File

@ -1 +1 @@
f9bc7b782248bada9292d8f4f149b152231f10cb
0f87a9b12d557908092017da84b77e77f69b1db2

4
po/mcs/mcs.pot
View File

@ -6,9 +6,9 @@
#, fuzzy
msgid ""
msgstr ""
"Project-Id-Version: mono 6.0.0.310\n"
"Project-Id-Version: mono 6.0.0.311\n"
"Report-Msgid-Bugs-To: http://www.mono-project.com/Bugs\n"
"POT-Creation-Date: 2019-06-28 08:14+0000\n"
"POT-Creation-Date: 2019-07-02 08:13+0000\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"

BIN
po/mcs/pt_BR.gmo
View File

Binary file not shown.

2
po/mcs/pt_BR.po.REMOVED.git-id
View File

@ -1 +1 @@
dde47bb2dcf8b4c9aec32544c63e465595b44961
8f1af855a9769e26fcb298b8a8f35556250e4fb1