Mercurial Mercurial > jdk-sandbox / comparison
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | file | latest | revisions | annotate | diff | comparison | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
jdk/makefiles/CreateJars.gmk
changeset 15681 8ca785029fe2
parent 15140 87c70ee15c73
child 15688 625addfb4d4c
equal deleted inserted replaced
15680:d379c4f7bb47 15681:8ca785029fe2 
     1 #
 
     1 #
 
     2 # Copyright (c) 2011, 2012, Oracle and/or its affiliates. All rights reserved.
 
     2 # Copyright (c) 2011, 2013, Oracle and/or its affiliates. All rights reserved.
 
     3 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 
     3 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 
     4 #
 
     4 #
 
     5 # This code is free software; you can redistribute it and/or modify it
 
     5 # This code is free software; you can redistribute it and/or modify it
 
     6 # under the terms of the GNU General Public License version 2 only, as
 
     6 # under the terms of the GNU General Public License version 2 only, as
 
     7 # published by the Free Software Foundation.  Oracle designates this
 
     7 # published by the Free Software Foundation.  Oracle designates this
 
    33 # Prepare the find cache. Only used if running on windows.
 
    33 # Prepare the find cache. Only used if running on windows.
 
    34 $(eval $(call FillCacheFind,$(JDK_OUTPUTDIR)/classes))
 
    34 $(eval $(call FillCacheFind,$(JDK_OUTPUTDIR)/classes))
 
    35 
    35 
    36 include Tools.gmk
 
    36 include Tools.gmk
 
    37 
    37 
       
    38 include Profiles.gmk
 
       
    39 
    38 #
 
    40 #
 
    39 # This makefile...so that altering will trigger rebuilding include/exclude-lists => jars
 
    41 # This makefile...so that altering will trigger rebuilding include/exclude-lists => jars
 
    40 #
 
    42 #
 
    41 MAKEFILE=$(JDK_TOPDIR)/makefiles/CreateJars.gmk
 
    43 MAKEFILE=$(JDK_TOPDIR)/makefiles/CreateJars.gmk
 
       
    44 #
 
       
    45 # And similarly for the Profiles
 
       
    46 PROFILE_MAKEFILES=$(JDK_TOPDIR)/makefiles/Profiles.gmk $(JDK_TOPDIR)/makefiles/profile-rtjar-includes.txt
 
    42 
    47 
    43 MAINMANIFEST := $(JDK_TOPDIR)/make/tools/manifest.mf
 
    48 MAINMANIFEST := $(JDK_TOPDIR)/make/tools/manifest.mf
 
    44 BEANMANIFEST := $(JDK_TOPDIR)/make/javax/swing/beaninfo/manifest
 
    49 BEANMANIFEST := $(JDK_TOPDIR)/make/javax/swing/beaninfo/manifest
 
    45 
       
    46 JARS:=
 
       
    47 
    50 
    48 $(eval $(call MakeDir,$(IMAGES_OUTPUTDIR)/lib))
 
    51 $(eval $(call MakeDir,$(IMAGES_OUTPUTDIR)/lib))
 
    49 
    52 
    50 ##########################################################################################
 
    53 ##########################################################################################
 
    51 
    54 
    55 		INCLUDES:=sun/tools/jconsole com/sun/tools/jconsole,\
 
    58 		INCLUDES:=sun/tools/jconsole com/sun/tools/jconsole,\
 
    56 		JARMAIN:=sun.tools.jconsole.JConsole,\
 
    59 		JARMAIN:=sun.tools.jconsole.JConsole,\
 
    57 		JAR:=$(IMAGES_OUTPUTDIR)/lib/jconsole.jar,\
 
    60 		JAR:=$(IMAGES_OUTPUTDIR)/lib/jconsole.jar,\
 
    58 		SKIP_METAINF:=true))
 
    61 		SKIP_METAINF:=true))
 
    59 
    62 
    60 JARS+=$(IMAGES_OUTPUTDIR)/lib/jconsole.jar
 
       
    61 
    63 
    62 ##########################################################################################
 
    64 ##########################################################################################
 
    63 
    65 
    64 $(eval $(call SetupArchive,BUILD_DNS_JAR,,\
 
    66 $(eval $(call SetupArchive,BUILD_DNS_JAR,,\
 
    65 		SRCS:=$(JDK_OUTPUTDIR)/classes,\
 
    67 		SRCS:=$(JDK_OUTPUTDIR)/classes,\
 
    66 		INCLUDES:=sun/net/spi/nameservice/dns,\
 
    68 		INCLUDES:=sun/net/spi/nameservice/dns,\
 
    67 		EXTRA_FILES:=META-INF/services/sun.net.spi.nameservice.NameServiceDescriptor,\
 
    69 		EXTRA_FILES:=META-INF/services/sun.net.spi.nameservice.NameServiceDescriptor,\
 
    68 		JAR:=$(IMAGES_OUTPUTDIR)/lib/ext/dnsns.jar,\
 
    70 		JAR:=$(IMAGES_OUTPUTDIR)/lib/ext/dnsns.jar,\
 
    69 		SKIP_METAINF:=true))
 
    71 		SKIP_METAINF:=true))
 
    70 
    72 
    71 JARS+=$(IMAGES_OUTPUTDIR)/lib/ext/dnsns.jar
 
       
    72 
    73 
    73 ##########################################################################################
 
    74 ##########################################################################################
 
    74 
    75 
    75 LOCALEDATA_INCLUDE_LOCALES := ar be bg ca cs da de el es et fi fr ga hi hr hu in is it \
 
    76 LOCALEDATA_INCLUDE_LOCALES := ar be bg ca cs da de el es et fi fr ga hi hr hu in is it \
 
    76                               iw ja ko lt lv mk ms mt nl no pl pt ro ru sk sl sq sr sv \
 
    77                               iw ja ko lt lv mk ms mt nl no pl pt ro ru sk sl sq sr sv \
 
   118 		INCLUDES:=$(LOCALEDATA_INCLUDES),\
 
   119 		INCLUDES:=$(LOCALEDATA_INCLUDES),\
 
   119 		EXCLUDES:=sun/text/resources/th/BreakIteratorRules_th.class,\
 
   120 		EXCLUDES:=sun/text/resources/th/BreakIteratorRules_th.class,\
 
   120 		JAR:=$(IMAGES_OUTPUTDIR)/lib/ext/localedata.jar,\
 
   121 		JAR:=$(IMAGES_OUTPUTDIR)/lib/ext/localedata.jar,\
 
   121 		SKIP_METAINF:=true))
 
   122 		SKIP_METAINF:=true))
 
   122 
   123 
   123 JARS+=$(IMAGES_OUTPUTDIR)/lib/ext/localedata.jar
 
   124 ##########################################################################################
 
   124 
   125 #
 
   125 ##########################################################################################
 
   126 # Different variants of rt.jar are built based on the current profile. The output
 
   126 # rt.jar and resources.jar are being built in the same way as in the old build. They require
 
   127 # directory is augmented with the profile name so that the final jar file and all the
 
   127 # the files to be in a certain order and converting that is not easy and will not be needed
 
   128 # intermediary list files will be in directory. This has the form lib$PROFILE rather than
 
   128 # in jigsaw anyway.
 
   129 # lib/$PROFILE so that it won't get copied as part of the image generation process.
 
   129 
   130 # Each profile customizes the RT_JAR_EXCLUDES variable.
 
   130 # Exclude list for rt.jar and resources.jar
 
   131 #
 
   131 RT_JAR_EXCLUDES := \
 
   132 ##########################################################################################
 
       
   133 
       
   134 # Full JRE exclude list for rt.jar and resources.jar
 
       
   135 # This value should exclude types destined for jars other than rt.jar and resources.jar. 
       
   136 # When building a Profile this value augments the profile specific exclusions
 
       
   137 RT_JAR_EXCLUDES += \
 
   132 	com/oracle/security \
 
   138 	com/oracle/security \
 
   133 	com/sun/codemodel \
 
   139 	com/sun/codemodel \
 
   134 	com/sun/crypto/provider \
 
   140 	com/sun/crypto/provider \
 
   135 	com/sun/istack/internal/tools \
 
   141 	com/sun/istack/internal/tools \
 
   136 	com/sun/jarsigner \
 
   142 	com/sun/jarsigner \
 
   248 	sun/tools/serialver \
 
   254 	sun/tools/serialver \
 
   249 	sun/tools/tree \
 
   255 	sun/tools/tree \
 
   250 	sun/tools/util \
 
   256 	sun/tools/util \
 
   251 	sun/util/cldr/CLDRLocaleDataMetaInfo.class \
 
   257 	sun/util/cldr/CLDRLocaleDataMetaInfo.class \
 
   252 	sun/util/resources/cldr \
 
   258 	sun/util/resources/cldr \
 
   253 	$(LOCALEDATA_INCLUDES)
 
   259 	$(LOCALEDATA_INCLUDES) \
 
   254 
       
   255 # These files should never be put into rt.jar
 
       
   256 # but due to a misstake...some are put there if embedded
 
       
   257 #
 
       
   258 ifneq ($(JAVASE_EMBEDDED), true)
 
       
   259 # normal (correct) case
 
       
   260 RT_JAR_EXCLUDES += \
 
       
   261 	com/oracle/jrockit/jfr \
 
   260 	com/oracle/jrockit/jfr \
 
   262 	oracle/jrockit/jfr
 
   261 	oracle/jrockit/jfr
 
   263 else
 
       
   264 # embedded (broken) case
 
       
   265 RT_JAR_EXCLUDES += \
 
       
   266   oracle/jrockit/jfr/parser \
 
       
   267   oracle/jrockit/jfr/tools \
 
       
   268   oracle/jrockit/jfr/NativeOptions.class \
 
       
   269   oracle/jrockit/jfr/RepositoryChunkHandler.class
 
       
   270 endif
 
       
   271 
   262 
   272 ifeq ($(OPENJDK_TARGET_OS), macosx)
 
   263 ifeq ($(OPENJDK_TARGET_OS), macosx)
 
   273         RT_JAR_EXCLUDES += com/sun/nio/sctp \
 
   264         RT_JAR_EXCLUDES += com/sun/nio/sctp \
 
   274                            sun/nio/ch/sctp
 
   265                            sun/nio/ch/sctp
 
   275 endif
 
   266 endif
 
   276 
   267 
   277 # Find all files in the classes dir to use as dependencies. This could be more fine granular.
 
   268 # Find all files in the classes dir to use as dependencies. This could be more fine granular.
 
   278 ALL_FILES_IN_CLASSES := $(call not-containing,_the.,$(filter-out %javac_state,\
 
   269 ALL_FILES_IN_CLASSES := $(call not-containing,_the.,$(filter-out %javac_state,\
 
   279                         $(call CacheFind,$(JDK_OUTPUTDIR)/classes)))
 
   270                         $(call CacheFind,$(JDK_OUTPUTDIR)/classes)))
 
   280 
   271 
   281 RT_JAR_MANIFEST_FILE := $(IMAGES_OUTPUTDIR)/lib/_the.rt.jar_manifest
 
   272 RT_JAR_MANIFEST_FILE := $(IMAGES_OUTPUTDIR)/lib$(PROFILE)/_the.rt.jar_manifest
 
   282 RESOURCE_JAR_MANIFEST_FILE := $(IMAGES_OUTPUTDIR)/lib/_the.resources.jar_manifest
 
   273 RESOURCE_JAR_MANIFEST_FILE := $(IMAGES_OUTPUTDIR)/lib$(PROFILE)/_the.resources.jar_manifest
 
   283 
   274 
   284 $(RT_JAR_MANIFEST_FILE): $(MAINMANIFEST) $(BEANMANIFEST)
 
   275 $(RT_JAR_MANIFEST_FILE): $(MAINMANIFEST) $(BEANMANIFEST)
 
   285 	$(MKDIR) -p $(@D)
 
   276 	$(MKDIR) -p $(@D)
 
   286 	$(RM) $@ $@.tmp
 
   277 	$(RM) $@ $@.tmp
 
   287 	$(SED) -e "s#@@RELEASE@@#$(RELEASE)#" 		\
 
   278 	$(SED) -e "s#@@RELEASE@@#$(RELEASE)#" 		\
 
   297 	$(SED) -e "s#@@RELEASE@@#$(RELEASE)#" 		\
 
   288 	$(SED) -e "s#@@RELEASE@@#$(RELEASE)#" 		\
 
   298 	       -e "s#@@COMPANY_NAME@@#$(COMPANY_NAME)#" \
 
   289 	       -e "s#@@COMPANY_NAME@@#$(COMPANY_NAME)#" \
 
   299 	       $(MAINMANIFEST) >> $@.tmp
 
   290 	       $(MAINMANIFEST) >> $@.tmp
 
   300 	$(MV) $@.tmp $@
 
   291 	$(MV) $@.tmp $@
 
   301 
   292 
   302 $(IMAGES_OUTPUTDIR)/lib/_the.jars.exclude: $(MAKEFILE)
 
   293 $(IMAGES_OUTPUTDIR)/lib$(PROFILE)/_the.jars.exclude: $(MAKEFILE) $(PROFILE_MAKEFILES)
 
   303 	$(MKDIR) -p $(@D)
 
   294 	$(MKDIR) -p $(@D)
 
   304 	$(RM) $@ $@.tmp
 
   295 	$(RM) $@ $@.tmp
 
   305 	$(call ListPathsSafely,RT_JAR_EXCLUDES,\n, >> $@.tmp)
 
   296 	$(call ListPathsSafely,RT_JAR_EXCLUDES,\n, >> $@.tmp)
 
   306 	$(MV) $@.tmp $@
 
   297 	$(MV) $@.tmp $@
 
   307 
   298 
   310 	$(MKDIR) -p $(@D)
 
   301 	$(MKDIR) -p $(@D)
 
   311 	$(RM) $@ $@.tmp
 
   302 	$(RM) $@ $@.tmp
 
   312 	$(TOOL_ADDJSUM) $< $@.tmp
 
   303 	$(TOOL_ADDJSUM) $< $@.tmp
 
   313 	$(MV) $@.tmp $@
 
   304 	$(MV) $@.tmp $@
 
   314 
   305 
   315 $(IMAGES_OUTPUTDIR)/lib/_the.jars.contents: $(BUILD_TOOLS) $(IMAGES_OUTPUTDIR)/lib/_the.jars.exclude \
 
   306 $(IMAGES_OUTPUTDIR)/lib$(PROFILE)/_the.jars.contents: $(BUILD_TOOLS) $(IMAGES_OUTPUTDIR)/lib$(PROFILE)/_the.jars.exclude \
 
   316 					 $(ALL_FILES_IN_CLASSES) $(IMAGES_OUTPUTDIR)/lib/classlist
 
   307 					 $(ALL_FILES_IN_CLASSES) $(IMAGES_OUTPUTDIR)/lib/classlist
 
   317 	$(MKDIR) -p $(@D)
 
   308 	$(MKDIR) -p $(@D)
 
   318 	$(RM) $@ $@.tmp
 
   309 	$(RM) $@ $@.tmp
 
   319 	($(CD) $(JDK_OUTPUTDIR)/classes && \
 
   310 	($(CD) $(JDK_OUTPUTDIR)/classes && \
 
   320 	    $(TOOL_JARREORDER) \
 
   311 	    $(TOOL_JARREORDER) \
 
   321 		-o  $@.tmp $(IMAGES_OUTPUTDIR)/lib/classlist $(IMAGES_OUTPUTDIR)/lib/_the.jars.exclude . )
 
   312 		-o  $@.tmp $(IMAGES_OUTPUTDIR)/lib/classlist $(IMAGES_OUTPUTDIR)/lib$(PROFILE)/_the.jars.exclude . )
 
   322 	$(MV) $@.tmp $@
 
   313 	$(MV) $@.tmp $@
 
   323 
   314 
   324 $(IMAGES_OUTPUTDIR)/lib/_the.rt.jar.contents: $(IMAGES_OUTPUTDIR)/lib/_the.jars.contents
 
   315 $(IMAGES_OUTPUTDIR)/lib$(PROFILE)/_the.rt.jar.contents: $(IMAGES_OUTPUTDIR)/lib$(PROFILE)/_the.jars.contents
 
   325 	$(MKDIR) -p $(@D)
 
   316 	$(MKDIR) -p $(@D)
 
   326 	$(RM) $@ $@.tmp
 
   317 	$(RM) $@ $@.tmp
 
   327 	$(GREP) -e '\.class$$' $(IMAGES_OUTPUTDIR)/lib/_the.jars.contents > $@.tmp
 
   318 	$(GREP) -e '\.class$$' $(IMAGES_OUTPUTDIR)/lib$(PROFILE)/_the.jars.contents > $@.tmp
 
       
   319 ifneq ($(PROFILE),)
 
       
   320 #       # Add back classes from excluded packages (fixing the $ substitution in the process)
 
       
   321 	for type in  $(subst \$$,\, $(RT_JAR_INCLUDE_TYPES)) ; do \
 
       
   322 	  $(ECHO) $$type >> $@.tmp ; \
 
       
   323 	done
 
       
   324 endif
 
   328 	$(MV) $@.tmp $@
 
   325 	$(MV) $@.tmp $@
 
   329 
   326 
   330 $(IMAGES_OUTPUTDIR)/lib/_the.resources.jar.contents: $(IMAGES_OUTPUTDIR)/lib/_the.jars.contents
 
   327 $(IMAGES_OUTPUTDIR)/lib$(PROFILE)/_the.resources.jar.contents: $(IMAGES_OUTPUTDIR)/lib$(PROFILE)/_the.jars.contents
 
   331 	$(MKDIR) -p $(@D)
 
   328 	$(MKDIR) -p $(@D)
 
   332 	$(RM) $@ $@.tmp
 
   329 	$(RM) $@ $@.tmp
 
   333 	$(GREP) -v -e '\.class$$' \
 
   330 	$(GREP) -v -e '\.class$$' \
 
   334 	    -e '/_the\.*' -e '^_the\.*' -e '\\_the\.*' -e 'javac_state' \
 
   331 	    -e '/_the\.*' -e '^_the\.*' -e '\\_the\.*' -e 'javac_state' \
 
   335 	    $(IMAGES_OUTPUTDIR)/lib/_the.jars.contents > $@.tmp
 
   332 	    $(IMAGES_OUTPUTDIR)/lib$(PROFILE)/_the.jars.contents > $@.tmp
 
       
   333 ifneq ($(PROFILE),)
 
       
   334 #       # Strip out all META-INF/services/ entries
 
       
   335 	$(GREP) -v -e 'META-INF/services/' $@.tmp > $@.tmp2
 
       
   336 #       # Add back the required services
 
       
   337 #       # FIXME: On Solaris if PROFILE_INCLUDE_METAINF_SERVICES is not defined
 
       
   338 #       # we get a syntax error from sh. That doesn't happen on linux
 
       
   339 	for service in $(PROFILE_INCLUDE_METAINF_SERVICES) ; do \
 
       
   340 	  $(ECHO) $$service >> $@.tmp2; \
 
       
   341 	done
 
       
   342 	$(MV) $@.tmp2 $@.tmp
 
       
   343 endif
 
   336 	$(MV) $@.tmp $@
 
   344 	$(MV) $@.tmp $@
 
   337 
   345 
       
   346 # This is a hack but I don't know how to make this fit into the existing scheme
 
       
   347 $(PROFILE_VERSION_CLASS_TARGETS) : $(PROFILE_VERSION_JAVA_TARGETS)
 
       
   348 	@$(JAVAC) -d $(@D)/../../ $(@D)/$(VERSION_JAVA_FILE)
 
       
   349 
       
   350 
       
   351 # Support for removing the addPropertyChangeListener and removePropertyChangeListener
 
       
   352 # methods from classes that only go into the profile builds. For now the Pack200.Packer
 
       
   353 # and Packer200.Unpacker classes have special handling because of the $ in the file
 
       
   354 # name.
 
       
   355 BEANLESS_CLASSES = $(IMAGES_OUTPUTDIR)/beanless
 
       
   356 
       
   357 $(BEANLESS_CLASSES)/%: $(JDK_OUTPUTDIR)/classes/%
 
       
   358 	$(MKDIR) -p $(@D)
 
       
   359 	$(TOOL_REMOVEMETHODS) $< $@ addPropertyChangeListener removePropertyChangeListener
 
       
   360 
       
   361 CLASSES_TO_DEBEAN = \
 
       
   362     java/util/logging/LogManager.class \
 
       
   363     com/sun/java/util/jar/pack/PackerImpl.class \
 
       
   364     com/sun/java/util/jar/pack/UnpackerImpl.class
 
       
   365 
       
   366 BEANLESS_CLASSES_TARGETS =
 
       
   367 ifneq ($(PROFILE),)
 
       
   368     BEANLESS_CLASSES_TARGETS := $(foreach c, $(CLASSES_TO_DEBEAN), $(BEANLESS_CLASSES)/$c)
 
       
   369 endif
 
       
   370 
       
   371 
   338 RT_JAR_CREATE_OPTIONS := c0fm
 
   372 RT_JAR_CREATE_OPTIONS := c0fm
 
       
   373 RT_JAR_UPDATE_OPTIONS := u0f
 
   339 ifeq ($(COMPRESS_JARS), true)
 
   374 ifeq ($(COMPRESS_JARS), true)
 
   340     RT_JAR_CREATE_OPTIONS := cfm
 
   375     RT_JAR_CREATE_OPTIONS := cfm
 
   341 endif
 
   376     RT_JAR_UPDATE_OPTIONS := uf
 
   342 
   377 endif
 
   343 $(IMAGES_OUTPUTDIR)/lib/rt.jar: $(IMAGES_OUTPUTDIR)/lib/_the.rt.jar.contents $(RT_JAR_MANIFEST_FILE)
 
   378 
   344 	$(ECHO) Creating rt.jar
 
   379 # This defines a target-specific variables to make the shell logic easier to see.
 
       
   380 # We need to find the Version.class file for the profile currently being built
 
       
   381 $(IMAGES_OUTPUTDIR)/lib$(PROFILE)/rt.jar: \
 
       
   382   CLASS_FILE = $(if $(PROFILE),$(strip $(foreach class,$(PROFILE_VERSION_CLASS_TARGETS),$(if $(findstring $(PROFILE),$(class)),$(class)))), NO_SUCH_FILE)
 
       
   383 # This is the real target
 
       
   384 $(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)
 
       
   385 	$(ECHO) Creating rt.jar $(PROFILE) Compressed=$(COMPRESS_JARS)
 
   345 	$(MKDIR) -p $(@D)
 
   386 	$(MKDIR) -p $(@D)
 
   346 	$(RM) $@ $@.tmp
 
   387 	$(RM) $@ $@.tmp
 
   347 	$(CD) $(JDK_OUTPUTDIR)/classes && \
 
   388 	$(CD) $(JDK_OUTPUTDIR)/classes && \
 
   348 	    $(JAR) $(RT_JAR_CREATE_OPTIONS) $@.tmp $(RT_JAR_MANIFEST_FILE) \
 
   389 	    $(JAR) $(RT_JAR_CREATE_OPTIONS) $@.tmp $(RT_JAR_MANIFEST_FILE) \
 
   349 	        @$(IMAGES_OUTPUTDIR)/lib/_the.rt.jar.contents
 
   390 	        @$(IMAGES_OUTPUTDIR)/lib$(PROFILE)/_the.rt.jar.contents && \
 
       
   391 	    if [ -f $(CLASS_FILE) ]; then \
 
       
   392 	      $(ECHO)  Updating rt.jar $(PROFILE) && \
 
       
   393 	      $(CD) $(patsubst %$(VERSION_CLASS_PATH),%,$(CLASS_FILE)) && \
 
       
   394                 $(JAR) $(RT_JAR_UPDATE_OPTIONS) $@.tmp $(VERSION_CLASS_PATH); \
 
       
   395 	      $(MKDIR) -p $(BEANLESS_CLASSES)/java/util/jar; \
 
       
   396 	      $(TOOL_REMOVEMETHODS) $(JDK_OUTPUTDIR)/classes/java/util/jar/Pack200\$$Packer.class \
 
       
   397 		$(BEANLESS_CLASSES)/java/util/jar/Pack200\$$Packer.class addPropertyChangeListener removePropertyChangeListener; \
 
       
   398 	      $(TOOL_REMOVEMETHODS) $(JDK_OUTPUTDIR)/classes/java/util/jar/Pack200\$$Unpacker.class \
 
       
   399 		$(BEANLESS_CLASSES)/java/util/jar/Pack200\$$Unpacker.class addPropertyChangeListener removePropertyChangeListener; \
 
       
   400 	      $(CD) $(BEANLESS_CLASSES) && \
 
       
   401 		$(JAR) $(RT_JAR_UPDATE_OPTIONS) $@.tmp $(CLASSES_TO_DEBEAN) java/util/jar/* ; \
 
       
   402             fi
 
   350 	$(MV) $@.tmp $@
 
   403 	$(MV) $@.tmp $@
 
   351 
   404 
   352 $(IMAGES_OUTPUTDIR)/lib/resources.jar: $(IMAGES_OUTPUTDIR)/lib/_the.resources.jar.contents \
 
   405 $(IMAGES_OUTPUTDIR)/lib$(PROFILE)/resources.jar: $(IMAGES_OUTPUTDIR)/lib$(PROFILE)/_the.resources.jar.contents \
 
   353 				    $(RESOURCE_JAR_MANIFEST_FILE)
 
   406 				    $(RESOURCE_JAR_MANIFEST_FILE)
 
   354 	$(ECHO) Creating resources.jar
 
   407 	$(ECHO) Creating resources.jar
 
   355 	$(MKDIR) -p $(@D)
 
   408 	$(MKDIR) -p $(@D)
 
   356 	$(RM) $@ $@.tmp
 
   409 	$(RM) $@ $@.tmp
 
   357 	$(CD) $(JDK_OUTPUTDIR)/classes && \
 
   410 	$(CD) $(JDK_OUTPUTDIR)/classes && \
 
   358 	    $(JAR) $(RT_JAR_CREATE_OPTIONS) $@.tmp $(RESOURCE_JAR_MANIFEST_FILE) \
 
   411 	    $(JAR) $(RT_JAR_CREATE_OPTIONS) $@.tmp $(RESOURCE_JAR_MANIFEST_FILE) \
 
   359 	        @$(IMAGES_OUTPUTDIR)/lib/_the.resources.jar.contents
 
   412 	        @$(IMAGES_OUTPUTDIR)/lib$(PROFILE)/_the.resources.jar.contents
 
   360 	$(MV) $@.tmp $@
 
   413 	$(MV) $@.tmp $@
 
   361 
       
   362 JARS+=$(IMAGES_OUTPUTDIR)/lib/rt.jar $(IMAGES_OUTPUTDIR)/lib/resources.jar
 
       
   363 
   414 
   364 ##########################################################################################
 
   415 ##########################################################################################
 
   365 
   416 
   366 ifneq ($(OPENJDK_TARGET_OS), windows)
 
   417 ifneq ($(OPENJDK_TARGET_OS), windows)
 
   367     CHARSETS_EXTRA_FILES:=sun/awt/motif/X11GBK.class \
 
   418     CHARSETS_EXTRA_FILES:=sun/awt/motif/X11GBK.class \
 
   383                                META-INF/services/java.nio.charset.spi.CharsetProvider, \
 
   434                                META-INF/services/java.nio.charset.spi.CharsetProvider, \
 
   384 		JAR:=$(IMAGES_OUTPUTDIR)/lib/charsets.jar, \
 
   435 		JAR:=$(IMAGES_OUTPUTDIR)/lib/charsets.jar, \
 
   385 		SKIP_METAINF := true, \
 
   436 		SKIP_METAINF := true, \
 
   386                 CHECK_COMPRESS_JAR:=true))
 
   437                 CHECK_COMPRESS_JAR:=true))
 
   387 
   438 
   388 JARS+=$(IMAGES_OUTPUTDIR)/lib/charsets.jar
 
       
   389 
       
   390 ##########################################################################################
 
   439 ##########################################################################################
 
   391 
   440 
   392 ifndef OPENJDK
 
   441 ifndef OPENJDK
 
   393 ifeq ($(ENABLE_JFR), true)
 
   442 ifeq ($(ENABLE_JFR), true)
 
   394     $(eval $(call SetupArchive,BUILD_JFR_JAR,,\
 
   443     $(eval $(call SetupArchive,BUILD_JFR_JAR,,\
 
   398 		JAR:=$(IMAGES_OUTPUTDIR)/lib/jfr.jar,\
 
   447 		JAR:=$(IMAGES_OUTPUTDIR)/lib/jfr.jar,\
 
   399 		SKIP_METAINF:=true,\
 
   448 		SKIP_METAINF:=true,\
 
   400 		MANIFEST:=$(MAINMANIFEST), \
 
   449 		MANIFEST:=$(MAINMANIFEST), \
 
   401                 CHECK_COMPRESS_JAR:=true))
 
   450                 CHECK_COMPRESS_JAR:=true))
 
   402 
   451 
   403     JARS+=$(IMAGES_OUTPUTDIR)/lib/jfr.jar
 
       
   404 endif
 
   452 endif
 
   405 endif
 
   453 endif
 
   406 
   454 
   407 ##########################################################################################
 
   455 ##########################################################################################
 
   408 
   456 
   415 		JAR:=$(IMAGES_OUTPUTDIR)/lib/jsse.jar,\
 
   463 		JAR:=$(IMAGES_OUTPUTDIR)/lib/jsse.jar,\
 
   416 		SKIP_METAINF:=true,\
 
   464 		SKIP_METAINF:=true,\
 
   417 		MANIFEST:=$(MAINMANIFEST), \
 
   465 		MANIFEST:=$(MAINMANIFEST), \
 
   418                 CHECK_COMPRESS_JAR:=true))
 
   466                 CHECK_COMPRESS_JAR:=true))
 
   419 
   467 
   420 JARS+=$(IMAGES_OUTPUTDIR)/lib/jsse.jar
 
       
   421 
       
   422 ##########################################################################################
 
   468 ##########################################################################################
 
   423 # Create manifest for security jars
 
   469 # Create manifest for security jars
 
   424 
   470 
   425 #
 
   471 #
 
   426 # Include these extra attributes for now, should probably take out.
 
   472 # Include these extra attributes for now, should probably take out.
 
   436 	$(ECHO) "Implementation-Vendor-Id: com.sun" >> $@.tmp
 
   482 	$(ECHO) "Implementation-Vendor-Id: com.sun" >> $@.tmp
 
   437 	$(MV) $@.tmp $@
 
   483 	$(MV) $@.tmp $@
 
   438 
   484 
   439 ##########################################################################################
 
   485 ##########################################################################################
 
   440 # For all security jars, always build the jar, but for closed, install the prebuilt signed
 
   486 # For all security jars, always build the jar, but for closed, install the prebuilt signed
 
   441 # version instead of the newly built jar. For open, signing is not needed. See SignJars.gmk
 
   487 # version instead of the newly built jar. Unsigned jars are treated as intermediate targets
 
       
   488 # and explicitly added to the JARS list. For open, signing is not needed. See SignJars.gmk
 
   442 # for more information.
 
   489 # for more information.
 
   443 
   490 
   444 SUNPKCS11_JAR_DST := $(IMAGES_OUTPUTDIR)/lib/ext/sunpkcs11.jar
 
   491 SUNPKCS11_JAR_DST := $(IMAGES_OUTPUTDIR)/lib/ext/sunpkcs11.jar
 
   445 SUNPKCS11_JAR_UNSIGNED := $(IMAGES_OUTPUTDIR)/unsigned/sunpkcs11.jar
 
   492 SUNPKCS11_JAR_UNSIGNED := $(IMAGES_OUTPUTDIR)/unsigned/sunpkcs11.jar
 
   446 
   493 
   462 else
 
   509 else
 
   463     $(SUNPKCS11_JAR_DST) : $(SUNPKCS11_JAR_UNSIGNED)
 
   510     $(SUNPKCS11_JAR_DST) : $(SUNPKCS11_JAR_UNSIGNED)
 
   464 	$(install-file)
 
   511 	$(install-file)
 
   465 endif
 
   512 endif
 
   466 
   513 
   467 JARS += $(SUNPKCS11_JAR_DST) $(SUNPKCS11_JAR_UNSIGNED)
 
   514 JARS += $(SUNPKCS11_JAR_UNSIGNED)
 
   468 
   515 
   469 ##########################################################################################
 
   516 ##########################################################################################
 
   470 
   517 
   471 SUNEC_JAR_DST := $(IMAGES_OUTPUTDIR)/lib/ext/sunec.jar
 
   518 SUNEC_JAR_DST := $(IMAGES_OUTPUTDIR)/lib/ext/sunec.jar
 
   472 SUNEC_JAR_UNSIGNED := $(IMAGES_OUTPUTDIR)/unsigned/sunec.jar
 
   519 SUNEC_JAR_UNSIGNED := $(IMAGES_OUTPUTDIR)/unsigned/sunec.jar
 
   489 else
 
   536 else
 
   490     $(SUNEC_JAR_DST) : $(SUNEC_JAR_UNSIGNED)
 
   537     $(SUNEC_JAR_DST) : $(SUNEC_JAR_UNSIGNED)
 
   491 	$(install-file)
 
   538 	$(install-file)
 
   492 endif
 
   539 endif
 
   493 
   540 
   494 JARS += $(SUNEC_JAR_DST) $(SUNEC_JAR_UNSIGNED)
 
   541 JARS += $(SUNEC_JAR_UNSIGNED)
 
   495 
   542 
   496 ##########################################################################################
 
   543 ##########################################################################################
 
   497 
   544 
   498 $(eval $(call SetupArchive,BUILD_SWINGBEANS_JAR,,\
 
   545 $(eval $(call SetupArchive,BUILD_SWINGBEANS_JAR,,\
 
   499 		SRCS:=$(JDK_OUTPUTDIR)/classes,\
 
   546 		SRCS:=$(JDK_OUTPUTDIR)/classes,\
 
   502 		EXCLUDES:=javax/swing/plaf,\
 
   549 		EXCLUDES:=javax/swing/plaf,\
 
   503 		EXTRA_FILES:=javax/swing/SwingBeanInfoBase.class sun/swing/BeanInfoUtils.class,\
 
   550 		EXTRA_FILES:=javax/swing/SwingBeanInfoBase.class sun/swing/BeanInfoUtils.class,\
 
   504 		JAR:=$(IMAGES_OUTPUTDIR)/lib/dt.jar,\
 
   551 		JAR:=$(IMAGES_OUTPUTDIR)/lib/dt.jar,\
 
   505 		SKIP_METAINF:=true))
 
   552 		SKIP_METAINF:=true))
 
   506 
   553 
   507 JARS+=$(IMAGES_OUTPUTDIR)/lib/dt.jar
 
       
   508 
       
   509 ##########################################################################################
 
   554 ##########################################################################################
 
   510 
   555 
   511 SUNJCE_PROVIDER_JAR_DST := $(IMAGES_OUTPUTDIR)/lib/ext/sunjce_provider.jar
 
   556 SUNJCE_PROVIDER_JAR_DST := $(IMAGES_OUTPUTDIR)/lib/ext/sunjce_provider.jar
 
   512 SUNJCE_PROVIDER_JAR_UNSIGNED := $(IMAGES_OUTPUTDIR)/unsigned/sunjce_provider.jar
 
   557 SUNJCE_PROVIDER_JAR_UNSIGNED := $(IMAGES_OUTPUTDIR)/unsigned/sunjce_provider.jar
 
   513 
   558 
   529 else
 
   574 else
 
   530     $(SUNJCE_PROVIDER_JAR_DST) : $(SUNJCE_PROVIDER_JAR_UNSIGNED)
 
   575     $(SUNJCE_PROVIDER_JAR_DST) : $(SUNJCE_PROVIDER_JAR_UNSIGNED)
 
   531 	$(install-file)
 
   576 	$(install-file)
 
   532 endif
 
   577 endif
 
   533 
   578 
   534 JARS += $(SUNJCE_PROVIDER_JAR_DST) $(SUNJCE_PROVIDER_JAR_UNSIGNED)
 
   579 JARS += $(SUNJCE_PROVIDER_JAR_UNSIGNED)
 
   535 
   580 
   536 ##########################################################################################
 
   581 ##########################################################################################
 
   537 
   582 
   538 JCE_JAR_DST := $(IMAGES_OUTPUTDIR)/lib/jce.jar
 
   583 JCE_JAR_DST := $(IMAGES_OUTPUTDIR)/lib/jce.jar
 
   539 JCE_JAR_UNSIGNED := $(IMAGES_OUTPUTDIR)/unsigned/jce.jar
 
   584 JCE_JAR_UNSIGNED := $(IMAGES_OUTPUTDIR)/unsigned/jce.jar
 
   556 else
 
   601 else
 
   557     $(JCE_JAR_DST) : $(JCE_JAR_UNSIGNED)
 
   602     $(JCE_JAR_DST) : $(JCE_JAR_UNSIGNED)
 
   558 	$(install-file)
 
   603 	$(install-file)
 
   559 endif
 
   604 endif
 
   560 
   605 
   561 JARS += $(JCE_JAR_DST) $(JCE_JAR_UNSIGNED)
 
   606 JARS +=  $(JCE_JAR_UNSIGNED)
 
   562 
   607 
   563 ##########################################################################################
 
   608 ##########################################################################################
 
   564 
   609 
   565 US_EXPORT_POLICY_JAR_DST := $(IMAGES_OUTPUTDIR)/lib/security/US_export_policy.jar
 
   610 US_EXPORT_POLICY_JAR_DST := $(IMAGES_OUTPUTDIR)/lib/security/US_export_policy.jar
 
   566 US_EXPORT_POLICY_JAR_UNSIGNED := $(IMAGES_OUTPUTDIR)/unsigned/US_export_policy.jar
 
   611 US_EXPORT_POLICY_JAR_UNSIGNED := $(IMAGES_OUTPUTDIR)/unsigned/US_export_policy.jar
 
   594 else
 
   639 else
 
   595     $(US_EXPORT_POLICY_JAR_DST): $(US_EXPORT_POLICY_JAR_UNSIGNED)
 
   640     $(US_EXPORT_POLICY_JAR_DST): $(US_EXPORT_POLICY_JAR_UNSIGNED)
 
   596 	$(install-file)
 
   641 	$(install-file)
 
   597 endif
 
   642 endif
 
   598 
   643 
   599 JARS += $(US_EXPORT_POLICY_JAR_DST) $(US_EXPORT_POLICY_JAR_UNSIGNED)
 
   644 JARS += $(US_EXPORT_POLICY_JAR_UNSIGNED)
 
   600 
   645 
   601 ##########################################################################################
 
   646 ##########################################################################################
 
   602 
   647 
   603 LOCAL_POLICY_JAR_DST := $(IMAGES_OUTPUTDIR)/lib/security/local_policy.jar
 
   648 LOCAL_POLICY_JAR_DST := $(IMAGES_OUTPUTDIR)/lib/security/local_policy.jar
 
   604 LOCAL_POLICY_JAR_UNSIGNED := $(IMAGES_OUTPUTDIR)/unsigned/local_policy.jar
 
   649 LOCAL_POLICY_JAR_UNSIGNED := $(IMAGES_OUTPUTDIR)/unsigned/local_policy.jar
 
   637 else
 
   682 else
 
   638     $(LOCAL_POLICY_JAR_DST): $(LOCAL_POLICY_JAR_UNSIGNED)
 
   683     $(LOCAL_POLICY_JAR_DST): $(LOCAL_POLICY_JAR_UNSIGNED)
 
   639 	$(install-file)
 
   684 	$(install-file)
 
   640 endif
 
   685 endif
 
   641 
   686 
   642 JARS += $(LOCAL_POLICY_JAR_DST) $(LOCAL_POLICY_JAR_UNSIGNED)
 
   687 JARS += $(LOCAL_POLICY_JAR_UNSIGNED)
 
   643 
   688 
   644 ##########################################################################################
 
   689 ##########################################################################################
 
   645 
   690 
   646 ifeq ($(OPENJDK_TARGET_OS),windows)
 
   691 ifeq ($(OPENJDK_TARGET_OS),windows)
 
   647 
   692 
   666 else
 
   711 else
 
   667     $(SUNMSCAPI_JAR_DST) : $(SUNMSCAPI_JAR_UNSIGNED)
 
   712     $(SUNMSCAPI_JAR_DST) : $(SUNMSCAPI_JAR_UNSIGNED)
 
   668 	$(install-file)
 
   713 	$(install-file)
 
   669 endif
 
   714 endif
 
   670 
   715 
   671 JARS += $(SUNMSCAPI_JAR_DST) $(SUNMSCAPI_JAR_UNSIGNED)
 
   716 JARS += $(SUNMSCAPI_JAR_UNSIGNED)
 
   672 
   717 
   673 endif
 
   718 endif
 
   674 
   719 
   675 ##########################################################################################
 
   720 ##########################################################################################
 
   676 
   721 
   693 
   738 
   694 $(UCRYPTO_JAR_DST) : $(UCRYPTO_JAR_SRC)
 
   739 $(UCRYPTO_JAR_DST) : $(UCRYPTO_JAR_SRC)
 
   695 	@$(ECHO) $(LOG_INFO) "\n>>>Installing prebuilt OracleUcrypto provider..."
 
   740 	@$(ECHO) $(LOG_INFO) "\n>>>Installing prebuilt OracleUcrypto provider..."
 
   696 	$(install-file)
 
   741 	$(install-file)
 
   697 
   742 
   698 JARS += $(UCRYPTO_JAR_DST) $(UCRYPTO_JAR_UNSIGNED)
 
   743 JARS += $(UCRYPTO_JAR_UNSIGNED) 
   699 
   744 
   700 endif
 
   745 endif
 
   701 endif
 
   746 endif
 
   702 
   747 
   703 ##########################################################################################
 
   748 ##########################################################################################
 
   715 			  sun/util/resources/cldr,\
 
   760 			  sun/util/resources/cldr,\
 
   716 		EXCLUDES:=sun/util/cldr/CLDRLocaleProviderAdapter,\
 
   761 		EXCLUDES:=sun/util/cldr/CLDRLocaleProviderAdapter,\
 
   717 		JAR:=$(CLDRDATA_JAR_DST),\
 
   762 		JAR:=$(CLDRDATA_JAR_DST),\
 
   718 		EXTRA_MANIFEST_ATTR:=CLDR-Version: $(CLDRVERSION),\
 
   763 		EXTRA_MANIFEST_ATTR:=CLDR-Version: $(CLDRVERSION),\
 
   719 		SKIP_METAINF:=true))
 
   764 		SKIP_METAINF:=true))
 
   720 
       
   721 JARS += $(CLDRDATA_JAR_DST)
 
       
   722 
   765 
   723 ##########################################################################################
 
   766 ##########################################################################################
 
   724 
   767 
   725 TOOLS_JAR_INCLUDES := \
 
   768 TOOLS_JAR_INCLUDES := \
 
   726         com/sun/codemodel       \
 
   769         com/sun/codemodel       \
 
   791 			     META-INF/services/com.sun.tools.internal.xjc.Plugin,\
 
   834 			     META-INF/services/com.sun.tools.internal.xjc.Plugin,\
 
   792 		JAR:=$(IMAGES_OUTPUTDIR)/lib/tools.jar,\
 
   835 		JAR:=$(IMAGES_OUTPUTDIR)/lib/tools.jar,\
 
   793 		SKIP_METAINF:=true, \
 
   836 		SKIP_METAINF:=true, \
 
   794                 CHECK_COMPRESS_JAR:=true))
 
   837                 CHECK_COMPRESS_JAR:=true))
 
   795 
   838 
   796 JARS+=$(IMAGES_OUTPUTDIR)/lib/tools.jar
 
       
   797 
   839 
   798 ##########################################################################################
 
   840 ##########################################################################################
 
   799 
   841 
   800 include javadoc/CORE_PKGS.gmk
 
   842 include javadoc/CORE_PKGS.gmk
 
   801 include javadoc/NON_CORE_PKGS.gmk
 
   843 include javadoc/NON_CORE_PKGS.gmk
 
   832 	    -bootclasspath $(JDK_OUTPUTDIR)/classes \
 
   874 	    -bootclasspath $(JDK_OUTPUTDIR)/classes \
 
   833 	    -XDprocess.packages -proc:only \
 
   875 	    -XDprocess.packages -proc:only \
 
   834 	    -processor com.sun.tools.javac.sym.CreateSymbols \
 
   876 	    -processor com.sun.tools.javac.sym.CreateSymbols \
 
   835 	    -Acom.sun.tools.javac.sym.Jar=$(IMAGES_OUTPUTDIR)/lib/rt.jar \
 
   877 	    -Acom.sun.tools.javac.sym.Jar=$(IMAGES_OUTPUTDIR)/lib/rt.jar \
 
   836 	    -Acom.sun.tools.javac.sym.Dest=$(IMAGES_OUTPUTDIR)/symbols/META-INF/sym/rt.jar \
 
   878 	    -Acom.sun.tools.javac.sym.Dest=$(IMAGES_OUTPUTDIR)/symbols/META-INF/sym/rt.jar \
 
       
   879 	    -Acom.sun.tools.javac.sym.Profiles=profile-rtjar-includes.txt \
 
   837 	    $(CORE_PKGS) $(NON_CORE_PKGS) $(EXCLUDE_PROPWARN_PKGS) $(EXPORTED_PRIVATE_PKGS)
 
   880 	    $(CORE_PKGS) $(NON_CORE_PKGS) $(EXCLUDE_PROPWARN_PKGS) $(EXPORTED_PRIVATE_PKGS)
 
   838 	$(TOUCH) $@
 
   881 	$(TOUCH) $@
 
   839 
   882 
   840 $(eval $(call MakeDir,$(IMAGES_OUTPUTDIR)/symbols))
 
   883 $(eval $(call MakeDir,$(IMAGES_OUTPUTDIR)/symbols))
 
   841 $(eval $(call SetupArchive,BUILD_CT_SYM,$(IMAGES_OUTPUTDIR)/symbols/_the.symbols,\
 
   884 $(eval $(call SetupArchive,BUILD_CT_SYM,$(IMAGES_OUTPUTDIR)/symbols/_the.symbols,\
 
   842 		SRCS:=$(IMAGES_OUTPUTDIR)/symbols,\
 
   885 		SRCS:=$(IMAGES_OUTPUTDIR)/symbols,\
 
   843 		INCLUDES:=META-INF/sym,\
 
   886 		INCLUDES:=META-INF/sym,\
 
   844 		JAR:=$(IMAGES_OUTPUTDIR)/lib/ct.sym, \
 
   887 		JAR:=$(IMAGES_OUTPUTDIR)/lib/ct.sym, \
 
   845 		CHECK_COMPRESS_JAR:=true))
 
   888 		CHECK_COMPRESS_JAR:=true))
 
   846 
   889 
   847 JARS+=$(IMAGES_OUTPUTDIR)/lib/ct.sym
 
       
   848 
   890 
   849 ##########################################################################################
 
   891 ##########################################################################################
 
   850 
   892 
   851 SRC_ZIP_INCLUDES = \
 
   893 SRC_ZIP_INCLUDES = \
 
   852 	com/sun/corba			\
 
   894 	com/sun/corba			\
 
   928 		EXCLUDES:=javax/swing/beaninfo,\
 
   970 		EXCLUDES:=javax/swing/beaninfo,\
 
   929 		SUFFIXES:=.java .c .h,\
 
   971 		SUFFIXES:=.java .c .h,\
 
   930 		ZIP:=$(IMAGES_OUTPUTDIR)/src.zip,\
 
   972 		ZIP:=$(IMAGES_OUTPUTDIR)/src.zip,\
 
   931 		EXTRA_DEPS:=$(LAUNCHER_ZIP_SRC)))
 
   973 		EXTRA_DEPS:=$(LAUNCHER_ZIP_SRC)))
 
   932 
   974 
   933 JARS+=$(IMAGES_OUTPUTDIR)/src.zip
 
       
   934 
       
   935 ##########################################################################################
 
   975 ##########################################################################################
 
   936 
   976 
   937 #
 
   977 #
 
   938 # This is an empty jar (only contains manifest) and fits poorly into framework...
 
   978 # This is an empty jar (only contains manifest) and fits poorly into framework...
 
   939 #   create simple rule instead
 
   979 #   create simple rule instead
 
   940 #
 
   980 #
 
   941 $(IMAGES_OUTPUTDIR)/lib/management-agent.jar : $(JDK_TOPDIR)/src/share/classes/sun/management/manifest
 
   981 $(IMAGES_OUTPUTDIR)/lib/management-agent.jar : $(JDK_TOPDIR)/src/share/classes/sun/management/manifest
 
   942 	$(JAR) cfm $@ $<
 
   982 	$(JAR) cfm $@ $<
 
   943 
   983 
   944 JARS += $(IMAGES_OUTPUTDIR)/lib/management-agent.jar
 
       
   945 
       
   946 ##########################################################################################
 
   984 ##########################################################################################
 
   947 
   985 
   948 $(IMAGES_OUTPUTDIR)/lib/ext/zipfs.jar : $(JDK_OUTPUTDIR)/demo/nio/zipfs/zipfs.jar
 
   986 $(IMAGES_OUTPUTDIR)/lib/ext/zipfs.jar : $(JDK_OUTPUTDIR)/demo/nio/zipfs/zipfs.jar
 
   949 	$(install-file)
 
   987 	$(install-file)
 
   950 
       
   951 JARS += $(IMAGES_OUTPUTDIR)/lib/ext/zipfs.jar
 
       
   952 
   988 
   953 ##########################################################################################
 
   989 ##########################################################################################
 
   954 
   990 
   955 ifeq ($(OPENJDK_TARGET_OS),macosx)
 
   991 ifeq ($(OPENJDK_TARGET_OS),macosx)
 
   956     $(eval $(call SetupArchive,BUILD_JOBJC_JAR,,\
 
   992     $(eval $(call SetupArchive,BUILD_JOBJC_JAR,,\
 
   957 		SRCS:=$(JDK_OUTPUTDIR)/jobjc_classes,\
 
   993 		SRCS:=$(JDK_OUTPUTDIR)/jobjc_classes,\
 
   958 		JAR:=$(IMAGES_OUTPUTDIR)/lib/JObjC.jar, \
 
   994 		JAR:=$(IMAGES_OUTPUTDIR)/lib/JObjC.jar, \
 
   959 		JARINDEX:=true))
 
   995 		JARINDEX:=true))
 
   960 
       
   961     JARS += $(IMAGES_OUTPUTDIR)/lib/JObjC.jar
 
       
   962 endif
 
   996 endif
 
   963 
   997 
   964 ##########################################################################################
 
   998 ##########################################################################################
 
   965 
   999 
   966 ifndef OPENJDK
 
  1000 ifndef OPENJDK
 
   967     $(eval $(call SetupArchive,BUILD_ALT_RT_JAR,,\
 
  1001     $(eval $(call SetupArchive,BUILD_ALT_RT_JAR,,\
 
   968 		SRCS:=$(JDK_OUTPUTDIR)/altclasses_classes,\
 
  1002 		SRCS:=$(JDK_OUTPUTDIR)/altclasses_classes,\
 
   969 		JAR:=$(IMAGES_OUTPUTDIR)/lib/alt-rt.jar))
 
  1003 		JAR:=$(IMAGES_OUTPUTDIR)/lib/alt-rt.jar))
 
   970 
  1004 
   971     JARS += $(IMAGES_OUTPUTDIR)/lib/alt-rt.jar
 
       
   972 endif
 
  1005 endif
 
   973 
  1006 
   974 ##########################################################################################
 
  1007 ##########################################################################################
 
   975 
  1008 
   976 # This file is imported from hotspot in Import.gmk. Copying it into images/lib so that
 
  1009 # This file is imported from hotspot in Import.gmk. Copying it into images/lib so that
 
   977 # all jars can be found in one place when creating images in Images.gmk. It needs to be
 
  1010 # all jars can be found in one place when creating images in Images.gmk. It needs to be
 
   978 # done here so that clean targets can be simple and accurate.
 
  1011 # done here so that clean targets can be simple and accurate.
 
   979 $(IMAGES_OUTPUTDIR)/lib/sa-jdi.jar: $(JDK_OUTPUTDIR)/lib/sa-jdi.jar
 
  1012 $(IMAGES_OUTPUTDIR)/lib/sa-jdi.jar: $(JDK_OUTPUTDIR)/lib/sa-jdi.jar
 
   980 	$(install-file)
 
  1013 	$(install-file)
 
   981 
       
   982 JARS += $(IMAGES_OUTPUTDIR)/lib/sa-jdi.jar
 
       
   983 
  1014 
   984 ##########################################################################################
 
  1015 ##########################################################################################
 
   985 #
 
  1016 #
 
   986 # sec-bin.zip is used by builds where the corresponding sources are not available
 
  1017 # sec-bin.zip is used by builds where the corresponding sources are not available
 
   987 #
 
  1018 #
jdk-sandbox