diff options
| author | Tom Tromey <tromey@redhat.com> | 2006-03-24 17:04:21 +0000 |
|---|---|---|
| committer | Tom Tromey <tromey@redhat.com> | 2006-03-24 17:04:21 +0000 |
| commit | f370efa1358a912b3c57e4bce650babbebd59269 (patch) | |
| tree | c05abd048b598694a7a4b129851cdf0e32ed8634 /lib | |
| parent | e5466b68ed93e3706b71d9666f0008d1ead1501f (diff) | |
| download | classpath-f370efa1358a912b3c57e4bce650babbebd59269.tar.gz | |
* .externalToolBuilders/CreateLocaleData.launch: Updated.
* gnu/java/locale/.cvsignore: New file.
* lib/Makefile.am (LocaleData.java): Put in gnu/java/locale.
* java/util/Locale.java (getAvailableLocales): Clone result.
(getISOCountries): Likewise.
(getISOLanguages): Likewise.
* scripts/generate-locale-list.sh: Make class public. Added new
array.
* gnu/java/locale/LocaleHelper.java (getCollatorLocales): New method.
(getLocaleCount): Likewise.
* java/text/Collator.java (getInstance): Javadoc typo fix.
(getAvailableLocales): Wrote.
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/Makefile.am | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/lib/Makefile.am b/lib/Makefile.am index e2c495714..8e5de9723 100644 --- a/lib/Makefile.am +++ b/lib/Makefile.am @@ -113,11 +113,11 @@ resources: copy-vmresources.sh classes: genclasses -$(top_builddir)/java/util/LocaleData.java: $(top_srcdir)/scripts/generate-locale-list.sh - mkdir -p $(top_builddir)/java/util - $(top_srcdir)/scripts/generate-locale-list.sh > $(top_builddir)/java/util/LocaleData.java +$(top_builddir)/gnu/java/locale/LocaleData.java: $(top_srcdir)/scripts/generate-locale-list.sh + mkdir -p $(top_builddir)/gnu/java/locale + $(top_srcdir)/scripts/generate-locale-list.sh > $(top_builddir)/gnu/java/locale/LocaleData.java -genclasses: gen-classlist.sh standard.omit $(top_builddir)/java/util/LocaleData.java gen-xpath-parser +genclasses: gen-classlist.sh standard.omit $(top_builddir)/gnu/java/locale/LocaleData.java gen-xpath-parser top_builddir=$(top_builddir) top_srcdir=$(top_srcdir) $(SHELL) ./gen-classlist.sh standard # Only rebuild parsers when explicitly asked to. @@ -156,7 +156,7 @@ endif EXTRA_DIST = standard.omit mkcollections.pl.in Makefile.gcj split-for-gcj.sh CLEANFILES = compile-classes resources classes \ glibj.zip classes.1 \ - $(top_builddir)/java/util/LocaleData.java \ + $(top_builddir)/gnu/java/locale/LocaleData.java \ $(JAVA_DEPEND) clean-local: @@ -177,4 +177,4 @@ dist-hook: $(FIND) $(distdir)/../gnu $(distdir)/../java $(distdir)/../javax $(distdir)/../org $(distdir)/../vm $(distdir)/../resource -name .cvsignore -print | xargs rm -f $(FIND) $(distdir)/../gnu $(distdir)/../java $(distdir)/../javax $(distdir)/../org $(distdir)/../vm -name class-dependencies.conf -print | xargs rm -f rm -f $(distdir)/../gnu/classpath/Configuration.java - rm -f $(distdir)/../java/util/LocaleData.java + rm -f $(distdir)/../gnu/java/locale/LocaleData.java |