jdk/makefiles/CompileJavaClasses.gmk
changeset 14231 a0c23c1c010f
parent 13702 efd6a05935b2
child 14344 a5537423264b
child 14343 8e4626a27efe
equal deleted inserted replaced
14104:8d9d430b4244 14231:a0c23c1c010f
    74 	SolarisUserDefinedFileAttributeView.java \
    74 	SolarisUserDefinedFileAttributeView.java \
    75 	SolarisWatchService.java \
    75 	SolarisWatchService.java \
    76 	SolarisAclFileAttributeView.java \
    76 	SolarisAclFileAttributeView.java \
    77 	SolarisLoginModule.java \
    77 	SolarisLoginModule.java \
    78 	SolarisSystem.java \
    78 	SolarisSystem.java \
       
    79         sun/nio/ch/DevPollArrayWrapper.java \
       
    80         sun/nio/ch/DevPollSelectorImpl.java \
       
    81         sun/nio/ch/DevPollSelectorProvider.java \
    79 	sun/nio/ch/EventPortSelectorImpl.java \
    82 	sun/nio/ch/EventPortSelectorImpl.java \
    80 	sun/nio/ch/EventPortSelectorProvider.java \
    83 	sun/nio/ch/EventPortSelectorProvider.java \
    81 	sun/nio/ch/EventPortWrapper.java \
    84 	sun/nio/ch/EventPortWrapper.java \
       
    85         sun/nio/ch/SolarisAsynchronousChannelProvider.java \
       
    86         sun/nio/ch/SolarisEventPort.java \
    82 	sun/tools/attach/SolarisAttachProvider.java \
    87 	sun/tools/attach/SolarisAttachProvider.java \
    83 	sun/tools/attach/SolarisVirtualMachine.java
    88 	sun/tools/attach/SolarisVirtualMachine.java
    84 endif
    89 endif
    85 
    90 
    86 # In the old build, this isn't excluded on macosx, even though it probably
    91 # In the old build, this isn't excluded on macosx, even though it probably
   103     EXCLUDES+=com/sun/java/swing/plaf/gtk
   108     EXCLUDES+=com/sun/java/swing/plaf/gtk
   104 endif
   109 endif
   105 
   110 
   106 ifneq ($(OPENJDK_TARGET_OS),linux)
   111 ifneq ($(OPENJDK_TARGET_OS),linux)
   107     EXFILES+=sun/tools/attach/LinuxAttachProvider.java \
   112     EXFILES+=sun/tools/attach/LinuxAttachProvider.java \
   108 	sun/tools/attach/LinuxVirtualMachine.java \
   113 	     sun/tools/attach/LinuxVirtualMachine.java \
   109 	sun/nio/fs/LinuxDosFileAttributeView.java \
   114              sun/nio/ch/EPoll.java \
   110 	sun/nio/fs/LinuxFileStore.java \
   115              sun/nio/ch/EPollArrayWrapper.java \
   111 	sun/nio/fs/LinuxFileSystem.java \
   116              sun/nio/ch/EPollPort.java \
   112 	sun/nio/fs/LinuxFileSystemProvider.java \
   117              sun/nio/ch/EPollSelectorImpl.java \
   113 	sun/nio/fs/LinuxNativeDispatcher.java \
   118              sun/nio/ch/EPollSelectorProvider.java \
   114 	sun/nio/fs/LinuxUserDefinedFileAttributeView.java \
   119              sun/nio/ch/LinuxAsynchronousChannelProvider.java \
   115 	sun/nio/fs/LinuxWatchService.java
   120 	     sun/nio/fs/LinuxDosFileAttributeView.java \
       
   121 	     sun/nio/fs/LinuxFileStore.java \
       
   122 	     sun/nio/fs/LinuxFileSystem.java \
       
   123 	     sun/nio/fs/LinuxFileSystemProvider.java \
       
   124 	     sun/nio/fs/LinuxNativeDispatcher.java \
       
   125 	     sun/nio/fs/LinuxUserDefinedFileAttributeView.java \
       
   126 	     sun/nio/fs/LinuxWatchService.java
   116 endif
   127 endif
   117 
   128 
   118 ifneq ($(OPENJDK_TARGET_OS),macosx)
   129 ifneq ($(OPENJDK_TARGET_OS),macosx)
   119     EXFILES+=sun/nio/fs/BsdFileStore.java \
   130     EXFILES+=sun/nio/ch/BsdAsynchronousChannelProvider.java \
       
   131              sun/nio/ch/KQueue.java \
       
   132              sun/nio/ch/KQueuePort.java \
       
   133              sun/nio/fs/BsdFileStore.java \
   120 	     sun/nio/fs/BsdFileSystem.java \
   134 	     sun/nio/fs/BsdFileSystem.java \
   121              sun/nio/fs/BsdFileSystemProvider.java \
   135              sun/nio/fs/BsdFileSystemProvider.java \
   122              sun/nio/fs/BsdNativeDispatcher.java \
   136              sun/nio/fs/BsdNativeDispatcher.java \
   123              sun/nio/fs/MacOSXFileSystemProvider.java \
   137              sun/nio/fs/MacOSXFileSystemProvider.java \
   124              sun/nio/fs/MacOSXFileSystem.java \
   138              sun/nio/fs/MacOSXFileSystem.java \
   145 ifeq (,$(filter $(OPENJDK_TARGET_OS), windows macosx))
   159 ifeq (,$(filter $(OPENJDK_TARGET_OS), windows macosx))
   146     EXFILES+=sun/awt/AWTCharset.java
   160     EXFILES+=sun/awt/AWTCharset.java
   147 endif
   161 endif
   148 
   162 
   149 ifneq ($(OPENJDK_TARGET_OS), macosx)
   163 ifneq ($(OPENJDK_TARGET_OS), macosx)
   150 #
   164     EXFILES+=sun/awt/X11/ScreenFormat.java \
   151 # Not in rt.jar on solaris and linux...(windows not checked)
   165              sun/awt/X11/XArc.java \
   152 #     in rt.jar on macosx ??
   166              sun/awt/X11/XChar2b.java \
   153 EXFILES+=sun/awt/X11/ScreenFormat.java \
   167              sun/awt/X11/XCharStruct.java \
   154          sun/awt/X11/XArc.java \
   168              sun/awt/X11/XClassHint.java \
   155          sun/awt/X11/XChar2b.java \
   169              sun/awt/X11/XComposeStatus.java \
   156          sun/awt/X11/XCharStruct.java \
   170              sun/awt/X11/XExtCodes.java \
   157          sun/awt/X11/XClassHint.java \
   171              sun/awt/X11/XFontProp.java \
   158          sun/awt/X11/XComposeStatus.java \
   172              sun/awt/X11/XFontSetExtents.java \
   159          sun/awt/X11/XExtCodes.java \
   173              sun/awt/X11/XFontStruct.java \
   160          sun/awt/X11/XFontProp.java \
   174              sun/awt/X11/XGCValues.java \
   161          sun/awt/X11/XFontSetExtents.java \
   175              sun/awt/X11/XHostAddress.java \
   162          sun/awt/X11/XFontStruct.java \
   176              sun/awt/X11/XIMCallback.java \
   163          sun/awt/X11/XGCValues.java \
   177              sun/awt/X11/XIMHotKeyTrigger.java \
   164          sun/awt/X11/XHostAddress.java \
   178              sun/awt/X11/XIMHotKeyTriggers.java \
   165          sun/awt/X11/XIMCallback.java \
   179              sun/awt/X11/XIMPreeditCaretCallbackStruct.java \
   166          sun/awt/X11/XIMHotKeyTrigger.java \
   180              sun/awt/X11/XIMPreeditDrawCallbackStruct.java \
   167          sun/awt/X11/XIMHotKeyTriggers.java \
   181              sun/awt/X11/XIMPreeditStateNotifyCallbackStruct.java \
   168          sun/awt/X11/XIMPreeditCaretCallbackStruct.java \
   182              sun/awt/X11/XIMStatusDrawCallbackStruct.java \
   169          sun/awt/X11/XIMPreeditDrawCallbackStruct.java \
   183              sun/awt/X11/XIMStringConversionCallbackStruct.java \
   170          sun/awt/X11/XIMPreeditStateNotifyCallbackStruct.java \
   184              sun/awt/X11/XIMStringConversionText.java \
   171          sun/awt/X11/XIMStatusDrawCallbackStruct.java \
   185              sun/awt/X11/XIMStyles.java \
   172          sun/awt/X11/XIMStringConversionCallbackStruct.java \
   186              sun/awt/X11/XIMText.java \
   173          sun/awt/X11/XIMStringConversionText.java \
   187              sun/awt/X11/XIMValuesList.java \
   174          sun/awt/X11/XIMStyles.java \
   188              sun/awt/X11/XImage.java \
   175          sun/awt/X11/XIMText.java \
   189              sun/awt/X11/XKeyboardControl.java \
   176          sun/awt/X11/XIMValuesList.java \
   190              sun/awt/X11/XKeyboardState.java \
   177          sun/awt/X11/XImage.java \
   191              sun/awt/X11/XOMCharSetList.java \
   178          sun/awt/X11/XKeyboardControl.java \
   192              sun/awt/X11/XOMFontInfo.java \
   179          sun/awt/X11/XKeyboardState.java \
   193              sun/awt/X11/XOMOrientation.java \
   180          sun/awt/X11/XOMCharSetList.java \
   194              sun/awt/X11/XPoint.java \
   181          sun/awt/X11/XOMFontInfo.java \
   195              sun/awt/X11/XRectangle.java \
   182          sun/awt/X11/XOMOrientation.java \
   196              sun/awt/X11/XSegment.java \
   183          sun/awt/X11/XPoint.java \
   197              sun/awt/X11/XStandardColormap.java \
   184          sun/awt/X11/XRectangle.java \
   198              sun/awt/X11/XTextItem.java \
   185          sun/awt/X11/XSegment.java \
   199              sun/awt/X11/XTextItem16.java \
   186          sun/awt/X11/XStandardColormap.java \
   200              sun/awt/X11/XTextProperty.java \
   187          sun/awt/X11/XTextItem.java \
   201              sun/awt/X11/XTimeCoord.java \
   188          sun/awt/X11/XTextItem16.java \
   202              sun/awt/X11/XWindowChanges.java \
   189          sun/awt/X11/XTextProperty.java \
   203              sun/awt/X11/XdbeSwapInfo.java \
   190          sun/awt/X11/XTimeCoord.java \
   204              sun/awt/X11/XmbTextItem.java \
   191          sun/awt/X11/XWindowChanges.java \
   205              sun/awt/X11/XwcTextItem.java
   192          sun/awt/X11/XdbeSwapInfo.java \
       
   193          sun/awt/X11/XmbTextItem.java \
       
   194          sun/awt/X11/XwcTextItem.java
       
   195 endif
   206 endif
   196 
   207 
   197 # Exclude another implicitly not included file.
   208 # Exclude another implicitly not included file.
   198 EXFILES+=sun/util/locale/AsciiUtil.java
   209 EXFILES+=sun/util/locale/AsciiUtil.java
   199 
   210 
   227     EXFILES+=sun/net/sdp/SdpProvider.java
   238     EXFILES+=sun/net/sdp/SdpProvider.java
   228 else
   239 else
   229     EXFILES+=sun/net/www/protocol/http/ntlm/NTLMAuthSequence.java
   240     EXFILES+=sun/net/www/protocol/http/ntlm/NTLMAuthSequence.java
   230 endif
   241 endif
   231 
   242 
   232 ifdef DISABLE_NIMBUS
   243 # Exclude nimbus files from rt.jar
   233     # TODO: need to check when it happens
   244 EXFILES+=javax/swing/plaf/nimbus/InternalFrameTitlePanePainter.java \
   234     # Exclude nimus if disabled
   245 				 javax/swing/plaf/nimbus/OptionPaneMessageAreaPainter.java \
   235     EXCLUDES+=	javax/swing/plaf/nimbus \
   246 				 javax/swing/plaf/nimbus/ScrollBarPainter.java \
   236 		com/sun/java/swing/plaf/nimbus
   247 				 javax/swing/plaf/nimbus/SliderPainter.java \
   237 else
   248 				 javax/swing/plaf/nimbus/SpinnerPainter.java \
   238 #
   249 				 javax/swing/plaf/nimbus/SplitPanePainter.java \
   239 # These are never put into rt.jar
   250 				 javax/swing/plaf/nimbus/TabbedPanePainter.java
   240 #
       
   241 EXFILES+=  javax/swing/plaf/nimbus/InternalFrameTitlePanePainter.java \
       
   242            javax/swing/plaf/nimbus/OptionPaneMessageAreaPainter.java \
       
   243            javax/swing/plaf/nimbus/ScrollBarPainter.java \
       
   244            javax/swing/plaf/nimbus/SliderPainter.java \
       
   245            javax/swing/plaf/nimbus/SpinnerPainter.java \
       
   246            javax/swing/plaf/nimbus/SplitPanePainter.java \
       
   247            javax/swing/plaf/nimbus/TabbedPanePainter.java
       
   248 endif
       
   249 
   251 
   250 # Acquire a list of files that should be copied straight over to the classes.
   252 # Acquire a list of files that should be copied straight over to the classes.
   251 include CopyIntoClasses.gmk
   253 include CopyIntoClasses.gmk
   252 # Now we have COPY_PATTERNS, COPY_FILES and COPY_EXTRA
   254 # Now we have COPY_PATTERNS, COPY_FILES and COPY_EXTRA
   253 
   255 
   254 ifndef OPENJDK
   256 ifndef OPENJDK
   255     CLOSED_SRC_DIRS:=$(JDK_TOPDIR)/src/closed/share/classes \
   257     CLOSED_SRC_DIRS:=$(JDK_TOPDIR)/src/closed/share/classes
   256 		     $(JDK_TOPDIR)/src/closed/$(OPENJDK_TARGET_OS_API_DIR)/classes
   258     ifneq ($(OPENJDK_TARGET_OS_API_DIR),windows)
       
   259       CLOSED_SRC_DIRS += $(JDK_TOPDIR)/src/closed/$(OPENJDK_TARGET_OS_API_DIR)/classes
       
   260     endif
   257 endif
   261 endif
   258 
   262 
   259 MACOSX_SRC_DIRS :=
   263 MACOSX_SRC_DIRS :=
   260 ifeq ($(OPENJDK_TARGET_OS),macosx)
   264 ifeq ($(OPENJDK_TARGET_OS),macosx)
   261      MACOSX_SRC_DIRS += $(JDK_TOPDIR)/src/macosx/classes
   265      MACOSX_SRC_DIRS += $(JDK_TOPDIR)/src/macosx/classes
   292                 SETUP:=GENERATE_JDKBYTECODE,\
   296                 SETUP:=GENERATE_JDKBYTECODE,\
   293 		SRC:=$(JDK_TOPDIR)/src/share/classes \
   297 		SRC:=$(JDK_TOPDIR)/src/share/classes \
   294 		     $(JDK_TOPDIR)/src/$(OPENJDK_TARGET_OS_API_DIR)/classes \
   298 		     $(JDK_TOPDIR)/src/$(OPENJDK_TARGET_OS_API_DIR)/classes \
   295 		     $(MACOSX_SRC_DIRS) \
   299 		     $(MACOSX_SRC_DIRS) \
   296 		     $(JDK_OUTPUTDIR)/gensrc \
   300 		     $(JDK_OUTPUTDIR)/gensrc \
   297 		     $(JDK_OUTPUTDIR)/gensrc_swing/javax/swing/beaninfo \
       
   298 		     $(CLOSED_SRC_DIRS),\
   301 		     $(CLOSED_SRC_DIRS),\
   299 		INCLUDES:=$(JDK_USER_DEFINED_FILTER),\
   302 		INCLUDES:=$(JDK_USER_DEFINED_FILTER),\
   300 		EXCLUDES:=$(EXCLUDES),\
   303 		EXCLUDES:=$(EXCLUDES),\
   301 		EXCLUDE_FILES:=$(EXFILES),\
   304 		EXCLUDE_FILES:=$(EXFILES),\
   302 		BIN:=$(JDK_OUTPUTDIR)/classes,\
   305 		BIN:=$(JDK_OUTPUTDIR)/classes,\
   324 				$(subst .,/,$(JDK_BASE_HEADER_CLASSES_WINDOWS)))
   327 				$(subst .,/,$(JDK_BASE_HEADER_CLASSES_WINDOWS)))
   325 endif
   328 endif
   326 
   329 
   327 # Set prereqs to the java files since make doesn't know about the class files. Add BUILD_JDK
   330 # Set prereqs to the java files since make doesn't know about the class files. Add BUILD_JDK
   328 # as an order only dependency to avoid race with the java compilation.
   331 # as an order only dependency to avoid race with the java compilation.
   329 $(JDK_OUTPUTDIR)/classes/_the.jdk.base.headers: $(JDK_BASE_HEADER_JAVA_FILES) | $(BUILD_JDK)
   332 $(JDK_OUTPUTDIR)/gensrc_headers/_the.jdk.base.headers: $(JDK_BASE_HEADER_JAVA_FILES) | $(BUILD_JDK)
   330 	$(ECHO) Generating headers for jdk base classes
   333 	$(ECHO) Generating headers for jdk base classes
   331 	$(JAVAH) -bootclasspath $(JDK_OUTPUTDIR)/classes -d $(JDK_OUTPUTDIR)/gensrc_headers \
   334 	$(JAVAH) -bootclasspath $(JDK_OUTPUTDIR)/classes -d $(JDK_OUTPUTDIR)/gensrc_headers \
   332 		$(JDK_BASE_HEADER_CLASSES)
   335 		$(JDK_BASE_HEADER_CLASSES)
   333 	$(TOUCH) $@
   336 	$(TOUCH) $@
   334 
   337 
   414 
   417 
   415 ##########################################################################################
   418 ##########################################################################################
   416 
   419 
   417 # copy with -a to preserve timestamps so dependencies down the line aren't messed up
   420 # copy with -a to preserve timestamps so dependencies down the line aren't messed up
   418 all: $(BUILD_JDK) $(JARS) $(COPY_EXTRA) $(JDK_OUTPUTDIR)/classes/META-INF/services/com.sun.tools.xjc.Plugin \
   421 all: $(BUILD_JDK) $(JARS) $(COPY_EXTRA) $(JDK_OUTPUTDIR)/classes/META-INF/services/com.sun.tools.xjc.Plugin \
   419 	$(JDK_OUTPUTDIR)/classes/_the.jdk.base.headers
   422 	$(JDK_OUTPUTDIR)/gensrc_headers/_the.jdk.base.headers
   420 
   423 
   421 .PHONY: all
   424 .PHONY: all