jdk/make/GenerateClasses.gmk
changeset 22937 f28798de1e6f
parent 22647 7e45e0a1088d
equal deleted inserted replaced
22936:1263cd9144d7 22937:f28798de1e6f
    87 GENCLASSES += $(RMI_11)
    87 GENCLASSES += $(RMI_11)
    88 
    88 
    89 # For RMI/IIOP call rmic a second time with -standardPackage option
    89 # For RMI/IIOP call rmic a second time with -standardPackage option
    90 # so that *_tie classes are generated in package without the prefix
    90 # so that *_tie classes are generated in package without the prefix
    91 # org.omg.stub (6375696)
    91 # org.omg.stub (6375696)
    92 JMAN_RMI_CLASSES := javax.management.remote.rmi.RMIConnectionImpl \
    92 JMX_RMI_CLASSES := javax.management.remote.rmi.RMIConnectionImpl \
    93     javax.management.remote.rmi.RMIServerImpl
    93     javax.management.remote.rmi.RMIServerImpl
       
    94 GENRMIIIOPCLASSES :=
       
    95 ifneq ($(RMICONNECTOR_IIOP), false)
       
    96   GENRMIIIOPCLASSES := $(RMICONNECTOR_IIOP)
       
    97 endif
    94 $(eval $(call SetupRMICompilation,RMI_IIOP, \
    98 $(eval $(call SetupRMICompilation,RMI_IIOP, \
    95     CLASSES := $(JMAN_RMI_CLASSES), \
    99     CLASSES := $(JMX_RMI_CLASSES), \
    96     CLASSES_DIR := $(CLASSES_DIR), \
   100     CLASSES_DIR := $(CLASSES_DIR), \
    97     STUB_CLASSES_DIR := $(STUB_CLASSES_DIR), \
   101     STUB_CLASSES_DIR := $(STUB_CLASSES_DIR), \
    98     RUN_V12 := true, \
   102     RUN_V12 := true, \
    99     RUN_IIOP := true, \
   103     RUN_IIOP := $(GENRMIIIOPCLASSES), \
   100     RUN_IIOP_STDPKG := true))
   104     RUN_IIOP_STDPKG := $(GENRMIIIOPCLASSES)))
   101 GENCLASSES += $(RMI_IIOP)
   105 GENCLASSES += $(RMI_IIOP)
   102 
   106 
   103 # Keep generated RMI/JRMP Stub source files and copy them to RMIC_GENSRC_DIR
   107 # Keep generated RMI/JRMP Stub source files and copy them to RMIC_GENSRC_DIR
   104 # so that javadoc can include them in the API (4997471)
   108 # so that javadoc can include them in the API (4997471)
   105 $(eval $(call SetupRMICompilation,RMI_SRC, \
   109 $(eval $(call SetupRMICompilation,RMI_SRC, \
   106     CLASSES := $(JMAN_RMI_CLASSES), \
   110     CLASSES := $(JMX_RMI_CLASSES), \
   107     CLASSES_DIR := $(CLASSES_DIR), \
   111     CLASSES_DIR := $(CLASSES_DIR), \
   108     STUB_CLASSES_DIR := $(RMIC_GENSRC_DIR), \
   112     STUB_CLASSES_DIR := $(RMIC_GENSRC_DIR), \
   109     RUN_V12 := true, \
   113     RUN_V12 := true, \
   110     KEEP_GENERATED := true))
   114     KEEP_GENERATED := true))
   111 GENCLASSES += $(filter %.java, $(RMI_SRC))
   115 GENCLASSES += $(filter %.java, $(RMI_SRC))