jdk/makefiles/CompileJavaClasses.gmk
changeset 22317 b420ef26d238
parent 20102 30b8aaa80ae2
parent 22307 8860c4df071b
child 22332 fba4c66089bb
equal deleted inserted replaced
20851:9f284cf7836b 22317:b420ef26d238
   269                $(JDK_TOPDIR)/src/solaris/classes/java/net/DefaultInterface.java \
   269                $(JDK_TOPDIR)/src/solaris/classes/java/net/DefaultInterface.java \
   270                $(JDK_TOPDIR)/src/solaris/classes/java/lang/ClassLoaderHelper.java \
   270                $(JDK_TOPDIR)/src/solaris/classes/java/lang/ClassLoaderHelper.java \
   271                $(JDK_TOPDIR)/src/solaris/classes/sun/util/locale/provider/HostLocaleProviderAdapterImpl.java \
   271                $(JDK_TOPDIR)/src/solaris/classes/sun/util/locale/provider/HostLocaleProviderAdapterImpl.java \
   272                $(JDK_TOPDIR)/src/solaris/classes/sun/nio/fs/GnomeFileTypeDetector.java
   272                $(JDK_TOPDIR)/src/solaris/classes/sun/nio/fs/GnomeFileTypeDetector.java
   273 
   273 
   274      # JObjC.jar contains 1.5 byte-code...so skip it here :-(
       
   275      # MACOSX_SRC_DIRS += $(JDK_TOPDIR)/src/macosx/native/jobjc/src
       
   276      # EXCLUDES+= tests/java/com/apple/jobjc
       
   277 
       
   278      EXCLUDES+= com/apple/jobjc
       
   279 endif
   274 endif
   280 
   275 
   281 # The exception handling of swing beaninfo
   276 # The exception handling of swing beaninfo
   282 # These resources violates the convention of having code and resources together under
   277 # These resources violates the convention of having code and resources together under
   283 # $(JDK_TOPDIR)/src/.../classes directories
   278 # $(JDK_TOPDIR)/src/.../classes directories
   325 	$(MKDIR) -p $(@D)
   320 	$(MKDIR) -p $(@D)
   326 	$(TOUCH) $@
   321 	$(TOUCH) $@
   327 
   322 
   328 ##########################################################################################
   323 ##########################################################################################
   329 
   324 
   330 ifeq ($(OPENJDK_TARGET_OS),macosx)
       
   331 #
       
   332 # JObjC.jar is compiled with BOOT_JAVAC which (may) not support the "-h" flag.
       
   333 #   so we first compile classes with BOOT_JAVAC and then with JDK_JAVAC :-(
       
   334 #
       
   335 $(eval $(call SetupJavaCompiler,GENERATE_15BYTECODE,\
       
   336      JAVAC:=$(JAVAC),\
       
   337      FLAGS:=-source 1.5 -target 1.5 -g -bootclasspath $(BOOT_RTJAR) -cp $(JDK_OUTPUTDIR)/../langtools/dist/lib/classes.jar $(DISABLE_WARNINGS),\
       
   338      SERVER_DIR:=$(SJAVAC_SERVER_DIR),\
       
   339      SERVER_JVM:=$(SJAVAC_SERVER_JAVA)))
       
   340 
       
   341 $(eval $(call SetupJavaCompilation,BUILD_JOBJC,\
       
   342 		SETUP:=GENERATE_15BYTECODE,\
       
   343 		DISABLE_SJAVAC:=true,\
       
   344 		SRC:=$(JDK_TOPDIR)/src/macosx/native/jobjc/src/core/java \
       
   345 		     $(JDK_TOPDIR)/src/macosx/native/jobjc/src/runtime-additions/java \
       
   346 		     $(JDK_OUTPUTDIR)/gensrc_jobjc/src, \
       
   347 		INCLUDES := com/apple/jobjc,\
       
   348                 EXCLUDES := tests/java/com/apple/jobjc,\
       
   349 		BIN:=$(JDK_OUTPUTDIR)/jobjc_classes,\
       
   350 		JAR:=$(JDK_OUTPUTDIR)/lib/JObjC.jar, \
       
   351 		JARINDEX := true))
       
   352 
       
   353 $(BUILD_JOBJC) : $(BUILD_JDK)
       
   354 
       
   355 $(eval $(call SetupJavaCompilation,BUILD_JOBJC_HEADERS,\
       
   356 		SETUP:=GENERATE_JDKBYTECODE,\
       
   357 		SRC:=$(JDK_TOPDIR)/src/macosx/native/jobjc/src/core/java \
       
   358 		     $(JDK_TOPDIR)/src/macosx/native/jobjc/src/runtime-additions/java \
       
   359 		     $(JDK_OUTPUTDIR)/gensrc_jobjc/src, \
       
   360 		INCLUDES := com/apple/jobjc,\
       
   361                 EXCLUDES := tests/java/com/apple/jobjc,\
       
   362 		BIN:=$(JDK_OUTPUTDIR)/jobjc_classes_headers,\
       
   363 		HEADERS:=$(JDK_OUTPUTDIR)/gensrc_headers_jobjc))
       
   364 
       
   365 $(BUILD_JOBJC_HEADERS) : $(BUILD_JDK)
       
   366 
       
   367 endif
       
   368 
   325 
   369 ##########################################################################################
   326 ##########################################################################################
   370 
   327 
   371 ifndef OPENJDK
   328 ifndef OPENJDK
   372 ifeq ($(OPENJDK_TARGET_OS), windows)
   329 ifeq ($(OPENJDK_TARGET_OS), windows)
   401 endif
   358 endif
   402 endif
   359 endif
   403 
   360 
   404 ##########################################################################################
   361 ##########################################################################################
   405 
   362 
   406 all: $(BUILD_JDK) $(BUILD_ALTCLASSES) $(BUILD_JOBJC) $(BUILD_JOBJC_HEADERS) $(COPY_EXTRA) \
   363 all: $(BUILD_JDK) $(BUILD_ALTCLASSES) $(COPY_EXTRA) \
   407 	$(JDK_OUTPUTDIR)/classes/META-INF/services/com.sun.tools.xjc.Plugin \
   364 	$(JDK_OUTPUTDIR)/classes/META-INF/services/com.sun.tools.xjc.Plugin \
   408 	$(BUILD_ACCESSBRIDGE_32) $(BUILD_ACCESSBRIDGE_64) \
   365 	$(BUILD_ACCESSBRIDGE_32) $(BUILD_ACCESSBRIDGE_64) \
   409 	$(BUILD_ACCESSBRIDGE_LEGACY)
   366 	$(BUILD_ACCESSBRIDGE_LEGACY)
   410 
   367 
   411 .PHONY: all
   368 .PHONY: all