Fixing CLDR projects eclipse configuration.
Update explanations in README-CLDR file.
Fix eclipse classpath to use downloaded latest CLDR libraries.
Fix eclipse launcher for GenerateGwtCldrData script.
Change-Id: Ibc5d3f964424a2adfacdbd6acd84d3b0d730b51f
diff --git a/eclipse/README-CLDR.txt b/eclipse/README-CLDR.txt
index 1a99f3d..31c4ce7 100644
--- a/eclipse/README-CLDR.txt
+++ b/eclipse/README-CLDR.txt
@@ -1,10 +1,20 @@
Steps to process CLDR data using Eclipse:
-1) Get the CLDR data available locally on your system, such as by:
- svn co http://unicode.org/repos/cldr/tags/release-1-8-1 <cldrdir>
-2) Set a linked resource variable pointing to this in Eclipse:
+1) Get latest CLDR data available locally on your system and compile
+ it, such as by:
+ $ svn co http://unicode.org/repos/cldr/tags/release-24 <cldrdir>
+ $ cd release-25/tools/java
+ $ ant clean jar
+2) Required CLDR variables in Eclipse
+ Set a linked resource variable pointing to this:
Window -> Preferences -> General -> Workspace -> Linked Resources
- Add a variable CLDR_ROOT pointing to <cldrdir> above
+ Add a variable CLDR_ROOT pointing to <cldrdir> above
+ Create a classpath variable pointing to the same folder:
+ Window -> Preferences -> Java -> Build Path -> Classpath Variables
+ Create a variable named CLDR_ROOT pointing to <cldrdir>
+ Create a string subtitution variable:
+ Window -> Preferences -> Run/Debug -> String Substitution -> New
+ Create the variable CLDR_ROOT pointing to <cldrdir>
3) Import the cldr-data, cldr-tools, and cldr-import projects (note that
CLDR_ROOT must be defined as above, or you will have to delete and
reimport these projects).
diff --git a/eclipse/external/cldr-tools/.classpath b/eclipse/external/cldr-tools/.classpath
index a360353..13f01b3 100644
--- a/eclipse/external/cldr-tools/.classpath
+++ b/eclipse/external/cldr-tools/.classpath
@@ -5,7 +5,7 @@
<classpathentry kind="var" path="GWT_TOOLS/lib/cup/java-cup-11a.jar"/>
<classpathentry kind="var" path="GWT_TOOLS/lib/xalan/xalan-2.7.1-nocup.jar"/>
<classpathentry kind="var" path="GWT_TOOLS/lib/apache/ant-1.7.1.jar"/>
- <classpathentry kind="var" path="GWT_TOOLS/lib/icu4j/50.1.1/icu4j.jar" sourcepath="/GWT_TOOLS/lib/icu4j/50.1.1/icu4j-src.jar"/>
- <classpathentry kind="var" path="GWT_TOOLS/lib/icu4j/50.1.1/utilities.jar" sourcepath="/GWT_TOOLS/lib/icu4j/50.1.1/utilities-src.jar"/>
+ <classpathentry kind="var" path="CLDR_ROOT/tools/java/libs/icu4j.jar" sourcepath="/CLDR_ROOT/tools/java/libs/icu4j-src.jar"/>
+ <classpathentry kind="var" path="CLDR_ROOT/tools/java/libs/utilities.jar" sourcepath="/CLDR_ROOT/tools/java/libs/utilities-src.jar"/>
<classpathentry kind="output" path="bin"/>
</classpath>
diff --git a/eclipse/tools/cldr-import/.classpath b/eclipse/tools/cldr-import/.classpath
index acb1c55..c53a620 100644
--- a/eclipse/tools/cldr-import/.classpath
+++ b/eclipse/tools/cldr-import/.classpath
@@ -4,12 +4,11 @@
<classpathentry kind="src" path="core/test"/>
<classpathentry kind="src" path="generated"/>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
- <classpathentry exported="true" kind="var" path="GWT_TOOLS/lib/junit/junit-4.8.2.jar" sourcepath="/GWT_TOOLS/lib/junit/junit-4.8.2-src.zip"/>
+ <classpathentry exported="true" kind="var" path="CLDR_ROOT/tools/java/libs/icu4j.jar" sourcepath="/CLDR_ROOT/tools/java/libs/icu4j-src.jar"/>
+ <classpathentry exported="true" kind="var" path="CLDR_ROOT/tools/java/libs/utilities.jar" sourcepath="/CLDR_ROOT/tools/java/libs/utilities-src.jar"/>
+ <classpathentry exported="true" kind="var" path="GWT_TOOLS/lib/junit/junit-4.8.2.jar" sourcepath="/GWT_TOOLS/lib/junit/junit-4.8.2-src.zip"/>
<classpathentry combineaccessrules="false" exported="true" kind="src" path="/gwt-user"/>
<classpathentry combineaccessrules="false" kind="src" path="/cldr-tools"/>
<classpathentry combineaccessrules="false" kind="src" path="/gwt-dev"/>
- <classpathentry kind="var" path="GWT_TOOLS/lib/cldr/21/cldr.jar" />
- <classpathentry kind="var" path="GWT_TOOLS/lib/icu4j/50.1.1/icu4j.jar" />
- <classpathentry kind="var" path="GWT_TOOLS/lib/icu4j/50.1.1/utilities.jar" />
<classpathentry kind="output" path="bin"/>
</classpath>
diff --git a/eclipse/tools/cldr-import/GenerateGwtCldrData.launch b/eclipse/tools/cldr-import/GenerateGwtCldrData.launch
index 9c6d71c..7b5d0fc 100644
--- a/eclipse/tools/cldr-import/GenerateGwtCldrData.launch
+++ b/eclipse/tools/cldr-import/GenerateGwtCldrData.launch
@@ -10,5 +10,5 @@
<stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value="com.google.gwt.tools.cldr.GenerateGwtCldrData"/>
<stringAttribute key="org.eclipse.jdt.launching.PROGRAM_ARGUMENTS" value="--sourcedir ${resource_loc:cldr-data/common}/main --outdir ${resource_loc:gwt-user/core}/.."/>
<stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="cldr-import"/>
-<stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-Xmx1024m"/>
+<stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-Xmx1024m -DCLDR_DIR=${CLDR_ROOT}"/>
</launchConfiguration>
