Mercurial > jdk8-mips64-public > langtools / changeset
changeset
Merge
Fri, 31 May 2013 10:28:30 +0100
- author
- chegar
- date
- Fri, 31 May 2013 10:28:30 +0100
- changeset 1834
- 76d08c649607
- parent 1833
- f1b90ea7d402
- parent 1769
- 023e9a614d26
- child 1835
- 536cad596942
- child 1836
- da8d0ee0938e
Merge
1.1 --- a/.hgtags Thu May 23 12:50:40 2013 +0100 1.2 +++ b/.hgtags Fri May 31 10:28:30 2013 +0100 1.3 @@ -212,3 +212,5 @@ 1.4 a1e10f3adc47c8602a72e43a41403a642e73e0b1 jdk8-b88 1.5 ec434cfd2752a7742c875c2fe7d556d8b81c0f3a jdk8-b89 1.6 e19283cd30a43fca94d8f7639c73ef66db493b1e jdk8-b90 1.7 +997c0fae2b12108959387862be54b78ca0ae3fca jdk8-b91 1.8 +149890642a0ed5138a4f16fe08ddbfeb8f8a1cb4 jdk8-b92
2.1 --- a/makefiles/BuildLangtools.gmk Thu May 23 12:50:40 2013 +0100 2.2 +++ b/makefiles/BuildLangtools.gmk Fri May 31 10:28:30 2013 +0100 2.3 @@ -56,7 +56,7 @@ 2.4 # The compileprops tools compiles a properties file into a resource bundle. 2.5 TOOL_COMPILEPROPS_CMD:=$(JAVA) -cp $(LANGTOOLS_OUTPUTDIR)/btclasses compileproperties.CompileProperties -quiet 2.6 # Lookup the properties that need to be compiled into resource bundles. 2.7 -PROPSOURCES:=$(shell find $(LANGTOOLS_TOPDIR)/src/share/classes -name "*.properties") 2.8 +PROPSOURCES:=$(shell $(FIND) $(LANGTOOLS_TOPDIR)/src/share/classes -name "*.properties") 2.9 # Strip away prefix and suffix, leaving for example only: "com/sun/tools/javac/resources/javac_zh_CN" 2.10 PROPPATHS:=$(patsubst $(LANGTOOLS_TOPDIR)/src/share/classes/%.properties,%,$(PROPSOURCES)) 2.11 # Generate the list of java files to be created. 2.12 @@ -70,13 +70,13 @@ 2.13 2.14 # Now setup the rule for the generation of the resource bundles. 2.15 $(LANGTOOLS_OUTPUTDIR)/gensrc/_the_props.d : $(PROPSOURCES) $(BUILD_TOOLS) 2.16 - rm -rf $(@D)/* 2.17 - mkdir -p $(@D) $(PROPDIRS) 2.18 - printf "jdk=$(JDK_VERSION)\nfull=$(FULL_VERSION)\nrelease=$(RELEASE)\n" > $(LANGTOOLS_OUTPUTDIR)/gensrc/com/sun/tools/javah/resources/version.properties 2.19 - printf "jdk=$(JDK_VERSION)\nfull=$(FULL_VERSION)\nrelease=$(RELEASE)\n" > $(LANGTOOLS_OUTPUTDIR)/gensrc/com/sun/tools/javap/resources/version.properties 2.20 - printf "jdk=$(JDK_VERSION)\nfull=$(FULL_VERSION)\nrelease=$(RELEASE)\n" > $(LANGTOOLS_OUTPUTDIR)/gensrc/com/sun/tools/javac/resources/version.properties 2.21 - printf "jdk=$(JDK_VERSION)\nfull=$(FULL_VERSION)\nrelease=$(RELEASE)\n" > $(LANGTOOLS_OUTPUTDIR)/gensrc/com/sun/tools/jdeps/resources/version.properties 2.22 - echo Compiling $(words $(PROPSOURCES) v1 v2 v3) properties into resource bundles 2.23 + $(RM) -r $(@D)/* 2.24 + $(MKDIR) -p $(@D) $(PROPDIRS) 2.25 + $(PRINTF) "jdk=$(JDK_VERSION)\nfull=$(FULL_VERSION)\nrelease=$(RELEASE)\n" > $(LANGTOOLS_OUTPUTDIR)/gensrc/com/sun/tools/javah/resources/version.properties 2.26 + $(PRINTF) "jdk=$(JDK_VERSION)\nfull=$(FULL_VERSION)\nrelease=$(RELEASE)\n" > $(LANGTOOLS_OUTPUTDIR)/gensrc/com/sun/tools/javap/resources/version.properties 2.27 + $(PRINTF) "jdk=$(JDK_VERSION)\nfull=$(FULL_VERSION)\nrelease=$(RELEASE)\n" > $(LANGTOOLS_OUTPUTDIR)/gensrc/com/sun/tools/javac/resources/version.properties 2.28 + $(PRINTF) "jdk=$(JDK_VERSION)\nfull=$(FULL_VERSION)\nrelease=$(RELEASE)\n" > $(LANGTOOLS_OUTPUTDIR)/gensrc/com/sun/tools/jdeps/resources/version.properties 2.29 + $(ECHO) Compiling $(words $(PROPSOURCES) v1 v2 v3) properties into resource bundles 2.30 $(TOOL_COMPILEPROPS_CMD) $(PROPCMDLINE) \ 2.31 -compile $(LANGTOOLS_OUTPUTDIR)/gensrc/com/sun/tools/javah/resources/version.properties \ 2.32 $(LANGTOOLS_OUTPUTDIR)/gensrc/com/sun/tools/javah/resources/version.java \ 2.33 @@ -90,7 +90,7 @@ 2.34 -compile $(LANGTOOLS_OUTPUTDIR)/gensrc/com/sun/tools/jdeps/resources/version.properties \ 2.35 $(LANGTOOLS_OUTPUTDIR)/gensrc/com/sun/tools/jdeps/resources/version.java \ 2.36 java.util.ListResourceBundle 2.37 - echo PROPS_ARE_CREATED=yes > $@ 2.38 + $(ECHO) PROPS_ARE_CREATED=yes > $@ 2.39 2.40 # Trigger the generation of the resource bundles. After the resource bundles have 2.41 # been compiled, then the makefile will restart and the newly created java files 2.42 @@ -134,19 +134,19 @@ 2.43 $(LANGTOOLS_OUTPUTDIR)/genstubs/_the_stubs.d : $(STUBSOURCES) $(BUILD_TOOLS) \ 2.44 $(LANGTOOLS_OUTPUTDIR)/dist/bootstrap/lib/javac.jar \ 2.45 $(LANGTOOLS_OUTPUTDIR)/gensrc/_the_props.d 2.46 - mkdir -p $(@D) 2.47 - mkdir -p $(LANGTOOLS_OUTPUTDIR)/tmpstubs 2.48 - echo $(LOG_INFO) Generating stubs from JDK sources. 2.49 - ($(TOOL_GENSTUBS_CMD) -s $(LANGTOOLS_OUTPUTDIR)/tmpstubs -sourcepath $(JDKS) $(STUBCLASSES) && echo STUBS_ARE_CREATED=yes > $@) 2.50 + $(MKDIR) -p $(@D) 2.51 + $(MKDIR) -p $(LANGTOOLS_OUTPUTDIR)/tmpstubs 2.52 + $(ECHO) $(LOG_INFO) Generating stubs from JDK sources. 2.53 + ($(TOOL_GENSTUBS_CMD) -s $(LANGTOOLS_OUTPUTDIR)/tmpstubs -sourcepath $(JDKS) $(STUBCLASSES) && $(ECHO) STUBS_ARE_CREATED=yes > $@) 2.54 if $(DIFF) -x "_the*" -rq $(LANGTOOLS_OUTPUTDIR)/tmpstubs $(LANGTOOLS_OUTPUTDIR)/genstubs > /dev/null 2>&1; then \ 2.55 - echo $(LOG_INFO) No changes in the stubs!; \ 2.56 - rm -rf $(LANGTOOLS_OUTPUTDIR)/tmpstubs; \ 2.57 + $(ECHO) $(LOG_INFO) No changes in the stubs!; \ 2.58 + $(RM) -r $(LANGTOOLS_OUTPUTDIR)/tmpstubs; \ 2.59 else \ 2.60 - echo $(LOG_INFO) Changes in stubs detected!; \ 2.61 - rm -rf $(@D); \ 2.62 - mv $(LANGTOOLS_OUTPUTDIR)/tmpstubs $(@D); \ 2.63 + $(ECHO) $(LOG_INFO) Changes in stubs detected!; \ 2.64 + $(RM) -r $(@D); \ 2.65 + $(MV) $(LANGTOOLS_OUTPUTDIR)/tmpstubs $(@D); \ 2.66 fi 2.67 - echo STUBS_ARE_CREATED=yes > $@ 2.68 + $(ECHO) STUBS_ARE_CREATED=yes > $@ 2.69 2.70 # Trigger a generation of the genstubs java source code and a restart 2.71 # of the makefile to make sure that the following build setup use the
3.1 --- a/test/tools/javac/annotations/typeAnnotations/classfile/TestNewCastArray.java Thu May 23 12:50:40 2013 +0100 3.2 +++ b/test/tools/javac/annotations/typeAnnotations/classfile/TestNewCastArray.java Fri May 31 10:28:30 2013 +0100 3.3 @@ -1,5 +1,5 @@ 3.4 /* 3.5 - * Copyright (c) 2013 Oracle and/or its affiliates. All rights reserved. 3.6 + * Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved. 3.7 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. 3.8 * 3.9 * This code is free software; you can redistribute it and/or modify it
