jdk Sdiff makefiles

makefiles/CreateJars.gmk

rev 5696 : 6336885: RFE: Locale Data Deployment Enhancements
4609153: Provide locale data for Indic locales
5104387: Support for gl_ES locale (galician language)
6337471: desktop/system locale preferences support
7056139: (cal) SPI support for locale-dependent Calendar parameters
7058206: Provide CalendarData SPI for week params and display field value names
7073852: Support multiple scripts for digits and decimal symbols per locale
7079560: [Fmt-Da] Context dependent month names support in SimpleDateFormat
7171324: getAvailableLocales() of locale sensitive services should return the actual availability of locales
7151414: (cal) Support calendar type identification
7168528: LocaleServiceProvider needs to be aware of Locale extensions
7171372: (cal) locale's default Calendar should be created if unknown calendar is specified
Summary: JEP 127: Improve Locale Data Packaging and Adopt Unicode CLDR Data (part 1 w/o packaging changes. by Naoto Sato and Masayoshi Okutsu)

  57                 SKIP_METAINF:=true))
  58 
  59 JARS+=$(JDK_OUTPUTDIR)/lib/jconsole.jar
  60 
  61 ##########################################################################################
  62 
  63 DNS_JAR_DEPS := \
  64   $(shell $(FIND) $(JDK_OUTPUTDIR)/classes/sun/net/spi/nameservice/dns/ -name "_the.package") \
  65 
  66 $(eval $(call SetupArchive,BUILD_DNS_JAR,$(DNS_JAR_DEPS),\
  67                 SRCS:=$(JDK_OUTPUTDIR)/classes,\
  68                 INCLUDES:=sun/net/spi/nameservice/dns,\
  69                 EXTRA_FILES:=META-INF/services/sun.net.spi.nameservice.NameServiceDescriptor,\
  70                 JAR:=$(JDK_OUTPUTDIR)/lib/ext/dnsns.jar,\
  71                 SKIP_METAINF:=true))
  72 
  73 JARS+=$(JDK_OUTPUTDIR)/lib/ext/dnsns.jar
  74 
  75 ##########################################################################################
  76 
  77 LOCALEDATA_INCLUDE_PATTERNS := \
  78         sun/text/resources/*_ar* \
  79         sun/text/resources/*_hi* \
  80         sun/text/resources/*_iw* \
  81         sun/text/resources/*_iw* \
  82         sun/text/resources/*_ja* \
  83         sun/text/resources/*_ko* \
  84         sun/text/resources/*_th.* \
  85         sun/text/resources/*_th_* \
  86         sun/text/resources/*_vi* \
  87         sun/text/resources/*_zh* \
  88         sun/text/resources/*Data_th \
  89         sun/text/resources/thai_dict \
  90         sun/util/resources/*_ar* \
  91         sun/util/resources/*_hi* \
  92         sun/util/resources/*_iw* \
  93         sun/util/resources/*_iw* \
  94         sun/util/resources/*_ja* \
  95         sun/util/resources/*_ko* \
  96         sun/util/resources/*_th_* \
  97         sun/util/resources/*_th.* \
  98         sun/util/resources/*_vi* \
  99         sun/util/resources/*_zh*
 100 
 101 LOCALEDATA_INCLUDES := $(patsubst $(JDK_OUTPUTDIR)/classes/%,%,\
 102         $(foreach i,$(LOCALEDATA_INCLUDE_PATTERNS), $(wildcard $(JDK_OUTPUTDIR)/classes/$i)))
 103 
 104 $(eval $(call SetupArchive,BUILD_LOCALEDATA_JAR,,\
 105                 SRCS:=$(JDK_OUTPUTDIR)/classes,\
 106                 SUFFIXES:=.class _dict _th,\
 107                 INCLUDES:=$(LOCALEDATA_INCLUDES),\

 108                 JAR:=$(JDK_OUTPUTDIR)/lib/ext/localedata.jar,\
 109                 SKIP_METAINF:=true))
 110 
 111 JARS+=$(JDK_OUTPUTDIR)/lib/ext/localedata.jar
 112 
 113 ##########################################################################################
 114 # rt.jar and resources.jar are being built in the same way as in the old build. They require
 115 # the files to be in a certain order and converting that is not easy and will not be needed
 116 # in jigsaw anyway.
 117 
 118 # Exclude list for rt.jar and resources.jar
 119 RT_JAR_EXCLUDES := \
 120         com/sun/javadoc \
 121         com/sun/jdi \
 122         com/sun/jarsigner \
 123         com/sun/source \
 124         com/sun/istack/internal/tools \
 125         META-INF/services/com.sun.jdi.connect.Connector \
 126         META-INF/services/com.sun.jdi.connect.spi.TransportService \
 127         META-INF/services/com.sun.tools.xjc.Plugin \

 227         javax/swing/JRadioButtonBeanInfo.class \
 228         javax/swing/JRadioButtonMenuItemBeanInfo.class \
 229         javax/swing/JScrollBarBeanInfo.class \
 230         javax/swing/JScrollPaneBeanInfo.class \
 231         javax/swing/JSeparatorBeanInfo.class \
 232         javax/swing/JSliderBeanInfo.class \
 233         javax/swing/JSpinnerBeanInfo.class \
 234         javax/swing/JSplitPaneBeanInfo.class \
 235         javax/swing/JTabbedPaneBeanInfo.class \
 236         javax/swing/JTableBeanInfo.class \
 237         javax/swing/JTextAreaBeanInfo.class \
 238         javax/swing/JTextFieldBeanInfo.class \
 239         javax/swing/JTextPaneBeanInfo.class \
 240         javax/swing/JToggleButtonBeanInfo.class \
 241         javax/swing/JToolBarBeanInfo.class \
 242         javax/swing/JTreeBeanInfo.class \
 243         javax/swing/JWindowBeanInfo.class \
 244         javax/swing/SwingBeanInfoBase.class \
 245         javax/swing/text/JTextComponentBeanInfo.class \
 246         sun/swing/BeanInfoUtils.class \
 247         $(LOCALEDATA_INCLUDES)



 248 
 249 # These files should never be put into rt.jar
 250 # but due to a misstake...some are put there if embedded
 251 #
 252 ifneq ($(JAVASE_EMBEDDED), true)
 253 # normal (correct) case
 254 RT_JAR_EXCLUDES += \
 255         com/oracle/jrockit/jfr \
 256         oracle/jrockit/jfr
 257 else
 258 # embedded (broken) case
 259 RT_JAR_EXCLUDES += \
 260   oracle/jrockit/jfr/parser \
 261   oracle/jrockit/jfr/tools \
 262   oracle/jrockit/jfr/NativeOptions.class \
 263   oracle/jrockit/jfr/RepositoryChunkHandler.class
 264 endif
 265 
 266 ifeq ($(OPENJDK_TARGET_OS), macosx)
 267         RT_JAR_EXCLUDES += com/sun/nio/sctp \

 616 
 617 ##########################################################################################
 618 
 619 ifeq ($(OPENJDK_TARGET_OS),solaris)
 620 ifndef OPENJDK
 621 
 622 UCRYPTO_JAR_DST := $(JDK_OUTPUTDIR)/lib/ext/ucrypto.jar
 623 UCRYPTO_JAR_SRC := $(JDK_TOPDIR)/make/closed/tools/crypto/ucrypto/ucrypto.jar
 624 
 625 $(UCRYPTO_JAR_DST) : $(UCRYPTO_JAR_SRC)
 626         @$(ECHO) "\n>>>Installing prebuilt OracleUcrypto provider..."
 627         $(RM) $@
 628         $(CP) $< $@
 629 
 630 JARS += $(UCRYPTO_JAR_DST)
 631 
 632 endif
 633 endif
 634 
 635 ##########################################################################################




















 636 
 637 TOOLS_JAR_INCLUDES := \
 638         sun/tools/asm           \
 639         sun/tools/jar           \
 640         sun/tools/java          \
 641         sun/tools/javac         \
 642         sun/tools/jcmd          \
 643         sun/tools/jps           \
 644         sun/tools/jstat         \
 645         sun/tools/jstatd        \
 646         sun/tools/native2ascii  \
 647         sun/tools/serialver     \
 648         sun/tools/tree          \
 649         sun/tools/util          \
 650         sun/security/tools/JarBASE64Encoder.class \
 651         sun/security/tools/JarSigner.class \
 652         sun/security/tools/JarSignerParameters.class \
 653         sun/security/tools/JarSignerResources.class \
 654         sun/security/tools/JarSignerResources_ja.class \
 655         sun/security/tools/JarSignerResources_zh_CN.class \

  57                 SKIP_METAINF:=true))
  58 
  59 JARS+=$(JDK_OUTPUTDIR)/lib/jconsole.jar
  60 
  61 ##########################################################################################
  62 
  63 DNS_JAR_DEPS := \
  64   $(shell $(FIND) $(JDK_OUTPUTDIR)/classes/sun/net/spi/nameservice/dns/ -name "_the.package") \
  65 
  66 $(eval $(call SetupArchive,BUILD_DNS_JAR,$(DNS_JAR_DEPS),\
  67                 SRCS:=$(JDK_OUTPUTDIR)/classes,\
  68                 INCLUDES:=sun/net/spi/nameservice/dns,\
  69                 EXTRA_FILES:=META-INF/services/sun.net.spi.nameservice.NameServiceDescriptor,\
  70                 JAR:=$(JDK_OUTPUTDIR)/lib/ext/dnsns.jar,\
  71                 SKIP_METAINF:=true))
  72 
  73 JARS+=$(JDK_OUTPUTDIR)/lib/ext/dnsns.jar
  74 
  75 ##########################################################################################
  76 
  77 LOCALEDATA_INCLUDE_LOCALES := ar hi iw ja ko th vi zh
  78 LOCALEDATA_INCLUDES := $(addprefix sun/text/resources/,$(LOCALEDATA_INCLUDE_LOCALES)) \
  79                        $(addprefix sun/util/resources/,$(LOCALEDATA_INCLUDE_LOCALES))




















  80 



  81 $(eval $(call SetupArchive,BUILD_LOCALEDATA_JAR,,\
  82                 SRCS:=$(JDK_OUTPUTDIR)/classes,\
  83                 SUFFIXES:=.class _dict _th,\
  84                 INCLUDES:=$(LOCALEDATA_INCLUDES),\
  85                 EXCLUDES:=sun/text/resources/th/BreakIteratorRules_th.class,\
  86                 JAR:=$(JDK_OUTPUTDIR)/lib/ext/localedata.jar,\
  87                 SKIP_METAINF:=true))
  88 
  89 JARS+=$(JDK_OUTPUTDIR)/lib/ext/localedata.jar
  90 
  91 ##########################################################################################
  92 # rt.jar and resources.jar are being built in the same way as in the old build. They require
  93 # the files to be in a certain order and converting that is not easy and will not be needed
  94 # in jigsaw anyway.
  95 
  96 # Exclude list for rt.jar and resources.jar
  97 RT_JAR_EXCLUDES := \
  98         com/sun/javadoc \
  99         com/sun/jdi \
 100         com/sun/jarsigner \
 101         com/sun/source \
 102         com/sun/istack/internal/tools \
 103         META-INF/services/com.sun.jdi.connect.Connector \
 104         META-INF/services/com.sun.jdi.connect.spi.TransportService \
 105         META-INF/services/com.sun.tools.xjc.Plugin \

 205         javax/swing/JRadioButtonBeanInfo.class \
 206         javax/swing/JRadioButtonMenuItemBeanInfo.class \
 207         javax/swing/JScrollBarBeanInfo.class \
 208         javax/swing/JScrollPaneBeanInfo.class \
 209         javax/swing/JSeparatorBeanInfo.class \
 210         javax/swing/JSliderBeanInfo.class \
 211         javax/swing/JSpinnerBeanInfo.class \
 212         javax/swing/JSplitPaneBeanInfo.class \
 213         javax/swing/JTabbedPaneBeanInfo.class \
 214         javax/swing/JTableBeanInfo.class \
 215         javax/swing/JTextAreaBeanInfo.class \
 216         javax/swing/JTextFieldBeanInfo.class \
 217         javax/swing/JTextPaneBeanInfo.class \
 218         javax/swing/JToggleButtonBeanInfo.class \
 219         javax/swing/JToolBarBeanInfo.class \
 220         javax/swing/JTreeBeanInfo.class \
 221         javax/swing/JWindowBeanInfo.class \
 222         javax/swing/SwingBeanInfoBase.class \
 223         javax/swing/text/JTextComponentBeanInfo.class \
 224         sun/swing/BeanInfoUtils.class \
 225         $(LOCALEDATA_INCLUDES) \
 226         sun/text/resources/cldr \
 227         sun/util/resources/cldr \
 228         sun/util/cldr/CLDRLocaleDataMetaInfo.class
 229 
 230 # These files should never be put into rt.jar
 231 # but due to a misstake...some are put there if embedded
 232 #
 233 ifneq ($(JAVASE_EMBEDDED), true)
 234 # normal (correct) case
 235 RT_JAR_EXCLUDES += \
 236         com/oracle/jrockit/jfr \
 237         oracle/jrockit/jfr
 238 else
 239 # embedded (broken) case
 240 RT_JAR_EXCLUDES += \
 241   oracle/jrockit/jfr/parser \
 242   oracle/jrockit/jfr/tools \
 243   oracle/jrockit/jfr/NativeOptions.class \
 244   oracle/jrockit/jfr/RepositoryChunkHandler.class
 245 endif
 246 
 247 ifeq ($(OPENJDK_TARGET_OS), macosx)
 248         RT_JAR_EXCLUDES += com/sun/nio/sctp \

 597 
 598 ##########################################################################################
 599 
 600 ifeq ($(OPENJDK_TARGET_OS),solaris)
 601 ifndef OPENJDK
 602 
 603 UCRYPTO_JAR_DST := $(JDK_OUTPUTDIR)/lib/ext/ucrypto.jar
 604 UCRYPTO_JAR_SRC := $(JDK_TOPDIR)/make/closed/tools/crypto/ucrypto/ucrypto.jar
 605 
 606 $(UCRYPTO_JAR_DST) : $(UCRYPTO_JAR_SRC)
 607         @$(ECHO) "\n>>>Installing prebuilt OracleUcrypto provider..."
 608         $(RM) $@
 609         $(CP) $< $@
 610 
 611 JARS += $(UCRYPTO_JAR_DST)
 612 
 613 endif
 614 endif
 615 
 616 ##########################################################################################
 617 
 618 # Get the CLDRVERSION
 619 include GensrcCLDR.gmk
 620 
 621 CLDRDATA_JAR_DST := $(JDK_OUTPUTDIR)/lib/ext/cldrdata.jar
 622 
 623 $(eval $(call SetupArchive,BUILD_CLDRDATA_JAR,$(CLDRDATA_DEPS),\
 624                 SRCS:=$(JDK_OUTPUTDIR)/classes,\
 625                 SUFFIXES:=.class,\
 626                 INCLUDES:=sun/text/resources/cldr \
 627                           sun/util/cldr \
 628                           sun/util/resources/cldr,\
 629                 EXCLUDES:=sun/util/cldr/CLDRLocaleProviderAdapter,\
 630                 JAR:=$(CLDRDATA_JAR_DST),\
 631                 EXTRA_MANIFEST_ATTR:=CLDR-Version: $(CLDRVERSION),\
 632                 SKIP_METAINF:=true))
 633 
 634 JARS += $(CLDRDATA_JAR_DST)
 635 
 636 ##########################################################################################
 637 
 638 TOOLS_JAR_INCLUDES := \
 639         sun/tools/asm           \
 640         sun/tools/jar           \
 641         sun/tools/java          \
 642         sun/tools/javac         \
 643         sun/tools/jcmd          \
 644         sun/tools/jps           \
 645         sun/tools/jstat         \
 646         sun/tools/jstatd        \
 647         sun/tools/native2ascii  \
 648         sun/tools/serialver     \
 649         sun/tools/tree          \
 650         sun/tools/util          \
 651         sun/security/tools/JarBASE64Encoder.class \
 652         sun/security/tools/JarSigner.class \
 653         sun/security/tools/JarSignerParameters.class \
 654         sun/security/tools/JarSignerResources.class \
 655         sun/security/tools/JarSignerResources_ja.class \
 656         sun/security/tools/JarSignerResources_zh_CN.class \