comparison makefiles/GensrcProperties.gmk @ 7280:a4f32e60635c

properly disable doclint now that it is integrated into langtools
author mduigou
date Tue, 05 Feb 2013 09:31:37 -0800
parents 64dd2aba6d33
children 5e383a73386a
comparison
equal deleted inserted replaced
5:4bee3c6fcae4 6:4a57c21b3bbf
20 # 20 #
21 # Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA 21 # Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
22 # or visit www.oracle.com if you need additional information or have any 22 # or visit www.oracle.com if you need additional information or have any
23 # questions. 23 # questions.
24 # 24 #
25
26 # Prepare the find cache. This is only used on windows.
27 $(eval $(call FillCacheFind,$(JDK_TOPDIR)/src/share/classes $(JDK_TOPDIR)/src/windows/classes))
25 28
26 # All .properties files to be compiled are appended to this variable. 29 # All .properties files to be compiled are appended to this variable.
27 ALL_COMPILED_PROPSOURCES:= 30 ALL_COMPILED_PROPSOURCES:=
28 # All generated .java files from compilation are appended to this variable. 31 # All generated .java files from compilation are appended to this variable.
29 ALL_COMPILED_PROPJAVAS:= 32 ALL_COMPILED_PROPJAVAS:=
115 # Some packages have properties that need to be converted to java source files. 118 # Some packages have properties that need to be converted to java source files.
116 119
117 #com/apple/laf/resources 120 #com/apple/laf/resources
118 ifeq ($(OPENJDK_TARGET_OS),macosx) 121 ifeq ($(OPENJDK_TARGET_OS),macosx)
119 $(eval $(call add_properties_to_compile,COM_APPLE_LAF,\ 122 $(eval $(call add_properties_to_compile,COM_APPLE_LAF,\
120 $(shell find $(JDK_TOPDIR)/src/macosx/classes/com/apple/laf/resources -name "*.properties"),\ 123 $(filter %.properties,\
121 ListResourceBundle)) 124 $(call CacheFind,$(JDK_TOPDIR)/src/macosx/classes/com/apple/laf/resources)),\
125 ListResourceBundle))
122 endif 126 endif
123 127
124 #com/sun/accessibility/internal/resources 128 #com/sun/accessibility/internal/resources
125 $(eval $(call add_properties_to_compile,COM_SUN_ACCESSIBILITY,\ 129 $(eval $(call add_properties_to_compile,COM_SUN_ACCESSIBILITY,\
126 $(shell find $(JDK_TOPDIR)/src/share/classes/com/sun/accessibility/internal/resources -name "*.properties"),\ 130 $(filter %.properties,\
127 ListResourceBundle)) 131 $(call CacheFind,$(JDK_TOPDIR)/src/share/classes/com/sun/accessibility/internal/resources)),\
132 ListResourceBundle))
128 $(eval $(call add_properties_to_compile,COM_SUN_ACCESSIBILITY_HK,\ 133 $(eval $(call add_properties_to_compile,COM_SUN_ACCESSIBILITY_HK,\
129 $(shell find $(JDK_TOPDIR)/src/share/classes/com/sun/accessibility/internal/resources -name "*.properties"),\ 134 $(filter %.properties,\
130 ListResourceBundle,%zh_TW,%zh_HK)) 135 $(call CacheFind,$(JDK_TOPDIR)/src/share/classes/com/sun/accessibility/internal/resources)),\
136 ListResourceBundle,%zh_TW,%zh_HK))
131 #com/sun/imageio/plugins/common 137 #com/sun/imageio/plugins/common
132 $(eval $(call add_properties_to_clean,COM_SUN_IMAGEIO,\ 138 $(eval $(call add_properties_to_clean,COM_SUN_IMAGEIO,\
133 $(shell find $(JDK_TOPDIR)/src/share/classes/com/sun/imageio -name "*.properties"))) 139 $(filter %.properties,\
140 $(call CacheFind,$(JDK_TOPDIR)/src/share/classes/com/sun/imageio))))
134 #com/sun/java/swing/plaf/gtk/resources 141 #com/sun/java/swing/plaf/gtk/resources
135 ifneq ($(OPENJDK_TARGET_OS), windows) 142 ifneq ($(OPENJDK_TARGET_OS), windows)
136 # Only compile GTK resource bundles on Solaris/Linux 143 # Only compile GTK resource bundles on Solaris/Linux
137 $(eval $(call add_properties_to_compile,COM_SUN_SWING_PLAF_GTK,\ 144 $(eval $(call add_properties_to_compile,COM_SUN_SWING_PLAF_GTK,\
138 $(shell find $(JDK_TOPDIR)/src/share/classes/com/sun/java/swing/plaf/gtk/resources -name "*.properties"),\ 145 $(filter %.properties,\
139 ListResourceBundle)) 146 $(call CacheFind,$(JDK_TOPDIR)/src/share/classes/com/sun/java/swing/plaf/gtk/resources)),\
147 ListResourceBundle))
140 $(eval $(call add_properties_to_compile,COM_SUN_SWING_PLAF_GTK_HK,\ 148 $(eval $(call add_properties_to_compile,COM_SUN_SWING_PLAF_GTK_HK,\
141 $(shell find $(JDK_TOPDIR)/src/share/classes/com/sun/java/swing/plaf/gtk/resources -name "*.properties"),\ 149 $(filter %.properties,\
142 ListResourceBundle,%zh_TW,%zh_HK)) 150 $(call CacheFind,$(JDK_TOPDIR)/src/share/classes/com/sun/java/swing/plaf/gtk/resources)),\
151 ListResourceBundle,%zh_TW,%zh_HK))
143 endif 152 endif
144 #com/sun/java/swing/plaf/motif/resources 153 #com/sun/java/swing/plaf/motif/resources
145 $(eval $(call add_properties_to_compile,COM_SUN_SWING_PLAF_MOTIF,\ 154 $(eval $(call add_properties_to_compile,COM_SUN_SWING_PLAF_MOTIF,\
146 $(shell find $(JDK_TOPDIR)/src/share/classes/com/sun/java/swing/plaf/motif/resources -name "*.properties"),\ 155 $(filter %.properties,\
147 ListResourceBundle)) 156 $(call CacheFind,$(JDK_TOPDIR)/src/share/classes/com/sun/java/swing/plaf/motif/resources)),\
157 ListResourceBundle))
148 $(eval $(call add_properties_to_compile,COM_SUN_SWING_PLAF_MOTIF_HK,\ 158 $(eval $(call add_properties_to_compile,COM_SUN_SWING_PLAF_MOTIF_HK,\
149 $(shell find $(JDK_TOPDIR)/src/share/classes/com/sun/java/swing/plaf/motif/resources -name "*.properties"),\ 159 $(filter %.properties,\
150 ListResourceBundle,%zh_TW,%zh_HK)) 160 $(call CacheFind,$(JDK_TOPDIR)/src/share/classes/com/sun/java/swing/plaf/motif/resources)),\
161 ListResourceBundle,%zh_TW,%zh_HK))
151 #com/sun/java/swing/plaf/windows/resources 162 #com/sun/java/swing/plaf/windows/resources
152 $(eval $(call add_properties_to_compile,COM_SUN_SWING_PLAF_WINDOWS,\ 163 $(eval $(call add_properties_to_compile,COM_SUN_SWING_PLAF_WINDOWS,\
153 $(shell find $(JDK_TOPDIR)/src/share/classes/com/sun/java/swing/plaf/windows/resources -name "*.properties"),\ 164 $(filter %.properties,\
154 ListResourceBundle)) 165 $(call CacheFind,$(JDK_TOPDIR)/src/share/classes/com/sun/java/swing/plaf/windows/resources)),\
166 ListResourceBundle))
155 $(eval $(call add_properties_to_compile,COM_SUN_SWING_PLAF_WINDOWS_HK,\ 167 $(eval $(call add_properties_to_compile,COM_SUN_SWING_PLAF_WINDOWS_HK,\
156 $(shell find $(JDK_TOPDIR)/src/share/classes/com/sun/java/swing/plaf/windows/resources -name "*.properties"),\ 168 $(filter %.properties,\
157 ListResourceBundle,%zh_TW,%zh_HK)) 169 $(call CacheFind,$(JDK_TOPDIR)/src/share/classes/com/sun/java/swing/plaf/windows/resources)),\
170 ListResourceBundle,%zh_TW,%zh_HK))
158 #com/sun/java/util/jar/pack 171 #com/sun/java/util/jar/pack
159 $(eval $(call add_properties_to_clean,JNDI_COSNAMING,\ 172 $(eval $(call add_properties_to_clean,JNDI_COSNAMING,\
160 $(JDK_TOPDIR)/src/share/classes/com/sun/java/util/jar/pack/intrinsic.properties)) 173 $(JDK_TOPDIR)/src/share/classes/com/sun/java/util/jar/pack/intrinsic.properties))
161 #com/sun/jndi/cosnaming 174 #com/sun/jndi/cosnaming
162 $(eval $(call add_properties_to_clean,JNDI_COSNAMING,\ 175 $(eval $(call add_properties_to_clean,JNDI_COSNAMING,\
167 180
168 #com/sun/org/apache/xml/internal/security/resource 181 #com/sun/org/apache/xml/internal/security/resource
169 #FIXME: The "xmlsecurity*.properties" pattern is not ideal; we might want to find 182 #FIXME: The "xmlsecurity*.properties" pattern is not ideal; we might want to find
170 #a better way to select the properties files that are needed. 183 #a better way to select the properties files that are needed.
171 $(eval $(call add_properties_to_clean,XML_SECURITY,\ 184 $(eval $(call add_properties_to_clean,XML_SECURITY,\
172 $(shell find $(JDK_TOPDIR)/src/share/classes/com/sun/org/apache/xml/internal/security/resource -name "xmlsecurity*.properties"))) 185 $(filter $(JDK_TOPDIR)/src/share/classes/com/sun/org/apache/xml/internal/security/resource/xmlsecurity%.properties,\
186 $(call CacheFind,$(JDK_TOPDIR)/src/share/classes/com/sun/org/apache/xml/internal/security/resource))))
173 187
174 #com/sun/rowset 188 #com/sun/rowset
175 $(eval $(call add_properties_to_clean,COM_SUN_ROWSET,\ 189 $(eval $(call add_properties_to_clean,COM_SUN_ROWSET,\
176 $(shell find $(JDK_TOPDIR)/src/share/classes/com/sun/rowset -name "*.properties"))) 190 $(filter %.properties,\
191 $(call CacheFind,$(JDK_TOPDIR)/src/share/classes/com/sun/rowset))))
177 $(eval $(call add_properties_to_clean,COM_SUN_ROWSET_HK,\ 192 $(eval $(call add_properties_to_clean,COM_SUN_ROWSET_HK,\
178 $(shell find $(JDK_TOPDIR)/src/share/classes/com/sun/rowset -name "*zh_TW.properties"),\ 193 $(filter %zh_TW.properties,\
194 $(call CacheFind,$(JDK_TOPDIR)/src/share/classes/com/sun/rowset)),\
179 %zh_TW,%zh_HK)) 195 %zh_TW,%zh_HK))
180 196
181 #com/sun/servicetag/resources 197 #com/sun/servicetag/resources
182 #com/sun/swing/internal/plaf/basic/resources 198 #com/sun/swing/internal/plaf/basic/resources
183 $(eval $(call add_properties_to_compile,COM_SUN_SWING_PLAF_BASIC,\ 199 $(eval $(call add_properties_to_compile,COM_SUN_SWING_PLAF_BASIC,\
184 $(shell find $(JDK_TOPDIR)/src/share/classes/com/sun/swing/internal/plaf/basic/resources -name "*.properties"),\ 200 $(filter %.properties,\
185 ListResourceBundle)) 201 $(call CacheFind,$(JDK_TOPDIR)/src/share/classes/com/sun/swing/internal/plaf/basic/resources)),\
202 ListResourceBundle))
186 $(eval $(call add_properties_to_compile,COM_SUN_SWING_PLAF_BASIC_HK,\ 203 $(eval $(call add_properties_to_compile,COM_SUN_SWING_PLAF_BASIC_HK,\
187 $(shell find $(JDK_TOPDIR)/src/share/classes/com/sun/swing/internal/plaf/basic/resources -name "*.properties"),\ 204 $(filter %.properties,\
188 ListResourceBundle,%zh_TW,%zh_HK)) 205 $(call CacheFind,$(JDK_TOPDIR)/src/share/classes/com/sun/swing/internal/plaf/basic/resources)),\
206 ListResourceBundle,%zh_TW,%zh_HK))
189 #com/sun/swing/internal/plaf/metal/resources 207 #com/sun/swing/internal/plaf/metal/resources
190 $(eval $(call add_properties_to_compile,COM_SUN_SWING_PLAF_METAL,\ 208 $(eval $(call add_properties_to_compile,COM_SUN_SWING_PLAF_METAL,\
191 $(shell find $(JDK_TOPDIR)/src/share/classes/com/sun/swing/internal/plaf/metal/resources -name "*.properties"),\ 209 $(filter %.properties,\
192 ListResourceBundle)) 210 $(call CacheFind,$(JDK_TOPDIR)/src/share/classes/com/sun/swing/internal/plaf/metal/resources)),\
211 ListResourceBundle))
193 $(eval $(call add_properties_to_compile,COM_SUN_SWING_PLAF_METAL_HK,\ 212 $(eval $(call add_properties_to_compile,COM_SUN_SWING_PLAF_METAL_HK,\
194 $(shell find $(JDK_TOPDIR)/src/share/classes/com/sun/swing/internal/plaf/metal/resources -name "*.properties"),\ 213 $(filter %.properties,$(call CacheFind,$(JDK_TOPDIR)/src/share/classes/com/sun/swing/internal/plaf/metal/resources)),\
195 ListResourceBundle,%zh_TW,%zh_HK)) 214 ListResourceBundle,%zh_TW,%zh_HK))
196 #com/sun/swing/internal/plaf/synth/resources 215 #com/sun/swing/internal/plaf/synth/resources
197 $(eval $(call add_properties_to_compile,COM_SUN_SWING_PLAF_SYNTH,\ 216 $(eval $(call add_properties_to_compile,COM_SUN_SWING_PLAF_SYNTH,\
198 $(shell find $(JDK_TOPDIR)/src/share/classes/com/sun/swing/internal/plaf/synth/resources -name "*.properties"),\ 217 $(filter %.properties,\
199 ListResourceBundle)) 218 $(call CacheFind,$(JDK_TOPDIR)/src/share/classes/com/sun/swing/internal/plaf/synth/resources)),\
219 ListResourceBundle))
200 $(eval $(call add_properties_to_compile,COM_SUN_SWING_PLAF_SYNTH_HK,\ 220 $(eval $(call add_properties_to_compile,COM_SUN_SWING_PLAF_SYNTH_HK,\
201 $(shell find $(JDK_TOPDIR)/src/share/classes/com/sun/swing/internal/plaf/synth/resources -name "*.properties"),\ 221 $(filter %.properties,\
202 ListResourceBundle,%zh_TW,%zh_HK)) 222 $(call CacheFind,$(JDK_TOPDIR)/src/share/classes/com/sun/swing/internal/plaf/synth/resources)),\
223 ListResourceBundle,%zh_TW,%zh_HK))
203 224
204 #com/sun/tools/jdi/resources 225 #com/sun/tools/jdi/resources
205 $(eval $(call add_properties_to_compile,COM_SUN_TOOLS_JDI,\ 226 $(eval $(call add_properties_to_compile,COM_SUN_TOOLS_JDI,\
206 $(shell find $(JDK_TOPDIR)/src/share/classes/com/sun/tools/jdi/resources -name "*.properties"),\ 227 $(filter %.properties,\
207 ListResourceBundle)) 228 $(call CacheFind,$(JDK_TOPDIR)/src/share/classes/com/sun/tools/jdi/resources)),\
229 ListResourceBundle))
208 230
209 #com/sun/tools/script/shell 231 #com/sun/tools/script/shell
210 #java/util 232 #java/util
211 #javax/sql/rowset 233 #javax/sql/rowset
212 $(eval $(call add_properties_to_clean,JAVAX_SQL_ROWSET,\ 234 $(eval $(call add_properties_to_clean,JAVAX_SQL_ROWSET,\
213 $(shell find $(JDK_TOPDIR)/src/share/classes/javax/sql/rowset -name "*.properties"))) 235 $(filter %.properties,\
236 $(call CacheFind,$(JDK_TOPDIR)/src/share/classes/javax/sql/rowset))))
214 #sun/awt/resources 237 #sun/awt/resources
215 $(eval $(call add_properties_to_compile,SUN_AWT,\ 238 $(eval $(call add_properties_to_compile,SUN_AWT,\
216 $(shell find $(JDK_TOPDIR)/src/share/classes/sun/awt/resources -name "*.properties"),\ 239 $(filter %.properties,\
217 ListResourceBundle)) 240 $(call CacheFind,$(JDK_TOPDIR)/src/share/classes/sun/awt/resources)),\
241 ListResourceBundle))
218 $(eval $(call add_properties_to_compile,SUN_AWT_HK,\ 242 $(eval $(call add_properties_to_compile,SUN_AWT_HK,\
219 $(shell find $(JDK_TOPDIR)/src/share/classes/sun/awt/resources -name "*.properties"),\ 243 $(filter %.properties,\
220 ListResourceBundle,%zh_TW,%zh_HK)) 244 $(call CacheFind,$(JDK_TOPDIR)/src/share/classes/sun/awt/resources)),\
245 ListResourceBundle,%zh_TW,%zh_HK))
221 #sun/awt/windows/ 246 #sun/awt/windows/
222 ifeq ($(OPENJDK_TARGET_OS),windows) 247 ifeq ($(OPENJDK_TARGET_OS),windows)
223 $(eval $(call add_properties_to_compile,SUN_AWT,\ 248 $(eval $(call add_properties_to_compile,SUN_AWT,\
224 $(shell find $(JDK_TOPDIR)/src/windows/classes/sun/awt/windows -name "awtLocalization*.properties"),\ 249 $(filter $(JDK_TOPDIR)/src/windows/classes/sun/awt/windows/awtLocalization%.properties,\
225 ListResourceBundle)) 250 $(call CacheFind,$(JDK_TOPDIR)/src/windows/classes/sun/awt/windows)),\
251 ListResourceBundle))
226 $(eval $(call add_properties_to_compile,SUN_AWT_HK,\ 252 $(eval $(call add_properties_to_compile,SUN_AWT_HK,\
227 $(shell find $(JDK_TOPDIR)/src/windows/classes/sun/awt/windows -name "awtLocalization*.properties"),\ 253 $(filter $(JDK_TOPDIR)/src/windows/classes/sun/awt/windows/awtLocalization%.properties,\
228 ListResourceBundle,%zh_TW,%zh_HK)) 254 $(call CacheFind,$(JDK_TOPDIR)/src/windows/classes/sun/awt/windows)),\
255 ListResourceBundle,%zh_TW,%zh_HK))
229 endif 256 endif
230 257
231 #sun/launcher/resources 258 #sun/launcher/resources
232 $(eval $(call add_properties_to_compile,SUN_LAUNCHER,\ 259 $(eval $(call add_properties_to_compile,SUN_LAUNCHER,\
233 $(shell find $(JDK_TOPDIR)/src/share/classes/sun/launcher/resources -name "*.properties"),\ 260 $(filter %.properties,\
234 ListResourceBundle)) 261 $(call CacheFind,$(JDK_TOPDIR)/src/share/classes/sun/launcher/resources)),\
262 ListResourceBundle))
235 $(eval $(call add_properties_to_compile,SUN_LAUNCHER_HK,\ 263 $(eval $(call add_properties_to_compile,SUN_LAUNCHER_HK,\
236 $(shell find $(JDK_TOPDIR)/src/share/classes/sun/launcher/resources -name "*.properties"),\ 264 $(filter %.properties,\
237 ListResourceBundle,%zh_TW,%zh_HK)) 265 $(call CacheFind,$(JDK_TOPDIR)/src/share/classes/sun/launcher/resources)),\
266 ListResourceBundle,%zh_TW,%zh_HK))
238 #sun/management/resources 267 #sun/management/resources
239 $(eval $(call add_properties_to_compile,SUN_MANAGEMENT,\ 268 $(eval $(call add_properties_to_compile,SUN_MANAGEMENT,\
240 $(shell find $(JDK_TOPDIR)/src/share/classes/sun/management/resources -name "*.properties"),\ 269 $(filter %.properties,\
241 ListResourceBundle)) 270 $(call CacheFind,$(JDK_TOPDIR)/src/share/classes/sun/management/resources)),\
271 ListResourceBundle))
242 $(eval $(call add_properties_to_compile,SUN_MANAGEMENT_KH,\ 272 $(eval $(call add_properties_to_compile,SUN_MANAGEMENT_KH,\
243 $(shell find $(JDK_TOPDIR)/src/share/classes/sun/management/resources -name "*.properties"),\ 273 $(filter %.properties,\
244 ListResourceBundle,%zh_TW,%zh_HK)) 274 $(call CacheFind,$(JDK_TOPDIR)/src/share/classes/sun/management/resources)),\
275 ListResourceBundle,%zh_TW,%zh_HK))
245 #sun/print 276 #sun/print
246 #sun/print/resources 277 #sun/print/resources
247 $(eval $(call add_properties_to_compile,SUN_PRINT,\ 278 $(eval $(call add_properties_to_compile,SUN_PRINT,\
248 $(shell find $(JDK_TOPDIR)/src/share/classes/sun/print/resources -name "*.properties"),\ 279 $(filter %.properties,\
249 ListResourceBundle)) 280 $(call CacheFind,$(JDK_TOPDIR)/src/share/classes/sun/print/resources)),\
281 ListResourceBundle))
250 $(eval $(call add_properties_to_compile,SUN_PRINT_HK,\ 282 $(eval $(call add_properties_to_compile,SUN_PRINT_HK,\
251 $(shell find $(JDK_TOPDIR)/src/share/classes/sun/print/resources -name "*.properties"),\ 283 $(filter %.properties,\
252 ListResourceBundle,%zh_TW,%zh_HK)) 284 $(call CacheFind,$(JDK_TOPDIR)/src/share/classes/sun/print/resources)),\
285 ListResourceBundle,%zh_TW,%zh_HK))
253 #sun/rmi/registry/resources 286 #sun/rmi/registry/resources
254 $(eval $(call add_properties_to_clean,SUN_RMI_REGISTRY,\ 287 $(eval $(call add_properties_to_clean,SUN_RMI_REGISTRY,\
255 $(shell find $(JDK_TOPDIR)/src/share/classes/sun/rmi/registry/resources -name "*.properties"))) 288 $(filter %.properties,\
289 $(call CacheFind,$(JDK_TOPDIR)/src/share/classes/sun/rmi/registry/resources))))
256 $(eval $(call add_properties_to_clean,SUN_RMI_REGISTRY_HK,\ 290 $(eval $(call add_properties_to_clean,SUN_RMI_REGISTRY_HK,\
257 $(shell find $(JDK_TOPDIR)/src/share/classes/sun/rmi/registry/resources -name "*zh_TW.properties"),\ 291 $(filter %zh_TW.properties,\
292 $(call CacheFind,$(JDK_TOPDIR)/src/share/classes/sun/rmi/registry/resources)),\
258 %zh_TW,%zh_HK)) 293 %zh_TW,%zh_HK))
259 294
260 #sun/rmi/rmic/resources 295 #sun/rmi/rmic/resources
261 $(eval $(call add_properties_to_clean,SUN_RMI_RMIC,\ 296 $(eval $(call add_properties_to_clean,SUN_RMI_RMIC,\
262 $(shell find $(JDK_TOPDIR)/src/share/classes/sun/rmi/rmic/resources -name "*.properties"))) 297 $(filter %.properties,\
298 $(call CacheFind,$(JDK_TOPDIR)/src/share/classes/sun/rmi/rmic/resources))))
263 299
264 #sun/rmi/server/resources 300 #sun/rmi/server/resources
265 $(eval $(call add_properties_to_clean,SUN_RMI_SERVER,\ 301 $(eval $(call add_properties_to_clean,SUN_RMI_SERVER,\
266 $(shell find $(JDK_TOPDIR)/src/share/classes/sun/rmi/server/resources -name "*.properties"))) 302 $(filter %.properties,\
303 $(call CacheFind,$(JDK_TOPDIR)/src/share/classes/sun/rmi/server/resources))))
267 $(eval $(call add_properties_to_clean,SUN_RMI_SERVER_HK,\ 304 $(eval $(call add_properties_to_clean,SUN_RMI_SERVER_HK,\
268 $(shell find $(JDK_TOPDIR)/src/share/classes/sun/rmi/server/resources -name "*zh_TW.properties"),\ 305 $(filter %zh_TW.properties,\
306 $(call CacheFind,$(JDK_TOPDIR)/src/share/classes/sun/rmi/server/resources)),\
269 %zh_TW,%zh_HK)) 307 %zh_TW,%zh_HK))
270 308
271 # sun/tools/jar/resources 309 # sun/tools/jar/resources
272 $(eval $(call add_properties_to_compile,SUN_TOOLS_JAR,\ 310 $(eval $(call add_properties_to_compile,SUN_TOOLS_JAR,\
273 $(shell find $(JDK_TOPDIR)/src/share/classes/sun/tools/jar/resources -name "*.properties"),\ 311 $(filter %.properties,\
274 ListResourceBundle)) 312 $(call CacheFind,$(JDK_TOPDIR)/src/share/classes/sun/tools/jar/resources)),\
313 ListResourceBundle))
275 $(eval $(call add_properties_to_compile,SUN_TOOLS_JAR_HK,\ 314 $(eval $(call add_properties_to_compile,SUN_TOOLS_JAR_HK,\
276 $(shell find $(JDK_TOPDIR)/src/share/classes/sun/tools/jar/resources -name "*.properties"),\ 315 $(filter %.properties,\
277 ListResourceBundle,%zh_TW,%zh_HK)) 316 $(call CacheFind,$(JDK_TOPDIR)/src/share/classes/sun/tools/jar/resources)),\
317 ListResourceBundle,%zh_TW,%zh_HK))
278 318
279 #sun/tools/javac/resources 319 #sun/tools/javac/resources
280 # It's unclear if the other localized property files here are supposed to be copied or not 320 # It's unclear if the other localized property files here are supposed to be copied or not
281 # but the old build system didn't copy them. 321 # but the old build system didn't copy them.
282 $(eval $(call add_properties_to_clean,SUN_TOOLS_SERIALVER,\ 322 $(eval $(call add_properties_to_clean,SUN_TOOLS_SERIALVER,\
283 $(shell find $(JDK_TOPDIR)/src/share/classes/sun/tools/javac/resources -name "javac.properties"))) 323 $(filter %javac.properties,\
324 $(call CacheFind,$(JDK_TOPDIR)/src/share/classes/sun/tools/javac/resources))))
284 325
285 #sun/tools/jconsole/resources 326 #sun/tools/jconsole/resources
286 $(eval $(call add_properties_to_clean,SUN_TOOLS_JCONSOLE,\ 327 $(eval $(call add_properties_to_clean,SUN_TOOLS_JCONSOLE,\
287 $(shell find $(JDK_TOPDIR)/src/share/classes/sun/tools/jconsole/resources -name "*.properties"))) 328 $(filter %.properties,\
329 $(call CacheFind,$(JDK_TOPDIR)/src/share/classes/sun/tools/jconsole/resources))))
288 330
289 #sun/tools/serialver 331 #sun/tools/serialver
290 $(eval $(call add_properties_to_clean,SUN_TOOLS_SERIALVER,\ 332 $(eval $(call add_properties_to_clean,SUN_TOOLS_SERIALVER,\
291 $(shell find $(JDK_TOPDIR)/src/share/classes/sun/tools/serialver -name "*.properties"),,,resources)) 333 $(filter %.properties,\
334 $(call CacheFind,$(JDK_TOPDIR)/src/share/classes/sun/tools/serialver)),,,resources))
292 335
293 #sun/util/logging/resources 336 #sun/util/logging/resources
294 $(eval $(call add_properties_to_compile,SUN_UTIL_LOGGING,\ 337 $(eval $(call add_properties_to_compile,SUN_UTIL_LOGGING,\
295 $(shell find $(JDK_TOPDIR)/src/share/classes/sun/util/logging/resources -name "*.properties"),\ 338 $(filter %.properties,\
296 ListResourceBundle)) 339 $(call CacheFind,$(JDK_TOPDIR)/src/share/classes/sun/util/logging/resources)),\
340 ListResourceBundle))
297 $(eval $(call add_properties_to_compile,SUN_UTIL_LOGGING_HK,\ 341 $(eval $(call add_properties_to_compile,SUN_UTIL_LOGGING_HK,\
298 $(shell find $(JDK_TOPDIR)/src/share/classes/sun/util/logging/resources -name "*.properties"),\ 342 $(filter %.properties,\
299 ListResourceBundle,%zh_TW,%zh_HK)) 343 $(call CacheFind,$(JDK_TOPDIR)/src/share/classes/sun/util/logging/resources)),\
344 ListResourceBundle,%zh_TW,%zh_HK))
300 # sun/util/resources 345 # sun/util/resources
301 $(eval $(call add_properties_to_compile,SUN_UTIL,\ 346 $(eval $(call add_properties_to_compile,SUN_UTIL,\
302 $(shell find $(JDK_TOPDIR)/src/share/classes/sun/util/resources -name "*.properties"),\ 347 $(filter %.properties,\
303 sun.util.resources.LocaleNamesBundle)) 348 $(call CacheFind,$(JDK_TOPDIR)/src/share/classes/sun/util/resources)),\
349 sun.util.resources.LocaleNamesBundle))
304 350
305 # Now setup the rule for the generation of the resource bundles. 351 # Now setup the rule for the generation of the resource bundles.
306 $(JDK_OUTPUTDIR)/gensrc/_the.compiled_properties : $(ALL_COMPILED_PROPSOURCES) $(BUILD_TOOLS) 352 $(JDK_OUTPUTDIR)/gensrc/_the.compiled_properties : $(ALL_COMPILED_PROPSOURCES) $(BUILD_TOOLS)
307 # Generate all output directories in advance since the build tool does not do that... 353 # Generate all output directories in advance since the build tool does not do that...
308 $(MKDIR) -p $(sort $(dir $(ALL_COMPILED_PROPJAVAS))) 354 $(MKDIR) -p $(sort $(dir $(ALL_COMPILED_PROPJAVAS)))