makefiles/CreateJars.gmk
Index Unified diffs Context diffs Sdiffs Wdiffs Patch New Old Previous File Next File jdk Cdiff makefiles/CreateJars.gmk

makefiles/CreateJars.gmk

Print this page

        

*** 30,49 **** default: all include Tools.gmk # # This makefile...so that altering will trigger rebuilding include/exclude-lists => jars # MAKEFILE=$(JDK_TOPDIR)/makefiles/CreateJars.gmk MAINMANIFEST := $(JDK_TOPDIR)/make/tools/manifest.mf BEANMANIFEST := $(JDK_TOPDIR)/make/javax/swing/beaninfo/manifest - JARS:= - $(eval $(call MakeDir,$(IMAGES_OUTPUTDIR)/lib)) ########################################################################################## $(eval $(call SetupArchive,BUILD_JCONSOLE_JAR,,\ --- 30,52 ---- default: all include Tools.gmk + include Profiles.gmk + # # This makefile...so that altering will trigger rebuilding include/exclude-lists => jars # MAKEFILE=$(JDK_TOPDIR)/makefiles/CreateJars.gmk + # + # And similarly for the Profiles + PROFILE_MAKEFILES=$(JDK_TOPDIR)/makefiles/Profiles.gmk $(JDK_TOPDIR)/makefiles/profile-rtjar-includes.txt MAINMANIFEST := $(JDK_TOPDIR)/make/tools/manifest.mf BEANMANIFEST := $(JDK_TOPDIR)/make/javax/swing/beaninfo/manifest $(eval $(call MakeDir,$(IMAGES_OUTPUTDIR)/lib)) ########################################################################################## $(eval $(call SetupArchive,BUILD_JCONSOLE_JAR,,\
*** 52,73 **** INCLUDES:=sun/tools/jconsole com/sun/tools/jconsole,\ JARMAIN:=sun.tools.jconsole.JConsole,\ JAR:=$(IMAGES_OUTPUTDIR)/lib/jconsole.jar,\ SKIP_METAINF:=true)) - JARS+=$(IMAGES_OUTPUTDIR)/lib/jconsole.jar ########################################################################################## $(eval $(call SetupArchive,BUILD_DNS_JAR,,\ SRCS:=$(JDK_OUTPUTDIR)/classes,\ INCLUDES:=sun/net/spi/nameservice/dns,\ EXTRA_FILES:=META-INF/services/sun.net.spi.nameservice.NameServiceDescriptor,\ JAR:=$(IMAGES_OUTPUTDIR)/lib/ext/dnsns.jar,\ SKIP_METAINF:=true)) - JARS+=$(IMAGES_OUTPUTDIR)/lib/ext/dnsns.jar ########################################################################################## LOCALEDATA_INCLUDE_LOCALES := ar be bg ca cs da de el es et fi fr ga hi hr hu in is it \ iw ja ko lt lv mk ms mt nl no pl pt ro ru sk sl sq sr sv \ --- 55,74 ----
*** 115,287 **** INCLUDES:=$(LOCALEDATA_INCLUDES),\ EXCLUDES:=sun/text/resources/th/BreakIteratorRules_th.class,\ JAR:=$(IMAGES_OUTPUTDIR)/lib/ext/localedata.jar,\ SKIP_METAINF:=true)) - JARS+=$(IMAGES_OUTPUTDIR)/lib/ext/localedata.jar - ########################################################################################## ! # rt.jar and resources.jar are being built in the same way as in the old build. They require ! # the files to be in a certain order and converting that is not easy and will not be needed ! # in jigsaw anyway. ! ! # Exclude list for rt.jar and resources.jar ! RT_JAR_EXCLUDES := \ ! com/sun/javadoc \ ! com/sun/jdi \ ! com/sun/jarsigner \ ! com/sun/source \ ! com/sun/istack/internal/tools \ ! META-INF/services/com.sun.jdi.connect.Connector \ ! META-INF/services/com.sun.jdi.connect.spi.TransportService \ ! META-INF/services/com.sun.tools.xjc.Plugin \ ! com/sun/tools \ ! sun/jvmstat \ ! sun/nio/cs/ext \ ! sun/awt/HKSCS.class \ ! sun/awt/motif/X11GB2312\$$$$Decoder.class \ ! sun/awt/motif/X11GB2312\$$$$Encoder.class \ ! sun/awt/motif/X11GB2312.class \ ! sun/awt/motif/X11GBK\$$$$Encoder.class \ ! sun/awt/motif/X11GBK.class \ ! sun/awt/motif/X11KSC5601\$$$$Decoder.class \ ! sun/awt/motif/X11KSC5601\$$$$Encoder.class \ ! sun/awt/motif/X11KSC5601.class \ ! META-INF/services/java.nio.charset.spi.CharsetProvider \ ! sun/rmi/rmic \ ! sun/tools/asm \ ! sun/tools/java \ ! sun/tools/javac \ ! com/sun/tools/classfile \ ! com/sun/tools/javap \ ! sun/tools/jcmd \ ! sun/tools/jconsole \ ! sun/tools/jps \ ! sun/tools/jstat \ ! sun/tools/jstatd \ ! sun/tools/native2ascii \ ! sun/tools/serialver \ ! sun/tools/tree \ ! sun/tools/util \ ! sun/security/tools/jarsigner \ ! sun/security/provider/Sun.class \ ! sun/security/rsa/SunRsaSign.class \ ! sun/security/ssl \ ! sun/security/ec/ECDHKeyAgreement.class \ ! sun/security/ec/ECDSASignature\$$$$Raw.class \ ! sun/security/ec/ECDSASignature\$$$$SHA1.class \ ! sun/security/ec/ECDSASignature\$$$$SHA224.class \ ! sun/security/ec/ECDSASignature\$$$$SHA256.class \ ! sun/security/ec/ECDSASignature\$$$$SHA384.class \ ! sun/security/ec/ECDSASignature\$$$$SHA512.class \ ! sun/security/ec/ECDSASignature.class \ ! sun/security/ec/ECKeyFactory.class \ ! sun/security/ec/ECKeyPairGenerator.class \ ! sun/security/ec/SunEC\$$$$1.class \ ! sun/security/ec/SunEC.class \ ! sun/security/ec/SunECEntries.class \ ! sun/security/mscapi \ ! sun/security/pkcs11 \ ! com/sun/net/ssl/internal/ssl \ ! javax/crypto \ ! sun/security/internal \ ! com/sun/crypto/provider \ ! META-INF/services/com.sun.tools.attach.spi.AttachProvider \ ! com/sun/tools/attach \ ! org/relaxng/datatype \ ! com/sun/codemodel \ ! com/sun/xml/internal/dtdparser \ ! com/sun/xml/internal/rngom \ ! com/sun/xml/internal/xsom \ ! com/sun/tools/script/shell \ ! sun/tools/attach \ ! sun/tools/jstack \ ! sun/tools/jinfo \ ! sun/tools/jmap \ ! sun/net/spi/nameservice/dns \ ! META-INF/services/sun.net.spi.nameservice.NameServiceDescriptor \ ! javax/swing/beaninfo \ ! javax/swing/AbstractButtonBeanInfo.class \ ! javax/swing/BoxBeanInfo.class \ ! javax/swing/JAppletBeanInfo.class \ ! javax/swing/JButtonBeanInfo.class \ ! javax/swing/JCheckBoxBeanInfo.class \ ! javax/swing/JCheckBoxMenuItemBeanInfo.class \ ! javax/swing/JColorChooserBeanInfo.class \ ! javax/swing/JComboBoxBeanInfo.class \ ! javax/swing/JComponentBeanInfo.class \ ! javax/swing/JDesktopPaneBeanInfo.class \ ! javax/swing/JDialogBeanInfo.class \ ! javax/swing/JEditorPaneBeanInfo.class \ ! javax/swing/JFileChooserBeanInfo.class \ ! javax/swing/JFormattedTextFieldBeanInfo.class \ ! javax/swing/JFrameBeanInfo.class \ ! javax/swing/JInternalFrameBeanInfo.class \ ! javax/swing/JLabelBeanInfo.class \ ! javax/swing/JLayeredPaneBeanInfo.class \ ! javax/swing/JListBeanInfo.class \ ! javax/swing/JMenuBarBeanInfo.class \ ! javax/swing/JMenuBeanInfo.class \ ! javax/swing/JMenuItemBeanInfo.class \ ! javax/swing/JOptionPaneBeanInfo.class \ ! javax/swing/JPanelBeanInfo.class \ ! javax/swing/JPasswordFieldBeanInfo.class \ ! javax/swing/JPopupMenuBeanInfo.class \ ! javax/swing/JProgressBarBeanInfo.class \ ! javax/swing/JRadioButtonBeanInfo.class \ ! javax/swing/JRadioButtonMenuItemBeanInfo.class \ ! javax/swing/JScrollBarBeanInfo.class \ ! javax/swing/JScrollPaneBeanInfo.class \ ! javax/swing/JSeparatorBeanInfo.class \ ! javax/swing/JSliderBeanInfo.class \ ! javax/swing/JSpinnerBeanInfo.class \ ! javax/swing/JSplitPaneBeanInfo.class \ ! javax/swing/JTabbedPaneBeanInfo.class \ ! javax/swing/JTableBeanInfo.class \ ! javax/swing/JTextAreaBeanInfo.class \ ! javax/swing/JTextFieldBeanInfo.class \ ! javax/swing/JTextPaneBeanInfo.class \ ! javax/swing/JToggleButtonBeanInfo.class \ ! javax/swing/JToolBarBeanInfo.class \ ! javax/swing/JTreeBeanInfo.class \ ! javax/swing/JWindowBeanInfo.class \ ! javax/swing/SwingBeanInfoBase.class \ ! javax/swing/text/JTextComponentBeanInfo.class \ ! sun/swing/BeanInfoUtils.class \ ! $(LOCALEDATA_INCLUDES) \ ! sun/text/resources/cldr \ ! sun/util/resources/cldr \ ! sun/util/cldr/CLDRLocaleDataMetaInfo.class ! ! # These files should never be put into rt.jar ! # but due to a misstake...some are put there if embedded ! # ! ifneq ($(JAVASE_EMBEDDED), true) ! # normal (correct) case ! RT_JAR_EXCLUDES += \ ! com/oracle/jrockit/jfr \ ! oracle/jrockit/jfr ! else ! # embedded (broken) case ! RT_JAR_EXCLUDES += \ ! oracle/jrockit/jfr/parser \ ! oracle/jrockit/jfr/tools \ ! oracle/jrockit/jfr/NativeOptions.class \ ! oracle/jrockit/jfr/RepositoryChunkHandler.class ! endif ! ! ifeq ($(OPENJDK_TARGET_OS), macosx) ! RT_JAR_EXCLUDES += com/sun/nio/sctp \ ! sun/nio/ch/sctp ! endif # Find all files in the classes dir to use as dependencies. This could be more fine granular. ALL_FILES_IN_CLASSES := $(shell $(FIND) $(JDK_OUTPUTDIR)/classes -type f \ | $(GREP) -v -e '/_the\.*' -e '^_the\.*' -e 'javac_state') ! RT_JAR_MANIFEST_FILE := $(IMAGES_OUTPUTDIR)/lib/_the.rt.jar_manifest ! RESOURCE_JAR_MANIFEST_FILE := $(IMAGES_OUTPUTDIR)/lib/_the.resources.jar_manifest $(RT_JAR_MANIFEST_FILE): $(MAINMANIFEST) $(BEANMANIFEST) $(MKDIR) -p $(@D) $(RM) $@ $@.tmp $(SED) -e "s#@@RELEASE@@#$(RELEASE)#" \ --- 116,141 ---- INCLUDES:=$(LOCALEDATA_INCLUDES),\ EXCLUDES:=sun/text/resources/th/BreakIteratorRules_th.class,\ JAR:=$(IMAGES_OUTPUTDIR)/lib/ext/localedata.jar,\ SKIP_METAINF:=true)) ########################################################################################## ! # ! # Different variants of rt.jar are built based on the current profile. The output ! # directory is augmented with the profile name so that the final jar file and all the ! # intermediary list files will be in directory. This has the form lib$PROFILE rather than ! # lib/$PROFILE so that it won't get copied as part of the image generation process. ! # Each profile customizes the RT_JAR_EXCLUDES variable. ! # ! ########################################################################################## # Find all files in the classes dir to use as dependencies. This could be more fine granular. ALL_FILES_IN_CLASSES := $(shell $(FIND) $(JDK_OUTPUTDIR)/classes -type f \ | $(GREP) -v -e '/_the\.*' -e '^_the\.*' -e 'javac_state') ! RT_JAR_MANIFEST_FILE := $(IMAGES_OUTPUTDIR)/lib$(PROFILE)/_the.rt.jar_manifest ! RESOURCE_JAR_MANIFEST_FILE := $(IMAGES_OUTPUTDIR)/lib$(PROFILE)/_the.resources.jar_manifest $(RT_JAR_MANIFEST_FILE): $(MAINMANIFEST) $(BEANMANIFEST) $(MKDIR) -p $(@D) $(RM) $@ $@.tmp $(SED) -e "s#@@RELEASE@@#$(RELEASE)#" \
*** 297,307 **** $(SED) -e "s#@@RELEASE@@#$(RELEASE)#" \ -e "s#@@COMPANY_NAME@@#$(COMPANY_NAME)#" \ $(MAINMANIFEST) >> $@.tmp $(MV) $@.tmp $@ ! $(IMAGES_OUTPUTDIR)/lib/_the.jars.exclude: $(MAKEFILE) $(MKDIR) -p $(@D) $(RM) $@ $@.tmp $(call ListPathsSafely,RT_JAR_EXCLUDES,\n, >> $@.tmp) $(MV) $@.tmp $@ --- 151,161 ---- $(SED) -e "s#@@RELEASE@@#$(RELEASE)#" \ -e "s#@@COMPANY_NAME@@#$(COMPANY_NAME)#" \ $(MAINMANIFEST) >> $@.tmp $(MV) $@.tmp $@ ! $(IMAGES_OUTPUTDIR)/lib$(PROFILE)/_the.jars.exclude: $(MAKEFILE) $(PROFILE_MAKEFILES) $(MKDIR) -p $(@D) $(RM) $@ $@.tmp $(call ListPathsSafely,RT_JAR_EXCLUDES,\n, >> $@.tmp) $(MV) $@.tmp $@
*** 310,368 **** $(MKDIR) -p $(@D) $(RM) $@ $@.tmp $(TOOL_ADDJSUM) $< $@.tmp $(MV) $@.tmp $@ ! $(IMAGES_OUTPUTDIR)/lib/_the.jars.contents: $(BUILD_TOOLS) $(IMAGES_OUTPUTDIR)/lib/_the.jars.exclude \ $(ALL_FILES_IN_CLASSES) $(IMAGES_OUTPUTDIR)/lib/classlist $(MKDIR) -p $(@D) $(RM) $@ $@.tmp ($(CD) $(JDK_OUTPUTDIR)/classes && \ $(TOOL_JARREORDER) \ ! -o $@.tmp $(IMAGES_OUTPUTDIR)/lib/classlist $(IMAGES_OUTPUTDIR)/lib/_the.jars.exclude . ) $(MV) $@.tmp $@ ! $(IMAGES_OUTPUTDIR)/lib/_the.rt.jar.contents: $(IMAGES_OUTPUTDIR)/lib/_the.jars.contents $(MKDIR) -p $(@D) $(RM) $@ $@.tmp ! $(GREP) -e '\.class$$' $(IMAGES_OUTPUTDIR)/lib/_the.jars.contents > $@.tmp $(MV) $@.tmp $@ ! $(IMAGES_OUTPUTDIR)/lib/_the.resources.jar.contents: $(IMAGES_OUTPUTDIR)/lib/_the.jars.contents $(MKDIR) -p $(@D) $(RM) $@ $@.tmp $(GREP) -v -e '\.class$$' \ ! -e '/_the\.*' -e '^_the\.*' -e '\\_the\.*' -e 'javac_state' \ ! $(IMAGES_OUTPUTDIR)/lib/_the.jars.contents > $@.tmp $(MV) $@.tmp $@ RT_JAR_CREATE_OPTIONS := c0fm ifeq ($(COMPRESS_JARS), true) RT_JAR_CREATE_OPTIONS := cfm endif ! $(IMAGES_OUTPUTDIR)/lib/rt.jar: $(IMAGES_OUTPUTDIR)/lib/_the.rt.jar.contents $(RT_JAR_MANIFEST_FILE) ! $(ECHO) Creating rt.jar $(MKDIR) -p $(@D) $(RM) $@ $@.tmp $(CD) $(JDK_OUTPUTDIR)/classes && \ $(JAR) $(RT_JAR_CREATE_OPTIONS) $@.tmp $(RT_JAR_MANIFEST_FILE) \ ! @$(IMAGES_OUTPUTDIR)/lib/_the.rt.jar.contents $(MV) $@.tmp $@ ! $(IMAGES_OUTPUTDIR)/lib/resources.jar: $(IMAGES_OUTPUTDIR)/lib/_the.resources.jar.contents \ $(RESOURCE_JAR_MANIFEST_FILE) $(ECHO) Creating resources.jar $(MKDIR) -p $(@D) $(RM) $@ $@.tmp $(CD) $(JDK_OUTPUTDIR)/classes && \ $(JAR) $(RT_JAR_CREATE_OPTIONS) $@.tmp $(RESOURCE_JAR_MANIFEST_FILE) \ ! @$(IMAGES_OUTPUTDIR)/lib/_the.resources.jar.contents $(MV) $@.tmp $@ - JARS+=$(IMAGES_OUTPUTDIR)/lib/rt.jar $(IMAGES_OUTPUTDIR)/lib/resources.jar - ########################################################################################## ifneq ($(OPENJDK_TARGET_OS), windows) CHARSETS_EXTRA_FILES:=sun/awt/motif/X11GBK.class \ sun/awt/motif/X11GB2312\$$$$Decoder.class \ --- 164,274 ---- $(MKDIR) -p $(@D) $(RM) $@ $@.tmp $(TOOL_ADDJSUM) $< $@.tmp $(MV) $@.tmp $@ ! $(IMAGES_OUTPUTDIR)/lib$(PROFILE)/_the.jars.contents: $(BUILD_TOOLS) $(IMAGES_OUTPUTDIR)/lib$(PROFILE)/_the.jars.exclude \ $(ALL_FILES_IN_CLASSES) $(IMAGES_OUTPUTDIR)/lib/classlist $(MKDIR) -p $(@D) $(RM) $@ $@.tmp ($(CD) $(JDK_OUTPUTDIR)/classes && \ $(TOOL_JARREORDER) \ ! -o $@.tmp $(IMAGES_OUTPUTDIR)/lib/classlist $(IMAGES_OUTPUTDIR)/lib$(PROFILE)/_the.jars.exclude . ) $(MV) $@.tmp $@ ! $(IMAGES_OUTPUTDIR)/lib$(PROFILE)/_the.rt.jar.contents: $(IMAGES_OUTPUTDIR)/lib$(PROFILE)/_the.jars.contents $(MKDIR) -p $(@D) $(RM) $@ $@.tmp ! $(GREP) -e '\.class$$' $(IMAGES_OUTPUTDIR)/lib$(PROFILE)/_the.jars.contents > $@.tmp $(MV) $@.tmp $@ + # Add back classes from excluded packages (fixing the $ substitution in the process) + for type in $(subst \$$,\, $(RT_JAR_INCLUDE_TYPES)) ; do \ + $(ECHO) $$type >> $@ ; \ + done ! $(IMAGES_OUTPUTDIR)/lib$(PROFILE)/_the.resources.jar.contents: $(IMAGES_OUTPUTDIR)/lib$(PROFILE)/_the.jars.contents $(MKDIR) -p $(@D) $(RM) $@ $@.tmp + # Strip out all META-INF/services/ entries $(GREP) -v -e '\.class$$' \ ! -e '/_the\.*' -e '^_the\.*' -e '\\_the\.*' -e 'javac_state' -e 'META-INF/services/' \ ! $(IMAGES_OUTPUTDIR)/lib$(PROFILE)/_the.jars.contents > $@.tmp ! # Add back the required services ! for service in $(PROFILE_INCLUDE_METAINF_SERVICES) ; do \ ! $(ECHO) $$service >> $@.tmp; \ ! done $(MV) $@.tmp $@ + # This is a hack but I don't know how to make this fit into the existing scheme + $(PROFILE_VERSION_CLASS_TARGETS) : $(PROFILE_VERSION_JAVA_TARGETS) + @$(JAVAC) -d $(@D)/../../ $(@D)/$(VERSION_JAVA_FILE) + + + # Support for removing the addPropertyChangeListener and removePropertyChangeListener + # methods from classes that only go into the profile builds. For now the Pack200.Packer + # and Packer200.Unpacker classes have special handling because of the $ in the file + # name. + BEANLESS_CLASSES = $(JDK_OUTPUTDIR)/beanless + + $(BEANLESS_CLASSES)/%: $(JDK_OUTPUTDIR)/classes/% + $(MKDIR) -p $(@D) + $(TOOL_REMOVEMETHODS) $< $@ addPropertyChangeListener removePropertyChangeListener + + CLASSES_TO_DEBEAN = \ + java/util/logging/LogManager.class \ + com/sun/java/util/jar/pack/PackerImpl.class \ + com/sun/java/util/jar/pack/UnpackerImpl.class + + BEANLESS_CLASSES_TARGETS = + ifneq ($(PROFILE),) + BEANLESS_CLASSES_TARGETS := $(foreach c, $(CLASSES_TO_DEBEAN), $(BEANLESS_CLASSES)/$c) + endif + + RT_JAR_CREATE_OPTIONS := c0fm + RT_JAR_UPDATE_OPTIONS := u0f ifeq ($(COMPRESS_JARS), true) RT_JAR_CREATE_OPTIONS := cfm + RT_JAR_UPDATE_OPTIONS := uf endif ! # This defines a target-specific variables to make the shell logic easier to see. ! # We need to find the Version.class file for the profile currently being built ! $(IMAGES_OUTPUTDIR)/lib$(PROFILE)/rt.jar: \ ! CLASS_FILE = $(if $(PROFILE),$(strip $(foreach class,$(PROFILE_VERSION_CLASS_TARGETS),$(if $(findstring $(PROFILE),$(class)),$(class)))), NO_SUCH_FILE) ! # This is the real target ! $(IMAGES_OUTPUTDIR)/lib$(PROFILE)/rt.jar: $(IMAGES_OUTPUTDIR)/lib$(PROFILE)/_the.rt.jar.contents $(RT_JAR_MANIFEST_FILE) $(PROFILE_VERSION_CLASS_TARGETS) $(BEANLESS_CLASSES_TARGETS) ! $(ECHO) Creating rt.jar $(PROFILE) Compressed=$(COMPRESS_JARS) $(MKDIR) -p $(@D) $(RM) $@ $@.tmp $(CD) $(JDK_OUTPUTDIR)/classes && \ $(JAR) $(RT_JAR_CREATE_OPTIONS) $@.tmp $(RT_JAR_MANIFEST_FILE) \ ! @$(IMAGES_OUTPUTDIR)/lib$(PROFILE)/_the.rt.jar.contents && \ ! if [ -f $(CLASS_FILE) ]; then \ ! $(ECHO) Updating rt.jar $(PROFILE) && \ ! $(CD) $(patsubst %$(VERSION_CLASS_PATH),%,$(CLASS_FILE)) && \ ! $(JAR) $(RT_JAR_UPDATE_OPTIONS) $@.tmp $(VERSION_CLASS_PATH); \ ! $(MKDIR) -p $(BEANLESS_CLASSES)/java/util/jar; \ ! $(TOOL_REMOVEMETHODS) $(JDK_OUTPUTDIR)/classes/java/util/jar/Pack200\$$Packer.class \ ! $(BEANLESS_CLASSES)/java/util/jar/Pack200\$$Packer.class addPropertyChangeListener removePropertyChangeListener; \ ! $(TOOL_REMOVEMETHODS) $(JDK_OUTPUTDIR)/classes/java/util/jar/Pack200\$$Unpacker.class \ ! $(BEANLESS_CLASSES)/java/util/jar/Pack200\$$Unpacker.class addPropertyChangeListener removePropertyChangeListener; \ ! $(CD) $(BEANLESS_CLASSES) && \ ! $(JAR) $(RT_JAR_UPDATE_OPTIONS) $@.tmp $(CLASSES_TO_DEBEAN) java/util/jar/* ; \ ! fi $(MV) $@.tmp $@ ! $(IMAGES_OUTPUTDIR)/lib$(PROFILE)/resources.jar: $(IMAGES_OUTPUTDIR)/lib$(PROFILE)/_the.resources.jar.contents \ $(RESOURCE_JAR_MANIFEST_FILE) $(ECHO) Creating resources.jar $(MKDIR) -p $(@D) $(RM) $@ $@.tmp $(CD) $(JDK_OUTPUTDIR)/classes && \ $(JAR) $(RT_JAR_CREATE_OPTIONS) $@.tmp $(RESOURCE_JAR_MANIFEST_FILE) \ ! @$(IMAGES_OUTPUTDIR)/lib$(PROFILE)/_the.resources.jar.contents $(MV) $@.tmp $@ ########################################################################################## ifneq ($(OPENJDK_TARGET_OS), windows) CHARSETS_EXTRA_FILES:=sun/awt/motif/X11GBK.class \ sun/awt/motif/X11GB2312\$$$$Decoder.class \
*** 383,394 **** META-INF/services/java.nio.charset.spi.CharsetProvider, \ JAR:=$(IMAGES_OUTPUTDIR)/lib/charsets.jar, \ SKIP_METAINF := true, \ CHECK_COMPRESS_JAR:=true)) - JARS+=$(IMAGES_OUTPUTDIR)/lib/charsets.jar - ########################################################################################## ifndef OPENJDK ifeq ($(ENABLE_JFR), true) $(eval $(call SetupArchive,BUILD_JFR_JAR,,\ --- 289,298 ----
*** 398,408 **** JAR:=$(IMAGES_OUTPUTDIR)/lib/jfr.jar,\ SKIP_METAINF:=true,\ MANIFEST:=$(MAINMANIFEST), \ CHECK_COMPRESS_JAR:=true)) - JARS+=$(IMAGES_OUTPUTDIR)/lib/jfr.jar endif endif ########################################################################################## --- 302,311 ----
*** 415,426 **** JAR:=$(IMAGES_OUTPUTDIR)/lib/jsse.jar,\ SKIP_METAINF:=true,\ MANIFEST:=$(MAINMANIFEST), \ CHECK_COMPRESS_JAR:=true)) - JARS+=$(IMAGES_OUTPUTDIR)/lib/jsse.jar - ########################################################################################## # Create manifest for security jars # # Include these extra attributes for now, should probably take out. --- 318,327 ----
*** 460,471 **** $(SUNPKCS11_JAR_DST): $(JCE_MANIFEST) endif - JARS += $(SUNPKCS11_JAR_DST) - ########################################################################################## SUNEC_JAR_DST := $(IMAGES_OUTPUTDIR)/lib/ext/sunec.jar ifndef OPENJDK --- 361,370 ----
*** 488,498 **** $(SUNEC_JAR_DST): $(JCE_MANIFEST) endif - JARS += $(SUNEC_JAR_DST) ########################################################################################## $(eval $(call SetupArchive,BUILD_SWINGBEANS_JAR,,\ SRCS:=$(JDK_OUTPUTDIR)/classes,\ --- 387,396 ----
*** 501,512 **** EXCLUDES:=javax/swing/plaf,\ EXTRA_FILES:=javax/swing/SwingBeanInfoBase.class sun/swing/BeanInfoUtils.class,\ JAR:=$(IMAGES_OUTPUTDIR)/lib/dt.jar,\ SKIP_METAINF:=true)) - JARS+=$(IMAGES_OUTPUTDIR)/lib/dt.jar - ########################################################################################## SUNJCE_PROVIDER_JAR_DST := $(IMAGES_OUTPUTDIR)/lib/ext/sunjce_provider.jar ifndef OPENJDK --- 399,408 ----
*** 528,539 **** $(SUNJCE_PROVIDER_JAR_DST): $(JCE_MANIFEST) endif - JARS += $(SUNJCE_PROVIDER_JAR_DST) - JCE_JAR_DST := $(IMAGES_OUTPUTDIR)/lib/jce.jar ifndef OPENJDK JCE_JAR_SRC := $(JDK_TOPDIR)/make/closed/tools/crypto/jce/jce.jar --- 424,433 ----
*** 554,564 **** $(JCE_JAR_DST): $(JCE_MANIFEST) endif - JARS += $(JCE_JAR_DST) ########################################################################################## US_EXPORT_POLICY_JAR_DST := $(IMAGES_OUTPUTDIR)/lib/security/US_export_policy.jar --- 448,457 ----
*** 593,604 **** EXTRA_MANIFEST_ATTR := Crypto-Strength: unlimited, \ SKIP_METAINF := true)) endif - JARS += $(US_EXPORT_POLICY_JAR_DST) - ########################################################################################## LOCAL_POLICY_JAR_DST := $(IMAGES_OUTPUTDIR)/lib/security/local_policy.jar ifndef OPENJDK --- 486,495 ----
*** 636,647 **** EXTRA_MANIFEST_ATTR := $(LOCAL_POLICY_JAR_ATTR), \ SKIP_METAINF := true)) endif - JARS += $(LOCAL_POLICY_JAR_DST) - ########################################################################################## ifeq ($(OPENJDK_TARGET_OS),windows) SUNMSCAPI_JAR_DST := $(IMAGES_OUTPUTDIR)/lib/ext/sunmscapi.jar --- 527,536 ----
*** 661,672 **** INCLUDES:= sun/security/mscapi,\ JAR:=$(SUNMSCAPI_JAR_DST), \ SKIP_METAINF:=true)) endif - JARS += $(SUNMSCAPI_JAR_DST) - endif ########################################################################################## ifeq ($(OPENJDK_TARGET_OS),solaris) --- 550,559 ----
*** 677,688 **** $(UCRYPTO_JAR_DST) : $(UCRYPTO_JAR_SRC) @$(ECHO) $(LOG_INFO) "\n>>>Installing prebuilt OracleUcrypto provider..." $(install-file) - JARS += $(UCRYPTO_JAR_DST) - endif endif ########################################################################################## --- 564,573 ----
*** 700,711 **** EXCLUDES:=sun/util/cldr/CLDRLocaleProviderAdapter,\ JAR:=$(CLDRDATA_JAR_DST),\ EXTRA_MANIFEST_ATTR:=CLDR-Version: $(CLDRVERSION),\ SKIP_METAINF:=true)) - JARS += $(CLDRDATA_JAR_DST) - ########################################################################################## TOOLS_JAR_INCLUDES := \ sun/tools/asm \ sun/tools/jar \ --- 585,594 ----
*** 773,783 **** META-INF/services/com.sun.tools.internal.xjc.Plugin,\ JAR:=$(IMAGES_OUTPUTDIR)/lib/tools.jar,\ SKIP_METAINF:=true, \ CHECK_COMPRESS_JAR:=true)) - JARS+=$(IMAGES_OUTPUTDIR)/lib/tools.jar ########################################################################################## include javadoc/CORE_PKGS.gmk include javadoc/NON_CORE_PKGS.gmk --- 656,665 ----
*** 814,834 **** -bootclasspath $(JDK_OUTPUTDIR)/classes \ -XDprocess.packages -proc:only \ -processor com.sun.tools.javac.sym.CreateSymbols \ -Acom.sun.tools.javac.sym.Jar=$(IMAGES_OUTPUTDIR)/lib/rt.jar \ -Acom.sun.tools.javac.sym.Dest=$(IMAGES_OUTPUTDIR)/symbols/META-INF/sym/rt.jar \ $(CORE_PKGS) $(NON_CORE_PKGS) $(EXCLUDE_PROPWARN_PKGS) $(EXPORTED_PRIVATE_PKGS) $(TOUCH) $@ $(shell $(MKDIR) -p $(IMAGES_OUTPUTDIR)/symbols) $(eval $(call SetupArchive,BUILD_CT_SYM,$(IMAGES_OUTPUTDIR)/symbols/_the.symbols,\ SRCS:=$(IMAGES_OUTPUTDIR)/symbols,\ INCLUDES:=META-INF/sym,\ JAR:=$(IMAGES_OUTPUTDIR)/lib/ct.sym, \ CHECK_COMPRESS_JAR:=true)) - JARS+=$(IMAGES_OUTPUTDIR)/lib/ct.sym ########################################################################################## SRC_ZIP_INCLUDES = \ java/applet \ --- 696,716 ---- -bootclasspath $(JDK_OUTPUTDIR)/classes \ -XDprocess.packages -proc:only \ -processor com.sun.tools.javac.sym.CreateSymbols \ -Acom.sun.tools.javac.sym.Jar=$(IMAGES_OUTPUTDIR)/lib/rt.jar \ -Acom.sun.tools.javac.sym.Dest=$(IMAGES_OUTPUTDIR)/symbols/META-INF/sym/rt.jar \ + -Acom.sun.tools.javac.sym.Profiles=profile-rtjar-includes.txt \ $(CORE_PKGS) $(NON_CORE_PKGS) $(EXCLUDE_PROPWARN_PKGS) $(EXPORTED_PRIVATE_PKGS) $(TOUCH) $@ $(shell $(MKDIR) -p $(IMAGES_OUTPUTDIR)/symbols) $(eval $(call SetupArchive,BUILD_CT_SYM,$(IMAGES_OUTPUTDIR)/symbols/_the.symbols,\ SRCS:=$(IMAGES_OUTPUTDIR)/symbols,\ INCLUDES:=META-INF/sym,\ JAR:=$(IMAGES_OUTPUTDIR)/lib/ct.sym, \ CHECK_COMPRESS_JAR:=true)) ########################################################################################## SRC_ZIP_INCLUDES = \ java/applet \
*** 910,970 **** EXCLUDES:=javax/swing/beaninfo,\ SUFFIXES:=.java .c .h,\ ZIP:=$(IMAGES_OUTPUTDIR)/src.zip,\ EXTRA_DEPS:=$(LAUNCHER_ZIP_SRC))) - JARS+=$(IMAGES_OUTPUTDIR)/src.zip - ########################################################################################## # # This is an empty jar (only contains manifest) and fits poorly into framework... # create simple rule instead # $(IMAGES_OUTPUTDIR)/lib/management-agent.jar : $(JDK_TOPDIR)/src/share/classes/sun/management/manifest $(JAR) cfm $@ $< - JARS += $(IMAGES_OUTPUTDIR)/lib/management-agent.jar - ########################################################################################## $(IMAGES_OUTPUTDIR)/lib/ext/zipfs.jar : $(JDK_OUTPUTDIR)/demo/nio/zipfs/zipfs.jar $(install-file) - JARS += $(IMAGES_OUTPUTDIR)/lib/ext/zipfs.jar - ########################################################################################## ifeq ($(OPENJDK_TARGET_OS),macosx) $(eval $(call SetupArchive,BUILD_JOBJC_JAR,,\ SRCS:=$(JDK_OUTPUTDIR)/jobjc_classes,\ JAR:=$(IMAGES_OUTPUTDIR)/lib/JObjC.jar, \ JARINDEX:=true)) - - JARS += $(IMAGES_OUTPUTDIR)/lib/JObjC.jar endif ########################################################################################## ifndef OPENJDK $(eval $(call SetupArchive,BUILD_ALT_RT_JAR,,\ SRCS:=$(JDK_OUTPUTDIR)/altclasses_classes,\ JAR:=$(IMAGES_OUTPUTDIR)/lib/alt-rt.jar)) - JARS += $(IMAGES_OUTPUTDIR)/lib/alt-rt.jar endif ########################################################################################## # This file is imported from hotspot in Import.gmk. Copying it into images/lib so that # all jars can be found in one place when creating images in Images.gmk. It needs to be # done here so that clean targets can be simple and accurate. $(IMAGES_OUTPUTDIR)/lib/sa-jdi.jar: $(JDK_OUTPUTDIR)/lib/sa-jdi.jar $(install-file) - JARS += $(IMAGES_OUTPUTDIR)/lib/sa-jdi.jar - ########################################################################################## -include $(CUSTOM_MAKE_DIR)/CreateJars.gmk ########################################################################################## --- 792,841 ----
makefiles/CreateJars.gmk
Index Unified diffs Context diffs Sdiffs Wdiffs Patch New Old Previous File Next File