jdk/makefiles/CompileJavaClasses.gmk
changeset 14596 a1f29d55b5ee
parent 14345 1cb211602711
child 14706 0651f78051e0
child 14705 f0b0af3a8999
equal deleted inserted replaced
14559:17820b958ae8 14596:a1f29d55b5ee
   336 		$(JDK_BASE_HEADER_CLASSES)
   336 		$(JDK_BASE_HEADER_CLASSES)
   337 	$(TOUCH) $@
   337 	$(TOUCH) $@
   338 
   338 
   339 ##########################################################################################
   339 ##########################################################################################
   340 
   340 
   341 #
       
   342 # This is an empty jar (only contains manifest) and fits poorly into framework...
       
   343 #   create simple rule instead
       
   344 #
       
   345 MANAGEMENT_AGENT_JAR_DEPS := $(JDK_TOPDIR)/src/share/classes/sun/management/manifest
       
   346 
       
   347 $(JDK_OUTPUTDIR)/lib/management-agent.jar : $(JDK_TOPDIR)/src/share/classes/sun/management/manifest
       
   348 	$(JAR) cfm $@ $(JDK_TOPDIR)/src/share/classes/sun/management/manifest
       
   349 
       
   350 JARS += $(JDK_OUTPUTDIR)/lib/management-agent.jar
       
   351 
       
   352 ##########################################################################################
       
   353 
       
   354 ifndef OPENJDK
   341 ifndef OPENJDK
   355 
   342 
   356 $(eval $(call SetupJavaCompilation,BUILD_ALTCLASSES_JAR,\
   343     $(eval $(call SetupJavaCompilation,BUILD_ALTCLASSES,\
   357 		SETUP:=GENERATE_JDKBYTECODE,\
   344 		SETUP:=GENERATE_JDKBYTECODE,\
   358 		SRC:=$(JDK_TOPDIR)/src/closed/share/altclasses, \
   345 		SRC:=$(JDK_TOPDIR)/src/closed/share/altclasses, \
   359 		BIN:=$(JDK_OUTPUTDIR)/altclasses_classes,\
   346 		BIN:=$(JDK_OUTPUTDIR)/altclasses_classes))
   360 		JAR:=$(JDK_OUTPUTDIR)/lib/alt-rt.jar))
   347 
   361 
   348     $(BUILD_ALTCLASSES): $(BUILD_JDK)
   362 $(BUILD_ALTCLASSES_JAR): $(BUILD_JDK)
       
   363 JARS += $(JDK_OUTPUTDIR)/lib/alt-rt.jar
       
   364 
   349 
   365 endif
   350 endif
   366 
   351 
   367 ##########################################################################################
   352 ##########################################################################################
   368 
   353 
   381      JAVAC:=$(JAVAC),\
   366      JAVAC:=$(JAVAC),\
   382      FLAGS:=-source 1.5 -target 1.5 -g -bootclasspath $(BOOT_RTJAR) -cp $(JDK_OUTPUTDIR)/../langtools/dist/lib/classes.jar $(DISABLE_WARNINGS),\
   367      FLAGS:=-source 1.5 -target 1.5 -g -bootclasspath $(BOOT_RTJAR) -cp $(JDK_OUTPUTDIR)/../langtools/dist/lib/classes.jar $(DISABLE_WARNINGS),\
   383      SERVER_DIR:=$(SJAVAC_SERVER_DIR),\
   368      SERVER_DIR:=$(SJAVAC_SERVER_DIR),\
   384      SERVER_JVM:=$(SJAVAC_SERVER_JAVA)))
   369      SERVER_JVM:=$(SJAVAC_SERVER_JAVA)))
   385 
   370 
   386 $(eval $(call SetupJavaCompilation,BUILD_JOBJC_JAR,\
   371 $(eval $(call SetupJavaCompilation,BUILD_JOBJC,\
   387 		SETUP:=GENERATE_15BYTECODE,\
   372 		SETUP:=GENERATE_15BYTECODE,\
   388 		DISABLE_SJAVAC:=true,\
   373 		DISABLE_SJAVAC:=true,\
   389 		SRC:=$(JDK_TOPDIR)/src/macosx/native/jobjc/src/core/java \
   374 		SRC:=$(JDK_TOPDIR)/src/macosx/native/jobjc/src/core/java \
   390 		     $(JDK_TOPDIR)/src/macosx/native/jobjc/src/runtime-additions/java \
   375 		     $(JDK_TOPDIR)/src/macosx/native/jobjc/src/runtime-additions/java \
   391 		     $(JDK_OUTPUTDIR)/gensrc, \
   376 		     $(JDK_OUTPUTDIR)/gensrc, \
   393                 EXCLUDES := tests/java/com/apple/jobjc,\
   378                 EXCLUDES := tests/java/com/apple/jobjc,\
   394 		BIN:=$(JDK_OUTPUTDIR)/jobjc_classes,\
   379 		BIN:=$(JDK_OUTPUTDIR)/jobjc_classes,\
   395 		JAR:=$(JDK_OUTPUTDIR)/lib/JObjC.jar, \
   380 		JAR:=$(JDK_OUTPUTDIR)/lib/JObjC.jar, \
   396 		JARINDEX := true))
   381 		JARINDEX := true))
   397 
   382 
   398 $(BUILD_JOBJC_JAR) : $(BUILD_JDK)
   383 $(BUILD_JOBJC) : $(BUILD_JDK)
   399 
   384 
   400 JARS += $(JDK_OUTPUTDIR)/lib/JObjC.jar
   385 $(eval $(call SetupJavaCompilation,BUILD_JOBJC_HEADERS,\
   401 
       
   402 $(eval $(call SetupJavaCompilation,BUILD_JOBJC_HEADERS_JAR,\
       
   403 		SETUP:=GENERATE_JDKBYTECODE,\
   386 		SETUP:=GENERATE_JDKBYTECODE,\
   404 		SRC:=$(JDK_TOPDIR)/src/macosx/native/jobjc/src/core/java \
   387 		SRC:=$(JDK_TOPDIR)/src/macosx/native/jobjc/src/core/java \
   405 		     $(JDK_TOPDIR)/src/macosx/native/jobjc/src/runtime-additions/java \
   388 		     $(JDK_TOPDIR)/src/macosx/native/jobjc/src/runtime-additions/java \
   406 		     $(JDK_OUTPUTDIR)/gensrc, \
   389 		     $(JDK_OUTPUTDIR)/gensrc, \
   407 		INCLUDES := com/apple/jobjc,\
   390 		INCLUDES := com/apple/jobjc,\
   408                 EXCLUDES := tests/java/com/apple/jobjc,\
   391                 EXCLUDES := tests/java/com/apple/jobjc,\
   409 		BIN:=$(JDK_OUTPUTDIR)/jobjc_classes_headers,\
   392 		BIN:=$(JDK_OUTPUTDIR)/jobjc_classes_headers,\
   410 		HEADERS:=$(JDK_OUTPUTDIR)/gensrc_headers_jobjc))
   393 		HEADERS:=$(JDK_OUTPUTDIR)/gensrc_headers_jobjc))
   411 
   394 
   412 $(BUILD_JOBJC_HEADERS_JAR) : $(BUILD_JDK)
   395 $(BUILD_JOBJC_HEADERS) : $(BUILD_JDK)
   413 
       
   414 JARS += $(BUILD_JOBJC_HEADERS_JAR)
       
   415 
   396 
   416 endif
   397 endif
   417 
   398 
   418 ##########################################################################################
   399 ##########################################################################################
   419 
   400 
   420 # copy with -a to preserve timestamps so dependencies down the line aren't messed up
   401 # copy with -a to preserve timestamps so dependencies down the line aren't messed up
   421 all: $(BUILD_JDK) $(JARS) $(COPY_EXTRA) $(JDK_OUTPUTDIR)/classes/META-INF/services/com.sun.tools.xjc.Plugin \
   402 all: $(BUILD_JDK) $(BUILD_ALTCLASSES) $(BUILD_JOBJC) $(BUILD_JOBJC_HEADERS) $(COPY_EXTRA) \
       
   403 	$(JDK_OUTPUTDIR)/classes/META-INF/services/com.sun.tools.xjc.Plugin \
   422 	$(JDK_OUTPUTDIR)/gensrc_headers/_the.jdk.base.headers
   404 	$(JDK_OUTPUTDIR)/gensrc_headers/_the.jdk.base.headers
   423 
   405 
   424 .PHONY: all
   406 .PHONY: all