jdk/makefiles/CreateJars.gmk
changeset 15140 87c70ee15c73
parent 14996 421c63041fe6
parent 15137 1ad653469ebc
child 15334 19ab20cb461f
child 15289 3ac550392e43
child 15681 8ca785029fe2
equal deleted inserted replaced
15125:a406c61365c3 15140:87c70ee15c73
    27 include MakeBase.gmk
    27 include MakeBase.gmk
    28 include JavaCompilation.gmk
    28 include JavaCompilation.gmk
    29 include Setup.gmk
    29 include Setup.gmk
    30 
    30 
    31 default: all
    31 default: all
       
    32 
       
    33 # Prepare the find cache. Only used if running on windows.
       
    34 $(eval $(call FillCacheFind,$(JDK_OUTPUTDIR)/classes))
    32 
    35 
    33 include Tools.gmk
    36 include Tools.gmk
    34 
    37 
    35 #
    38 #
    36 # This makefile...so that altering will trigger rebuilding include/exclude-lists => jars
    39 # This makefile...so that altering will trigger rebuilding include/exclude-lists => jars
   124 # the files to be in a certain order and converting that is not easy and will not be needed
   127 # the files to be in a certain order and converting that is not easy and will not be needed
   125 # in jigsaw anyway.
   128 # in jigsaw anyway.
   126 
   129 
   127 # Exclude list for rt.jar and resources.jar
   130 # Exclude list for rt.jar and resources.jar
   128 RT_JAR_EXCLUDES := \
   131 RT_JAR_EXCLUDES := \
       
   132 	com/oracle/security \
       
   133 	com/sun/codemodel \
       
   134 	com/sun/crypto/provider \
       
   135 	com/sun/istack/internal/tools \
       
   136 	com/sun/jarsigner \
   129 	com/sun/javadoc \
   137 	com/sun/javadoc \
   130 	com/sun/jdi \
   138 	com/sun/jdi \
   131 	com/sun/jarsigner \
   139 	com/sun/net/ssl/internal/ssl \
   132 	com/sun/source \
   140 	com/sun/source \
   133 	com/sun/istack/internal/tools \
       
   134 	META-INF/services/com.sun.jdi.connect.Connector \
       
   135 	META-INF/services/com.sun.jdi.connect.spi.TransportService \
       
   136 	META-INF/services/com.sun.tools.xjc.Plugin \
       
   137 	com/sun/tools \
   141 	com/sun/tools \
   138 	sun/jvmstat \
       
   139 	sun/nio/cs/ext \
       
   140 	sun/awt/HKSCS.class \
       
   141 	sun/awt/motif/X11GB2312\$$$$Decoder.class \
       
   142 	sun/awt/motif/X11GB2312\$$$$Encoder.class \
       
   143 	sun/awt/motif/X11GB2312.class \
       
   144 	sun/awt/motif/X11GBK\$$$$Encoder.class \
       
   145 	sun/awt/motif/X11GBK.class \
       
   146 	sun/awt/motif/X11KSC5601\$$$$Decoder.class \
       
   147 	sun/awt/motif/X11KSC5601\$$$$Encoder.class \
       
   148 	sun/awt/motif/X11KSC5601.class \
       
   149 	META-INF/services/java.nio.charset.spi.CharsetProvider \
       
   150 	sun/rmi/rmic \
       
   151 	sun/tools/asm \
       
   152 	sun/tools/java \
       
   153 	sun/tools/javac \
       
   154 	com/sun/tools/classfile \
       
   155 	com/sun/tools/javap \
       
   156 	sun/tools/jcmd \
       
   157 	sun/tools/jconsole \
       
   158 	sun/tools/jps \
       
   159 	sun/tools/jstat \
       
   160 	sun/tools/jstatd \
       
   161 	sun/tools/native2ascii \
       
   162 	sun/tools/serialver \
       
   163 	sun/tools/tree \
       
   164 	sun/tools/util \
       
   165 	sun/security/tools/jarsigner \
       
   166 	sun/security/provider/Sun.class \
       
   167 	sun/security/rsa/SunRsaSign.class \
       
   168 	sun/security/ssl \
       
   169 	sun/security/ec/ECDHKeyAgreement.class \
       
   170 	sun/security/ec/ECDSASignature\$$$$Raw.class \
       
   171 	sun/security/ec/ECDSASignature\$$$$SHA1.class \
       
   172 	sun/security/ec/ECDSASignature\$$$$SHA224.class \
       
   173 	sun/security/ec/ECDSASignature\$$$$SHA256.class \
       
   174 	sun/security/ec/ECDSASignature\$$$$SHA384.class \
       
   175 	sun/security/ec/ECDSASignature\$$$$SHA512.class \
       
   176 	sun/security/ec/ECDSASignature.class \
       
   177 	sun/security/ec/ECKeyFactory.class \
       
   178 	sun/security/ec/ECKeyPairGenerator.class \
       
   179 	sun/security/ec/SunEC\$$$$1.class \
       
   180 	sun/security/ec/SunEC.class \
       
   181 	sun/security/ec/SunECEntries.class \
       
   182 	sun/security/mscapi \
       
   183 	sun/security/pkcs11 \
       
   184 	com/sun/net/ssl/internal/ssl \
       
   185 	javax/crypto \
       
   186 	sun/security/internal \
       
   187 	com/sun/crypto/provider \
       
   188 	META-INF/services/com.sun.tools.attach.spi.AttachProvider \
       
   189 	com/sun/tools/attach \
       
   190 	org/relaxng/datatype \
       
   191 	com/sun/codemodel \
       
   192 	com/sun/xml/internal/dtdparser \
   142 	com/sun/xml/internal/dtdparser \
   193 	com/sun/xml/internal/rngom \
   143 	com/sun/xml/internal/rngom \
   194 	com/sun/xml/internal/xsom \
   144 	com/sun/xml/internal/xsom \
   195 	com/sun/tools/script/shell \
   145 	javax/crypto \
   196 	sun/tools/attach \
   146 	javax/swing/AbstractButtonBeanInfo.class \
   197 	sun/tools/jstack \
       
   198 	sun/tools/jinfo \
       
   199 	sun/tools/jmap \
       
   200 	sun/net/spi/nameservice/dns \
       
   201 	META-INF/services/sun.net.spi.nameservice.NameServiceDescriptor \
       
   202 	javax/swing/beaninfo \
   147 	javax/swing/beaninfo \
   203 	javax/swing/AbstractButtonBeanInfo.class \
       
   204 	javax/swing/BoxBeanInfo.class \
   148 	javax/swing/BoxBeanInfo.class \
   205 	javax/swing/JAppletBeanInfo.class \
   149 	javax/swing/JAppletBeanInfo.class \
   206 	javax/swing/JButtonBeanInfo.class \
   150 	javax/swing/JButtonBeanInfo.class \
   207 	javax/swing/JCheckBoxBeanInfo.class \
   151 	javax/swing/JCheckBoxBeanInfo.class \
   208 	javax/swing/JCheckBoxMenuItemBeanInfo.class \
   152 	javax/swing/JCheckBoxMenuItemBeanInfo.class \
   244 	javax/swing/JToolBarBeanInfo.class \
   188 	javax/swing/JToolBarBeanInfo.class \
   245 	javax/swing/JTreeBeanInfo.class \
   189 	javax/swing/JTreeBeanInfo.class \
   246 	javax/swing/JWindowBeanInfo.class \
   190 	javax/swing/JWindowBeanInfo.class \
   247 	javax/swing/SwingBeanInfoBase.class \
   191 	javax/swing/SwingBeanInfoBase.class \
   248 	javax/swing/text/JTextComponentBeanInfo.class \
   192 	javax/swing/text/JTextComponentBeanInfo.class \
       
   193 	META-INF/services/com.sun.jdi.connect.Connector \
       
   194 	META-INF/services/com.sun.jdi.connect.spi.TransportService \
       
   195 	META-INF/services/com.sun.tools.attach.spi.AttachProvider \
       
   196 	META-INF/services/com.sun.tools.xjc.Plugin \
       
   197 	META-INF/services/java.nio.charset.spi.CharsetProvider \
       
   198 	META-INF/services/sun.net.spi.nameservice.NameServiceDescriptor \
       
   199 	org/relaxng/datatype \
       
   200 	sun/awt/HKSCS.class \
       
   201 	sun/awt/motif/X11GB2312.class \
       
   202 	sun/awt/motif/X11GB2312\$$$$Decoder.class \
       
   203 	sun/awt/motif/X11GB2312\$$$$Encoder.class \
       
   204 	sun/awt/motif/X11GBK.class \
       
   205 	sun/awt/motif/X11GBK\$$$$Encoder.class \
       
   206 	sun/awt/motif/X11KSC5601.class \
       
   207 	sun/awt/motif/X11KSC5601\$$$$Decoder.class \
       
   208 	sun/awt/motif/X11KSC5601\$$$$Encoder.class \
       
   209 	sun/jvmstat \
       
   210 	sun/net/spi/nameservice/dns \
       
   211 	sun/nio/cs/ext \
       
   212 	sun/rmi/rmic \
       
   213 	sun/security/ec/ECDHKeyAgreement.class \
       
   214 	sun/security/ec/ECDSASignature.class \
       
   215 	sun/security/ec/ECDSASignature\$$$$Raw.class \
       
   216 	sun/security/ec/ECDSASignature\$$$$SHA1.class \
       
   217 	sun/security/ec/ECDSASignature\$$$$SHA224.class \
       
   218 	sun/security/ec/ECDSASignature\$$$$SHA256.class \
       
   219 	sun/security/ec/ECDSASignature\$$$$SHA384.class \
       
   220 	sun/security/ec/ECDSASignature\$$$$SHA512.class \
       
   221 	sun/security/ec/ECKeyFactory.class \
       
   222 	sun/security/ec/ECKeyPairGenerator.class \
       
   223 	sun/security/ec/SunEC\$$$$1.class \
       
   224 	sun/security/ec/SunEC.class \
       
   225 	sun/security/ec/SunECEntries.class \
       
   226 	sun/security/internal \
       
   227 	sun/security/mscapi \
       
   228 	sun/security/pkcs11 \
       
   229 	sun/security/provider/Sun.class \
       
   230 	sun/security/rsa/SunRsaSign.class \
       
   231 	sun/security/ssl \
       
   232 	sun/security/tools/jarsigner \
   249 	sun/swing/BeanInfoUtils.class \
   233 	sun/swing/BeanInfoUtils.class \
   250 	$(LOCALEDATA_INCLUDES) \
       
   251 	sun/text/resources/cldr \
   234 	sun/text/resources/cldr \
       
   235 	sun/tools/asm \
       
   236 	sun/tools/attach \
       
   237 	sun/tools/java \
       
   238 	sun/tools/javac \
       
   239 	sun/tools/jcmd \
       
   240 	sun/tools/jconsole \
       
   241 	sun/tools/jinfo \
       
   242 	sun/tools/jmap \
       
   243 	sun/tools/jps \
       
   244 	sun/tools/jstack \
       
   245 	sun/tools/jstat \
       
   246 	sun/tools/jstatd \
       
   247 	sun/tools/native2ascii \
       
   248 	sun/tools/serialver \
       
   249 	sun/tools/tree \
       
   250 	sun/tools/util \
       
   251 	sun/util/cldr/CLDRLocaleDataMetaInfo.class \
   252 	sun/util/resources/cldr \
   252 	sun/util/resources/cldr \
   253 	sun/util/cldr/CLDRLocaleDataMetaInfo.class
   253 	$(LOCALEDATA_INCLUDES)
   254 
   254 
   255 # These files should never be put into rt.jar
   255 # These files should never be put into rt.jar
   256 # but due to a misstake...some are put there if embedded
   256 # but due to a misstake...some are put there if embedded
   257 #
   257 #
   258 ifneq ($(JAVASE_EMBEDDED), true)
   258 ifneq ($(JAVASE_EMBEDDED), true)
   273         RT_JAR_EXCLUDES += com/sun/nio/sctp \
   273         RT_JAR_EXCLUDES += com/sun/nio/sctp \
   274                            sun/nio/ch/sctp
   274                            sun/nio/ch/sctp
   275 endif
   275 endif
   276 
   276 
   277 # Find all files in the classes dir to use as dependencies. This could be more fine granular.
   277 # Find all files in the classes dir to use as dependencies. This could be more fine granular.
   278 ALL_FILES_IN_CLASSES := $(shell $(FIND) $(JDK_OUTPUTDIR)/classes -type f \
   278 ALL_FILES_IN_CLASSES := $(call not-containing,_the.,$(filter-out %javac_state,\
   279 			| $(GREP) -v -e '/_the\.*' -e '^_the\.*' -e 'javac_state')
   279                         $(call CacheFind,$(JDK_OUTPUTDIR)/classes)))
   280 
   280 
   281 RT_JAR_MANIFEST_FILE := $(IMAGES_OUTPUTDIR)/lib/_the.rt.jar_manifest
   281 RT_JAR_MANIFEST_FILE := $(IMAGES_OUTPUTDIR)/lib/_the.rt.jar_manifest
   282 RESOURCE_JAR_MANIFEST_FILE := $(IMAGES_OUTPUTDIR)/lib/_the.resources.jar_manifest
   282 RESOURCE_JAR_MANIFEST_FILE := $(IMAGES_OUTPUTDIR)/lib/_the.resources.jar_manifest
   283 
   283 
   284 $(RT_JAR_MANIFEST_FILE): $(MAINMANIFEST) $(BEANMANIFEST)
   284 $(RT_JAR_MANIFEST_FILE): $(MAINMANIFEST) $(BEANMANIFEST)
   435 	$(ECHO) "Extension-Name: javax.crypto" >> $@.tmp
   435 	$(ECHO) "Extension-Name: javax.crypto" >> $@.tmp
   436 	$(ECHO) "Implementation-Vendor-Id: com.sun" >> $@.tmp
   436 	$(ECHO) "Implementation-Vendor-Id: com.sun" >> $@.tmp
   437 	$(MV) $@.tmp $@
   437 	$(MV) $@.tmp $@
   438 
   438 
   439 ##########################################################################################
   439 ##########################################################################################
       
   440 # 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
       
   442 # for more information.
   440 
   443 
   441 SUNPKCS11_JAR_DST := $(IMAGES_OUTPUTDIR)/lib/ext/sunpkcs11.jar
   444 SUNPKCS11_JAR_DST := $(IMAGES_OUTPUTDIR)/lib/ext/sunpkcs11.jar
   442 
   445 SUNPKCS11_JAR_UNSIGNED := $(IMAGES_OUTPUTDIR)/unsigned/sunpkcs11.jar
   443 ifndef OPENJDK
   446 
   444 
   447 $(eval $(call SetupArchive,BUILD_SUNPKCS11_JAR,,\
   445     SUNPKCS11_JAR_SRC := $(JDK_TOPDIR)/make/closed/tools/crypto/pkcs11/sunpkcs11.jar
       
   446 
       
   447     $(SUNPKCS11_JAR_DST) : $(SUNPKCS11_JAR_SRC)
       
   448 	@$(ECHO) $(LOG_INFO) "\n>>>Installing prebuilt SunPKCS11 provider..."
       
   449 	$(install-file)
       
   450 
       
   451 else
       
   452 
       
   453     $(eval $(call SetupArchive,BUILD_SUNPKCS11_JAR,,\
       
   454 	SRCS:=$(JDK_OUTPUTDIR)/classes, \
   448 	SRCS:=$(JDK_OUTPUTDIR)/classes, \
   455 	SUFFIXES:=.class,\
   449 	SUFFIXES:=.class,\
   456 	INCLUDES:=sun/security/pkcs11,\
   450 	INCLUDES:=sun/security/pkcs11,\
   457 	JAR:=$(SUNPKCS11_JAR_DST), \
   451 	JAR:=$(SUNPKCS11_JAR_UNSIGNED), \
   458         MANIFEST:=$(JCE_MANIFEST), \
   452         MANIFEST:=$(JCE_MANIFEST), \
   459 	SKIP_METAINF := true))
   453 	SKIP_METAINF := true))
   460 
   454 
   461     $(SUNPKCS11_JAR_DST): $(JCE_MANIFEST)
   455 $(SUNPKCS11_JAR_UNSIGNED): $(JCE_MANIFEST)
   462 
   456 
   463 endif
   457 ifndef OPENJDK
   464 
   458     SUNPKCS11_JAR_SRC := $(JDK_TOPDIR)/make/closed/tools/crypto/pkcs11/sunpkcs11.jar
   465 JARS += $(SUNPKCS11_JAR_DST)
   459     $(SUNPKCS11_JAR_DST) : $(SUNPKCS11_JAR_SRC)
       
   460 	@$(ECHO) $(LOG_INFO) "\n>>>Installing prebuilt SunPKCS11 provider..."
       
   461 	$(install-file)
       
   462 else
       
   463     $(SUNPKCS11_JAR_DST) : $(SUNPKCS11_JAR_UNSIGNED)
       
   464 	$(install-file)
       
   465 endif
       
   466 
       
   467 JARS += $(SUNPKCS11_JAR_DST) $(SUNPKCS11_JAR_UNSIGNED)
   466 
   468 
   467 ##########################################################################################
   469 ##########################################################################################
   468 
   470 
   469 SUNEC_JAR_DST := $(IMAGES_OUTPUTDIR)/lib/ext/sunec.jar
   471 SUNEC_JAR_DST := $(IMAGES_OUTPUTDIR)/lib/ext/sunec.jar
   470 
   472 SUNEC_JAR_UNSIGNED := $(IMAGES_OUTPUTDIR)/unsigned/sunec.jar
   471 ifndef OPENJDK
   473 
   472 
   474 $(eval $(call SetupArchive,BUILD_SUNEC_JAR,,\
   473     SUNEC_JAR_SRC := $(JDK_TOPDIR)/make/closed/tools/crypto/ec/sunec.jar
       
   474 
       
   475     $(SUNEC_JAR_DST) : $(SUNEC_JAR_SRC)
       
   476 	@$(ECHO) $(LOG_INFO) "\n>>>Installing prebuilt SunEC provider..."
       
   477 	$(install-file)
       
   478 
       
   479 else
       
   480 
       
   481     $(eval $(call SetupArchive,BUILD_SUNEC_JAR,,\
       
   482 		SRCS:=$(JDK_OUTPUTDIR)/classes, \
   475 		SRCS:=$(JDK_OUTPUTDIR)/classes, \
   483 		SUFFIXES:=.class,\
   476 		SUFFIXES:=.class,\
   484 		INCLUDES:=sun/security/ec,\
   477 		INCLUDES:=sun/security/ec,\
   485 		JAR:=$(SUNEC_JAR_DST), \
   478 		JAR:=$(SUNEC_JAR_UNSIGNED), \
   486                 MANIFEST:=$(JCE_MANIFEST), \
   479                 MANIFEST:=$(JCE_MANIFEST), \
   487 		SKIP_METAINF := true))
   480 		SKIP_METAINF := true))
   488 
   481 
   489     $(SUNEC_JAR_DST): $(JCE_MANIFEST)
   482 $(SUNEC_JAR_UNSIGNED): $(JCE_MANIFEST)
   490 
   483 
   491 endif
   484 ifndef OPENJDK
   492 
   485     SUNEC_JAR_SRC := $(JDK_TOPDIR)/make/closed/tools/crypto/ec/sunec.jar
   493 JARS += $(SUNEC_JAR_DST)
   486     $(SUNEC_JAR_DST) : $(SUNEC_JAR_SRC)
       
   487 	@$(ECHO) $(LOG_INFO) "\n>>>Installing prebuilt SunEC provider..."
       
   488 	$(install-file)
       
   489 else
       
   490     $(SUNEC_JAR_DST) : $(SUNEC_JAR_UNSIGNED)
       
   491 	$(install-file)
       
   492 endif
       
   493 
       
   494 JARS += $(SUNEC_JAR_DST) $(SUNEC_JAR_UNSIGNED)
   494 
   495 
   495 ##########################################################################################
   496 ##########################################################################################
   496 
   497 
   497 $(eval $(call SetupArchive,BUILD_SWINGBEANS_JAR,,\
   498 $(eval $(call SetupArchive,BUILD_SWINGBEANS_JAR,,\
   498 		SRCS:=$(JDK_OUTPUTDIR)/classes,\
   499 		SRCS:=$(JDK_OUTPUTDIR)/classes,\
   506 JARS+=$(IMAGES_OUTPUTDIR)/lib/dt.jar
   507 JARS+=$(IMAGES_OUTPUTDIR)/lib/dt.jar
   507 
   508 
   508 ##########################################################################################
   509 ##########################################################################################
   509 
   510 
   510 SUNJCE_PROVIDER_JAR_DST := $(IMAGES_OUTPUTDIR)/lib/ext/sunjce_provider.jar
   511 SUNJCE_PROVIDER_JAR_DST := $(IMAGES_OUTPUTDIR)/lib/ext/sunjce_provider.jar
   511 
   512 SUNJCE_PROVIDER_JAR_UNSIGNED := $(IMAGES_OUTPUTDIR)/unsigned/sunjce_provider.jar
   512 ifndef OPENJDK
   513 
   513     SUNJCE_PROVIDER_JAR_SRC := $(JDK_TOPDIR)/make/closed/tools/crypto/jce/sunjce_provider.jar
   514 $(eval $(call SetupArchive,BUILD_SUNJCE_PROVIDER_JAR,,\
   514 
       
   515     $(SUNJCE_PROVIDER_JAR_DST) : $(SUNJCE_PROVIDER_JAR_SRC)
       
   516 	@$(ECHO) $(LOG_INFO) "\n>>>Installing prebuilt SunJCE provider..."
       
   517 	$(install-file)
       
   518 
       
   519 else
       
   520 
       
   521     $(eval $(call SetupArchive,BUILD_SUNJCE_PROVIDER_JAR,,\
       
   522 		SRCS:=$(JDK_OUTPUTDIR)/classes, \
   515 		SRCS:=$(JDK_OUTPUTDIR)/classes, \
   523 		SUFFIXES:=.class,\
   516 		SUFFIXES:=.class,\
   524 		INCLUDES:= com/sun/crypto/provider,\
   517 		INCLUDES:= com/sun/crypto/provider,\
   525 		JAR:=$(SUNJCE_PROVIDER_JAR_DST), \
   518 		JAR:=$(SUNJCE_PROVIDER_JAR_UNSIGNED), \
   526                 MANIFEST:=$(JCE_MANIFEST), \
   519                 MANIFEST:=$(JCE_MANIFEST), \
   527 		SKIP_METAINF := true))
   520 		SKIP_METAINF := true))
   528 
   521 
   529     $(SUNJCE_PROVIDER_JAR_DST): $(JCE_MANIFEST)
   522 $(SUNJCE_PROVIDER_JAR_UNSIGNED): $(JCE_MANIFEST)
   530 
   523 
   531 endif
   524 ifndef OPENJDK
   532 
   525     SUNJCE_PROVIDER_JAR_SRC := $(JDK_TOPDIR)/make/closed/tools/crypto/jce/sunjce_provider.jar
   533 JARS += $(SUNJCE_PROVIDER_JAR_DST)
   526     $(SUNJCE_PROVIDER_JAR_DST) : $(SUNJCE_PROVIDER_JAR_SRC)
       
   527 	@$(ECHO) $(LOG_INFO) "\n>>>Installing prebuilt SunJCE provider..."
       
   528 	$(install-file)
       
   529 else
       
   530     $(SUNJCE_PROVIDER_JAR_DST) : $(SUNJCE_PROVIDER_JAR_UNSIGNED)
       
   531 	$(install-file)
       
   532 endif
       
   533 
       
   534 JARS += $(SUNJCE_PROVIDER_JAR_DST) $(SUNJCE_PROVIDER_JAR_UNSIGNED)
       
   535 
       
   536 ##########################################################################################
   534 
   537 
   535 JCE_JAR_DST := $(IMAGES_OUTPUTDIR)/lib/jce.jar
   538 JCE_JAR_DST := $(IMAGES_OUTPUTDIR)/lib/jce.jar
   536 
   539 JCE_JAR_UNSIGNED := $(IMAGES_OUTPUTDIR)/unsigned/jce.jar
   537 ifndef OPENJDK
   540 
   538 
   541 $(eval $(call SetupArchive,BUILD_JCE_JAR,,\
   539     JCE_JAR_SRC := $(JDK_TOPDIR)/make/closed/tools/crypto/jce/jce.jar
       
   540 
       
   541     $(JCE_JAR_DST) : $(JCE_JAR_SRC)
       
   542 	@$(ECHO) $(LOG_INFO) "\n>>>Installing prebuilt jce.jar..."
       
   543 	$(install-file)
       
   544 
       
   545 else
       
   546 
       
   547     $(eval $(call SetupArchive,BUILD_JCE_JAR,,\
       
   548 		SRCS:=$(JDK_OUTPUTDIR)/classes, \
   542 		SRCS:=$(JDK_OUTPUTDIR)/classes, \
   549 		SUFFIXES:=.class,\
   543 		SUFFIXES:=.class,\
   550 		INCLUDES:= javax/crypto sun/security/internal,\
   544 		INCLUDES:= javax/crypto sun/security/internal,\
   551 		JAR:=$(JCE_JAR_DST), \
   545 		JAR:=$(JCE_JAR_UNSIGNED), \
   552                 MANIFEST:=$(JCE_MANIFEST), \
   546                 MANIFEST:=$(JCE_MANIFEST), \
   553 		SKIP_METAINF := true))
   547 		SKIP_METAINF := true))
   554 
   548 
   555     $(JCE_JAR_DST): $(JCE_MANIFEST)
   549 $(JCE_JAR_UNSIGNED): $(JCE_MANIFEST)
   556 
   550 
   557 endif
   551 ifndef OPENJDK
   558 
   552     JCE_JAR_SRC := $(JDK_TOPDIR)/make/closed/tools/crypto/jce/jce.jar
   559 JARS += $(JCE_JAR_DST)
   553     $(JCE_JAR_DST) : $(JCE_JAR_SRC)
       
   554 	@$(ECHO) $(LOG_INFO) "\n>>>Installing prebuilt jce.jar..."
       
   555 	$(install-file)
       
   556 else
       
   557     $(JCE_JAR_DST) : $(JCE_JAR_UNSIGNED)
       
   558 	$(install-file)
       
   559 endif
       
   560 
       
   561 JARS += $(JCE_JAR_DST) $(JCE_JAR_UNSIGNED)
   560 
   562 
   561 ##########################################################################################
   563 ##########################################################################################
   562 
   564 
   563 US_EXPORT_POLICY_JAR_DST := $(IMAGES_OUTPUTDIR)/lib/security/US_export_policy.jar
   565 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
       
   567 
       
   568 #
       
   569 # TODO fix so that SetupArchive does not write files into SRCS
       
   570 #   then we don't need this extra copying
       
   571 #
       
   572 # NOTE:  We currently do not place restrictions on our limited export
       
   573 # policy.  This was not a typo.
       
   574 #
       
   575 US_EXPORT_POLICY_JAR_SRC_DIR := $(JDK_TOPDIR)/make/javax/crypto/policy/unlimited
       
   576 US_EXPORT_POLICY_JAR_TMP := $(IMAGES_OUTPUTDIR)/US_export_policy_jar.tmp
       
   577 
       
   578 $(US_EXPORT_POLICY_JAR_TMP)/% : $(US_EXPORT_POLICY_JAR_SRC_DIR)/%
       
   579 	$(install-file)
       
   580 
       
   581 US_EXPORT_POLICY_JAR_DEPS := $(US_EXPORT_POLICY_JAR_TMP)/default_US_export.policy
       
   582 
       
   583 $(eval $(call SetupArchive,BUILD_US_EXPORT_POLICY_JAR,$(US_EXPORT_POLICY_JAR_DEPS),\
       
   584 		SRCS:=$(US_EXPORT_POLICY_JAR_TMP), \
       
   585 		SUFFIXES:= .policy,\
       
   586 		JAR:=$(US_EXPORT_POLICY_JAR_UNSIGNED), \
       
   587 		EXTRA_MANIFEST_ATTR := Crypto-Strength: unlimited, \
       
   588 		SKIP_METAINF := true))
   564 
   589 
   565 ifndef OPENJDK
   590 ifndef OPENJDK
   566 
       
   567 
       
   568     $(US_EXPORT_POLICY_JAR_DST): $(JDK_TOPDIR)/make/closed/tools/crypto/jce/US_export_policy.jar
   591     $(US_EXPORT_POLICY_JAR_DST): $(JDK_TOPDIR)/make/closed/tools/crypto/jce/US_export_policy.jar
   569 	$(ECHO) $(LOG_INFO) Copying $(@F)
   592 	$(ECHO) $(LOG_INFO) Copying $(@F)
   570 	$(install-file)
   593 	$(install-file)
   571 
       
   572 else
   594 else
   573 
   595     $(US_EXPORT_POLICY_JAR_DST): $(US_EXPORT_POLICY_JAR_UNSIGNED)
   574     #
   596 	$(install-file)
   575     # TODO fix so that SetupArchive does not write files into SRCS
   597 endif
   576     #   then we don't need this extra copying
   598 
   577     #
   599 JARS += $(US_EXPORT_POLICY_JAR_DST) $(US_EXPORT_POLICY_JAR_UNSIGNED)
   578     # NOTE:  We currently do not place restrictions on our limited export
   600 
   579     # policy.  This was not a typo.
   601 ##########################################################################################
   580     #
   602 
   581     US_EXPORT_POLICY_JAR_SRC_DIR := $(JDK_TOPDIR)/make/javax/crypto/policy/unlimited
   603 LOCAL_POLICY_JAR_DST := $(IMAGES_OUTPUTDIR)/lib/security/local_policy.jar
   582     US_EXPORT_POLICY_JAR_TMP := $(IMAGES_OUTPUTDIR)/US_export_policy_jar.tmp
   604 LOCAL_POLICY_JAR_UNSIGNED := $(IMAGES_OUTPUTDIR)/unsigned/local_policy.jar
   583 
   605 
   584     $(US_EXPORT_POLICY_JAR_TMP)/% : $(US_EXPORT_POLICY_JAR_SRC_DIR)/%
   606 #
   585 	$(install-file)
   607 # TODO fix so that SetupArchive does not write files into SRCS
   586 
   608 #   then we don't need this extra copying
   587     US_EXPORT_POLICY_JAR_DEPS := $(US_EXPORT_POLICY_JAR_TMP)/default_US_export.policy
   609 #
   588 
   610 LOCAL_POLICY_JAR_TMP := $(IMAGES_OUTPUTDIR)/local_policy_jar.tmp
   589     $(eval $(call SetupArchive,BUILD_US_EXPORT_POLICY_JAR,$(US_EXPORT_POLICY_JAR_DEPS),\
   611 
   590 		SRCS:=$(US_EXPORT_POLICY_JAR_TMP), \
   612 ifeq ($(UNLIMITED_CRYPTO), true)
       
   613     LOCAL_POLICY_JAR_SRC_DIR := $(JDK_TOPDIR)/make/javax/crypto/policy/unlimited
       
   614     LOCAL_POLICY_JAR_DEPS := $(LOCAL_POLICY_JAR_TMP)/default_local.policy
       
   615     LOCAL_POLICY_JAR_ATTR := Crypto-Strength: unlimited
       
   616 else
       
   617     LOCAL_POLICY_JAR_SRC_DIR := $(JDK_TOPDIR)/make/javax/crypto/policy/limited
       
   618     LOCAL_POLICY_JAR_DEPS := $(LOCAL_POLICY_JAR_TMP)/exempt_local.policy \
       
   619                              $(LOCAL_POLICY_JAR_TMP)/default_local.policy
       
   620     LOCAL_POLICY_JAR_ATTR := Crypto-Strength: limited
       
   621 endif
       
   622 
       
   623 $(LOCAL_POLICY_JAR_TMP)/% : $(LOCAL_POLICY_JAR_SRC_DIR)/%
       
   624 	$(install-file)
       
   625 
       
   626 $(eval $(call SetupArchive,BUILD_LOCAL_POLICY_JAR,$(LOCAL_POLICY_JAR_DEPS),\
       
   627 		SRCS:=$(LOCAL_POLICY_JAR_TMP),\
   591 		SUFFIXES:= .policy,\
   628 		SUFFIXES:= .policy,\
   592 		JAR:=$(US_EXPORT_POLICY_JAR_DST), \
   629 		JAR:=$(LOCAL_POLICY_JAR_UNSIGNED), \
   593 		EXTRA_MANIFEST_ATTR := Crypto-Strength: unlimited, \
   630 		EXTRA_MANIFEST_ATTR := $(LOCAL_POLICY_JAR_ATTR), \
   594 		SKIP_METAINF := true))
   631 		SKIP_METAINF := true))
   595 
   632 
   596 endif
       
   597 
       
   598 JARS += $(US_EXPORT_POLICY_JAR_DST)
       
   599 
       
   600 ##########################################################################################
       
   601 
       
   602 LOCAL_POLICY_JAR_DST := $(IMAGES_OUTPUTDIR)/lib/security/local_policy.jar
       
   603 
       
   604 ifndef OPENJDK
   633 ifndef OPENJDK
   605 
       
   606     $(LOCAL_POLICY_JAR_DST): $(JDK_TOPDIR)/make/closed/tools/crypto/jce/local_policy.jar
   634     $(LOCAL_POLICY_JAR_DST): $(JDK_TOPDIR)/make/closed/tools/crypto/jce/local_policy.jar
   607 	$(ECHO) $(LOG_INFO) Copying $(@F)
   635 	$(ECHO) $(LOG_INFO) Copying $(@F)
   608 	$(install-file)
   636 	$(install-file)
   609 
       
   610 else
   637 else
   611 
   638     $(LOCAL_POLICY_JAR_DST): $(LOCAL_POLICY_JAR_UNSIGNED)
   612     #
   639 	$(install-file)
   613     # TODO fix so that SetupArchive does not write files into SRCS
   640 endif
   614     #   then we don't need this extra copying
   641 
   615     #
   642 JARS += $(LOCAL_POLICY_JAR_DST) $(LOCAL_POLICY_JAR_UNSIGNED)
   616     LOCAL_POLICY_JAR_TMP := $(IMAGES_OUTPUTDIR)/local_policy_jar.tmp
       
   617 
       
   618     ifeq ($(UNLIMITED_CRYPTO), true)
       
   619         LOCAL_POLICY_JAR_SRC_DIR := $(JDK_TOPDIR)/make/javax/crypto/policy/unlimited
       
   620         LOCAL_POLICY_JAR_DEPS := $(LOCAL_POLICY_JAR_TMP)/default_local.policy
       
   621         LOCAL_POLICY_JAR_ATTR := Crypto-Strength: unlimited
       
   622     else
       
   623         LOCAL_POLICY_JAR_SRC_DIR := $(JDK_TOPDIR)/make/javax/crypto/policy/limited
       
   624         LOCAL_POLICY_JAR_DEPS := $(LOCAL_POLICY_JAR_TMP)/exempt_local.policy \
       
   625                                  $(LOCAL_POLICY_JAR_TMP)/default_local.policy
       
   626         LOCAL_POLICY_JAR_ATTR := Crypto-Strength: limited
       
   627     endif
       
   628 
       
   629     $(LOCAL_POLICY_JAR_TMP)/% : $(LOCAL_POLICY_JAR_SRC_DIR)/%
       
   630 	$(install-file)
       
   631 
       
   632     $(eval $(call SetupArchive,BUILD_LOCAL_POLICY_JAR,$(LOCAL_POLICY_JAR_DEPS),\
       
   633 		SRCS:=$(LOCAL_POLICY_JAR_TMP),\
       
   634 		SUFFIXES:= .policy,\
       
   635 		JAR:=$(LOCAL_POLICY_JAR_DST), \
       
   636 		EXTRA_MANIFEST_ATTR := $(LOCAL_POLICY_JAR_ATTR), \
       
   637 		SKIP_METAINF := true))
       
   638 
       
   639 endif
       
   640 
       
   641 JARS += $(LOCAL_POLICY_JAR_DST)
       
   642 
   643 
   643 ##########################################################################################
   644 ##########################################################################################
   644 
   645 
   645 ifeq ($(OPENJDK_TARGET_OS),windows)
   646 ifeq ($(OPENJDK_TARGET_OS),windows)
   646 
   647 
   647 SUNMSCAPI_JAR_DST := $(IMAGES_OUTPUTDIR)/lib/ext/sunmscapi.jar
   648 SUNMSCAPI_JAR_DST := $(IMAGES_OUTPUTDIR)/lib/ext/sunmscapi.jar
   648 
   649 SUNMSCAPI_JAR_UNSIGNED := $(IMAGES_OUTPUTDIR)/unsigned/sunmscapi.jar
   649 ifndef OPENJDK
       
   650 SUNMSCAPI_JAR_SRC := $(JDK_TOPDIR)/make/closed/tools/crypto/mscapi/sunmscapi.jar
       
   651 
       
   652 $(SUNMSCAPI_JAR_DST) : $(SUNMSCAPI_JAR_SRC)
       
   653 	@$(ECHO) $(LOG_INFO) "\n>>>Installing prebuilt SunMSCAPI provider..."
       
   654 	$(install-file)
       
   655 
       
   656 else
       
   657 
   650 
   658 $(eval $(call SetupArchive,BUILD_SUNMSCAPI_JAR,,\
   651 $(eval $(call SetupArchive,BUILD_SUNMSCAPI_JAR,,\
   659 		SRCS:=$(JDK_OUTPUTDIR)/classes, \
   652 		SRCS:=$(JDK_OUTPUTDIR)/classes, \
   660 		SUFFIXES:=.class,\
   653 		SUFFIXES:=.class,\
   661 		INCLUDES:= sun/security/mscapi,\
   654 		INCLUDES:= sun/security/mscapi,\
   662 		JAR:=$(SUNMSCAPI_JAR_DST), \
   655 		JAR:=$(SUNMSCAPI_JAR_UNSIGNED), \
       
   656 		MANIFEST:=$(JCE_MANIFEST), \
   663 		SKIP_METAINF:=true))
   657 		SKIP_METAINF:=true))
   664 endif
   658 
   665 
   659 $(SUNMSCAPI_JAR_UNSIGNED): $(JCE_MANIFEST)
   666 JARS += $(SUNMSCAPI_JAR_DST)
   660 
       
   661 ifndef OPENJDK
       
   662     SUNMSCAPI_JAR_SRC := $(JDK_TOPDIR)/make/closed/tools/crypto/mscapi/sunmscapi.jar
       
   663     $(SUNMSCAPI_JAR_DST) : $(SUNMSCAPI_JAR_SRC)
       
   664 	@$(ECHO) $(LOG_INFO) "\n>>>Installing prebuilt SunMSCAPI provider..."
       
   665 	$(install-file)
       
   666 else
       
   667     $(SUNMSCAPI_JAR_DST) : $(SUNMSCAPI_JAR_UNSIGNED)
       
   668 	$(install-file)
       
   669 endif
       
   670 
       
   671 JARS += $(SUNMSCAPI_JAR_DST) $(SUNMSCAPI_JAR_UNSIGNED)
   667 
   672 
   668 endif
   673 endif
   669 
   674 
   670 ##########################################################################################
   675 ##########################################################################################
   671 
   676 
   672 ifeq ($(OPENJDK_TARGET_OS),solaris)
   677 ifeq ($(OPENJDK_TARGET_OS),solaris)
   673 ifndef OPENJDK
   678 ifndef OPENJDK
   674 
   679 
   675 UCRYPTO_JAR_DST := $(IMAGES_OUTPUTDIR)/lib/ext/ucrypto.jar
   680 UCRYPTO_JAR_DST := $(IMAGES_OUTPUTDIR)/lib/ext/ucrypto.jar
       
   681 UCRYPTO_JAR_UNSIGNED := $(IMAGES_OUTPUTDIR)/unsigned/ucrypto.jar
   676 UCRYPTO_JAR_SRC := $(JDK_TOPDIR)/make/closed/tools/crypto/ucrypto/ucrypto.jar
   682 UCRYPTO_JAR_SRC := $(JDK_TOPDIR)/make/closed/tools/crypto/ucrypto/ucrypto.jar
       
   683 
       
   684 $(eval $(call SetupArchive,BUILD_UCRYPTO_JAR,,\
       
   685 		SRCS:=$(JDK_OUTPUTDIR)/classes, \
       
   686 		SUFFIXES:=.class,\
       
   687 		INCLUDES:=com/oracle/security/ucrypto,\
       
   688 		JAR:=$(UCRYPTO_JAR_UNSIGNED), \
       
   689 		MANIFEST:=$(JCE_MANIFEST), \
       
   690 		SKIP_METAINF:=true))
       
   691 
       
   692 $(UCRYPTO_JAR_UNSIGNED): $(JCE_MANIFEST)
   677 
   693 
   678 $(UCRYPTO_JAR_DST) : $(UCRYPTO_JAR_SRC)
   694 $(UCRYPTO_JAR_DST) : $(UCRYPTO_JAR_SRC)
   679 	@$(ECHO) $(LOG_INFO) "\n>>>Installing prebuilt OracleUcrypto provider..."
   695 	@$(ECHO) $(LOG_INFO) "\n>>>Installing prebuilt OracleUcrypto provider..."
   680 	$(install-file)
   696 	$(install-file)
   681 
   697 
   682 JARS += $(UCRYPTO_JAR_DST)
   698 JARS += $(UCRYPTO_JAR_DST) $(UCRYPTO_JAR_UNSIGNED)
   683 
   699 
   684 endif
   700 endif
   685 endif
   701 endif
   686 
   702 
   687 ##########################################################################################
   703 ##########################################################################################
   705 JARS += $(CLDRDATA_JAR_DST)
   721 JARS += $(CLDRDATA_JAR_DST)
   706 
   722 
   707 ##########################################################################################
   723 ##########################################################################################
   708 
   724 
   709 TOOLS_JAR_INCLUDES := \
   725 TOOLS_JAR_INCLUDES := \
   710 	sun/tools/asm		\
   726         com/sun/codemodel       \
   711 	sun/tools/jar		\
   727 	com/sun/istack/internal/tools       \
   712 	sun/tools/java		\
   728 	com/sun/jarsigner	\
   713 	sun/tools/javac		\
       
   714 	sun/tools/jcmd		\
       
   715 	sun/tools/jps		\
       
   716 	sun/tools/jstat		\
       
   717 	sun/tools/jstatd	\
       
   718 	sun/tools/native2ascii	\
       
   719 	sun/tools/serialver	\
       
   720 	sun/tools/tree		\
       
   721 	sun/tools/util		\
       
   722 	sun/security/tools/jarsigner \
       
   723 	sun/rmi/rmic		\
       
   724 	sun/applet		\
       
   725 	sun/jvmstat		\
       
   726 	com/sun/javadoc		\
   729 	com/sun/javadoc		\
   727 	com/sun/jdi		\
   730 	com/sun/jdi		\
   728 	com/sun/jarsigner	\
       
   729 	com/sun/source          \
   731 	com/sun/source          \
       
   732 	com/sun/tools/attach	\
   730 	com/sun/tools/classfile \
   733 	com/sun/tools/classfile \
       
   734 	com/sun/tools/corba     \
   731 	com/sun/tools/doclets   \
   735 	com/sun/tools/doclets   \
   732 	com/sun/tools/doclint   \
   736 	com/sun/tools/doclint   \
   733 	com/sun/tools/example/debug/expr \
   737 	com/sun/tools/example/debug/expr \
   734 	com/sun/tools/example/debug/tty  \
   738 	com/sun/tools/example/debug/tty  \
   735 	com/sun/tools/extcheck  \
   739 	com/sun/tools/extcheck  \
   736 	com/sun/tools/hat       \
   740 	com/sun/tools/hat       \
       
   741         com/sun/tools/internal/jxc             \
       
   742 	com/sun/tools/internal/jxc/ap   \
       
   743 	com/sun/tools/internal/ws       \
       
   744 	com/sun/tools/internal/ws/wscompile/plugin/at_generated \
       
   745 	com/sun/tools/internal/xjc       \
   737 	com/sun/tools/javac     \
   746 	com/sun/tools/javac     \
   738 	com/sun/tools/javadoc   \
   747 	com/sun/tools/javadoc   \
   739 	com/sun/tools/javah     \
   748 	com/sun/tools/javah     \
   740 	com/sun/tools/javap     \
   749 	com/sun/tools/javap     \
   741 	com/sun/tools/jdeps	\
   750 	com/sun/tools/jdeps	\
   742 	com/sun/tools/corba     \
   751 	com/sun/tools/jdi	\
   743 	com/sun/tools/internal/xjc       \
   752 	com/sun/tools/script/shell	\
   744 	com/sun/tools/internal/ws       \
   753 	com/sun/xml/internal/dtdparser \
   745 	com/sun/istack/internal/tools       \
       
   746 	com/sun/tools/internal/jxc/ap   \
       
   747 	com/sun/tools/internal/ws/wscompile/plugin/at_generated \
       
   748         com/sun/codemodel       \
       
   749         com/sun/tools/internal/jxc             \
       
   750         com/sun/xml/internal/rngom       \
   754         com/sun/xml/internal/rngom       \
   751         com/sun/xml/internal/xsom       \
   755         com/sun/xml/internal/xsom       \
   752         org/relaxng/datatype   \
   756         org/relaxng/datatype   \
   753 	com/sun/xml/internal/dtdparser \
   757 	sun/applet		\
   754 	com/sun/tools/jdi	\
   758 	sun/jvmstat		\
   755 	com/sun/tools/script/shell	\
   759 	sun/rmi/rmic		\
   756 	com/sun/tools/attach	\
   760 	sun/security/tools/jarsigner \
       
   761 	sun/tools/asm		\
   757 	sun/tools/attach	\
   762 	sun/tools/attach	\
       
   763 	sun/tools/jar		\
       
   764 	sun/tools/java		\
       
   765 	sun/tools/javac		\
       
   766 	sun/tools/jcmd		\
       
   767 	sun/tools/jinfo         \
       
   768 	sun/tools/jmap		\
       
   769 	sun/tools/jps		\
   758 	sun/tools/jstack        \
   770 	sun/tools/jstack        \
   759 	sun/tools/jinfo         \
   771 	sun/tools/jstat		\
   760 	sun/tools/jmap
   772 	sun/tools/jstatd	\
       
   773 	sun/tools/native2ascii	\
       
   774 	sun/tools/serialver	\
       
   775 	sun/tools/tree		\
       
   776 	sun/tools/util
   761 
   777 
   762 # The sjavac tools is not ready for public consumption.
   778 # The sjavac tools is not ready for public consumption.
   763 TOOLS_JAR_EXCLUDES=com/sun/tools/sjavac
   779 TOOLS_JAR_EXCLUDES=com/sun/tools/sjavac
   764 
   780 
   765 $(eval $(call SetupArchive,BUILD_TOOLS_JAR,,\
   781 $(eval $(call SetupArchive,BUILD_TOOLS_JAR,,\
   819 	    -Acom.sun.tools.javac.sym.Jar=$(IMAGES_OUTPUTDIR)/lib/rt.jar \
   835 	    -Acom.sun.tools.javac.sym.Jar=$(IMAGES_OUTPUTDIR)/lib/rt.jar \
   820 	    -Acom.sun.tools.javac.sym.Dest=$(IMAGES_OUTPUTDIR)/symbols/META-INF/sym/rt.jar \
   836 	    -Acom.sun.tools.javac.sym.Dest=$(IMAGES_OUTPUTDIR)/symbols/META-INF/sym/rt.jar \
   821 	    $(CORE_PKGS) $(NON_CORE_PKGS) $(EXCLUDE_PROPWARN_PKGS) $(EXPORTED_PRIVATE_PKGS)
   837 	    $(CORE_PKGS) $(NON_CORE_PKGS) $(EXCLUDE_PROPWARN_PKGS) $(EXPORTED_PRIVATE_PKGS)
   822 	$(TOUCH) $@
   838 	$(TOUCH) $@
   823 
   839 
   824 $(shell $(MKDIR) -p $(IMAGES_OUTPUTDIR)/symbols)
   840 $(eval $(call MakeDir,$(IMAGES_OUTPUTDIR)/symbols))
   825 $(eval $(call SetupArchive,BUILD_CT_SYM,$(IMAGES_OUTPUTDIR)/symbols/_the.symbols,\
   841 $(eval $(call SetupArchive,BUILD_CT_SYM,$(IMAGES_OUTPUTDIR)/symbols/_the.symbols,\
   826 		SRCS:=$(IMAGES_OUTPUTDIR)/symbols,\
   842 		SRCS:=$(IMAGES_OUTPUTDIR)/symbols,\
   827 		INCLUDES:=META-INF/sym,\
   843 		INCLUDES:=META-INF/sym,\
   828 		JAR:=$(IMAGES_OUTPUTDIR)/lib/ct.sym, \
   844 		JAR:=$(IMAGES_OUTPUTDIR)/lib/ct.sym, \
   829 		CHECK_COMPRESS_JAR:=true))
   845 		CHECK_COMPRESS_JAR:=true))
   831 JARS+=$(IMAGES_OUTPUTDIR)/lib/ct.sym
   847 JARS+=$(IMAGES_OUTPUTDIR)/lib/ct.sym
   832 
   848 
   833 ##########################################################################################
   849 ##########################################################################################
   834 
   850 
   835 SRC_ZIP_INCLUDES = \
   851 SRC_ZIP_INCLUDES = \
       
   852 	com/sun/corba			\
       
   853 	com/sun/image/codec/jpeg	\
       
   854 	com/sun/imageio                 \
       
   855 	com/sun/java_cup		\
       
   856 	com/sun/javadoc			\
       
   857 	com/sun/java/swing		\
       
   858 	com/sun/jlex	        	\
       
   859 	com/sun/jmx			\
       
   860 	com/sun/naming			\
       
   861 	com/sun/org/apache		\
       
   862 	com/sun/security/auth		\
       
   863 	com/sun/security/jgss		\
       
   864 	com/sun/source			\
   836 	java/applet			\
   865 	java/applet			\
   837 	java/awt			\
   866 	java/awt			\
   838 	java/beans			\
   867 	java/beans			\
   839 	java/io				\
   868 	java/io				\
   840 	java/lang			\
   869 	java/lang			\
   844 	java/rmi			\
   873 	java/rmi			\
   845 	java/security			\
   874 	java/security			\
   846 	java/sql			\
   875 	java/sql			\
   847 	java/text			\
   876 	java/text			\
   848 	java/util			\
   877 	java/util			\
   849 	com/sun/corba			\
       
   850 	com/sun/image/codec/jpeg	\
       
   851 	com/sun/imageio                 \
       
   852 	com/sun/java/swing		\
       
   853 	com/sun/javadoc			\
       
   854 	com/sun/jmx			\
       
   855 	com/sun/source			\
       
   856 	com/sun/naming			\
       
   857 	com/sun/security/auth		\
       
   858 	com/sun/security/jgss		\
       
   859 	javax/accessibility		\
   878 	javax/accessibility		\
   860 	javax/annotation		\
   879 	javax/annotation		\
   861 	javax/script			\
       
   862 	javax/imageio			\
   880 	javax/imageio			\
   863 	javax/lang			\
   881 	javax/lang			\
   864 	javax/management		\
   882 	javax/management		\
   865 	javax/naming			\
   883 	javax/naming			\
   866 	javax/print			\
   884 	javax/print			\
   867 	javax/rmi			\
   885 	javax/rmi			\
       
   886 	javax/script			\
   868 	javax/security			\
   887 	javax/security			\
   869 	javax/sound			\
   888 	javax/sound			\
   870 	javax/sql			\
   889 	javax/sql			\
   871 	javax/swing			\
   890 	javax/swing			\
   872 	javax/tools			\
   891 	javax/tools			\
   873 	javax/xml			\
   892 	javax/xml			\
   874 	com/sun/org/apache		\
       
   875 	com/sun/java_cup		\
       
   876 	com/sun/jlex	        	\
       
   877 	org/ietf			\
   893 	org/ietf			\
   878 	org/omg				\
   894 	org/omg				\
   879 	org/w3c/dom			\
   895 	org/w3c/dom			\
   880 	org/xml/sax			\
   896 	org/xml/sax			\
   881 	sunw
   897 	sunw
   964 	$(install-file)
   980 	$(install-file)
   965 
   981 
   966 JARS += $(IMAGES_OUTPUTDIR)/lib/sa-jdi.jar
   982 JARS += $(IMAGES_OUTPUTDIR)/lib/sa-jdi.jar
   967 
   983 
   968 ##########################################################################################
   984 ##########################################################################################
       
   985 #
       
   986 # sec-bin.zip is used by builds where the corresponding sources are not available
       
   987 #
       
   988 $(eval $(call SetupZipArchive,BUILD_SEC_BIN_ZIP,\
       
   989 		SRC:=$(JDK_OUTPUTDIR),\
       
   990 		INCLUDES:=classes/javax/net \
       
   991 			  classes/javax/security/cert \
       
   992 			  classes/com/sun/net/ssl \
       
   993 			  classes/com/sun/security/cert \
       
   994 			  classes/sun/net/www/protocol/https \
       
   995 			  classes/sun/security/pkcs12 \
       
   996 			  classes/sun/security/ssl \
       
   997 			  classes/sun/security/krb5 \
       
   998 			  classes/sun/security/krb5/internal \
       
   999 			  classes/sun/security/krb5/internal/ccache \
       
  1000 			  classes/sun/security/krb5/internal/crypto \
       
  1001 			  classes/sun/security/krb5/internal/ktab \
       
  1002 			  classes/sun/security/krb5/internal/rcache \
       
  1003 			  classes/sun/security/krb5/internal/util,\
       
  1004 		INCLUDE_FILES:=classes/sun/security/jgss/spi/GSSContextSpi.class,\
       
  1005 		EXCLUDES:=classes/sun/security/krb5/internal/tools,\
       
  1006 		ZIP:=$(IMAGES_OUTPUTDIR)/sec-bin.zip))
       
  1007 
       
  1008 JARS += $(IMAGES_OUTPUTDIR)/sec-bin.zip
       
  1009 
       
  1010 ##########################################################################################
       
  1011 #
       
  1012 # Windows specific binary security packages.
       
  1013 #
       
  1014 ifeq ($(OPENJDK_TARGET_OS),windows)
       
  1015     # sec-windows-bin.zip is used by builds where the corresponding sources are not available
       
  1016     $(eval $(call SetupZipArchive,BUILD_SEC_WINDOWS_BIN_ZIP,\
       
  1017 		SRC:=$(JDK_OUTPUTDIR),\
       
  1018 		INCLUDES:=classes/sun/security/krb5/internal/tools,\
       
  1019 		ZIP:=$(IMAGES_OUTPUTDIR)/sec-windows-bin.zip))
       
  1020 
       
  1021     JARS += $(IMAGES_OUTPUTDIR)/sec-windows-bin.zip
       
  1022 
       
  1023     # JGSS files contain the native Kerberos library
       
  1024     ifeq ($(OPENJDK_TARGET_CPU),x86_64)
       
  1025         JGSS_ZIP_NAME=jgss-windows-x64-bin.zip
       
  1026     else
       
  1027         JGSS_ZIP_NAME=jgss-windows-i586-bin.zip
       
  1028     endif
       
  1029 
       
  1030     $(eval $(call SetupZipArchive,BUILD_JGSS_BIN_ZIP,\
       
  1031 		SRC:=$(JDK_OUTPUTDIR),\
       
  1032 		INCLUDE_FILES:=bin/w2k_lsa_auth.dll \
       
  1033 			       bin/w2k_lsa_auth.map \
       
  1034 			       bin/w2k_lsa_auth.pdb,\
       
  1035 		ZIP:=$(IMAGES_OUTPUTDIR)/$(JGSS_ZIP_NAME)))
       
  1036 
       
  1037     JARS += $(IMAGES_OUTPUTDIR)/$(JGSS_ZIP_NAME)
       
  1038 endif
       
  1039 
       
  1040 ##########################################################################################
   969 
  1041 
   970 -include $(CUSTOM_MAKE_DIR)/CreateJars.gmk
  1042 -include $(CUSTOM_MAKE_DIR)/CreateJars.gmk
   971 
  1043 
   972 ##########################################################################################
  1044 ##########################################################################################
   973 
  1045