From 85aee40cc3b25eeaccba6ef59fca124fd9ee5100 Mon Sep 17 00:00:00 2001
From: Hugo van der Merwe <17109322+hugovdm@users.noreply.github.com>
Date: Sun, 14 Jun 2020 17:49:00 +0200
Subject: [PATCH] ICU-21078 Improve instructions and gitignore files for
 cldr-to-icu.

This also adds .idea/ to the top-level .gitignore, next to .vs/ and
.vscode/.
---
 .gitignore                              | 2 ++
 tools/cldr/{cldr-to-icu => }/.gitignore | 2 +-
 tools/cldr/cldr-to-icu/README.txt       | 3 ++-
 3 files changed, 5 insertions(+), 2 deletions(-)
 rename tools/cldr/{cldr-to-icu => }/.gitignore (89%)

diff --git a/.gitignore b/.gitignore
index 079c1e79d4d..4efac556dfe 100644
--- a/.gitignore
+++ b/.gitignore
@@ -42,6 +42,7 @@ perf-*.xml
 test-*.xml
 
 # Directories
+.idea/
 .vs/
 .vscode/
 ARM/
@@ -56,6 +57,7 @@ bin/
 debug/
 doc/
 lib/
+!tools/cldr/lib
 out/
 release/
 tmp/
diff --git a/tools/cldr/cldr-to-icu/.gitignore b/tools/cldr/.gitignore
similarity index 89%
rename from tools/cldr/cldr-to-icu/.gitignore
rename to tools/cldr/.gitignore
index 8d31dd98484..ed5b154cd21 100644
--- a/tools/cldr/cldr-to-icu/.gitignore
+++ b/tools/cldr/.gitignore
@@ -3,5 +3,5 @@
 !/lib/README.txt
 
 # Ignore the default Maven target directory.
-/target
+/cldr-to-icu/target
 
diff --git a/tools/cldr/cldr-to-icu/README.txt b/tools/cldr/cldr-to-icu/README.txt
index 750f41a065d..4bde0a4487a 100644
--- a/tools/cldr/cldr-to-icu/README.txt
+++ b/tools/cldr/cldr-to-icu/README.txt
@@ -55,12 +55,13 @@ $ICU_ROOT/tools/cldr/lib (see the README.txt in that directory for more
 information).
 
 $ cd "$ICU_ROOT/tools/cldr/lib"
-$ install-cldr-jars.sh "$CLDR_ROOT"
+$ ./install-cldr-jars.sh "$CLDR_ROOT"
 
 
 Generating all ICU data
 -----------------------
 
+$ cd "$ICU_ROOT/tools/cldr/cldr-to-icu"
 $ ant -f build-icu-data.xml