Changeset 144


Ignore:
Timestamp:
Sep 4, 2010, 1:44:54 AM (15 years ago)
Author:
dmik
Message:

jdk/make: Added ifndef OS2_TEMP to disable various components we don't yet support and thus make it possible to have a full build cycle.

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

Legend:

Unmodified
Added
Removed

  • trunk/openjdk/jdk/make/Makefile

    r27 r144  
    260260all build:: sanity-all post-sanity-all
    261261
     262ifndef OS2_TEMP
    262263SUBDIRS    = tools java javax org sun sunw com jpda mkdemo mksample launchers
     264else
     265SUBDIRS    = tools java org sun sunw com launchers
     266endif
    263267all build::
    264268        $(SUBDIRS-loop)

  • trunk/openjdk/jdk/make/com/sun/Makefile

    r2 r144  
    4040
    4141# Omit mirror since it's built with the apt tool.
     42ifndef OS2_TEMP # security
    4243SUBDIRS = $(SCRIPT_SUBDIR) image security crypto/provider jndi jmx \
    4344    java inputmethods org rowset net/httpserver net/ssl demo \
    4445    tools jarsigner
     46else
     47SUBDIRS = $(SCRIPT_SUBDIR) jndi jmx \
     48    java org rowset net/httpserver demo \
     49    jarsigner
     50endif
    4551
    4652all build clean clobber::

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

    r69 r144  
    337337#
    338338TOOLS = \
     339
     340ifndef OS2_TEMP # security
     341TOOLS += \
    339342        META-INF/services/com.sun.jdi.connect.Connector \
    340343        META-INF/services/com.sun.jdi.connect.spi.TransportService \
     344
     345endif
     346TOOLS += \
    341347        sun/tools/asm           \
    342348        sun/tools/jar           \
    … …  
    351357        sun/tools/tree          \
    352358        sun/tools/util          \
     359
     360ifndef OS2_TEMP # security
     361TOOLS += \
    353362        sun/security/tools/JarBASE64Encoder.class \
    354363        sun/security/tools/JarSigner.class \
    … …  
    360369        sun/security/tools/SignatureFile.class \
    361370        sun/security/tools/TimestampedSigner.class \
     371
     372endif
     373TOOLS += \
    362374        sun/rmi/rmic            \
    363375        sun/applet              \
    364376        sun/jvmstat             \
    365377        com/sun/javadoc         \
     378
     379ifndef OS2_TEMP # JPDA
     380TOOLS += \
    366381        com/sun/jdi             \
     382
     383endif
     384TOOLS += \
    367385        com/sun/jarsigner       \
    368386        com/sun/mirror          \
    369387        com/sun/source          \
    370388        com/sun/tools/doclets   \
     389
     390ifndef OS2_TEMP # JPDA
     391TOOLS += \
    371392        com/sun/tools/example/debug/expr \
    372393        com/sun/tools/example/debug/tty  \
    373394        com/sun/tools/extcheck  \
     395
     396endif
     397TOOLS += \
    374398        com/sun/tools/hat       \
    375399        com/sun/tools/javac     \
    … …  
    390414        org/relaxng/datatype   \
    391415        com/sun/xml/internal/dtdparser \
     416
     417ifndef OS2_TEMP # JPDA
     418TOOLS += \
    392419        com/sun/tools/jdi       \
     420
     421endif
     422TOOLS += \
    393423        com/sun/tools/script/shell      \
     424
     425ifndef OS2_TEMP # com.sun.tools.attach
     426TOOLS += \
    394427        META-INF/services/com.sun.tools.attach.spi.AttachProvider \
    395428        com/sun/tools/attach    \
    396429        sun/tools/attach        \
     430
     431endif
     432TOOLS += \
    397433        sun/tools/jstack        \
    398434        sun/tools/jinfo         \
    … …  
    660696        @$(java-vm-cleanup)
    661697
     698ifndef OS2_TEMP # security
    662699# Create jsse.jar containing SunJSSE implementation classes
    663700JSSE_JAR=$(TEMPDIR)/jsse-orig.jar
    … …  
    668705                $(JAR_JFLAGS)
    669706        @$(java-vm-cleanup)
     707endif
    670708
    671709# Create sec-bin.zip
    … …  
    776814        $(CP) $(RT_JAR) $(JRE_IMAGE_DIR)/lib/rt.jar
    777815        $(CP) $(RESOURCES_JAR) $(JRE_IMAGE_DIR)/lib/resources.jar
     816ifndef OS2_TEMP # security     
    778817        $(CP) $(JSSE_JAR) $(JRE_IMAGE_DIR)/lib/jsse.jar
     818endif
    779819        @# Generate meta-index to make boot and extension class loaders lazier
    780820        $(CD) $(JRE_IMAGE_DIR)/lib && \
    … …  
    911951        @#
    912952        $(CP) $(LIBDIR)/$(LIB_PREFIX)jvm.$(LIB_SUFFIX) $(JDK_IMAGE_DIR)/lib
     953ifndef OS2_TEMP
    913954        $(CP) $(LIBDIR)/$(LIB_PREFIX)jawt.$(LIB_SUFFIX) $(JDK_IMAGE_DIR)/lib
     955endif
    914956        @#
    915957        @# bin/
    … …  
    9801022        @# So for Linux, make use of the -T option (like Solaris' -I option) of
    9811023        @# obtaining the list of files from a file. MKS tar has no such option.
    982   ifeq ($(PLATFORM), linux)
     1024  ifeq ($(filter-out linux os2, $(PLATFORM)),)
    9831025        for d in $(SOURCE_DIRS); do \
    9841026          $(RM) $(ABS_TEMPDIR)/src-files.list; \
    … …  
    10371079        @# demo, include
    10381080        @#
     1081ifndef OS2_TEMP
    10391082        $(CP) -r -f $(DEMODIR) $(JDK_IMAGE_DIR)
    10401083        $(CP) -r -f $(SAMPLEDIR) $(JDK_IMAGE_DIR)
    … …  
    10441087        @#
    10451088        $(CD) javax/swing/beaninfo && $(MAKE) swing-1.2-beans
     1089endif
    10461090ifneq ($(filter-out windows os2, $(PLATFORM)),)
    10471091        $(call copy-man-pages,$(JDK_IMAGE_DIR),$(JDK_MAN_PAGES))

  • trunk/openjdk/jdk/make/sun/Makefile

    r74 r144  
    6262  RENDER_SUBDIR = dcpr
    6363endif
     64ifndef OS2_TEMP # security, GUI stuff
    6465SUBDIRS = jar security javazic misc net audio $(RENDER_SUBDIR) image \
    6566          awt splashscreen $(XAWT_SUBDIR) $(MOTIF_SUBDIRS) \
    … …  
    6869          jawt text nio launcher management $(ORG_SUBDIR) \
    6970          native2ascii serialver tools jconsole
     71else
     72SUBDIRS = jar javazic misc net \
     73          rmi beans $(JDBC_SUBDIR) \
     74          text nio launcher management $(ORG_SUBDIR) \
     75          native2ascii serialver tools jconsole
     76endif
    7077
    7178all build clean clobber::

  • trunk/openjdk/jdk/make/sun/net/FILES_java.gmk

    r74 r144  
    8888        sun/net/www/protocol/http/NegotiatorImpl.java \
    8989        sun/net/www/protocol/http/NegotiateCallbackHandler.java \
     90
     91ifndef OS2_TEMP # security
     92FILES_java += \
    9093        sun/net/www/protocol/https/AbstractDelegateHttpsURLConnection.java \
    9194        sun/net/www/protocol/https/HttpsClient.java \
    … …  
    9497        sun/net/www/protocol/https/DelegateHttpsURLConnection.java \
    9598        sun/net/www/protocol/https/Handler.java \
     99
     100endif
     101FILES_java += \
    96102        sun/net/www/protocol/jar/Handler.java \
    97103        sun/net/www/protocol/jar/URLJarFile.java \
Note: See TracChangeset for help on using the changeset viewer.