Merge branch 'upstream'
Former-commit-id: c3f8db450305e7310584dda8daf37b0201337649
This commit is contained in:
Xamarin Public Jenkins (auto-signing)
commit
85db029fc1
@ -1 +1 @@
|
||||
e01cc2bb9e61cf2533ccbd873e22f71e768156f9
|
||||
5cddb32e13af11623b2e96384461a2595fae2237
|
||||
@ -1 +1 @@
|
||||
08b1b5c5cb881e8662aada9959378c6c4b2b4ecf
|
||||
c29bc5931daf65abd230d8b4ff4469ff74250676
|
||||
4
external/bockbuild/bb
vendored
4
external/bockbuild/bb
vendored
@ -194,8 +194,6 @@ class Bockbuild:
|
||||
self.artifact_root, '%s-%s' % (package.name, arch))
|
||||
package.buildstring_file = package.build_artifact + '.buildstring'
|
||||
package.log = os.path.join(self.logs, package.name + '.log')
|
||||
if os.path.exists(package.log):
|
||||
delete(package.log)
|
||||
|
||||
package.source_dir_name = expand_macros(package.source_dir_name, package)
|
||||
workspace_path = os.path.join(self.build_root, package.source_dir_name)
|
||||
@ -226,6 +224,8 @@ class Bockbuild:
|
||||
package.deploy_requests.append (stage)
|
||||
|
||||
for package in packages.values():
|
||||
if os.path.exists(package.log):
|
||||
delete(package.log)
|
||||
package.start_build(arch, dest, stage)
|
||||
# make artifact in scratch
|
||||
# delete artifact + buildstring
|
||||
|
||||
4
external/bockbuild/bockbuild.py
vendored
4
external/bockbuild/bockbuild.py
vendored
@ -194,8 +194,6 @@ class Bockbuild:
|
||||
self.artifact_root, '%s-%s' % (package.name, arch))
|
||||
package.buildstring_file = package.build_artifact + '.buildstring'
|
||||
package.log = os.path.join(self.logs, package.name + '.log')
|
||||
if os.path.exists(package.log):
|
||||
delete(package.log)
|
||||
|
||||
package.source_dir_name = expand_macros(package.source_dir_name, package)
|
||||
workspace_path = os.path.join(self.build_root, package.source_dir_name)
|
||||
@ -226,6 +224,8 @@ class Bockbuild:
|
||||
package.deploy_requests.append (stage)
|
||||
|
||||
for package in packages.values():
|
||||
if os.path.exists(package.log):
|
||||
delete(package.log)
|
||||
package.start_build(arch, dest, stage)
|
||||
# make artifact in scratch
|
||||
# delete artifact + buildstring
|
||||
|
||||
@ -139,12 +139,12 @@ class DarwinProfile (UnixProfile):
|
||||
package.local_ld_flags = ['-arch i386', '-m32']
|
||||
package.local_gcc_flags = ['-arch i386', '-m32']
|
||||
package.local_configure_flags = [
|
||||
'--build=i386-apple-darwin13.0.0', '--disable-dependency-tracking']
|
||||
'--build=i386-apple-darwin13.0.0', '--host=i386-apple-darwin13.0.0', '--disable-dependency-tracking']
|
||||
elif arch == 'darwin-64':
|
||||
package.local_ld_flags = ['-arch x86_64 -m64']
|
||||
package.local_gcc_flags = ['-arch x86_64 -m64']
|
||||
package.local_configure_flags = [
|
||||
'--build=x86_64-apple-darwin13.0.0', '--disable-dependency-tracking']
|
||||
'--build=x86_64-apple-darwin13.0.0', '--host=x86_64-apple-darwin13.0.0', '--disable-dependency-tracking']
|
||||
else:
|
||||
error('Unknown arch %s' % arch)
|
||||
|
||||
|
||||
@ -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.313";
|
||||
public const string MonoVersion = "6.0.0.316";
|
||||
public const string MonoCompany = "Mono development team";
|
||||
public const string MonoProduct = "Mono Common Language Infrastructure";
|
||||
public const string MonoCopyright = "(c) Various Mono authors";
|
||||
|
||||
@ -1 +1 @@
|
||||
9d771de1e37e20223e1515ceef3c51a607dd9676
|
||||
c2958acd9b794fb9864a0467a32a12abd1e4e443
|
||||
@ -1 +1 @@
|
||||
24c5db848db083a50471562a8dccdfe73d378e89
|
||||
5096249101c7fbf0781b6c1e53d23c7f8f5152f6
|
||||
@ -1 +1 @@
|
||||
136b6eadba8d83e14a6350119be4f54efba244a0
|
||||
714c883658daf608a92d5fdf5837f71e351ddc25
|
||||
Binary file not shown.
@ -1 +1 @@
|
||||
d5646d0db41586dd9927ee301c3aeb260b7e4502
|
||||
41000e60d4f033eab3cff5382413fc5537c29bb2
|
||||
@ -1 +1 @@
|
||||
78685d6eac6a519b046f0f678549cd9176063501
|
||||
95a60d8f09db096c54333130fe0c4a3b452e3fe3
|
||||
@ -1 +1 @@
|
||||
cc9d470d93be56d6cf6f0f58a28a4b305435f279
|
||||
704a687baf43f44b0d589607ac669498e8247dba
|
||||
@ -1 +1 @@
|
||||
98ff6dec797dcc545d47ca10ebfe5dc7d07a19c3
|
||||
265131681fd06dbf97777cd54967d7bdb59cb6f1
|
||||
@ -1 +1 @@
|
||||
9d771de1e37e20223e1515ceef3c51a607dd9676
|
||||
c2958acd9b794fb9864a0467a32a12abd1e4e443
|
||||
@ -1 +1 @@
|
||||
24c5db848db083a50471562a8dccdfe73d378e89
|
||||
5096249101c7fbf0781b6c1e53d23c7f8f5152f6
|
||||
@ -1 +1 @@
|
||||
136b6eadba8d83e14a6350119be4f54efba244a0
|
||||
714c883658daf608a92d5fdf5837f71e351ddc25
|
||||
Binary file not shown.
@ -1 +1 @@
|
||||
d5646d0db41586dd9927ee301c3aeb260b7e4502
|
||||
41000e60d4f033eab3cff5382413fc5537c29bb2
|
||||
@ -1 +1 @@
|
||||
78685d6eac6a519b046f0f678549cd9176063501
|
||||
95a60d8f09db096c54333130fe0c4a3b452e3fe3
|
||||
@ -1 +1 @@
|
||||
cc9d470d93be56d6cf6f0f58a28a4b305435f279
|
||||
704a687baf43f44b0d589607ac669498e8247dba
|
||||
@ -1 +1 @@
|
||||
98ff6dec797dcc545d47ca10ebfe5dc7d07a19c3
|
||||
265131681fd06dbf97777cd54967d7bdb59cb6f1
|
||||
@ -1 +1 @@
|
||||
9d771de1e37e20223e1515ceef3c51a607dd9676
|
||||
c2958acd9b794fb9864a0467a32a12abd1e4e443
|
||||
@ -1 +1 @@
|
||||
24c5db848db083a50471562a8dccdfe73d378e89
|
||||
5096249101c7fbf0781b6c1e53d23c7f8f5152f6
|
||||
@ -1 +1 @@
|
||||
136b6eadba8d83e14a6350119be4f54efba244a0
|
||||
714c883658daf608a92d5fdf5837f71e351ddc25
|
||||
Binary file not shown.
@ -1 +1 @@
|
||||
d5646d0db41586dd9927ee301c3aeb260b7e4502
|
||||
41000e60d4f033eab3cff5382413fc5537c29bb2
|
||||
@ -1 +1 @@
|
||||
78685d6eac6a519b046f0f678549cd9176063501
|
||||
95a60d8f09db096c54333130fe0c4a3b452e3fe3
|
||||
@ -1 +1 @@
|
||||
cc9d470d93be56d6cf6f0f58a28a4b305435f279
|
||||
704a687baf43f44b0d589607ac669498e8247dba
|
||||
@ -1 +1 @@
|
||||
98ff6dec797dcc545d47ca10ebfe5dc7d07a19c3
|
||||
265131681fd06dbf97777cd54967d7bdb59cb6f1
|
||||
@ -1 +1 @@
|
||||
9d771de1e37e20223e1515ceef3c51a607dd9676
|
||||
c2958acd9b794fb9864a0467a32a12abd1e4e443
|
||||
@ -1 +1 @@
|
||||
24c5db848db083a50471562a8dccdfe73d378e89
|
||||
5096249101c7fbf0781b6c1e53d23c7f8f5152f6
|
||||
@ -1 +1 @@
|
||||
05d89078335562b19acb24b89da84d08e15e6255
|
||||
e118d53d7414286fbe9ac45352cdb72d905b86ad
|
||||
Binary file not shown.
@ -1 +1 @@
|
||||
d5646d0db41586dd9927ee301c3aeb260b7e4502
|
||||
41000e60d4f033eab3cff5382413fc5537c29bb2
|
||||
@ -1 +1 @@
|
||||
78685d6eac6a519b046f0f678549cd9176063501
|
||||
95a60d8f09db096c54333130fe0c4a3b452e3fe3
|
||||
@ -1 +1 @@
|
||||
cc9d470d93be56d6cf6f0f58a28a4b305435f279
|
||||
704a687baf43f44b0d589607ac669498e8247dba
|
||||
@ -1 +1 @@
|
||||
d9a6e09a1accd139fdd621166ed24ec9dae2a315
|
||||
f2b746fa0b9fe2ce34ce37e0574e43666282456e
|
||||
@ -1 +1 @@
|
||||
#define FULL_VERSION "explicit/9d7bbcf"
|
||||
#define FULL_VERSION "explicit/5e7b960"
|
||||
|
||||
@ -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@test-local:
|
||||
@HOST_WIN32_TRUE@test-local:
|
||||
@CROSS_COMPILE_TRUE@clean-local:
|
||||
@HOST_WIN32_TRUE@clean-local:
|
||||
@CROSS_COMPILE_TRUE@test-local:
|
||||
@HOST_WIN32_TRUE@test-local:
|
||||
clean: clean-am
|
||||
|
||||
clean-am: clean-checkPROGRAMS clean-generic clean-libtool clean-local \
|
||||
|
||||
BIN
po/mcs/de.gmo
BIN
po/mcs/de.gmo
Binary file not shown.
@ -1 +1 @@
|
||||
bad0c7ed7214fd1358a507fa335357ac13f09664
|
||||
6428d884003d6f6ebc19c4e7cc3f5052b06f777d
|
||||
BIN
po/mcs/es.gmo
BIN
po/mcs/es.gmo
Binary file not shown.
@ -1 +1 @@
|
||||
b4d6d19760e7de51684e5435cc8fdf06cf35d232
|
||||
d3cf7ad6244ba16f67c3358e674e901cdf366a40
|
||||
BIN
po/mcs/ja.gmo
BIN
po/mcs/ja.gmo
Binary file not shown.
@ -1 +1 @@
|
||||
a6b7453411a7bab3b78eab6660ea0f066fbd68c5
|
||||
8a3a2eb5153d7a937491b52e02627411b84a7c08
|
||||
@ -6,9 +6,9 @@
|
||||
#, fuzzy
|
||||
msgid ""
|
||||
msgstr ""
|
||||
"Project-Id-Version: mono 6.0.0.313\n"
|
||||
"Project-Id-Version: mono 6.0.0.316\n"
|
||||
"Report-Msgid-Bugs-To: http://www.mono-project.com/Bugs\n"
|
||||
"POT-Creation-Date: 2019-07-12 08:14+0000\n"
|
||||
"POT-Creation-Date: 2019-07-26 08:04+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
BIN
po/mcs/pt_BR.gmo
Binary file not shown.
@ -1 +1 @@
|
||||
cb9a929c98d33d57aa976405ee989d01d4502ffa
|
||||
37ccdbf3930dfc000b9b985432b1679875b40986
|
||||
Loading…
x
Reference in New Issue
Block a user