Changeset 158

Timestamp:

Sep 21, 2010, 4:32:41 PM (15 years ago)

Author:

dmik

Message:

jdk/make: Enabled packaging security classes.

Location:

trunk/openjdk/jdk/make

Files:

• Makefile (modified) (1 diff)
• common/Release.gmk (modified) (9 diffs)
• sun/Makefile (modified) (2 diffs)

trunk/openjdk/jdk/make/Makefile

@@ -262 +262 @@
 ifndef OS2_TEMP
 SUBDIRS    = tools java javax org sun sunw com jpda mkdemo mksample launchers
-else
+else # disable various stuff
 SUBDIRS    = tools java org sun sunw com launchers
 endif

trunk/openjdk/jdk/make/common/Release.gmk

@@ -338 +338 @@
 TOOLS = \
 
-ifndef OS2_TEMP # security
+ifndef OS2_TEMP # JPDA
 TOOLS += \
         META-INF/services/com.sun.jdi.connect.Connector \
@@ -357 +357 @@
         sun/tools/tree          \
         sun/tools/util          \
-
-ifndef OS2_TEMP # security
-TOOLS += \
         sun/security/tools/JarBASE64Encoder.class \
         sun/security/tools/JarSigner.class \
@@ -369 +366 @@
         sun/security/tools/SignatureFile.class \
         sun/security/tools/TimestampedSigner.class \
-
-endif
-TOOLS += \
         sun/rmi/rmic            \
         sun/applet              \
@@ -423 +417 @@
         com/sun/tools/script/shell      \
 
-ifndef OS2_TEMP # com.sun.tools.attach
+ifndef OS2_TEMP # disable com.sun.tools.attach (see ticket:18)
 TOOLS += \
         META-INF/services/com.sun.tools.attach.spi.AttachProvider \
@@ -696 +690 @@
         @$(java-vm-cleanup)
 
-ifndef OS2_TEMP # security
 # Create jsse.jar containing SunJSSE implementation classes
 JSSE_JAR=$(TEMPDIR)/jsse-orig.jar
@@ -705 +698 @@
                 $(JAR_JFLAGS)
         @$(java-vm-cleanup)
-endif
 
 # Create sec-bin.zip
@@ -814 +806 @@
         $(CP) $(RT_JAR) $(JRE_IMAGE_DIR)/lib/rt.jar
         $(CP) $(RESOURCES_JAR) $(JRE_IMAGE_DIR)/lib/resources.jar
-ifndef OS2_TEMP # security      
         $(CP) $(JSSE_JAR) $(JRE_IMAGE_DIR)/lib/jsse.jar
-endif
         @# Generate meta-index to make boot and extension class loaders lazier
         $(CD) $(JRE_IMAGE_DIR)/lib && \
@@ -951 +941 @@
         @#
         $(CP) $(LIBDIR)/$(LIB_PREFIX)jvm.$(LIB_SUFFIX) $(JDK_IMAGE_DIR)/lib
-ifndef OS2_TEMP
+ifndef OS2_TEMP # GUI stuff
         $(CP) $(LIBDIR)/$(LIB_PREFIX)jawt.$(LIB_SUFFIX) $(JDK_IMAGE_DIR)/lib
 endif
@@ -1079 +1069 @@
         @# demo, include
         @#
-ifndef OS2_TEMP
+ifndef OS2_TEMP # later
         $(CP) -r -f $(DEMODIR) $(JDK_IMAGE_DIR)
         $(CP) -r -f $(SAMPLEDIR) $(JDK_IMAGE_DIR)
+endif   
         $(CP) -r $(INCLUDEDIR) $(JDK_IMAGE_DIR)
+ifndef OS2_TEMP # GUI stuff
         @#
         @# Swing BeanInfo generation

trunk/openjdk/jdk/make/sun/Makefile

@@ -62 +62 @@
   RENDER_SUBDIR = dcpr
 endif
-ifndef OS2_TEMP # GUI stuff
+ifndef OS2_TEMP
 SUBDIRS = jar security javazic misc net audio $(RENDER_SUBDIR) image \
           awt splashscreen $(XAWT_SUBDIR) $(MOTIF_SUBDIRS) \
@@ -69 +69 @@
           jawt text nio launcher management $(ORG_SUBDIR) \
           native2ascii serialver tools jconsole
-else
+else # disable GUI stuff
 SUBDIRS = jar security javazic misc net \
           rmi beans $(JDBC_SUBDIR) \