Changeset 158


Ignore:
Timestamp:
Sep 21, 2010, 2:32:41 PM (10 years ago)
Author:
dmik
Message:

jdk/make: Enabled packaging security classes.

Location:
trunk/openjdk/jdk/make
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • trunk/openjdk/jdk/make/Makefile

    r144 r158  
    262262ifndef OS2_TEMP
    263263SUBDIRS    = tools java javax org sun sunw com jpda mkdemo mksample launchers
    264 else
     264else # disable various stuff
    265265SUBDIRS    = tools java org sun sunw com launchers
    266266endif
  • trunk/openjdk/jdk/make/common/Release.gmk

    r144 r158  
    338338TOOLS = \
    339339
    340 ifndef OS2_TEMP # security
     340ifndef OS2_TEMP # JPDA
    341341TOOLS += \
    342342        META-INF/services/com.sun.jdi.connect.Connector \
     
    357357        sun/tools/tree          \
    358358        sun/tools/util          \
    359 
    360 ifndef OS2_TEMP # security
    361 TOOLS += \
    362359        sun/security/tools/JarBASE64Encoder.class \
    363360        sun/security/tools/JarSigner.class \
     
    369366        sun/security/tools/SignatureFile.class \
    370367        sun/security/tools/TimestampedSigner.class \
    371 
    372 endif
    373 TOOLS += \
    374368        sun/rmi/rmic            \
    375369        sun/applet              \
     
    423417        com/sun/tools/script/shell      \
    424418
    425 ifndef OS2_TEMP # com.sun.tools.attach
     419ifndef OS2_TEMP # disable com.sun.tools.attach (see ticket:18)
    426420TOOLS += \
    427421        META-INF/services/com.sun.tools.attach.spi.AttachProvider \
     
    696690        @$(java-vm-cleanup)
    697691
    698 ifndef OS2_TEMP # security
    699692# Create jsse.jar containing SunJSSE implementation classes
    700693JSSE_JAR=$(TEMPDIR)/jsse-orig.jar
     
    705698                $(JAR_JFLAGS)
    706699        @$(java-vm-cleanup)
    707 endif
    708700
    709701# Create sec-bin.zip
     
    814806        $(CP) $(RT_JAR) $(JRE_IMAGE_DIR)/lib/rt.jar
    815807        $(CP) $(RESOURCES_JAR) $(JRE_IMAGE_DIR)/lib/resources.jar
    816 ifndef OS2_TEMP # security     
    817808        $(CP) $(JSSE_JAR) $(JRE_IMAGE_DIR)/lib/jsse.jar
    818 endif
    819809        @# Generate meta-index to make boot and extension class loaders lazier
    820810        $(CD) $(JRE_IMAGE_DIR)/lib && \
     
    951941        @#
    952942        $(CP) $(LIBDIR)/$(LIB_PREFIX)jvm.$(LIB_SUFFIX) $(JDK_IMAGE_DIR)/lib
    953 ifndef OS2_TEMP
     943ifndef OS2_TEMP # GUI stuff
    954944        $(CP) $(LIBDIR)/$(LIB_PREFIX)jawt.$(LIB_SUFFIX) $(JDK_IMAGE_DIR)/lib
    955945endif
     
    10791069        @# demo, include
    10801070        @#
    1081 ifndef OS2_TEMP
     1071ifndef OS2_TEMP # later
    10821072        $(CP) -r -f $(DEMODIR) $(JDK_IMAGE_DIR)
    10831073        $(CP) -r -f $(SAMPLEDIR) $(JDK_IMAGE_DIR)
     1074endif   
    10841075        $(CP) -r $(INCLUDEDIR) $(JDK_IMAGE_DIR)
     1076ifndef OS2_TEMP # GUI stuff
    10851077        @#
    10861078        @# Swing BeanInfo generation
  • trunk/openjdk/jdk/make/sun/Makefile

    r154 r158  
    6262  RENDER_SUBDIR = dcpr
    6363endif
    64 ifndef OS2_TEMP # GUI stuff
     64ifndef OS2_TEMP
    6565SUBDIRS = jar security javazic misc net audio $(RENDER_SUBDIR) image \
    6666          awt splashscreen $(XAWT_SUBDIR) $(MOTIF_SUBDIRS) \
     
    6969          jawt text nio launcher management $(ORG_SUBDIR) \
    7070          native2ascii serialver tools jconsole
    71 else
     71else # disable GUI stuff
    7272SUBDIRS = jar security javazic misc net \
    7373          rmi beans $(JDBC_SUBDIR) \
Note: See TracChangeset for help on using the changeset viewer.