equal
deleted
inserted
replaced
40 JSTAT_RESOURCEDIR = $(JDK_TOPDIR)/src/share/classes/sun/tools/jstat/resources |
40 JSTAT_RESOURCEDIR = $(JDK_TOPDIR)/src/share/classes/sun/tools/jstat/resources |
41 COPY_FILES += \ |
41 COPY_FILES += \ |
42 $(JSTAT_RESOURCEDIR)/jstat_options \ |
42 $(JSTAT_RESOURCEDIR)/jstat_options \ |
43 $(JSTAT_RESOURCEDIR)/jstat_unsupported_options |
43 $(JSTAT_RESOURCEDIR)/jstat_unsupported_options |
44 |
44 |
45 # Extra jhat files |
45 # Extra jhat files |
46 JHAT_RESOURCEDIR = $(JDK_TOPDIR)/src/share/classes/com/sun/tools/hat/resources |
46 JHAT_RESOURCEDIR = $(JDK_TOPDIR)/src/share/classes/com/sun/tools/hat/resources |
47 COPY_FILES += \ |
47 COPY_FILES += \ |
48 $(JHAT_RESOURCEDIR)/hat.js \ |
48 $(JHAT_RESOURCEDIR)/hat.js \ |
49 $(JHAT_RESOURCEDIR)/oqlhelp.html \ |
49 $(JHAT_RESOURCEDIR)/oqlhelp.html \ |
50 $(JHAT_RESOURCEDIR)/platform_names.txt |
50 $(JHAT_RESOURCEDIR)/platform_names.txt |
51 |
51 |
52 # Extra jrunscript files |
52 # Extra jrunscript files |
53 JRUNSCRIPT_RESOURCEDIR = $(JDK_TOPDIR)/src/share/classes/com/sun/tools/script/shell |
53 JRUNSCRIPT_RESOURCEDIR = $(JDK_TOPDIR)/src/share/classes/com/sun/tools/script/shell |
54 COPY_FILES += \ |
54 COPY_FILES += \ |
55 $(JRUNSCRIPT_RESOURCEDIR)/init.js \ |
55 $(JRUNSCRIPT_RESOURCEDIR)/init.js \ |
56 $(JRUNSCRIPT_RESOURCEDIR)/messages.properties |
56 $(JRUNSCRIPT_RESOURCEDIR)/messages.properties |
57 |
57 |
58 # Extra jvmstat files |
58 # Extra jvmstat files |
59 COPY_FILES += \ |
59 COPY_FILES += \ |
60 $(JDK_TOPDIR)/src/share/classes/sun/jvmstat/perfdata/resources/aliasmap |
60 $(JDK_TOPDIR)/src/share/classes/sun/jvmstat/perfdata/resources/aliasmap |
61 |
61 |
87 # Filter out JavaCup32.png from OpenJDK |
87 # Filter out JavaCup32.png from OpenJDK |
88 COPY_FILES := $(filter-out $(SWING_PLAF_WINDOWS_RESOURCES_DIR)/icons/JavaCup32.png, $(COPY_FILES)) |
88 COPY_FILES := $(filter-out $(SWING_PLAF_WINDOWS_RESOURCES_DIR)/icons/JavaCup32.png, $(COPY_FILES)) |
89 # Alter JavaCup32.png from ClosedJDK |
89 # Alter JavaCup32.png from ClosedJDK |
90 COPY_FILES += \ |
90 COPY_FILES += \ |
91 $(SWING_PLAF_WINDOWS_RESOURCES_DIR_CLOSED)/icons/JavaCup32.png |
91 $(SWING_PLAF_WINDOWS_RESOURCES_DIR_CLOSED)/icons/JavaCup32.png |
|
92 endif |
|
93 |
|
94 ifndef OPENJDK |
|
95 JFR_CONFIGURATION_DIR_CLOSED = $(JDK_TOPDIR)/src/closed/share/classes/oracle/jrockit/jfr/settings |
|
96 COPY_FILES += \ |
|
97 $(JFR_CONFIGURATION_DIR_CLOSED)/jfc.xsd |
92 endif |
98 endif |
93 |
99 |
94 SWING_PLAF_BASIC_RESOURCES_DIR = $(JDK_TOPDIR)/src/share/classes/javax/swing/plaf/basic |
100 SWING_PLAF_BASIC_RESOURCES_DIR = $(JDK_TOPDIR)/src/share/classes/javax/swing/plaf/basic |
95 COPY_FILES += \ |
101 COPY_FILES += \ |
96 $(wildcard $(SWING_PLAF_BASIC_RESOURCES_DIR)/icons/*.png) |
102 $(wildcard $(SWING_PLAF_BASIC_RESOURCES_DIR)/icons/*.png) |
152 ########################################################################################## |
158 ########################################################################################## |
153 # |
159 # |
154 # Copy the META-INF/services configuration files that are scattered around the source tree |
160 # Copy the META-INF/services configuration files that are scattered around the source tree |
155 # into classes/META-INF/services. Be aware that META-INF directories that are located at a |
161 # into classes/META-INF/services. Be aware that META-INF directories that are located at a |
156 # source root (.../classes/META-INF) are automatically copied verbatim by the |
162 # source root (.../classes/META-INF) are automatically copied verbatim by the |
157 # SetupJavaCompilation macro. |
163 # SetupJavaCompilation macro. |
158 # |
164 # |
159 # Any other META-INF/services configuration file is found here and platform specific comments |
165 # Any other META-INF/services configuration file is found here and platform specific comments |
160 # are uncommented and the configuration file is stored in the output META-INF directory. |
166 # are uncommented and the configuration file is stored in the output META-INF directory. |
161 |
167 |
162 # Make sure the output directory is created. |
168 # Make sure the output directory is created. |
205 # Now setup the dependency rules to generate a META-INF/services/... from the correct source. |
211 # Now setup the dependency rules to generate a META-INF/services/... from the correct source. |
206 META-INF_RULES_SERVICES:=$(RULES_SERVICES_PRINT) $(join $(OUT_SERVICES_FILES_COLON),$(SRC_SERVICES_FILES)) |
212 META-INF_RULES_SERVICES:=$(RULES_SERVICES_PRINT) $(join $(OUT_SERVICES_FILES_COLON),$(SRC_SERVICES_FILES)) |
207 # Eval the newly created rules to incorporate them into the make tree. |
213 # Eval the newly created rules to incorporate them into the make tree. |
208 define addto_meta-inf_services |
214 define addto_meta-inf_services |
209 $1 |
215 $1 |
210 echo $(LOG_INFO) Installing META-INF/services/$$(@F) |
216 echo $(LOG_INFO) Installing META-INF/services/$$(@F) |
211 $(CAT) $$< | $(SED) -e "s/^#\[$(OPENJDK_TARGET_OS)\]//" > $$@ |
217 $(CAT) $$< | $(SED) -e "s/^#\[$(OPENJDK_TARGET_OS)\]//" > $$@ |
212 endef |
218 endef |
213 $(foreach i,$(META-INF_RULES_SERVICES),$(eval $(call addto_meta-inf_services,$i))) |
219 $(foreach i,$(META-INF_RULES_SERVICES),$(eval $(call addto_meta-inf_services,$i))) |
214 # Here is the generic rule, whose receipt the above rules will trigger. |
220 # Here is the generic rule, whose receipt the above rules will trigger. |
215 |
221 |