Imported Upstream version 4.3.2.467

Former-commit-id: 9c2cb47f45fa221e661ab616387c9cda183f283d
This commit is contained in:
Xamarin Public Jenkins
2016-02-22 11:00:01 -05:00
parent f302175246
commit f3e3aab35a
4097 changed files with 122406 additions and 82300 deletions

View File

@@ -189,8 +189,6 @@ AUTOMAKE = @AUTOMAKE@
AWK = @AWK@
BOEHM_DEFINES = @BOEHM_DEFINES@
BUILD_EXEEXT = @BUILD_EXEEXT@
BUILD_GLIB_CFLAGS = @BUILD_GLIB_CFLAGS@
BUILD_GLIB_LIBS = @BUILD_GLIB_LIBS@
CC = @CC@
CCAS = @CCAS@
CCASDEPMODE = @CCASDEPMODE@
@@ -206,9 +204,9 @@ CXXCPP = @CXXCPP@
CXXDEPMODE = @CXXDEPMODE@
CXXFLAGS = @CXXFLAGS@
CYGPATH_W = @CYGPATH_W@
DEFAULT_PROFILE = @DEFAULT_PROFILE@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
DISABLE_SHARED_HANDLES = @DISABLE_SHARED_HANDLES@
DLLTOOL = @DLLTOOL@
DOLT_BASH = @DOLT_BASH@
DSYMUTIL = @DSYMUTIL@
@@ -226,8 +224,6 @@ GDKX11 = @GDKX11@
GETTEXT_MACRO_VERSION = @GETTEXT_MACRO_VERSION@
GLIB_CFLAGS = @GLIB_CFLAGS@
GLIB_LIBS = @GLIB_LIBS@
GMODULE_CFLAGS = @GMODULE_CFLAGS@
GMODULE_LIBS = @GMODULE_LIBS@
GMSGFMT = @GMSGFMT@
GMSGFMT_015 = @GMSGFMT_015@
GREP = @GREP@

View File

@@ -48,16 +48,11 @@ namespace Mono.Tools.LocaleBuilder
public string[] DayNames = new string[Constants.NUM_DAYS];
public int? FirstDayOfWeek;
public string RawFullDateTimePattern;
public string LongDatePattern;
public string LongTimePattern;
public string MonthDayPattern;
public string[] MonthGenitiveNames = new string[Constants.NUM_MONTHS];
public string[] MonthNames = new string[Constants.NUM_MONTHS];
public string PMDesignator;
public string ShortDatePattern;
public string ShortTimePattern;
public string TimeSeparator;
public string YearMonthPattern;
public string[] ShortDatePatterns = new string[Constants.NUM_SHORT_DATE_PATTERNS];
public string[] LongDatePatterns = new string[Constants.NUM_LONG_DATE_PATTERNS];
public string[] ShortTimePatterns = new string[Constants.NUM_SHORT_TIME_PATTERNS];

View File

