| author | erikj |
| Fri, 07 Mar 2014 15:01:32 +0100 | |
| changeset 23236 | 7c5997f59e20 |
| parent 23235 | d1b1878b2eaa |
| child 23237 | 0c0c7f131faa |
--- a/jdk/make/CompileJavaClasses.gmk Fri Mar 07 09:18:15 2014 +0100 +++ b/jdk/make/CompileJavaClasses.gmk Fri Mar 07 15:01:32 2014 +0100 @@ -307,12 +307,6 @@ $(JDK_TOPDIR)/src/solaris/classes/sun/nio/ch/sctp/SctpServerChannelImpl.java endif -# The exception handling of swing beaninfo -# These resources violates the convention of having code and resources together under -# $(JDK_TOPDIR)/src/.../classes directories -$(JDK_OUTPUTDIR)/classes/javax/swing/beaninfo/images/%.gif: $(JDK_TOPDIR)/make/data/swingbeaninfo/images/%.gif - $(call install-file) - # The JDK_USER_DEFINED_FILTER is a poor man's incremental build: by specifying # JDK_FILTER at the make command line, only a subset of the JDK java files will # be recompiled. If multiple paths are separated by comma, convert that into a @@ -341,6 +335,7 @@ BIN:=$(JDK_OUTPUTDIR)/classes,\ COPY:=$(COPY_PATTERNS),\ COPY_FILES:=$(COPY_FILES),\ + CLEAN_FILES:=$(CLEAN_FILES),\ HEADERS:=$(JDK_OUTPUTDIR)/gensrc_headers,\ ADD_JAVAC_FLAGS:=$(BUILD_JDK_SOURCEPATH)))
--- a/jdk/make/CopyIntoClasses.gmk Fri Mar 07 09:18:15 2014 +0100 +++ b/jdk/make/CopyIntoClasses.gmk Fri Mar 07 15:01:32 2014 +0100 @@ -25,121 +25,53 @@ # Copy icu and _dict files used by the text break iterator -COPY_PATTERNS = .icu _dict - -# Copy config files for com.sun.org.apache.xml.internal.security - -XMLSECURITY_RESOURCEDIR = $(JDK_TOPDIR)/src/share/classes/com/sun/org/apache/xml/internal/security/resource -COPY_FILES += \ - $(XMLSECURITY_RESOURCEDIR)/config.dtd \ - $(XMLSECURITY_RESOURCEDIR)/config.xml - -# Copy sun/tools related files into the classes directory. - -# Extra jstat files -JSTAT_RESOURCEDIR = $(JDK_TOPDIR)/src/share/classes/sun/tools/jstat/resources -COPY_FILES += \ - $(JSTAT_RESOURCEDIR)/jstat_options \ - $(JSTAT_RESOURCEDIR)/jstat_unsupported_options - -# Extra jhat files -JHAT_RESOURCEDIR = $(JDK_TOPDIR)/src/share/classes/com/sun/tools/hat/resources -COPY_FILES += \ - $(JHAT_RESOURCEDIR)/hat.js \ - $(JHAT_RESOURCEDIR)/oqlhelp.html \ - $(JHAT_RESOURCEDIR)/platform_names.txt +COPY_PATTERNS := .icu _dict .dat _options .js aliasmap .spp .wav .css \ + .png .gif .xml .dtd .txt oqlhelp.html -# Extra jrunscript files -JRUNSCRIPT_RESOURCEDIR = $(JDK_TOPDIR)/src/share/classes/com/sun/tools/script/shell -COPY_FILES += \ - $(JRUNSCRIPT_RESOURCEDIR)/init.js \ - $(JRUNSCRIPT_RESOURCEDIR)/messages.properties - -# Extra jvmstat files -COPY_FILES += \ - $(JDK_TOPDIR)/src/share/classes/sun/jvmstat/perfdata/resources/aliasmap - -# JConsole resources -JCONSOLE_RESOURCES_DIR = $(JDK_TOPDIR)/src/share/classes/sun/tools/jconsole/resources -COPY_FILES += \ - $(wildcard $(JCONSOLE_RESOURCES_DIR)/*.png) \ - $(wildcard $(JCONSOLE_RESOURCES_DIR)/*.gif) +# These directories should not be copied at all +EXCLUDES += \ + com/sun/org/apache/xml/internal/security/resource/schema \ + java/awt/doc-files \ + java/lang/doc-files \ + javax/swing/doc-files \ + javax/swing/text/doc-files \ + javax/swing/plaf/synth/doc-files \ + javax/swing/undo/doc-files \ + sun/awt/X11/doc-files \ + sun/util/cldr/resources \ + # -# Print resources -PRINT_RESOURCES_DIR = $(JDK_TOPDIR)/src/share/classes/sun/print/resources -COPY_FILES += \ - $(wildcard $(PRINT_RESOURCES_DIR)/*.png) +# These files should never be included +EXFILES += build.xml README.txt version.txt -# IDN resources -COPY_FILES += \ - $(JDK_TOPDIR)/src/share/classes/sun/net/idn/uidna.spp - -# -# Swing plaf resources -# -SWING_PLAF_WINDOWS_RESOURCES_DIR = $(JDK_TOPDIR)/src/share/classes/com/sun/java/swing/plaf/windows -COPY_FILES += \ - $(wildcard $(SWING_PLAF_WINDOWS_RESOURCES_DIR)/icons/*.gif) \ - $(wildcard $(SWING_PLAF_WINDOWS_RESOURCES_DIR)/icons/*.png) +# These icons are handled in GensrcIcons.gmk +EXFILES += \ + sun/awt/X11/java-icon16.png \ + sun/awt/X11/java-icon24.png \ + sun/awt/X11/java-icon32.png \ + sun/awt/X11/java-icon48.png \ + $(wildcard $(JDK_TOPDIR)/src/share/classes/sun/awt/resources/*.png) \ + # ifndef OPENJDK - SWING_PLAF_WINDOWS_RESOURCES_DIR_CLOSED = $(JDK_TOPDIR)/src/closed/share/classes/com/sun/java/swing/plaf/windows - # Filter out JavaCup32.png from OpenJDK - COPY_FILES := $(filter-out $(SWING_PLAF_WINDOWS_RESOURCES_DIR)/icons/JavaCup32.png, $(COPY_FILES)) - # Alter JavaCup32.png from ClosedJDK - COPY_FILES += \ - $(SWING_PLAF_WINDOWS_RESOURCES_DIR_CLOSED)/icons/JavaCup32.png + # Theses icons have closed replacements + SWING_PLAF_MOTIF_RESOURCES_DIR := $(JDK_TOPDIR)/src/share/classes/com/sun/java/swing/plaf/motif + EXFILES += \ + $(JDK_TOPDIR)/src/share/classes/com/sun/java/swing/plaf/windows/icons/JavaCup32.png \ + $(JDK_TOPDIR)/src/share/classes/javax/swing/plaf/basic/icons/JavaCup16.png \ + $(wildcard $(SWING_PLAF_MOTIF_RESOURCES_DIR)/icons/*.gif) \ + $(wildcard $(SWING_PLAF_MOTIF_RESOURCES_DIR)/icons/*.png) \ + # + + EXFILES += mib_core.txt endif ifeq ($(ENABLE_JFR), true) - JFR_CONFIGURATION_DIR_CLOSED = $(JDK_TOPDIR)/src/closed/share/classes/oracle/jrockit/jfr/settings + JFR_CONFIGURATION_DIR_CLOSED := $(JDK_TOPDIR)/src/closed/share/classes/oracle/jrockit/jfr/settings COPY_FILES += \ $(JFR_CONFIGURATION_DIR_CLOSED)/jfc.xsd endif -SWING_PLAF_BASIC_RESOURCES_DIR = $(JDK_TOPDIR)/src/share/classes/javax/swing/plaf/basic -COPY_FILES += \ - $(wildcard $(SWING_PLAF_BASIC_RESOURCES_DIR)/icons/*.png) - -ifndef OPENJDK - SWING_PLAF_BASIC_RESOURCES_DIR_CLOSED = $(JDK_TOPDIR)/src/closed/share/classes/javax/swing/plaf/basic - # Filter out JavaCup16.png from OpenJDK - COPY_FILES := $(filter-out $(SWING_PLAF_BASIC_RESOURCES_DIR)/icons/JavaCup16.png, $(COPY_FILES)) - # Alter JavaCup16.png from ClosedJDK - COPY_FILES += \ - $(SWING_PLAF_BASIC_RESOURCES_DIR_CLOSED)/icons/JavaCup16.png -endif - -ifdef OPENJDK - SWING_PLAF_MOTIF_RESOURCES_DIR = $(JDK_TOPDIR)/src/share/classes/com/sun/java/swing/plaf/motif - COPY_FILES += \ - $(wildcard $(SWING_PLAF_MOTIF_RESOURCES_DIR)/icons/*.gif) \ - $(wildcard $(SWING_PLAF_MOTIF_RESOURCES_DIR)/icons/*.png) -else - SWING_PLAF_MOTIF_RESOURCES_DIR_CLOSED = $(JDK_TOPDIR)/src/closed/share/classes/com/sun/java/swing/plaf/motif - COPY_FILES += \ - $(wildcard $(SWING_PLAF_MOTIF_RESOURCES_DIR_CLOSED)/icons/*.gif) \ - $(wildcard $(SWING_PLAF_MOTIF_RESOURCES_DIR_CLOSED)/icons/*.png) -endif - -SWING_PLAF_METAL_RESOURCES_DIR = $(JDK_TOPDIR)/src/share/classes/javax/swing/plaf/metal -COPY_FILES += \ - $(wildcard $(SWING_PLAF_METAL_RESOURCES_DIR)/icons/*.gif) \ - $(wildcard $(SWING_PLAF_METAL_RESOURCES_DIR)/icons/*.png) \ - $(wildcard $(SWING_PLAF_METAL_RESOURCES_DIR)/icons/ocean/*.gif) \ - $(wildcard $(SWING_PLAF_METAL_RESOURCES_DIR)/icons/ocean/*.png) \ - $(wildcard $(SWING_PLAF_METAL_RESOURCES_DIR)/sounds/*.wav) - -ifneq ($(OPENJDK_TARGET_OS), windows) - # Only copy GTK resources on Solaris/Linux - SWING_PLAF_GTK_RESOURCES_DIR = $(JDK_TOPDIR)/src/share/classes/com/sun/java/swing/plaf/gtk - COPY_FILES += \ - $(wildcard $(SWING_PLAF_GTK_RESOURCES_DIR)/icons/*.gif) \ - $(wildcard $(SWING_PLAF_GTK_RESOURCES_DIR)/icons/*.png) \ - $(wildcard $(SWING_PLAF_GTK_RESOURCES_DIR)/resources/metacity/SwingFallbackTheme/metacity-1/*.xml) -endif -# END: Swing plaf resources - SWING_BEANINFO_RESOURCES_SRC_DIR = $(JDK_TOPDIR)/make/data/swingbeaninfo/images SWING_BEANINFO_RESOURCES_SRC = $(wildcard $(SWING_BEANINFO_RESOURCES_SRC_DIR)/*.gif) OUT_BEANINFO_RESOURCES = $(patsubst $(SWING_BEANINFO_RESOURCES_SRC_DIR)%, \ @@ -147,13 +79,13 @@ $(SWING_BEANINFO_RESOURCES_SRC)) COPY_EXTRA += $(OUT_BEANINFO_RESOURCES) -# END: Swing beaninfo resources -# Swing text resources -SWING_TEXT_RESOURCEDIR = $(JDK_TOPDIR)/src/share/classes/javax/swing/text -COPY_FILES += \ - $(SWING_TEXT_RESOURCEDIR)/html/default.css \ - $(wildcard $(SWING_TEXT_RESOURCEDIR)/rtf/charsets/*.txt) +# The exception handling of swing beaninfo +# These resources violates the convention of having code and resources together under +# $(JDK_TOPDIR)/src/.../classes directories +$(JDK_OUTPUTDIR)/classes/javax/swing/beaninfo/images/%.gif: \ + $(JDK_TOPDIR)/make/data/swingbeaninfo/images/%.gif + $(call install-file) ########################################################################################## # @@ -222,14 +154,7 @@ COPY_EXTRA += $(OUT_SERVICES_FILES) COPY_EXTRA += $(OUT_SERVICES_FILES_PRINT) -### - -$(JDK_OUTPUTDIR)/classes/sun/nio/cs/ext/sjis0213.dat: $(JDK_OUTPUTDIR)/gensrc/sun/nio/cs/ext/sjis0213.dat - $(call install-file) - -COPY_EXTRA += $(JDK_OUTPUTDIR)/classes/sun/nio/cs/ext/sjis0213.dat - -### +################################################################################ JAVAX_SOUND_SRC := $(JDK_TOPDIR)/src/share/classes/com/sun/media/sound/services @@ -248,3 +173,30 @@ JAVAX_SOUND_RULES := $(foreach F, $(JAVAX_SOUND_SRC_FILES), $(JDK_OUTPUTDIR)/classes/META-INF/services/$(notdir $F):$(JAVAX_SOUND_SRC)/$F) $(foreach R, $(JAVAX_SOUND_RULES), $(eval $(call addto_meta-inf_services, $R))) + +################################################################################ + +CLEAN_FILES := $(wildcard \ + $(JDK_TOPDIR)/src/share/classes/com/sun/imageio/plugins/common/*.properties \ + $(JDK_TOPDIR)/src/share/classes/com/sun/java/util/jar/pack/*.properties \ + $(JDK_TOPDIR)/src/share/classes/com/sun/jndi/cosnaming/jndiprovider.properties \ + $(JDK_TOPDIR)/src/share/classes/com/sun/jndi/ldap/jndiprovider.properties \ + $(JDK_TOPDIR)/src/share/classes/com/sun/org/apache/xml/internal/security/resource/*.properties \ + $(JDK_TOPDIR)/src/share/classes/com/sun/rowset/*.properties \ + $(JDK_TOPDIR)/src/share/classes/com/sun/tools/script/shell/*.properties \ + $(JDK_TOPDIR)/src/share/classes/javax/sql/rowset/*.properties \ + $(JDK_TOPDIR)/src/share/classes/sun/rmi/registry/resources/*.properties \ + $(JDK_TOPDIR)/src/share/classes/sun/rmi/rmic/resources/*.properties \ + $(JDK_TOPDIR)/src/share/classes/sun/rmi/server/resources/*.properties \ + $(JDK_TOPDIR)/src/share/classes/sun/tools/javac/resources/*.properties \ + $(JDK_TOPDIR)/src/share/classes/sun/tools/jconsole/resources/*.properties \ + $(JDK_TOPDIR)/src/share/classes/sun/tools/serialver/resources/*.properties \ + ) + +# Copy zh_HK files from zh_TW + +$(JDK_OUTPUTDIR)/classes/%_zh_HK.properties: $(JDK_OUTPUTDIR)/classes/%_zh_TW.properties + $(install-file) + +COPY_EXTRA += $(patsubst $(JDK_TOPDIR)/src/share/classes/%, $(JDK_OUTPUTDIR)/classes/%, \ + $(subst _zh_TW,_zh_HK, $(filter %_zh_TW.properties, $(CLEAN_FILES))))
--- a/jdk/make/Tools.gmk Fri Mar 07 09:18:15 2014 +0100 +++ b/jdk/make/Tools.gmk Fri Mar 07 15:01:32 2014 +0100 @@ -61,9 +61,6 @@ TOOL_COMPILEPROPERTIES = $(JAVA) -cp $(JDK_OUTPUTDIR)/btclasses \ build.tools.compileproperties.CompileProperties -TOOL_STRIPPROPERTIES = $(JAVA) -cp $(JDK_OUTPUTDIR)/btclasses \ - build.tools.stripproperties.StripProperties - TOOL_JARREORDER = $(JAVA) -cp $(JDK_OUTPUTDIR)/btclasses \ build.tools.jarreorder.JarReorder
--- a/jdk/make/gensrc/GensrcProperties.gmk Fri Mar 07 09:18:15 2014 +0100 +++ b/jdk/make/gensrc/GensrcProperties.gmk Fri Mar 07 15:01:32 2014 +0100 @@ -33,19 +33,10 @@ # The (very long) command line for compilation, stored in a file, prior to use. COMPILE_PROPCMDLINE := -# All .properties files to be cleaned are appended to this variable. -ALL_CLEANED_PROPSOURCES := -# All generated cleaned .properties files from cleaning are appended to this variable. -ALL_CLEANED_PROPOUTPUT := -# The (very long) command line for cleaning, stored in a file, prior to use. -CLEAN_PROPCMDLINE := - define add_properties_to_compile # $1 is the name of the properties group # $2 is the files belonging to this group # $3 is the super class for the generated java file. - # $4 is a from pattern for translating stripped name from source to target - # $5 is the to pattern replacing $3 in the target # Strip away prefix and suffix, # leaving for example: sun/util/resources/CurrencyNames_sv @@ -53,16 +44,14 @@ $$(patsubst $(JDK_TOPDIR)/src/macosx/classes/%.properties, %, \ $$(patsubst $(JDK_TOPDIR)/src/share/classes/%.properties, %, $2))) - # Apply optional name transformation, example: hz_TW -> hz_HK - $(if $4, $1_PROPPATHS := $$(patsubst $4, $5, $$($1_PROPPATHS))) - # Accumulate all found properties files. ALL_COMPILED_PROPSOURCES += $2 # Generate the list of to be created java files. ALL_COMPILED_PROPJAVAS += $$(patsubst %, $(JDK_OUTPUTDIR)/gensrc/%.java, $$($1_PROPPATHS)) - # Now generate a sequence of "-compile ...CurrencyNames_sv.properties ...CurrencyNames_sv.java ListResourceBundle" + # Now generate a sequence of + # "-compile ...CurrencyNames_sv.properties ...CurrencyNames_sv.java ListResourceBundle" # suitable to be fed into the CompileProperties command. COMPILE_PROPCMDLINE += $$(subst _SPACE_,$(SPACE),$$(join $$(addprefix -compile_SPACE_, $2), \ $$(addsuffix _SPACE_$(strip $3), \ @@ -70,290 +59,55 @@ $$(addsuffix .java, $$($1_PROPPATHS)))))) endef -define add_properties_to_clean - # $1 is the name of the properties group - # $2 is the files belonging to this group - # $3 is a from pattern for translating stripped name from source to target - # $4 is the to pattern replacing $3 in the target - # $5 optional name of extra directory to put properties files in (ex: resources) - - # Strip away prefix and suffix, - # leaving for example: sun/util/resources/CurrencyNames_sv - $1_PROPPATHS := $$(patsubst $(JDK_TOPDIR)/src/$(OPENJDK_TARGET_OS_API_DIR)/classes/%.properties, %, \ - $$(patsubst $(JDK_TOPDIR)/src/share/classes/%.properties, %, $2)) - - # Apply optional name transformation, example: hz_TW -> hz_HK - $(if $3, $1_PROPPATHS := $$(patsubst $3, $4, $$($1_PROPPATHS))) - - # Accumulate all found properties files. - ALL_CLEANED_PROPSOURCES += $2 - - # Generate the list of to be created java files. - $1_PROPOUTPUT := $$(patsubst %, $(JDK_OUTPUTDIR)/classes/%.properties, $$($1_PROPPATHS)) - # If the properties target file isn't in a "resources" dir, add one. - ifneq ($5, ) - $1_PROPOUTPUT := $$(foreach p, $$($1_PROPOUTPUT), $$(dir $$p)$5/$$(notdir $$p)) - endif - - ALL_CLEANED_PROPOUTPUT += $$($1_PROPOUTPUT) +################################################################################ +# Some packages have properties that need to be converted to java source files. +COMPILE_PROP_SRC_FILES := \ + $(filter %.properties, $(call CacheFind, \ + $(JDK_TOPDIR)/src/share/classes/com/sun/accessibility/internal/resources \ + $(JDK_TOPDIR)/src/share/classes/com/sun/java/swing/plaf/motif/resources \ + $(JDK_TOPDIR)/src/share/classes/com/sun/java/swing/plaf/windows/resources \ + $(JDK_TOPDIR)/src/share/classes/com/sun/swing/internal/plaf/basic/resources \ + $(JDK_TOPDIR)/src/share/classes/com/sun/swing/internal/plaf/metal/resources \ + $(JDK_TOPDIR)/src/share/classes/com/sun/swing/internal/plaf/synth/resources \ + $(JDK_TOPDIR)/src/share/classes/com/sun/tools/jdi/resources \ + $(JDK_TOPDIR)/src/share/classes/sun/awt/resources \ + $(JDK_TOPDIR)/src/share/classes/sun/launcher/resources \ + $(JDK_TOPDIR)/src/share/classes/sun/management/resources \ + $(JDK_TOPDIR)/src/share/classes/sun/print/resources \ + $(JDK_TOPDIR)/src/share/classes/sun/tools/jar/resources \ + $(JDK_TOPDIR)/src/share/classes/sun/util/logging/resources)) \ + # - # Now generate a sequence of "-clean ...[src]...CurrencyNames_sv.properties ...[build]...CurrencyNames_sv.properties" - # suitable to be fed into the StripProperties command. - CLEAN_PROPCMDLINE += $$(subst _SPACE_,$(SPACE),$$(join $$(addprefix -clean_SPACE_,$2), \ - $$(addprefix _SPACE_, $$($1_PROPOUTPUT)))) -endef - -# Some packages contain pregenerated java files instead of properties files. -# But unfortunately not all properties should be converted, some should be -# copied....argggghhh. - -# For example: -# sun/applet/resources -# sun/misc/resources -# sun/text/resources -# sun/tools/jconsole/resources -# sun/tools/native2ascii/resources -# sun/util/resources - -# Some packages have properties that need to be converted to java source files. - -#com/apple/laf/resources ifeq ($(OPENJDK_TARGET_OS), macosx) - $(eval $(call add_properties_to_compile,COM_APPLE_LAF, \ - $(filter %.properties, \ - $(call CacheFind, $(JDK_TOPDIR)/src/macosx/classes/com/apple/laf/resources)), \ - ListResourceBundle)) + COMPILE_PROP_SRC_FILES += \ + $(filter %.properties, $(call CacheFind, \ + $(JDK_TOPDIR)/src/macosx/classes/com/apple/laf/resources \ + $(JDK_TOPDIR)/src/macosx/classes/sun/awt/resources)) \ + # endif -#com/sun/accessibility/internal/resources -$(eval $(call add_properties_to_compile,COM_SUN_ACCESSIBILITY, \ - $(filter %.properties, \ - $(call CacheFind, $(JDK_TOPDIR)/src/share/classes/com/sun/accessibility/internal/resources)), \ - ListResourceBundle)) -$(eval $(call add_properties_to_compile,COM_SUN_ACCESSIBILITY_HK, \ - $(filter %.properties, \ - $(call CacheFind, $(JDK_TOPDIR)/src/share/classes/com/sun/accessibility/internal/resources)), \ - ListResourceBundle, %zh_TW, %zh_HK)) -#com/sun/imageio/plugins/common -$(eval $(call add_properties_to_clean,COM_SUN_IMAGEIO, \ - $(filter %.properties, \ - $(call CacheFind, $(JDK_TOPDIR)/src/share/classes/com/sun/imageio)))) -#com/sun/java/swing/plaf/gtk/resources -ifneq ($(OPENJDK_TARGET_OS), windows) - # Only compile GTK resource bundles on Solaris/Linux - $(eval $(call add_properties_to_compile,COM_SUN_SWING_PLAF_GTK, \ - $(filter %.properties, \ - $(call CacheFind, $(JDK_TOPDIR)/src/share/classes/com/sun/java/swing/plaf/gtk/resources)), \ - ListResourceBundle)) - $(eval $(call add_properties_to_compile,COM_SUN_SWING_PLAF_GTK_HK, \ - $(filter %.properties, \ - $(call CacheFind, $(JDK_TOPDIR)/src/share/classes/com/sun/java/swing/plaf/gtk/resources)), \ - ListResourceBundle, %zh_TW, %zh_HK)) -endif -#com/sun/java/swing/plaf/motif/resources -$(eval $(call add_properties_to_compile,COM_SUN_SWING_PLAF_MOTIF, \ - $(filter %.properties, \ - $(call CacheFind, $(JDK_TOPDIR)/src/share/classes/com/sun/java/swing/plaf/motif/resources)), \ - ListResourceBundle)) -$(eval $(call add_properties_to_compile,COM_SUN_SWING_PLAF_MOTIF_HK, \ - $(filter %.properties, \ - $(call CacheFind, $(JDK_TOPDIR)/src/share/classes/com/sun/java/swing/plaf/motif/resources)), \ - ListResourceBundle, %zh_TW, %zh_HK)) -#com/sun/java/swing/plaf/windows/resources -$(eval $(call add_properties_to_compile,COM_SUN_SWING_PLAF_WINDOWS, \ - $(filter %.properties, \ - $(call CacheFind, $(JDK_TOPDIR)/src/share/classes/com/sun/java/swing/plaf/windows/resources)), \ - ListResourceBundle)) -$(eval $(call add_properties_to_compile,COM_SUN_SWING_PLAF_WINDOWS_HK, \ - $(filter %.properties, \ - $(call CacheFind, $(JDK_TOPDIR)/src/share/classes/com/sun/java/swing/plaf/windows/resources)), \ - ListResourceBundle, %zh_TW, %zh_HK)) -#com/sun/java/util/jar/pack -$(eval $(call add_properties_to_clean,JNDI_COSNAMING, \ - $(JDK_TOPDIR)/src/share/classes/com/sun/java/util/jar/pack/intrinsic.properties)) -#com/sun/jndi/cosnaming -$(eval $(call add_properties_to_clean,JNDI_COSNAMING, \ - $(JDK_TOPDIR)/src/share/classes/com/sun/jndi/cosnaming/jndiprovider.properties)) -#com/sun/jndi/ldap -$(eval $(call add_properties_to_clean,JNDI_COSNAMING, \ - $(JDK_TOPDIR)/src/share/classes/com/sun/jndi/ldap/jndiprovider.properties)) - -#com/sun/org/apache/xml/internal/security/resource -#FIXME: The "xmlsecurity*.properties" pattern is not ideal; we might want to find -#a better way to select the properties files that are needed. -$(eval $(call add_properties_to_clean,XML_SECURITY, \ - $(filter $(JDK_TOPDIR)/src/share/classes/com/sun/org/apache/xml/internal/security/resource/xmlsecurity%.properties, \ - $(call CacheFind, $(JDK_TOPDIR)/src/share/classes/com/sun/org/apache/xml/internal/security/resource)))) - -#com/sun/rowset -$(eval $(call add_properties_to_clean,COM_SUN_ROWSET, \ - $(filter %.properties, \ - $(call CacheFind, $(JDK_TOPDIR)/src/share/classes/com/sun/rowset)))) -$(eval $(call add_properties_to_clean,COM_SUN_ROWSET_HK, \ - $(filter %zh_TW.properties, \ - $(call CacheFind, $(JDK_TOPDIR)/src/share/classes/com/sun/rowset)), \ - %zh_TW, %zh_HK)) - -#com/sun/swing/internal/plaf/basic/resources -$(eval $(call add_properties_to_compile,COM_SUN_SWING_PLAF_BASIC, \ - $(filter %.properties, \ - $(call CacheFind, $(JDK_TOPDIR)/src/share/classes/com/sun/swing/internal/plaf/basic/resources)), \ - ListResourceBundle)) -$(eval $(call add_properties_to_compile,COM_SUN_SWING_PLAF_BASIC_HK, \ - $(filter %.properties, \ - $(call CacheFind, $(JDK_TOPDIR)/src/share/classes/com/sun/swing/internal/plaf/basic/resources)), \ - ListResourceBundle, %zh_TW, %zh_HK)) -#com/sun/swing/internal/plaf/metal/resources -$(eval $(call add_properties_to_compile,COM_SUN_SWING_PLAF_METAL, \ - $(filter %.properties, \ - $(call CacheFind, $(JDK_TOPDIR)/src/share/classes/com/sun/swing/internal/plaf/metal/resources)), \ - ListResourceBundle)) -$(eval $(call add_properties_to_compile,COM_SUN_SWING_PLAF_METAL_HK, \ - $(filter %.properties, $(call CacheFind, $(JDK_TOPDIR)/src/share/classes/com/sun/swing/internal/plaf/metal/resources)), \ - ListResourceBundle, %zh_TW, %zh_HK)) -#com/sun/swing/internal/plaf/synth/resources -$(eval $(call add_properties_to_compile,COM_SUN_SWING_PLAF_SYNTH, \ - $(filter %.properties, \ - $(call CacheFind, $(JDK_TOPDIR)/src/share/classes/com/sun/swing/internal/plaf/synth/resources)), \ - ListResourceBundle)) -$(eval $(call add_properties_to_compile,COM_SUN_SWING_PLAF_SYNTH_HK, \ - $(filter %.properties, \ - $(call CacheFind, $(JDK_TOPDIR)/src/share/classes/com/sun/swing/internal/plaf/synth/resources)), \ - ListResourceBundle, %zh_TW, %zh_HK)) - -#com/sun/tools/jdi/resources -$(eval $(call add_properties_to_compile,COM_SUN_TOOLS_JDI, \ - $(filter %.properties, \ - $(call CacheFind, $(JDK_TOPDIR)/src/share/classes/com/sun/tools/jdi/resources)), \ - ListResourceBundle)) - -#com/sun/tools/script/shell -#java/util -#javax/sql/rowset -$(eval $(call add_properties_to_clean,JAVAX_SQL_ROWSET, \ - $(filter %.properties, \ - $(call CacheFind, $(JDK_TOPDIR)/src/share/classes/javax/sql/rowset)))) -#sun/awt/resources -$(eval $(call add_properties_to_compile,SUN_AWT, \ - $(filter %.properties, \ - $(call CacheFind, $(JDK_TOPDIR)/src/share/classes/sun/awt/resources)), \ - ListResourceBundle)) -$(eval $(call add_properties_to_compile,SUN_AWT_HK, \ - $(filter %.properties, \ - $(call CacheFind, $(JDK_TOPDIR)/src/share/classes/sun/awt/resources)), \ - ListResourceBundle, %zh_TW, %zh_HK)) -#sun/awt/windows/ ifeq ($(OPENJDK_TARGET_OS), windows) - $(eval $(call add_properties_to_compile,SUN_AWT, \ - $(filter $(JDK_TOPDIR)/src/windows/classes/sun/awt/windows/awtLocalization%.properties, \ - $(call CacheFind, $(JDK_TOPDIR)/src/windows/classes/sun/awt/windows)), \ - ListResourceBundle)) - $(eval $(call add_properties_to_compile,SUN_AWT_HK, \ - $(filter $(JDK_TOPDIR)/src/windows/classes/sun/awt/windows/awtLocalization%.properties, \ - $(call CacheFind, $(JDK_TOPDIR)/src/windows/classes/sun/awt/windows)), \ - ListResourceBundle, %zh_TW, %zh_HK)) -endif -# os x specific awt properties -ifeq ($(OPENJDK_TARGET_OS),macosx) -$(eval $(call add_properties_to_compile,SUN_AWT,\ - $(filter $(JDK_TOPDIR)/src/macosx/classes/sun/awt/resources/%.properties,\ - $(call CacheFind,$(JDK_TOPDIR)/src/macosx/classes/sun/awt/resources)),\ - ListResourceBundle)) + COMPILE_PROP_SRC_FILES += \ + $(filter %.properties, $(call CacheFind, \ + $(JDK_TOPDIR)/src/windows/classes/sun/awt/windows)) \ + # +else # ! windows + COMPILE_PROP_SRC_FILES += \ + $(filter %.properties, $(call CacheFind, \ + $(JDK_TOPDIR)/src/share/classes/com/sun/java/swing/plaf/gtk/resources)) \ + # endif -#sun/launcher/resources -$(eval $(call add_properties_to_compile,SUN_LAUNCHER, \ - $(filter %.properties, \ - $(call CacheFind, $(JDK_TOPDIR)/src/share/classes/sun/launcher/resources)), \ - ListResourceBundle)) -$(eval $(call add_properties_to_compile,SUN_LAUNCHER_HK, \ - $(filter %.properties, \ - $(call CacheFind, $(JDK_TOPDIR)/src/share/classes/sun/launcher/resources)), \ - ListResourceBundle, %zh_TW, %zh_HK)) -#sun/management/resources -$(eval $(call add_properties_to_compile,SUN_MANAGEMENT, \ - $(filter %.properties, \ - $(call CacheFind, $(JDK_TOPDIR)/src/share/classes/sun/management/resources)), \ - ListResourceBundle)) -$(eval $(call add_properties_to_compile,SUN_MANAGEMENT_KH, \ - $(filter %.properties, \ - $(call CacheFind, $(JDK_TOPDIR)/src/share/classes/sun/management/resources)), \ - ListResourceBundle, %zh_TW, %zh_HK)) -#sun/print -#sun/print/resources -$(eval $(call add_properties_to_compile,SUN_PRINT, \ - $(filter %.properties, \ - $(call CacheFind, $(JDK_TOPDIR)/src/share/classes/sun/print/resources)), \ - ListResourceBundle)) -$(eval $(call add_properties_to_compile,SUN_PRINT_HK, \ - $(filter %.properties, \ - $(call CacheFind, $(JDK_TOPDIR)/src/share/classes/sun/print/resources)), \ - ListResourceBundle, %zh_TW, %zh_HK)) -#sun/rmi/registry/resources -$(eval $(call add_properties_to_clean,SUN_RMI_REGISTRY, \ - $(filter %.properties, \ - $(call CacheFind, $(JDK_TOPDIR)/src/share/classes/sun/rmi/registry/resources)))) -$(eval $(call add_properties_to_clean,SUN_RMI_REGISTRY_HK, \ - $(filter %zh_TW.properties, \ - $(call CacheFind, $(JDK_TOPDIR)/src/share/classes/sun/rmi/registry/resources)), \ - %zh_TW, %zh_HK)) - -#sun/rmi/rmic/resources -$(eval $(call add_properties_to_clean,SUN_RMI_RMIC, \ - $(filter %.properties, \ - $(call CacheFind, $(JDK_TOPDIR)/src/share/classes/sun/rmi/rmic/resources)))) +$(eval $(call add_properties_to_compile,LIST_RESOURCE_BUNDLE, \ + $(COMPILE_PROP_SRC_FILES), ListResourceBundle)) -#sun/rmi/server/resources -$(eval $(call add_properties_to_clean,SUN_RMI_SERVER, \ - $(filter %.properties, \ - $(call CacheFind, $(JDK_TOPDIR)/src/share/classes/sun/rmi/server/resources)))) -$(eval $(call add_properties_to_clean,SUN_RMI_SERVER_HK, \ - $(filter %zh_TW.properties, \ - $(call CacheFind, $(JDK_TOPDIR)/src/share/classes/sun/rmi/server/resources)), \ - %zh_TW, %zh_HK)) - -# sun/tools/jar/resources -$(eval $(call add_properties_to_compile,SUN_TOOLS_JAR, \ - $(filter %.properties, \ - $(call CacheFind, $(JDK_TOPDIR)/src/share/classes/sun/tools/jar/resources)), \ - ListResourceBundle)) -$(eval $(call add_properties_to_compile,SUN_TOOLS_JAR_HK, \ - $(filter %.properties, \ - $(call CacheFind, $(JDK_TOPDIR)/src/share/classes/sun/tools/jar/resources)), \ - ListResourceBundle, %zh_TW, %zh_HK)) - -#sun/tools/javac/resources -# It's unclear if the other localized property files here are supposed to be copied or not -# but the old build system didn't copy them. -$(eval $(call add_properties_to_clean,SUN_TOOLS_SERIALVER, \ - $(filter %javac.properties, \ - $(call CacheFind, $(JDK_TOPDIR)/src/share/classes/sun/tools/javac/resources)))) - -#sun/tools/jconsole/resources -$(eval $(call add_properties_to_clean,SUN_TOOLS_JCONSOLE, \ - $(filter %.properties, \ - $(call CacheFind, $(JDK_TOPDIR)/src/share/classes/sun/tools/jconsole/resources)))) - -#sun/tools/serialver -$(eval $(call add_properties_to_clean,SUN_TOOLS_SERIALVER, \ - $(filter %.properties, \ - $(call CacheFind, $(JDK_TOPDIR)/src/share/classes/sun/tools/serialver)), , ,resources)) - -#sun/util/logging/resources -$(eval $(call add_properties_to_compile,SUN_UTIL_LOGGING, \ - $(filter %.properties, \ - $(call CacheFind, $(JDK_TOPDIR)/src/share/classes/sun/util/logging/resources)), \ - ListResourceBundle)) -$(eval $(call add_properties_to_compile,SUN_UTIL_LOGGING_HK, \ - $(filter %.properties, \ - $(call CacheFind, $(JDK_TOPDIR)/src/share/classes/sun/util/logging/resources)), \ - ListResourceBundle, %zh_TW, %zh_HK)) # sun/util/resources $(eval $(call add_properties_to_compile,SUN_UTIL, \ $(filter %.properties, \ $(call CacheFind, $(JDK_TOPDIR)/src/share/classes/sun/util/resources)), \ sun.util.resources.LocaleNamesBundle)) +################################################################################ # Now setup the rule for the generation of the resource bundles. $(JDK_OUTPUTDIR)/gensrc/_the.compiled_properties: $(ALL_COMPILED_PROPSOURCES) $(BUILD_TOOLS) # Generate all output directories in advance since the build tool does not do that... @@ -363,33 +117,31 @@ $(TOOL_COMPILEPROPERTIES) -quiet @$(JDK_OUTPUTDIR)/gensrc/_the.cmdline $(TOUCH) $@ -# Now setup the rule for the generation of the cleaned properties. -# FIXME: We currently don't handle removed properties incrementally. -$(JDK_OUTPUTDIR)/classes/_the.cleaned_properties: $(ALL_CLEANED_PROPSOURCES) $(BUILD_TOOLS) - $(RM) $(JDK_OUTPUTDIR)/classes/_the.cleaned_properties.cmdline - # Generate all output directories in advance since the build tool does not do that... - $(MKDIR) -p $(sort $(dir $(ALL_CLEANED_PROPOUTPUT))) - $(ECHO) Copying and cleaning $(words $(ALL_CLEANED_PROPSOURCES)) properties - $(call ListPathsSafely,CLEAN_PROPCMDLINE,\n, >> $(JDK_OUTPUTDIR)/classes/_the.cleaned_properties.cmdline) - $(TOOL_STRIPPROPERTIES) @$(JDK_OUTPUTDIR)/classes/_the.cleaned_properties.cmdline - $(TOUCH) $@ - $(ALL_COMPILED_PROPJAVAS): $(JDK_OUTPUTDIR)/gensrc/_the.compiled_properties -$(ALL_CLEANED_PROPOUTPUT): $(JDK_OUTPUTDIR)/classes/_the.cleaned_properties - +################################################################################ +# Some zh_HK resources are just copies of zh_TW -# Some zh_HK resources are just copied of zh_TW +define convert_tw_to_hk + $(MKDIR) -p $(@D) + $(CAT) $< | $(SED) -e '/class/s/_zh_TW/_zh_HK/' > $@ +endef + $(JDK_OUTPUTDIR)/gensrc/%_zh_HK.java: $(JDK_TOPDIR)/src/share/classes/%_zh_TW.java - $(MKDIR) -p $(@D) - $(CAT) $< | $(SED) -e '/class/s/_zh_TW/_zh_HK/' > $@ + $(call convert_tw_to_hk) + +$(JDK_OUTPUTDIR)/gensrc/%_zh_HK.java: $(JDK_OUTPUTDIR)/gensrc/%_zh_TW.java + $(call convert_tw_to_hk) ZH_HK_JAVA := sun/applet/resources/MsgAppletViewer_zh_HK.java \ sun/misc/resources/Messages_zh_HK.java \ sun/security/util/AuthResources_zh_HK.java \ sun/security/util/Resources_zh_HK.java -ZH_HK_JAVA_FILES := $(addprefix $(JDK_OUTPUTDIR)/gensrc/, $(ZH_HK_JAVA)) +ZH_HK_JAVA_FILES := $(addprefix $(JDK_OUTPUTDIR)/gensrc/, $(ZH_HK_JAVA)) \ + $(filter-out $(JDK_OUTPUTDIR)/gensrc/sun/util/resources/zh/%, \ + $(subst _zh_TW,_zh_HK,$(filter %_zh_TW.java, $(ALL_COMPILED_PROPJAVAS)))) +################################################################################ -GENSRC_PROPERTIES := $(ALL_COMPILED_PROPJAVAS) $(ALL_CLEANED_PROPOUTPUT) $(ZH_HK_JAVA_FILES) +GENSRC_PROPERTIES := $(ALL_COMPILED_PROPJAVAS) $(ZH_HK_JAVA_FILES)
--- a/jdk/make/src/classes/build/tools/stripproperties/StripProperties.java Fri Mar 07 09:18:15 2014 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,288 +0,0 @@ -/* - * Copyright (c) 2001, 2013, Oracle and/or its affiliates. All rights reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * - * This code is free software; you can redistribute it and/or modify it - * under the terms of the GNU General Public License version 2 only, as - * published by the Free Software Foundation. Oracle designates this - * particular file as subject to the "Classpath" exception as provided - * by Oracle in the LICENSE file that accompanied this code. - * - * This code is distributed in the hope that it will be useful, but WITHOUT - * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or - * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License - * version 2 for more details (a copy is included in the LICENSE file that - * accompanied this code). - * - * You should have received a copy of the GNU General Public License version - * 2 along with this work; if not, write to the Free Software Foundation, - * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. - * - * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA - * or visit www.oracle.com if you need additional information or have any - * questions. - */ - -package build.tools.stripproperties; - -import java.io.BufferedInputStream; -import java.io.BufferedWriter; -import java.io.FileInputStream; -import java.io.FileNotFoundException; -import java.io.FileOutputStream; -import java.io.OutputStream; -import java.io.OutputStreamWriter; -import java.io.IOException; -import java.io.InputStream; -import java.util.ArrayList; -import java.util.Enumeration; -import java.util.Iterator; -import java.util.List; -import java.util.Properties; - -/** - * Reads a properties file from standard input and writes an equivalent - * properties file without comments to standard output. - */ -public class StripProperties { - - private static void error(String msg, Exception e) { - System.err.println("ERROR: stripproperties: " + msg); - if ( e != null ) { - System.err.println("EXCEPTION: " + e.toString()); - e.printStackTrace(); - } - } - - private static List<String> infiles = new ArrayList<String>(); - private static List<String> outfiles = new ArrayList<String>(); - - private static boolean parseOptions(String args[]) { - boolean ok = true; - - for ( int i = 0; i < args.length ; i++ ) { - if ( "-clean".equals(args[i]) && i+2 < args.length ) { - infiles.add(args[++i]); - outfiles.add(args[++i]); - } else if ( args[i].charAt(0)=='@') { - String filename = args[i].substring(1); - FileInputStream finput = null; - byte contents[] = null; - try { - finput = new FileInputStream(filename); - int byteCount = finput.available(); - if ( byteCount <= 0 ) { - error("The @file is empty", null); - ok = false; - } else { - contents = new byte[byteCount]; - int bytesRead = finput.read(contents); - if ( byteCount != bytesRead ) { - error("Cannot read all of @file", null); - ok = false; - } - } - } catch ( IOException e ) { - error("cannot open " + filename, e); - ok = false; - } - if ( finput != null ) { - try { - finput.close(); - } catch ( IOException e ) { - ok = false; - error("cannot close " + filename, e); - } - } - if ( ok && contents != null ) { - String tokens[] = (new String(contents)).split("\\s+"); - if ( tokens.length > 0 ) { - ok = parseOptions(tokens); - } - } - if ( !ok ) { - break; - } - } else { - infiles.add(args[i]); - outfiles.add(args[i]); - } - } - return ok; - } - - private static boolean stripFiles(List<String> infiles, List<String> outfiles) { - boolean ok = true; - Iterator<String> inIter = infiles.iterator(); - Iterator<String> outIter = outfiles.iterator(); - - for (; inIter.hasNext(); ) { - String infile = inIter.next(); - String outfile = outIter.next(); - - Properties prop = new Properties(); - InputStream in = null; - try { - in = new BufferedInputStream(new FileInputStream(infile)); - prop.load(in); - } catch ( FileNotFoundException e ) { - error("Cannot access file " + infile, e); - ok = false; - } catch ( IOException e ) { - error("IO exception processing file " + infile, e); - ok = false; - } - if ( in != null ) { - try { - in.close(); - } catch ( IOException e ) { - error("IO exception closing file " + infile, e); - ok = false; - } - } - if ( !ok ) { - break; - } - - OutputStream out = null; - try { - out = new FileOutputStream(outfile); - storeProperties(prop, out); - out.flush(); - } catch ( IOException e ) { - error("IO exception processing file " + outfile, e); - ok = false; - } - if ( out != null ) { - try { - out.close(); - } catch ( IOException e ) { - error("IO exception closing file " + outfile, e); - ok = false; - } - } - if ( !ok ) { - break; - } - - } - return ok; - } - - /** - * Strip the properties filenames supplied, replacing their contents. - * @param args Names of properties files to process and replace contents - */ - public static void main(String args[]) { - boolean ok = parseOptions(args); - if ( !ok || !stripFiles(infiles, outfiles) ) { - System.exit(1); - } - } - - // --- code below here is adapted from java.util.Properties --- - - private static final String specialSaveChars = "=: \t\r\n\f#!"; - - /* - * Converts unicodes to encoded \uxxxx - * and writes out any of the characters in specialSaveChars - * with a preceding slash - */ - private static String saveConvert(String theString, boolean escapeSpace) { - int len = theString.length(); - StringBuffer outBuffer = new StringBuffer(len*2); - - for(int x=0; x<len; x++) { - char aChar = theString.charAt(x); - switch(aChar) { - case ' ': - if (x == 0 || escapeSpace) { - outBuffer.append('\\'); - } - outBuffer.append(' '); - break; - case '\\': - outBuffer.append('\\'); - outBuffer.append('\\'); - break; - case '\t': - outBuffer.append('\\'); - outBuffer.append('t'); - break; - case '\n': - outBuffer.append('\\'); - outBuffer.append('n'); - break; - case '\r': - outBuffer.append('\\'); - outBuffer.append('r'); - break; - case '\f': - outBuffer.append('\\'); - outBuffer.append('f'); - break; - default: - if ((aChar < 0x0020) || (aChar == 0x007e) || (aChar > 0x00ff)) { - outBuffer.append('\\'); - outBuffer.append('u'); - outBuffer.append(toHex((aChar >> 12) & 0xF)); - outBuffer.append(toHex((aChar >> 8) & 0xF)); - outBuffer.append(toHex((aChar >> 4) & 0xF)); - outBuffer.append(toHex( aChar & 0xF)); - } else { - if (specialSaveChars.indexOf(aChar) != -1) { - outBuffer.append('\\'); - } - outBuffer.append(aChar); - } - } - } - return outBuffer.toString(); - } - - /** - * Writes the content of <code>properties</code> to <code>out</code>. - * The format is that of Properties.store with the following modifications: - * <ul> - * <li>No header or date is written - * <li>Latin-1 characters are written as single bytes, not escape sequences - * <li>Line breaks are indicated by a single \n independent of platform - * <ul> - */ - private static void storeProperties(Properties properties, OutputStream out) - throws IOException { - BufferedWriter awriter; - awriter = new BufferedWriter(new OutputStreamWriter(out, "8859_1")); - for (Enumeration<Object> e = properties.keys(); e.hasMoreElements();) { - String key = (String)e.nextElement(); - String val = (String)properties.get(key); - key = saveConvert(key, true); - - /* No need to escape embedded and trailing spaces for value, hence - * pass false to flag. - */ - val = saveConvert(val, false); - writeln(awriter, key + "=" + val); - } - awriter.flush(); - } - - private static void writeln(BufferedWriter bw, String s) throws IOException { - bw.write(s); - bw.write("\n"); - } - - /** - * Convert a nibble to a hex character - * @param nibble the nibble to convert. - */ - private static char toHex(int nibble) { - return hexDigit[(nibble & 0xF)]; - } - - /** A table of hex digits */ - private static final char[] hexDigit = { - '0','1','2','3','4','5','6','7','8','9','A','B','C','D','E','F' - }; -}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/jdk/src/share/classes/sun/tools/serialver/resources/serialver.properties Fri Mar 07 15:01:32 2014 +0100 @@ -0,0 +1,20 @@ +SerialVersionInspector=Serial Version Inspector +File=File +Exit=Exit +Show=Show +FullClassName=Full Class Name: +SerialVersion=Serial Version: +NotSerializable=\ + Class {0} is not Serializable. +ClassNotFound=\ + Class {0} not found. +error.parsing.classpath=\ + Error parsing classpath {0}. +error.missing.classpath=\ + Missing argument for -classpath option +invalid.flag=\ + Invalid flag {0}. +ignoring.classes=\ + Cannot specify class arguments with the -show option +usage=\ + use: serialver [-classpath classpath] [-show] [classname...]
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/jdk/src/share/classes/sun/tools/serialver/resources/serialver_ja.properties Fri Mar 07 15:01:32 2014 +0100 @@ -0,0 +1,13 @@ +SerialVersionInspector=\u30B7\u30EA\u30A2\u30EB\u30FB\u30D0\u30FC\u30B8\u30E7\u30F3\u30FB\u30A4\u30F3\u30B9\u30DA\u30AF\u30BF +File=\u30D5\u30A1\u30A4\u30EB +Exit=\u7D42\u4E86 +Show=\u8868\u793A +FullClassName=\u5B8C\u5168\u30AF\u30E9\u30B9\u540D: +SerialVersion=\u30B7\u30EA\u30A2\u30EB\u30FB\u30D0\u30FC\u30B8\u30E7\u30F3: +NotSerializable=\u30AF\u30E9\u30B9{0}\u306F\u76F4\u5217\u5316\u3067\u304D\u307E\u305B\u3093\u3002 +ClassNotFound=\u30AF\u30E9\u30B9{0}\u304C\u898B\u3064\u304B\u308A\u307E\u305B\u3093\u3002 +error.parsing.classpath=\u30AF\u30E9\u30B9\u30D1\u30B9{0}\u306E\u89E3\u6790\u30A8\u30E9\u30FC\u3067\u3059\u3002 +error.missing.classpath=-classpath\u30AA\u30D7\u30B7\u30E7\u30F3\u306E\u5F15\u6570\u304C\u898B\u3064\u304B\u308A\u307E\u305B\u3093 +invalid.flag=\u7121\u52B9\u306A\u30D5\u30E9\u30B0{0}\u3002 +ignoring.classes=-show\u30AA\u30D7\u30B7\u30E7\u30F3\u3092\u6301\u3064\u30AF\u30E9\u30B9\u5F15\u6570\u3092\u6307\u5B9A\u3067\u304D\u307E\u305B\u3093 +usage=\u4F7F\u7528\u65B9\u6CD5: serialver [-classpath classpath] [-show] [classname...]
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/jdk/src/share/classes/sun/tools/serialver/resources/serialver_zh_CN.properties Fri Mar 07 15:01:32 2014 +0100 @@ -0,0 +1,13 @@ +SerialVersionInspector=\u5E8F\u5217\u7248\u672C\u68C0\u67E5\u5668 +File=\u6587\u4EF6 +Exit=\u9000\u51FA +Show=\u663E\u793A +FullClassName=\u5B8C\u6574\u7684\u7C7B\u540D: +SerialVersion=\u5E8F\u5217\u7248\u672C: +NotSerializable=\u7C7B{0}\u65E0\u6CD5\u5E8F\u5217\u5316\u3002 +ClassNotFound=\u627E\u4E0D\u5230\u7C7B{0}\u3002 +error.parsing.classpath=\u89E3\u6790\u7C7B\u8DEF\u5F84 {0} \u65F6\u51FA\u9519\u3002 +error.missing.classpath=\u7F3A\u5C11 -classpath \u9009\u9879\u7684\u53C2\u6570 +invalid.flag=\u65E0\u6548\u6807\u8BB0{0}\u3002 +ignoring.classes=\u65E0\u6CD5\u4F7F\u7528 -show \u9009\u9879\u6307\u5B9A\u7C7B\u53C2\u6570 +usage=\u7528\u6CD5: serialver [-classpath \u7C7B\u8DEF\u5F84] [-show] [\u7C7B\u540D\u79F0...]
--- a/jdk/src/share/classes/sun/tools/serialver/serialver.properties Fri Mar 07 09:18:15 2014 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,20 +0,0 @@ -SerialVersionInspector=Serial Version Inspector -File=File -Exit=Exit -Show=Show -FullClassName=Full Class Name: -SerialVersion=Serial Version: -NotSerializable=\ - Class {0} is not Serializable. -ClassNotFound=\ - Class {0} not found. -error.parsing.classpath=\ - Error parsing classpath {0}. -error.missing.classpath=\ - Missing argument for -classpath option -invalid.flag=\ - Invalid flag {0}. -ignoring.classes=\ - Cannot specify class arguments with the -show option -usage=\ - use: serialver [-classpath classpath] [-show] [classname...]
--- a/jdk/src/share/classes/sun/tools/serialver/serialver_ja.properties Fri Mar 07 09:18:15 2014 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,13 +0,0 @@ -SerialVersionInspector=\u30B7\u30EA\u30A2\u30EB\u30FB\u30D0\u30FC\u30B8\u30E7\u30F3\u30FB\u30A4\u30F3\u30B9\u30DA\u30AF\u30BF -File=\u30D5\u30A1\u30A4\u30EB -Exit=\u7D42\u4E86 -Show=\u8868\u793A -FullClassName=\u5B8C\u5168\u30AF\u30E9\u30B9\u540D: -SerialVersion=\u30B7\u30EA\u30A2\u30EB\u30FB\u30D0\u30FC\u30B8\u30E7\u30F3: -NotSerializable=\u30AF\u30E9\u30B9{0}\u306F\u76F4\u5217\u5316\u3067\u304D\u307E\u305B\u3093\u3002 -ClassNotFound=\u30AF\u30E9\u30B9{0}\u304C\u898B\u3064\u304B\u308A\u307E\u305B\u3093\u3002 -error.parsing.classpath=\u30AF\u30E9\u30B9\u30D1\u30B9{0}\u306E\u89E3\u6790\u30A8\u30E9\u30FC\u3067\u3059\u3002 -error.missing.classpath=-classpath\u30AA\u30D7\u30B7\u30E7\u30F3\u306E\u5F15\u6570\u304C\u898B\u3064\u304B\u308A\u307E\u305B\u3093 -invalid.flag=\u7121\u52B9\u306A\u30D5\u30E9\u30B0{0}\u3002 -ignoring.classes=-show\u30AA\u30D7\u30B7\u30E7\u30F3\u3092\u6301\u3064\u30AF\u30E9\u30B9\u5F15\u6570\u3092\u6307\u5B9A\u3067\u304D\u307E\u305B\u3093 -usage=\u4F7F\u7528\u65B9\u6CD5: serialver [-classpath classpath] [-show] [classname...]
--- a/jdk/src/share/classes/sun/tools/serialver/serialver_zh_CN.properties Fri Mar 07 09:18:15 2014 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,13 +0,0 @@ -SerialVersionInspector=\u5E8F\u5217\u7248\u672C\u68C0\u67E5\u5668 -File=\u6587\u4EF6 -Exit=\u9000\u51FA -Show=\u663E\u793A -FullClassName=\u5B8C\u6574\u7684\u7C7B\u540D: -SerialVersion=\u5E8F\u5217\u7248\u672C: -NotSerializable=\u7C7B{0}\u65E0\u6CD5\u5E8F\u5217\u5316\u3002 -ClassNotFound=\u627E\u4E0D\u5230\u7C7B{0}\u3002 -error.parsing.classpath=\u89E3\u6790\u7C7B\u8DEF\u5F84 {0} \u65F6\u51FA\u9519\u3002 -error.missing.classpath=\u7F3A\u5C11 -classpath \u9009\u9879\u7684\u53C2\u6570 -invalid.flag=\u65E0\u6548\u6807\u8BB0{0}\u3002 -ignoring.classes=\u65E0\u6CD5\u4F7F\u7528 -show \u9009\u9879\u6307\u5B9A\u7C7B\u53C2\u6570 -usage=\u7528\u6CD5: serialver [-classpath \u7C7B\u8DEF\u5F84] [-show] [\u7C7B\u540D\u79F0...]