organicmaps/icu
13
Fork 0
mirror of https://github.com/unicode-org/icu.git synced 2025-04-05 21:45:37 +00:00
Code Issues 1 Projects Releases Wiki Activity Actions 12

ICU-21140 Fix cldr-to-icu tooling to work on Windows

Browse source
This commit is contained in:
daniel-ju 2020-06-02 14:22:39 -04:00 • committed by David Beaumont
parent f0ad454691
commit bb7b8481bd
3 changed files with 14 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
tools/cldr/cldr-to-icu/src/main/java/org/unicode/icu/tool/cldrtoicu/LdmlConverter.java
View file

@ -242,7 +242,7 @@ public final class LdmlConverter {
private static ImmutableList<String> readLinesFromResource(String name) {
try (InputStream in = LdmlConverter.class.getResourceAsStream(name)) {
return ImmutableList.copyOf(CharStreams.readLines(new InputStreamReader(in)));
return ImmutableList.copyOf(CharStreams.readLines(new InputStreamReader(in, UTF_8)));
} catch (IOException e) {
throw new RuntimeException("cannot read resource: " + name, e);
}

5
tools/cldr/cldr-to-icu/src/main/java/org/unicode/icu/tool/cldrtoicu/ant/CleanOutputDirectoryTask.java
View file

@ -100,8 +100,9 @@ public final class CleanOutputDirectoryTask extends Task {
}
@SuppressWarnings("unused")
public void setRoot(Path root) {
this.root = root;
public void setRoot(String root) {
// Use String here since on some systems Ant doesn't support automatically converting Path instances.
this.root = Paths.get(root);
}
@SuppressWarnings("unused")

16
tools/cldr/cldr-to-icu/src/main/java/org/unicode/icu/tool/cldrtoicu/ant/ConvertIcuDataTask.java
View file

@ -16,6 +16,7 @@ import static java.util.stream.Collectors.joining;
import static org.unicode.cldr.api.CldrPath.parseDistinguishingPath;
import java.nio.file.Path;
import java.nio.file.Paths;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;
@ -76,13 +77,15 @@ public final class ConvertIcuDataTask extends Task {
private Predicate<String> idFilter = id -> true;
@SuppressWarnings("unused")
public void setOutputDir(Path path) {
config.setOutputDir(path);
public void setOutputDir(String path) {
// Use String here since on some systems Ant doesn't support automatically converting Path instances.
config.setOutputDir(Paths.get(path));
}
@SuppressWarnings("unused")
public void setCldrDir(Path path) {
this.cldrPath = checkNotNull(path);
public void setCldrDir(String path) {
// Use String here since on some systems Ant doesn't support automatically converting Path instances.
this.cldrPath = checkNotNull(Paths.get(path));
}
@SuppressWarnings("unused")
@ -108,8 +111,9 @@ public final class ConvertIcuDataTask extends Task {
}
@SuppressWarnings("unused")
public void setSpecialsDir(Path path) {
config.setSpecialsDir(path);
public void setSpecialsDir(String path) {
// Use String here since on some systems Ant doesn't support automatically converting Path instances.
config.setSpecialsDir(Paths.get(path));
}
@SuppressWarnings("unused")