@@ -133,18 +133,18 @@ namespace Mono.Tools.LocaleBuilder
Dump (writer, df.DayNames, "DayNames");
writer.WriteLine ("{0}: {1}", "FirstDayOfWeek", (DayOfWeek) df.FirstDayOfWeek);
// Dump (writer, df.GetAllDateTimePatterns (), "GetAllDateTimePatterns");
writer.WriteLine ("{0}: {1}", "LongDatePattern", df.LongDatePattern);
writer.WriteLine ("{0}: {1}", "LongTimePattern", df.LongTimePattern);
// writer.WriteLine ("{0}: {1}", "LongDatePattern", df.LongDatePattern);
// writer.WriteLine ("{0}: {1}", "LongTimePattern", df.LongTimePattern);
writer.WriteLine ("{0}: {1}", "MonthDayPattern", df.MonthDayPattern);
Dump (writer, df.MonthGenitiveNames, "MonthGenitiveNames");
Dump (writer, df.MonthNames, "MonthNames");
writer.WriteLine ("{0}: {1}", "NativeCalendarName", df.NativeCalendarName);
writer.WriteLine ("{0}: {1}", "PMDesignator", df.PMDesignator);
writer.WriteLine ("{0}: {1}", "ShortDatePattern", df.ShortDatePattern);
// writer.WriteLine ("{0}: {1}", "ShortDatePattern", df.ShortDatePattern);
Dump (writer, df.ShortestDayNames, "ShortestDayNames");
writer.WriteLine ("{0}: {1}", "ShortTimePattern", df.ShortTimePattern);
// writer.WriteLine ("{0}: {1}", "ShortTimePattern", df.ShortTimePattern);
writer.WriteLine ("{0}: {1}", "TimeSeparator", df.TimeSeparator);
writer.WriteLine ("{0}: {1}", "YearMonthPattern", df.YearMonthPattern);
// writer.WriteLine ("{0}: {1}", "YearMonthPattern", df.YearMonthPattern);
var ti = c.TextInfoEntry;
writer.WriteLine ("-- TextInfo --");
@@ -924,9 +924,6 @@ namespace Mono.Tools.LocaleBuilder
}
}
// It looks like it never changes
data.DateTimeFormatEntry.TimeSeparator = ":";
// TODO: Don't have input data available but most values are 2 with few exceptions for 1 and 3
// We don't add 3 as it's for some arabic states only
switch (data.ThreeLetterISOLanguageName) {
@@ -1130,13 +1127,16 @@ namespace Mono.Tools.LocaleBuilder
if (el != null) {
// CLDR uses unicode negative sign for some culture (e.g sv, is, lt, don't kwnow why) but .net always
// uses simple - sign
if (el.InnerText == "\u2212") {
switch (el.InnerText) {
case "\u2212":
case "\u200F\u002D": // Remove any right-to-left mark characters
case "\u200E\u002D":
ni.NegativeSign = "-";
} else if (el.InnerText == "\u200F\u002D") {
// Remove any right-to-left mark characters
ni.NegativeSign = "-";
} else
ni.NegativeSign = el.InnerText;
break;
default:
ni.NegativeSign = el.InnerText;
break;
}
}
el = node.SelectSingleNode ("infinity");

View File

@@ -129,8 +129,6 @@ AUTOMAKE = @AUTOMAKE@
AWK = @AWK@
BOEHM_DEFINES = @BOEHM_DEFINES@
BUILD_EXEEXT = @BUILD_EXEEXT@
BUILD_GLIB_CFLAGS = @BUILD_GLIB_CFLAGS@
BUILD_GLIB_LIBS = @BUILD_GLIB_LIBS@
CC = @CC@
CCAS = @CCAS@
CCASDEPMODE = @CCASDEPMODE@
@@ -146,9 +144,9 @@ CXXCPP = @CXXCPP@
CXXDEPMODE = @CXXDEPMODE@
CXXFLAGS = @CXXFLAGS@
CYGPATH_W = @CYGPATH_W@
DEFAULT_PROFILE = @DEFAULT_PROFILE@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
DISABLE_SHARED_HANDLES = @DISABLE_SHARED_HANDLES@
DLLTOOL = @DLLTOOL@
DOLT_BASH = @DOLT_BASH@
DSYMUTIL = @DSYMUTIL@
@@ -166,8 +164,6 @@ GDKX11 = @GDKX11@
GETTEXT_MACRO_VERSION = @GETTEXT_MACRO_VERSION@
GLIB_CFLAGS = @GLIB_CFLAGS@
GLIB_LIBS = @GLIB_LIBS@
GMODULE_CFLAGS = @GMODULE_CFLAGS@
GMODULE_LIBS = @GMODULE_LIBS@
GMSGFMT = @GMSGFMT@
GMSGFMT_015 = @GMSGFMT_015@
GREP = @GREP@

View File

@@ -1 +1 @@
5acbc5535da9977890582be2151836a36f5070c6
7127286033736426a6427b3c01db2e6f7bc69a2b

View File

@@ -192,8 +192,6 @@ AUTOMAKE = @AUTOMAKE@
AWK = @AWK@
BOEHM_DEFINES = @BOEHM_DEFINES@
BUILD_EXEEXT = @BUILD_EXEEXT@
BUILD_GLIB_CFLAGS = @BUILD_GLIB_CFLAGS@
BUILD_GLIB_LIBS = @BUILD_GLIB_LIBS@
CC = @CC@
CCAS = @CCAS@
CCASDEPMODE = @CCASDEPMODE@
@@ -209,9 +207,9 @@ CXXCPP = @CXXCPP@
CXXDEPMODE = @CXXDEPMODE@
CXXFLAGS = @CXXFLAGS@
CYGPATH_W = @CYGPATH_W@
DEFAULT_PROFILE = @DEFAULT_PROFILE@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
DISABLE_SHARED_HANDLES = @DISABLE_SHARED_HANDLES@
DLLTOOL = @DLLTOOL@
DOLT_BASH = @DOLT_BASH@
DSYMUTIL = @DSYMUTIL@
@@ -229,8 +227,6 @@ GDKX11 = @GDKX11@
GETTEXT_MACRO_VERSION = @GETTEXT_MACRO_VERSION@
GLIB_CFLAGS = @GLIB_CFLAGS@
GLIB_LIBS = @GLIB_LIBS@
GMODULE_CFLAGS = @GMODULE_CFLAGS@
GMODULE_LIBS = @GMODULE_LIBS@
GMSGFMT = @GMSGFMT@
GMSGFMT_015 = @GMSGFMT_015@
GREP = @GREP@

View File

@@ -178,8 +178,6 @@ AUTOMAKE = @AUTOMAKE@
AWK = @AWK@
BOEHM_DEFINES = @BOEHM_DEFINES@
BUILD_EXEEXT = @BUILD_EXEEXT@
BUILD_GLIB_CFLAGS = @BUILD_GLIB_CFLAGS@
BUILD_GLIB_LIBS = @BUILD_GLIB_LIBS@
CC = @CC@
CCAS = @CCAS@
CCASDEPMODE = @CCASDEPMODE@
@@ -195,9 +193,9 @@ CXXCPP = @CXXCPP@
CXXDEPMODE = @CXXDEPMODE@
CXXFLAGS = @CXXFLAGS@
CYGPATH_W = @CYGPATH_W@
DEFAULT_PROFILE = @DEFAULT_PROFILE@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
DISABLE_SHARED_HANDLES = @DISABLE_SHARED_HANDLES@
DLLTOOL = @DLLTOOL@
DOLT_BASH = @DOLT_BASH@
DSYMUTIL = @DSYMUTIL@
@@ -215,8 +213,6 @@ GDKX11 = @GDKX11@
GETTEXT_MACRO_VERSION = @GETTEXT_MACRO_VERSION@
GLIB_CFLAGS = @GLIB_CFLAGS@
GLIB_LIBS = @GLIB_LIBS@
GMODULE_CFLAGS = @GMODULE_CFLAGS@
GMODULE_LIBS = @GMODULE_LIBS@
GMSGFMT = @GMSGFMT@
GMSGFMT_015 = @GMSGFMT_015@
GREP = @GREP@

View File

@@ -110,8 +110,6 @@ read_entry (EntryStream *stream, void *data)
#define BEGIN_PROTOCOL_ENTRY_HEAVY6(method,t1,f1,t2,f2,t3,f3,t4,f4,t5,f5,t6,f6) \
BEGIN_PROTOCOL_ENTRY6 (method,t1,f1,t2,f2,t3,f3,t4,f4,t5,f5,t6,f6)
#define FLUSH()
#define DEFAULT_PRINT()
#define CUSTOM_PRINT(_)
@@ -120,6 +118,7 @@ read_entry (EntryStream *stream, void *data)
#define IS_VTABLE_MATCH(_)
#define END_PROTOCOL_ENTRY
#define END_PROTOCOL_ENTRY_FLUSH
#define END_PROTOCOL_ENTRY_HEAVY
#include <mono/sgen/sgen-protocol-def.h>
@@ -169,8 +168,6 @@ is_always_match (int type)
#define BEGIN_PROTOCOL_ENTRY_HEAVY6(method,t1,f1,t2,f2,t3,f3,t4,f4,t5,f5,t6,f6) \
BEGIN_PROTOCOL_ENTRY6 (method,t1,f1,t2,f2,t3,f3,t4,f4,t5,f5,t6,f6)
#define FLUSH()
#define DEFAULT_PRINT()
#define CUSTOM_PRINT(_)
@@ -180,6 +177,7 @@ is_always_match (int type)
#define IS_VTABLE_MATCH(_)
#define END_PROTOCOL_ENTRY
#define END_PROTOCOL_ENTRY_FLUSH
#define END_PROTOCOL_ENTRY_HEAVY
#include <mono/sgen/sgen-protocol-def.h>
@@ -402,8 +400,6 @@ print_entry (int type, void *data, int num_nums, int *match_indices, gboolean co
#define BEGIN_PROTOCOL_ENTRY_HEAVY6(method,t1,f1,t2,f2,t3,f3,t4,f4,t5,f5,t6,f6) \
BEGIN_PROTOCOL_ENTRY6 (method,t1,f1,t2,f2,t3,f3,t4,f4,t5,f5,t6,f6)
#define FLUSH()
#define DEFAULT_PRINT() \
print_entry_content (pes_size, pes, color_output);
#define CUSTOM_PRINT(print) \
@@ -417,6 +413,8 @@ print_entry (int type, void *data, int num_nums, int *match_indices, gboolean co
printf ("\n"); \
break; \
}
#define END_PROTOCOL_ENTRY_FLUSH \
END_PROTOCOL_ENTRY
#define END_PROTOCOL_ENTRY_HEAVY \
END_PROTOCOL_ENTRY
@@ -487,8 +485,6 @@ match_index (gpointer ptr, int type, void *data)
#define BEGIN_PROTOCOL_ENTRY_HEAVY6(method,t1,f1,t2,f2,t3,f3,t4,f4,t5,f5,t6,f6) \
BEGIN_PROTOCOL_ENTRY6 (method,t1,f1,t2,f2,t3,f3,t4,f4,t5,f5,t6,f6)
#define FLUSH()
#define DEFAULT_PRINT()
#define CUSTOM_PRINT(_)
@@ -500,6 +496,8 @@ match_index (gpointer ptr, int type, void *data)
#define END_PROTOCOL_ENTRY \
break; \
}
#define END_PROTOCOL_ENTRY_FLUSH \
END_PROTOCOL_ENTRY
#define END_PROTOCOL_ENTRY_HEAVY \
END_PROTOCOL_ENTRY
@@ -550,8 +548,6 @@ is_vtable_match (gpointer ptr, int type, void *data)
#define BEGIN_PROTOCOL_ENTRY_HEAVY6(method,t1,f1,t2,f2,t3,f3,t4,f4,t5,f5,t6,f6) \
BEGIN_PROTOCOL_ENTRY6 (method,t1,f1,t2,f2,t3,f3,t4,f4,t5,f5,t6,f6)
#define FLUSH()
#define DEFAULT_PRINT()
#define CUSTOM_PRINT(_)
@@ -563,6 +559,8 @@ is_vtable_match (gpointer ptr, int type, void *data)
#define END_PROTOCOL_ENTRY \
break; \
}
#define END_PROTOCOL_ENTRY_FLUSH \
END_PROTOCOL_ENTRY
#define END_PROTOCOL_ENTRY_HEAVY \
END_PROTOCOL_ENTRY