Mercurial > hg > icedtea9-forest > langtools

changeset 1296:24540bbb4135

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge
author andrew
date Tue, 29 May 2012 00:27:58 +0100
parents 8caec3672381 (diff) 179fa85aeefa (current diff)
children 7450073e2e6f
files .hgtags make/build.xml make/test/lib/apt.sh make/tools/CompileProperties/CompileProperties.java make/tools/CompileProperties/CompilePropertiesTask.java make/tools/GenStubs/GenStubs.java make/tools/SelectTool/SelectToolTask.java src/share/classes/com/sun/mirror/apt/AnnotationProcessor.java src/share/classes/com/sun/mirror/apt/AnnotationProcessorEnvironment.java src/share/classes/com/sun/mirror/apt/AnnotationProcessorFactory.java src/share/classes/com/sun/mirror/apt/AnnotationProcessorListener.java src/share/classes/com/sun/mirror/apt/AnnotationProcessors.java src/share/classes/com/sun/mirror/apt/Filer.java src/share/classes/com/sun/mirror/apt/Messager.java src/share/classes/com/sun/mirror/apt/RoundCompleteEvent.java src/share/classes/com/sun/mirror/apt/RoundCompleteListener.java src/share/classes/com/sun/mirror/apt/RoundState.java src/share/classes/com/sun/mirror/apt/package-info.java src/share/classes/com/sun/mirror/declaration/AnnotationMirror.java src/share/classes/com/sun/mirror/declaration/AnnotationTypeDeclaration.java src/share/classes/com/sun/mirror/declaration/AnnotationTypeElementDeclaration.java src/share/classes/com/sun/mirror/declaration/AnnotationValue.java src/share/classes/com/sun/mirror/declaration/ClassDeclaration.java src/share/classes/com/sun/mirror/declaration/ConstructorDeclaration.java src/share/classes/com/sun/mirror/declaration/Declaration.java src/share/classes/com/sun/mirror/declaration/EnumConstantDeclaration.java src/share/classes/com/sun/mirror/declaration/EnumDeclaration.java src/share/classes/com/sun/mirror/declaration/ExecutableDeclaration.java src/share/classes/com/sun/mirror/declaration/FieldDeclaration.java src/share/classes/com/sun/mirror/declaration/InterfaceDeclaration.java src/share/classes/com/sun/mirror/declaration/MemberDeclaration.java src/share/classes/com/sun/mirror/declaration/MethodDeclaration.java src/share/classes/com/sun/mirror/declaration/Modifier.java src/share/classes/com/sun/mirror/declaration/PackageDeclaration.java src/share/classes/com/sun/mirror/declaration/ParameterDeclaration.java src/share/classes/com/sun/mirror/declaration/TypeDeclaration.java src/share/classes/com/sun/mirror/declaration/TypeParameterDeclaration.java src/share/classes/com/sun/mirror/declaration/package-info.java src/share/classes/com/sun/mirror/overview.html src/share/classes/com/sun/mirror/type/AnnotationType.java src/share/classes/com/sun/mirror/type/ArrayType.java src/share/classes/com/sun/mirror/type/ClassType.java src/share/classes/com/sun/mirror/type/DeclaredType.java src/share/classes/com/sun/mirror/type/EnumType.java src/share/classes/com/sun/mirror/type/InterfaceType.java src/share/classes/com/sun/mirror/type/MirroredTypeException.java src/share/classes/com/sun/mirror/type/MirroredTypesException.java src/share/classes/com/sun/mirror/type/PrimitiveType.java src/share/classes/com/sun/mirror/type/ReferenceType.java src/share/classes/com/sun/mirror/type/TypeMirror.java src/share/classes/com/sun/mirror/type/TypeVariable.java src/share/classes/com/sun/mirror/type/VoidType.java src/share/classes/com/sun/mirror/type/WildcardType.java src/share/classes/com/sun/mirror/type/package-info.java src/share/classes/com/sun/mirror/util/DeclarationFilter.java src/share/classes/com/sun/mirror/util/DeclarationScanner.java src/share/classes/com/sun/mirror/util/DeclarationVisitor.java src/share/classes/com/sun/mirror/util/DeclarationVisitors.java src/share/classes/com/sun/mirror/util/Declarations.java src/share/classes/com/sun/mirror/util/SimpleDeclarationVisitor.java src/share/classes/com/sun/mirror/util/SimpleTypeVisitor.java src/share/classes/com/sun/mirror/util/SourceOrderDeclScanner.java src/share/classes/com/sun/mirror/util/SourcePosition.java src/share/classes/com/sun/mirror/util/TypeVisitor.java src/share/classes/com/sun/mirror/util/Types.java src/share/classes/com/sun/mirror/util/package-info.java src/share/classes/com/sun/tools/apt/Main.java src/share/classes/com/sun/tools/apt/comp/AnnotationProcessingError.java src/share/classes/com/sun/tools/apt/comp/Apt.java src/share/classes/com/sun/tools/apt/comp/BootstrapAPF.java src/share/classes/com/sun/tools/apt/comp/PrintAP.java src/share/classes/com/sun/tools/apt/comp/UsageMessageNeededException.java src/share/classes/com/sun/tools/apt/main/AptJavaCompiler.java src/share/classes/com/sun/tools/apt/main/CommandLine.java src/share/classes/com/sun/tools/apt/main/Main.java src/share/classes/com/sun/tools/apt/mirror/AptEnv.java src/share/classes/com/sun/tools/apt/mirror/apt/AnnotationProcessorEnvironmentImpl.java src/share/classes/com/sun/tools/apt/mirror/apt/FilerImpl.java src/share/classes/com/sun/tools/apt/mirror/apt/MessagerImpl.java src/share/classes/com/sun/tools/apt/mirror/apt/RoundCompleteEventImpl.java src/share/classes/com/sun/tools/apt/mirror/apt/RoundStateImpl.java src/share/classes/com/sun/tools/apt/mirror/declaration/AnnotationMirrorImpl.java src/share/classes/com/sun/tools/apt/mirror/declaration/AnnotationProxyMaker.java src/share/classes/com/sun/tools/apt/mirror/declaration/AnnotationTypeDeclarationImpl.java src/share/classes/com/sun/tools/apt/mirror/declaration/AnnotationTypeElementDeclarationImpl.java src/share/classes/com/sun/tools/apt/mirror/declaration/AnnotationValueImpl.java src/share/classes/com/sun/tools/apt/mirror/declaration/ClassDeclarationImpl.java src/share/classes/com/sun/tools/apt/mirror/declaration/Constants.java src/share/classes/com/sun/tools/apt/mirror/declaration/ConstructorDeclarationImpl.java src/share/classes/com/sun/tools/apt/mirror/declaration/DeclarationImpl.java src/share/classes/com/sun/tools/apt/mirror/declaration/DeclarationMaker.java src/share/classes/com/sun/tools/apt/mirror/declaration/EnumConstantDeclarationImpl.java src/share/classes/com/sun/tools/apt/mirror/declaration/EnumDeclarationImpl.java src/share/classes/com/sun/tools/apt/mirror/declaration/ExecutableDeclarationImpl.java src/share/classes/com/sun/tools/apt/mirror/declaration/FieldDeclarationImpl.java src/share/classes/com/sun/tools/apt/mirror/declaration/InterfaceDeclarationImpl.java src/share/classes/com/sun/tools/apt/mirror/declaration/MemberDeclarationImpl.java src/share/classes/com/sun/tools/apt/mirror/declaration/MethodDeclarationImpl.java src/share/classes/com/sun/tools/apt/mirror/declaration/PackageDeclarationImpl.java src/share/classes/com/sun/tools/apt/mirror/declaration/ParameterDeclarationImpl.java src/share/classes/com/sun/tools/apt/mirror/declaration/TypeDeclarationImpl.java src/share/classes/com/sun/tools/apt/mirror/declaration/TypeParameterDeclarationImpl.java src/share/classes/com/sun/tools/apt/mirror/type/AnnotationTypeImpl.java src/share/classes/com/sun/tools/apt/mirror/type/ArrayTypeImpl.java src/share/classes/com/sun/tools/apt/mirror/type/ClassTypeImpl.java src/share/classes/com/sun/tools/apt/mirror/type/DeclaredTypeImpl.java src/share/classes/com/sun/tools/apt/mirror/type/EnumTypeImpl.java src/share/classes/com/sun/tools/apt/mirror/type/InterfaceTypeImpl.java src/share/classes/com/sun/tools/apt/mirror/type/PrimitiveTypeImpl.java src/share/classes/com/sun/tools/apt/mirror/type/TypeMaker.java src/share/classes/com/sun/tools/apt/mirror/type/TypeMirrorImpl.java src/share/classes/com/sun/tools/apt/mirror/type/TypeVariableImpl.java src/share/classes/com/sun/tools/apt/mirror/type/VoidTypeImpl.java src/share/classes/com/sun/tools/apt/mirror/type/WildcardTypeImpl.java src/share/classes/com/sun/tools/apt/mirror/util/DeclarationsImpl.java src/share/classes/com/sun/tools/apt/mirror/util/SourcePositionImpl.java src/share/classes/com/sun/tools/apt/mirror/util/TypesImpl.java src/share/classes/com/sun/tools/apt/resources/apt.properties src/share/classes/com/sun/tools/apt/resources/apt_ja.properties src/share/classes/com/sun/tools/apt/resources/apt_zh_CN.properties src/share/classes/com/sun/tools/apt/util/Bark.java src/share/classes/com/sun/tools/javac/Launcher.java src/share/classes/com/sun/tools/javac/file/Paths.java src/share/classes/com/sun/tools/javac/jvm/ClassReader.java src/share/classes/com/sun/tools/javac/main/JavacOption.java src/share/classes/com/sun/tools/javac/main/OptionName.java src/share/classes/com/sun/tools/javac/main/RecognizedOptions.java src/share/classes/com/sun/tools/javac/parser/DocCommentScanner.java src/share/classes/com/sun/tools/javac/parser/EndPosParser.java src/share/classes/com/sun/tools/javac/parser/Keywords.java src/share/classes/com/sun/tools/javac/parser/Token.java test/jprt.config test/tools/apt/Basics/Aggregate.java test/tools/apt/Basics/ClassAnnotations.java test/tools/apt/Basics/FreshnessApf.java test/tools/apt/Basics/GenClass.java test/tools/apt/Basics/Indirect.java test/tools/apt/Basics/Lacuna.java test/tools/apt/Basics/MethodAnnotations.java test/tools/apt/Basics/Milk.java test/tools/apt/Basics/MisMatch.java test/tools/apt/Basics/Misc.java test/tools/apt/Basics/MyMarker.java test/tools/apt/Basics/MySimple.java test/tools/apt/Basics/NestedClassAnnotations.java test/tools/apt/Basics/ParameterAnnotations.java test/tools/apt/Basics/StaticFieldAnnotations.java test/tools/apt/Basics/StaticMethodAnnotations.java test/tools/apt/Basics/TestGetPackageApf.java test/tools/apt/Basics/TestGetTypeDeclarationApf.java test/tools/apt/Basics/annot/AnnotMarker.java test/tools/apt/Basics/annot/AnnotShangri_la.java test/tools/apt/Basics/annot/AnnotSimple.java test/tools/apt/Basics/annot/annot2/AnnotMarker2.java test/tools/apt/Basics/annot/annot2/AnnotSimple2.java test/tools/apt/Basics/com.sun.mirror.apt.AnnotationProcessorFactory test/tools/apt/Basics/foo/bar/Baz.java test/tools/apt/Basics/foo/bar/Quux.java test/tools/apt/Basics/golden.txt test/tools/apt/Basics/goldenAggregate.txt test/tools/apt/Basics/p1/p2.java test/tools/apt/Basics/p1/p2/C1.java test/tools/apt/Basics/print.sh test/tools/apt/Compile/ClassDeclApf.java test/tools/apt/Compile/ClassDeclApf2.java test/tools/apt/Compile/Dummy1.java test/tools/apt/Compile/ErrorAPF.java test/tools/apt/Compile/HelloAnnotation.java test/tools/apt/Compile/HelloWorld.java test/tools/apt/Compile/Round1Apf.java test/tools/apt/Compile/Round2Apf.java test/tools/apt/Compile/Round3Apf.java test/tools/apt/Compile/Round4Apf.java test/tools/apt/Compile/Rounds.java test/tools/apt/Compile/StaticApf.java test/tools/apt/Compile/WarnAPF.java test/tools/apt/Compile/WrappedStaticApf.java test/tools/apt/Compile/compile.sh test/tools/apt/Compile/golden.txt test/tools/apt/Compile/goldenFactory.txt test/tools/apt/Compile/goldenWarn.txt test/tools/apt/Compile/servicesRound1 test/tools/apt/Compile/servicesRound2 test/tools/apt/Compile/servicesRound3 test/tools/apt/Compile/servicesRound4 test/tools/apt/Compile/servicesStaticApf test/tools/apt/Compile/src/AhOneClass.java test/tools/apt/Compile/src/AndAhTwoClass.java test/tools/apt/Compile/src/Round1Class.java test/tools/apt/Discovery/Dee.java test/tools/apt/Discovery/Dum.java test/tools/apt/Discovery/Empty.java test/tools/apt/Discovery/PhantomTouch.java test/tools/apt/Discovery/PhantomUpdate.java test/tools/apt/Discovery/Touch.java test/tools/apt/Discovery/discovery.sh test/tools/apt/Discovery/servicesBadTouch test/tools/apt/Discovery/servicesPhantomTouch test/tools/apt/Discovery/servicesTouch test/tools/apt/Discovery/servicesTweedle test/tools/apt/Misc/Marked.java test/tools/apt/Misc/Marker.java test/tools/apt/Misc/Misc.java test/tools/apt/Misc/misc.sh test/tools/apt/Misc/servicesMisc test/tools/apt/Options/Marked.java test/tools/apt/Options/Marker.java test/tools/apt/Options/OptionChecker.java test/tools/apt/Options/options.sh test/tools/apt/Options/servicesOptions test/tools/apt/Scanners/Counter.java test/tools/apt/Scanners/MemberOrderApf.java test/tools/apt/Scanners/Order.java test/tools/apt/Scanners/Scanner.java test/tools/apt/Scanners/TestEnum.java test/tools/apt/Scanners/VisitOrder.java test/tools/apt/Scanners/scanner.sh test/tools/apt/Scanners/servicesScanner test/tools/apt/lib/Ignore.java test/tools/apt/lib/Test.java test/tools/apt/lib/TestProcessor.java test/tools/apt/lib/TestProcessorFactory.java test/tools/apt/lib/Tester.java test/tools/apt/mirror/declaration/AnnoMirror.java test/tools/apt/mirror/declaration/AnnoTypeDecl.java test/tools/apt/mirror/declaration/AnnoTypeElemDecl.java test/tools/apt/mirror/declaration/AnnoVal.java test/tools/apt/mirror/declaration/ClassDecl.java test/tools/apt/mirror/declaration/ConstExpr.java test/tools/apt/mirror/declaration/ConstructorDecl.java test/tools/apt/mirror/declaration/EnumDecl.java test/tools/apt/mirror/declaration/FieldDecl.java test/tools/apt/mirror/declaration/GetAnno.java test/tools/apt/mirror/declaration/InterfaceDecl.java test/tools/apt/mirror/declaration/MethodDecl.java test/tools/apt/mirror/declaration/PackageDecl.java test/tools/apt/mirror/declaration/ParameterDecl.java test/tools/apt/mirror/declaration/pkg1/AClass.java test/tools/apt/mirror/declaration/pkg1/AnAnnoType.java test/tools/apt/mirror/declaration/pkg1/AnEnum.java test/tools/apt/mirror/declaration/pkg1/AnInterface.java test/tools/apt/mirror/declaration/pkg1/package-info.java test/tools/apt/mirror/declaration/pkg1/pkg2/AnInterface.java test/tools/apt/mirror/declaration/pkg1/pkg2/package.html test/tools/apt/mirror/type/AnnoTyp.java test/tools/apt/mirror/type/ArrayTyp.java test/tools/apt/mirror/type/ClassTyp.java test/tools/apt/mirror/type/EnumTyp.java test/tools/apt/mirror/type/InterfaceTyp.java test/tools/apt/mirror/type/PrimitiveTyp.java test/tools/apt/mirror/type/TypeVar.java test/tools/apt/mirror/type/WildcardTyp.java test/tools/apt/mirror/util/Overrides.java test/tools/apt/mirror/util/TypeCreation.java test/tools/javac/apt.sh test/tools/javac/diags/examples/InferredDoNotConformToBounds.java
diffstat 2 files changed, 4 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/.hgtags	Thu May 24 16:16:05 2012 -0700
+++ b/.hgtags	Tue May 29 00:27:58 2012 +0100
@@ -50,6 +50,7 @@
 9596dff460935f09684c11d156ce591f92584f0d jdk7-b73
 1a66b08deed0459054b5b1bea3dfbead30d258fa jdk7-b74
 2485f5641ed0829205aaaeb31ad711c2c2ef0de3 jdk7-b75
