Imported Upstream version 4.0.0~alpha1

Former-commit-id: 806294f5ded97629b74c85c09952f2a74fe182d9

tools/locale-builder/Constants.cs

@@ -41,8 +41,9 @@ namespace Mono.Tools.LocaleBuilder
 		public const int NUM_CALENDARS = 4;
 
 		public const int NUM_SHORT_DATE_PATTERNS = 14;
-		public const int NUM_LONG_DATE_PATTERNS = 8;
+		public const int NUM_LONG_DATE_PATTERNS = 10;
 		public const int NUM_SHORT_TIME_PATTERNS = 12;
 		public const int NUM_LONG_TIME_PATTERNS = 9;
+		public const int NUM_YEAR_MONTH_PATTERNS = 8;
 	}
 }

tools/locale-builder/DateTimeFormatEntry.cs

@@ -63,19 +63,13 @@ namespace Mono.Tools.LocaleBuilder
 		public string[] ShortTimePatterns = new string[Constants.NUM_SHORT_TIME_PATTERNS];
 		public string[] LongTimePatterns = new string[Constants.NUM_LONG_TIME_PATTERNS];
 		public string[] ShortestDayNames = new string[Constants.NUM_DAYS];
+		public string[] YearMonthPatterns = new string[Constants.NUM_YEAR_MONTH_PATTERNS];
 
 		public int Row;
 
 		public void AppendTableRow (StringBuilder builder)
 		{
 			builder.Append ("\t{");
-			builder.Append (EncodeStringIdx (LongDatePattern) + ", ");
-			builder.Append (EncodeStringIdx (ShortDatePattern) + ", ");
-
-			builder.Append (EncodeStringIdx (LongTimePattern) + ", ");
-			builder.Append (EncodeStringIdx (ShortTimePattern) + ", ");
-
-			builder.Append (EncodeStringIdx (YearMonthPattern) + ", ");
 			builder.Append (EncodeStringIdx (MonthDayPattern) + ", ");
 
 			builder.Append (EncodeStringIdx (AMDesignator) + ", ");
@@ -104,6 +98,8 @@ namespace Mono.Tools.LocaleBuilder
 			AppendPatterns (builder, ShortTimePatterns);
 			builder.Append (',');
 			AppendPatterns (builder, LongTimePatterns);
+			builder.Append (',');
+			AppendPatterns (builder, YearMonthPatterns);
 
 			builder.Append ('}');
 		}

tools/locale-builder/Makefile.in

@@ -148,6 +148,7 @@ CXXFLAGS = @CXXFLAGS@
 CYGPATH_W = @CYGPATH_W@
 DEFS = @DEFS@
 DEPDIR = @DEPDIR@
+DISABLE_PERF_EVENTS = @DISABLE_PERF_EVENTS@
 DISABLE_SHARED_HANDLES = @DISABLE_SHARED_HANDLES@
 DLLTOOL = @DLLTOOL@
 DOLT_BASH = @DOLT_BASH@
@@ -231,12 +232,15 @@ RANLIB = @RANLIB@
 SED = @SED@
 SET_MAKE = @SET_MAKE@
 SGEN_DEFINES = @SGEN_DEFINES@
+SHARED_CFLAGS = @SHARED_CFLAGS@
 SHELL = @SHELL@
 SQLITE = @SQLITE@
 SQLITE3 = @SQLITE3@
 STRIP = @STRIP@
 USE_NLS = @USE_NLS@
 VERSION = @VERSION@
+VTUNE_CFLAGS = @VTUNE_CFLAGS@
+VTUNE_LIBS = @VTUNE_LIBS@
 WERROR_CFLAGS = @WERROR_CFLAGS@
 X11 = @X11@
 XATTR_LIB = @XATTR_LIB@

tools/locale-builder/Patterns.cs.REMOVED.git-id

@@ -1 +1 @@
-41b8aaf5ef1c6244ecf4b4846f0b34dd3de4b675
+b2e7e8b961017e7fb586222c7827496d7c82d1f7