8129881: JDK-8008577 breaks Nashorn test
8130845: Change to CLDR Locale data in JDK 9 b71 causes SimpleDateFormat parsing errors
8132125: German (Switzerland) formatting broken if CLDR Locale Data is used
Reviewed-by: tbell, okutsu
--- a/make/Main.gmk Wed Jul 05 20:44:11 2017 +0200
+++ b/make/Main.gmk Mon Aug 03 21:49:23 2015 -0700
@@ -78,11 +78,14 @@
interim-rmic:
+($(CD) $(JDK_TOPDIR)/make && $(MAKE) $(MAKE_ARGS) -f CompileInterimRmic.gmk)
+interim-cldrconverter:
+ +($(CD) $(JDK_TOPDIR)/make && $(MAKE) $(MAKE_ARGS) -f CopyInterimCLDRConverter.gmk)
+
buildtools-jdk:
+($(CD) $(JDK_TOPDIR)/make && $(MAKE) $(MAKE_ARGS) -f Tools.gmk java-tools)
ALL_TARGETS += buildtools-langtools interim-langtools interim-corba \
- interim-rmic buildtools-jdk
+ interim-rmic interim-cldrconverter buildtools-jdk
################################################################################
# Special targets for certain modules
@@ -345,7 +348,7 @@
interim-langtools: $(LANGTOOLS_GENSRC_TARGETS)
- buildtools-jdk: interim-langtools
+ buildtools-jdk: interim-langtools interim-cldrconverter
$(CORBA_GENSRC_TARGETS): interim-langtools