+83367f01297bf255f511f5291bbbbaa24a9c8459 icedtea7-1.12
 8fb9b4be3cb1574302acde90549a4d333ef51e93 jdk7-b76
 0398ae15b90ac76d87ee21844453e95ff8613e43 jdk7-b77
 acc1e40a5874ebf32bebcb6ada565b3b40b7461c jdk7-b78
@@ -63,6 +64,7 @@
 ef07347428f2198ae6b8144ac0b9086bbe39fd16 jdk7-b86
 409db93d19c002333980df5b797c6b965150c7a0 jdk7-b87
 f9b5d4867a26f8c4b90ad37fe2c345b721e93d6b jdk7-b88
+681f1f51926faf4c73d8905a429ff4ead6e9d622 icedtea7-1.13
 6cea9a143208bc1185ced046942c0f4e45dbeba5 jdk7-b89
 71c2c23a7c35b2896c87004023b9743b6d1b7758 jdk7-b90
 97b6fa97b8ddb3a49394011c2a0ec5d6535e594c jdk7-b91
@@ -111,6 +113,7 @@
 3d7acdbb72cab55deedfd35f60d4732abc9d6ac4 jdk7-b134
 9d0a61ac567b983da7cc8f4a7030f2245bb6dbab jdk7-b135
 ed0f7f1f9511db4f9615b1426d22f8b961629275 jdk7-b136
+8e26c4aee63c04ee129bf9068f5eea47cc385177 icedtea-1.14
 a15c9b058ae007d4ccb7e35ce44e4dfa977f090b jdk7-b137
 53f212bed4f4304dce7f0bf0fa01c998c65bacd6 jdk7-b138
 853b6bb99f9b58eb7cf8211c67d3b6e4f1228a3e jdk7-b139
--- a/make/build.xml	Thu May 24 16:16:05 2012 -0700
+++ b/make/build.xml	Tue May 29 00:27:58 2012 +0100
@@ -891,7 +891,7 @@
         </javac>
         <taskdef name="genstubs"
                  classname="anttasks.GenStubsTask"
-                 classpath="${build.toolclasses.dir}/"/>
+                 classpath="${build.toolclasses.dir}:${build.bootstrap.dir}/classes:${ant.home}/lib/ant.jar"/>
     </target>
 
     <target name="-def-javadoc-tool" depends="-check-target.java.home">