jdk/makefiles/GenerateClasses.gmk
changeset 20884 66f924cdfeb9
parent 20870 c7ec34cb6e3c
parent 20547 453837141fac
equal deleted inserted replaced
20876:e01644e3645e 20884:66f924cdfeb9
    55 BTRMIC_CP := $(CORBA_OUTPUTDIR)/btjars/btcorba.jar$(PATH_SEP)$(JDK_OUTPUTDIR)/btclasses_rmic$(PATH_SEP)$(BOOTSTRAP_JAVAC_JAR)
    55 BTRMIC_CP := $(CORBA_OUTPUTDIR)/btjars/btcorba.jar$(PATH_SEP)$(JDK_OUTPUTDIR)/btclasses_rmic$(PATH_SEP)$(BOOTSTRAP_JAVAC_JAR)
    56 BTRMIC_ARGS := "-Xbootclasspath/p:$(BTRMIC_CP)" -cp "$(BTRMIC_CP)"
    56 BTRMIC_ARGS := "-Xbootclasspath/p:$(BTRMIC_CP)" -cp "$(BTRMIC_CP)"
    57 RMIC := $(JAVA) $(BTRMIC_ARGS) sun.rmi.rmic.Main
    57 RMIC := $(JAVA) $(BTRMIC_ARGS) sun.rmi.rmic.Main
    58 
    58 
    59 CLASSES_DIR := $(JDK_OUTPUTDIR)/classes
    59 CLASSES_DIR := $(JDK_OUTPUTDIR)/classes
    60 # NOTE: If the smart javac dependency management is reintroduced, these classes risk 
    60 # NOTE: If the smart javac dependency management is reintroduced, these classes risk
    61 # interfering with the dependency checking. In that case they will need to be kept separate.
    61 # interfering with the dependency checking. In that case they will need to be kept separate.
    62 STUB_CLASSES_DIR := $(JDK_OUTPUTDIR)/classes
    62 STUB_CLASSES_DIR := $(JDK_OUTPUTDIR)/classes
    63 RMIC_GENSRC_DIR := $(JDK_OUTPUTDIR)/gendocsrc_rmic
    63 RMIC_GENSRC_DIR := $(JDK_OUTPUTDIR)/gendocsrc_rmic
    64 
    64 
    65 GENCLASSES :=
    65 GENCLASSES := 
    66 
    66 
    67 ##########################################################################################
    67 ##########################################################################################
    68 #
    68 #
    69 # Generate RMI stubs
    69 # Generate RMI stubs
    70 #
    70 #
    71 
    71 
    72 $(eval $(call SetupRMICompilation,RMI_12,\
    72 $(eval $(call SetupRMICompilation,RMI_12, \
    73 		CLASSES:=sun.rmi.server.Activation$$$$ActivationSystemImpl\
    73     CLASSES := sun.rmi.server.Activation$$$$ActivationSystemImpl \
    74 			 java.rmi.activation.ActivationGroup\
    74         java.rmi.activation.ActivationGroup \
    75 			 com.sun.jndi.rmi.registry.ReferenceWrapper,\
    75         com.sun.jndi.rmi.registry.ReferenceWrapper, \
    76 		CLASSES_DIR:=$(CLASSES_DIR),\
    76     CLASSES_DIR := $(CLASSES_DIR), \
    77 		STUB_CLASSES_DIR:=$(STUB_CLASSES_DIR),\
    77     STUB_CLASSES_DIR := $(STUB_CLASSES_DIR), \
    78 		RUN_V12:=true))
    78     RUN_V12 := true))
    79 GENCLASSES += $(RMI_12)
    79 GENCLASSES += $(RMI_12)
    80 
    80 
    81 $(eval $(call SetupRMICompilation,RMI_11,\
    81 $(eval $(call SetupRMICompilation,RMI_11, \
    82 		CLASSES:=sun.rmi.registry.RegistryImpl\
    82     CLASSES := sun.rmi.registry.RegistryImpl \
    83 			 sun.rmi.transport.DGCImpl,\
    83         sun.rmi.transport.DGCImpl, \
    84 		CLASSES_DIR:=$(CLASSES_DIR),\
    84     CLASSES_DIR := $(CLASSES_DIR), \
    85 		STUB_CLASSES_DIR:=$(STUB_CLASSES_DIR),\
    85     STUB_CLASSES_DIR := $(STUB_CLASSES_DIR), \
    86 		RUN_V11:=true))
    86     RUN_V11 := true))
    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 JMAN_RMI_CLASSES := javax.management.remote.rmi.RMIConnectionImpl \
    93 		  javax.management.remote.rmi.RMIServerImpl
    93     javax.management.remote.rmi.RMIServerImpl
    94 $(eval $(call SetupRMICompilation,RMI_IIOP,\
    94 $(eval $(call SetupRMICompilation,RMI_IIOP, \
    95 		CLASSES:=$(JMAN_RMI_CLASSES),\
    95     CLASSES := $(JMAN_RMI_CLASSES), \
    96 		CLASSES_DIR:=$(CLASSES_DIR),\
    96     CLASSES_DIR := $(CLASSES_DIR), \
    97 		STUB_CLASSES_DIR:=$(STUB_CLASSES_DIR),\
    97     STUB_CLASSES_DIR := $(STUB_CLASSES_DIR), \
    98 		RUN_V12:=true,\
    98     RUN_V12 := true, \
    99 		RUN_IIOP:=true,\
    99     RUN_IIOP := true, \
   100 		RUN_IIOP_STDPKG:=true))
   100     RUN_IIOP_STDPKG := true))
   101 GENCLASSES += $(RMI_IIOP)
   101 GENCLASSES += $(RMI_IIOP)
   102 
   102 
   103 # Keep generated RMI/JRMP Stub source files and copy them to RMIC_GENSRC_DIR
   103 # 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)
   104 # so that javadoc can include them in the API (4997471)
   105 $(eval $(call SetupRMICompilation,RMI_SRC,\
   105 $(eval $(call SetupRMICompilation,RMI_SRC, \
   106 		CLASSES:=$(JMAN_RMI_CLASSES),\
   106     CLASSES := $(JMAN_RMI_CLASSES), \
   107 		CLASSES_DIR:=$(CLASSES_DIR),\
   107     CLASSES_DIR := $(CLASSES_DIR), \
   108 		STUB_CLASSES_DIR:=$(RMIC_GENSRC_DIR),\
   108     STUB_CLASSES_DIR := $(RMIC_GENSRC_DIR), \
   109 		RUN_V12:=true,\
   109     RUN_V12 := true, \
   110 		KEEP_GENERATED:=true))
   110     KEEP_GENERATED := true))
   111 GENCLASSES += $(filter %.java,$(RMI_SRC))
   111 GENCLASSES += $(filter %.java, $(RMI_SRC))
   112 
   112 
   113 ##########################################################################################
   113 ##########################################################################################
   114 
   114 
   115 $(RMI_12) $(RMI_11) $(RMI_IIOP) $(RMI_SRC): $(BUILD_BOOTSTRAP_RMIC)
   115 $(RMI_12) $(RMI_11) $(RMI_IIOP) $(RMI_SRC): $(BUILD_BOOTSTRAP_RMIC)
   116 
   116