Imported Upstream version 5.4.0.199

Former-commit-id: f4d318e4b2f128fa9f4d31b37bb3839a3fc0dfb2

tools/locale-builder/Driver.cs

@@ -1177,10 +1177,13 @@ namespace Mono.Tools.LocaleBuilder
 				if (el != null)
 					ni.PositiveSign = el.InnerText;
 
+				// CLDR uses unicode negative sign for some culture (e.g sv, is, lt, don't kwnow why) but .NET always
+				// uses simple "-" sign and what is worse the parsing code cannot deal with non-ASCII values
+				ni.NegativeSign = "-";
+
+				/*
 				el = node.SelectSingleNode ("minusSign");
 				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
 					switch (el.InnerText) {
 					case "\u2212":
 					case "\u200F\u002D": // Remove any right-to-left mark characters
@@ -1194,7 +1197,7 @@ namespace Mono.Tools.LocaleBuilder
 						break;
 					}
 				}
-
+				*/
 				el = node.SelectSingleNode ("infinity");
 
 				// We cannot use the value from CLDR because many broken

tools/locale-builder/Makefile.am

@@ -41,7 +41,7 @@ minimal: locale-builder.exe locale-data
 	$(RUNTIME) locale-builder.exe --locales '$(MINIMAL_LOCALES)'
 
 locale-data:
-	if ! test -d CLDR/common ; then \
+	if ! test -e CLDR/common/supplemental/supplementalData.xml ; then \
 		curl http://www.unicode.org/Public/cldr/30.0.2/core.zip -o core.zip ; \
 		unzip core.zip -d CLDR ; \
 	fi

tools/locale-builder/Makefile.in

@@ -559,7 +559,7 @@ minimal: locale-builder.exe locale-data
 	$(RUNTIME) locale-builder.exe --locales '$(MINIMAL_LOCALES)'
 
 locale-data:
-	if ! test -d CLDR/common ; then \
+	if ! test -e CLDR/common/supplemental/supplementalData.xml ; then \
 		curl http://www.unicode.org/Public/cldr/30.0.2/core.zip -o core.zip ; \
 		unzip core.zip -d CLDR ; \
 	fi