Changeset 144 for trunk/openjdk/jdk/make/sun

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/sun

Files:

• Makefile (modified) (2 diffs)
• net/FILES_java.gmk (modified) (2 diffs)

trunk/openjdk/jdk/make/sun/Makefile

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

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

@@ -88 +88 @@
         sun/net/www/protocol/http/NegotiatorImpl.java \
         sun/net/www/protocol/http/NegotiateCallbackHandler.java \
+
+ifndef OS2_TEMP # security
+FILES_java += \
         sun/net/www/protocol/https/AbstractDelegateHttpsURLConnection.java \
         sun/net/www/protocol/https/HttpsClient.java \
@@ -94 +97 @@
         sun/net/www/protocol/https/DelegateHttpsURLConnection.java \
         sun/net/www/protocol/https/Handler.java \
+
+endif
+FILES_java += \
         sun/net/www/protocol/jar/Handler.java \
         sun/net/www/protocol/jar/URLJarFile.java \