From ab120497cfbb0f2dc0daf1ccb0960972bbf939c2 Mon Sep 17 00:00:00 2001 From: Mandy Chung Date: Wed, 27 May 2015 13:25:18 -0700 Subject: [PATCH] 8074432: Move jdeps and javap to jdk.jdeps module Reviewed-by: jjg, alanb, erikj --- langtools/make/CompileInterim.gmk | 6 ++--- langtools/make/build.properties | 4 +-- langtools/make/build.xml | 6 ++--- langtools/make/gensrc/Gensrc-jdk.compiler.gmk | 5 +--- ...ensrc-jdk.dev.gmk => Gensrc-jdk.jdeps.gmk} | 6 ++++- langtools/make/intellij/langtools.iml | 4 +-- langtools/make/intellij/workspace.xml | 12 ++++----- .../netbeans/langtools/nbproject/project.xml | 26 +++++++++---------- .../com/sun/tools/classfile/AccessFlags.java | 0 .../com/sun/tools/classfile/Annotation.java | 0 .../AnnotationDefault_attribute.java | 0 .../com/sun/tools/classfile/Attribute.java | 0 .../tools/classfile/AttributeException.java | 0 .../com/sun/tools/classfile/Attributes.java | 0 .../classfile/BootstrapMethods_attribute.java | 0 .../CharacterRangeTable_attribute.java | 0 .../com/sun/tools/classfile/ClassFile.java | 0 .../com/sun/tools/classfile/ClassReader.java | 0 .../sun/tools/classfile/ClassTranslator.java | 0 .../com/sun/tools/classfile/ClassWriter.java | 0 .../sun/tools/classfile/Code_attribute.java | 0 .../classfile/CompilationID_attribute.java | 0 .../com/sun/tools/classfile/ConstantPool.java | 0 .../classfile/ConstantPoolException.java | 0 .../classfile/ConstantValue_attribute.java | 0 .../sun/tools/classfile/DefaultAttribute.java | 0 .../com/sun/tools/classfile/Dependencies.java | 0 .../com/sun/tools/classfile/Dependency.java | 0 .../tools/classfile/Deprecated_attribute.java | 0 .../com/sun/tools/classfile/Descriptor.java | 0 .../tools/classfile/DescriptorException.java | 0 .../classfile/EnclosingMethod_attribute.java | 0 .../tools/classfile/Exceptions_attribute.java | 0 .../com/sun/tools/classfile/Field.java | 0 .../classfile/InnerClasses_attribute.java | 0 .../com/sun/tools/classfile/Instruction.java | 0 .../classfile/LineNumberTable_attribute.java | 0 .../LocalVariableTable_attribute.java | 0 .../LocalVariableTypeTable_attribute.java | 0 .../com/sun/tools/classfile/Method.java | 0 .../classfile/MethodParameters_attribute.java | 0 .../com/sun/tools/classfile/Opcode.java | 0 .../sun/tools/classfile/ReferenceFinder.java | 0 .../RuntimeAnnotations_attribute.java | 0 ...RuntimeInvisibleAnnotations_attribute.java | 0 ...visibleParameterAnnotations_attribute.java | 0 ...imeInvisibleTypeAnnotations_attribute.java | 0 ...RuntimeParameterAnnotations_attribute.java | 0 .../RuntimeTypeAnnotations_attribute.java | 0 .../RuntimeVisibleAnnotations_attribute.java | 0 ...VisibleParameterAnnotations_attribute.java | 0 ...ntimeVisibleTypeAnnotations_attribute.java | 0 .../com/sun/tools/classfile/Signature.java | 0 .../tools/classfile/Signature_attribute.java | 0 .../SourceDebugExtension_attribute.java | 0 .../tools/classfile/SourceFile_attribute.java | 0 .../tools/classfile/SourceID_attribute.java | 0 .../classfile/StackMapTable_attribute.java | 0 .../tools/classfile/StackMap_attribute.java | 0 .../tools/classfile/Synthetic_attribute.java | 0 .../classes/com/sun/tools/classfile/Type.java | 0 .../sun/tools/classfile/TypeAnnotation.java | 0 .../com/sun/tools/classfile/package-info.java | 0 .../com/sun/tools/javap/AnnotationWriter.java | 0 .../com/sun/tools/javap/AttributeWriter.java | 0 .../com/sun/tools/javap/BasicWriter.java | 0 .../com/sun/tools/javap/ClassWriter.java | 0 .../com/sun/tools/javap/CodeWriter.java | 0 .../com/sun/tools/javap/ConstantWriter.java | 0 .../classes/com/sun/tools/javap/Context.java | 0 .../com/sun/tools/javap/DisassemblerTool.java | 0 .../tools/javap/InstructionDetailWriter.java | 0 .../com/sun/tools/javap/InternalError.java | 0 .../com/sun/tools/javap/JavapFileManager.java | 0 .../com/sun/tools/javap/JavapTask.java | 0 .../tools/javap/LocalVariableTableWriter.java | 0 .../javap/LocalVariableTypeTableWriter.java | 0 .../classes/com/sun/tools/javap/Main.java | 0 .../classes/com/sun/tools/javap/Messages.java | 0 .../classes/com/sun/tools/javap/Options.java | 0 .../com/sun/tools/javap/SourceWriter.java | 0 .../com/sun/tools/javap/StackMapWriter.java | 0 .../com/sun/tools/javap/TryBlockWriter.java | 0 .../sun/tools/javap/TypeAnnotationWriter.java | 0 .../classes/com/sun/tools/javap/overview.html | 0 .../com/sun/tools/javap/package-info.java | 0 .../tools/javap/resources/javap.properties | 0 .../tools/javap/resources/javap_ja.properties | 0 .../javap/resources/javap_zh_CN.properties | 0 .../resources/version.properties-template | 0 .../classes/com/sun/tools/jdeps/Analyzer.java | 0 .../classes/com/sun/tools/jdeps/Archive.java | 0 .../com/sun/tools/jdeps/ClassFileReader.java | 0 .../com/sun/tools/jdeps/JdepsTask.java | 0 .../classes/com/sun/tools/jdeps/Main.java | 0 .../classes/com/sun/tools/jdeps/Module.java | 0 .../com/sun/tools/jdeps/ModulesXmlReader.java | 0 .../sun/tools/jdeps/PlatformClassPath.java | 0 .../classes/com/sun/tools/jdeps/Profile.java | 0 .../tools/jdeps/resources/jdeps.properties | 0 .../tools/jdeps/resources/jdeps_ja.properties | 0 .../jdeps/resources/jdeps_zh_CN.properties | 0 .../jdeps/resources/jdkinternals.properties | 0 .../resources/version.properties-template | 0 .../test/tools/javac/4241573/T4241573.java | 2 +- .../test/tools/javac/7003595/T7003595.java | 2 +- .../CPoolRefClassContainingInlinedCts.java | 2 +- .../CheckACC_STRICTFlagOnclinitTest.java | 2 +- .../7199823/InnerClassCannotBeVerified.java | 2 +- .../8000518/DuplicateConstantPoolEntry.java | 2 +- ...eckACC_STRICTFlagOnPkgAccessClassTest.java | 2 +- .../8009170/RedundantByteCodeInArrayTest.java | 2 +- .../MethodParameters/AnnotationTest.java | 2 +- .../MethodParameters/AnonymousClass.java | 2 +- .../javac/MethodParameters/Constructors.java | 2 +- .../javac/MethodParameters/EnumTest.java | 2 +- .../MethodParameters/InstanceMethods.java | 2 +- .../javac/MethodParameters/LambdaTest.java | 2 +- .../MethodParameters/LocalClassTest.java | 2 +- .../MethodParameters/MemberClassTest.java | 2 +- .../javac/MethodParameters/StaticMethods.java | 2 +- .../MethodParameters/UncommonParamNames.java | 2 +- .../tools/javac/MethodParametersTest.java | 2 +- .../test/tools/javac/NoStringToLower.java | 2 +- ...ationsAreNotCopiedToBridgeMethodsTest.java | 2 +- .../DebugPointerAtBadPositionTest.java | 2 +- .../InlinedFinallyConfuseDebuggersTest.java | 2 +- .../tools/javac/T7053059/DoubleCastTest.java | 2 +- langtools/test/tools/javac/T7093325.java | 2 +- ...rClassAttrMustNotHaveStrictFPFlagTest.java | 2 +- .../T8003967/DetectMutableStaticFields.java | 2 +- ...rNamesAreNotCopiedToAnonymousInitTest.java | 2 +- .../EmptyUTF8ForInnerClassNameTest.java | 2 +- .../javac/T8019486/WrongLNTForLambdaTest.java | 2 +- .../DeadCodeGeneratedForEmptyTryTest.java | 2 +- .../NoDeadCodeGenerationOnTrySmtTest.java | 2 +- .../DontGenerateLVTForGNoneOpTest.java | 2 +- .../annotations/SyntheticParameters.java | 2 +- .../classfile/CombinationsTargetTest1.java | 2 +- .../classfile/CombinationsTargetTest2.java | 2 +- .../classfile/CombinationsTargetTest3.java | 2 +- .../typeAnnotations/classfile/DeadCode.java | 2 +- .../classfile/NewTypeArguments.java | 2 +- .../classfile/NoTargetAnnotations.java | 2 +- .../typeAnnotations/classfile/Scopes.java | 2 +- .../classfile/SyntheticParameters.java | 2 +- .../typeAnnotations/classfile/T8008762.java | 2 +- .../typeAnnotations/classfile/T8008769.java | 2 +- .../typeAnnotations/classfile/T8010015.java | 2 +- .../classfile/TestAnonInnerClasses.java | 2 +- .../classfile/TestNewCastArray.java | 2 +- .../typeAnnotations/classfile/TypeCasts.java | 2 +- .../typeAnnotations/classfile/Wildcards.java | 2 +- .../referenceinfos/ClassExtends.java | 2 +- .../referenceinfos/ClassTypeParam.java | 2 +- .../ConstructorInvocationTypeArgument.java | 2 +- .../referenceinfos/Constructors.java | 2 +- .../referenceinfos/ExceptionParameters.java | 2 +- .../referenceinfos/Fields.java | 2 +- .../referenceinfos/FromSpecification.java | 2 +- .../referenceinfos/Initializers.java | 2 +- .../referenceinfos/Lambda.java | 2 +- .../MethodInvocationTypeArgument.java | 2 +- .../referenceinfos/MethodParameters.java | 2 +- .../referenceinfos/MethodReceivers.java | 2 +- .../referenceinfos/MethodReturns.java | 2 +- .../referenceinfos/MethodThrows.java | 2 +- .../referenceinfos/MethodTypeParam.java | 2 +- .../referenceinfos/MultiCatch.java | 2 +- .../referenceinfos/NestedTypes.java | 2 +- .../referenceinfos/NewObjects.java | 2 +- .../RepeatingTypeAnnotations.java | 2 +- .../referenceinfos/ResourceVariable.java | 2 +- .../referenceinfos/TypeCasts.java | 2 +- .../referenceinfos/TypeTests.java | 2 +- .../InnerClasses/SyntheticClasses.java | 2 +- .../AnnotationDefaultTest.java | 2 +- .../EnclosingMethod/EnclosingMethodTest.java | 2 +- .../LineNumberTable/LineNumberTest.java | 2 +- .../LocalVariableTableTest.java | 2 +- .../LocalVariableTypeTableTest.java | 2 +- .../attributes/Signature/ConstructorTest.java | 2 +- .../attributes/Signature/EnumTest.java | 2 +- .../attributes/Signature/ExceptionTest.java | 2 +- .../attributes/Signature/FieldTest.java | 2 +- .../attributes/Signature/InnerClassTest.java | 2 +- .../Signature/MethodParameterTest.java | 2 +- .../Signature/MethodTypeBoundTest.java | 2 +- .../attributes/Signature/ReturnTypeTest.java | 2 +- .../SourceFile/AnonymousClassTest.java | 2 +- .../attributes/SourceFile/InnerClassTest.java | 2 +- .../attributes/SourceFile/LocalClassTest.java | 2 +- .../attributes/SourceFile/MixTest.java | 2 +- .../SourceFile/NoSourceFileAttribute.java | 2 +- .../SourceFile/SyntheticClassTest.java | 2 +- .../TopLevelClassesOneFileTest.java | 2 +- .../deprecated/DeprecatedPackageTest.java | 2 +- .../attributes/deprecated/DeprecatedTest.java | 2 +- ...InnerAnnotationsInInnerAnnotationTest.java | 2 +- .../InnerAnnotationsInInnerClassTest.java | 2 +- .../InnerAnnotationsInInnerEnumTest.java | 2 +- .../InnerAnnotationsInInnerInterfaceTest.java | 2 +- .../InnerClassesHierarchyTest.java | 2 +- .../InnerClassesInAnonymousClassTest.java | 2 +- .../InnerClassesInInnerAnnotationTest.java | 2 +- .../InnerClassesInInnerClassTest.java | 2 +- .../InnerClassesInInnerEnumTest.java | 2 +- .../InnerClassesInInnerInterfaceTest.java | 2 +- .../InnerClassesInLocalClassTest.java | 2 +- .../innerclasses/InnerClassesIndexTest.java | 2 +- .../innerclasses/InnerClassesTest.java | 2 +- .../InnerEnumInInnerAnnotationTest.java | 2 +- .../InnerEnumInInnerEnumTest.java | 2 +- .../InnerEnumInInnerInterfaceTest.java | 2 +- .../InnerEnumsInInnerClassTest.java | 2 +- .../InnerInterfacesInInnerAnnotationTest.java | 2 +- .../InnerInterfacesInInnerClassTest.java | 2 +- .../InnerInterfacesInInnerEnumTest.java | 2 +- .../InnerInterfacesInInnerInterfaceTest.java | 2 +- .../innerclasses/NoInnerClassesTest.java | 2 +- .../tools/javac/classreader/BadClass.java | 2 +- .../javac/constDebug/ConstDebugTest.java | 2 +- .../javac/defaultMethods/BadClassfile.java | 2 +- ...heckACC_STRICTFlagOnDefaultMethodTest.java | 2 +- .../javac/defaultMethods/TestDefaultBody.java | 2 +- .../TestNoBridgeOnDefaults.java | 2 +- .../super/TestDirectSuperInterfaceInvoke.java | 2 +- .../tools/javac/diags/CheckResourceKeys.java | 2 +- .../_super/NonDirectSuper/NonDirectSuper.java | 2 +- .../test/tools/javac/flow/LVTHarness.java | 2 +- .../javac/generics/bridges/BridgeHarness.java | 2 +- .../jvm/ClassRefDupInConstantPoolTest.java | 2 +- .../test/tools/javac/lambda/ByteCodeTest.java | 2 +- .../javac/lambda/LambdaTestStrictFPFlag.java | 2 +- .../javac/lambda/LocalVariableTable.java | 2 +- .../tools/javac/lambda/TestInvokeDynamic.java | 2 +- .../lambda/bytecode/TestLambdaBytecode.java | 2 +- ...estNonSerializableLambdaNameStability.java | 2 +- .../ConditionalLineNumberTest.java | 2 +- .../linenumbers/NestedLineNumberTest.java | 2 +- langtools/test/tools/javac/meth/TestCP.java | 2 +- .../javac/multicatch/7005371/T7005371.java | 2 +- .../test/tools/javac/multicatch/Pos05.java | 2 +- .../tools/javac/varargs/6199075/T6199075.java | 2 +- .../tools/javac/varargs/7042566/T7042566.java | 2 +- .../test/tools/javadoc/CheckResourceKeys.java | 2 +- .../test/tools/javap/4111861/T4111861.java | 2 +- .../test/tools/javap/4870651/T4870651.java | 2 +- .../test/tools/javap/6937244/T6937244.java | 2 +- .../test/tools/javap/6937244/T6937244A.java | 2 +- .../8006334/JavapTaskCtorFailWithNPE.java | 2 +- .../JavapReturns0AfterClassNotFoundTest.java | 2 +- .../test/tools/javap/AccessModifiers.java | 2 +- .../test/tools/javap/BadAttributeLength.java | 2 +- .../tools/javap/BoundsTypeVariableTest.java | 2 +- .../test/tools/javap/DescriptorTest.java | 2 +- langtools/test/tools/javap/ExtPath.java | 2 +- .../test/tools/javap/InvalidOptions.java | 2 +- .../test/tools/javap/MethodParameters.java | 2 +- .../test/tools/javap/StackMapTableTest.java | 2 +- langtools/test/tools/javap/T4075403.java | 2 +- langtools/test/tools/javap/T4459541.java | 2 +- langtools/test/tools/javap/T4501660.java | 2 +- langtools/test/tools/javap/T4501661.java | 2 +- langtools/test/tools/javap/T4777949.java | 2 +- langtools/test/tools/javap/T4876942.java | 2 +- langtools/test/tools/javap/T4880663.java | 2 +- langtools/test/tools/javap/T4880672.java | 2 +- langtools/test/tools/javap/T4884240.java | 2 +- langtools/test/tools/javap/T4975569.java | 2 +- langtools/test/tools/javap/T6271787.java | 2 +- langtools/test/tools/javap/T6474890.java | 2 +- langtools/test/tools/javap/T6587786.java | 2 +- langtools/test/tools/javap/T6622216.java | 2 +- langtools/test/tools/javap/T6622232.java | 2 +- langtools/test/tools/javap/T6622260.java | 2 +- langtools/test/tools/javap/T6715251.java | 2 +- langtools/test/tools/javap/T6715753.java | 2 +- langtools/test/tools/javap/T6715767.java | 2 +- langtools/test/tools/javap/T6716452.java | 2 +- langtools/test/tools/javap/T6824493.java | 2 +- langtools/test/tools/javap/T6863746.java | 2 +- langtools/test/tools/javap/T6866657.java | 2 +- langtools/test/tools/javap/T6868539.java | 2 +- langtools/test/tools/javap/T6879371.java | 2 +- langtools/test/tools/javap/T7004698.java | 2 +- langtools/test/tools/javap/T7186925.java | 2 +- langtools/test/tools/javap/T7190862.java | 2 +- langtools/test/tools/javap/T8032814.java | 2 +- langtools/test/tools/javap/T8032819.java | 2 +- langtools/test/tools/javap/T8033180.java | 2 +- langtools/test/tools/javap/T8033711.java | 2 +- langtools/test/tools/javap/T8035104.java | 2 +- langtools/test/tools/javap/T8038414.java | 2 +- .../test/tools/javap/TestSuperclass.java | 2 +- .../test/tools/javap/WhitespaceTest.java | 2 +- .../test/tools/javap/classfile/T6887895.java | 2 +- .../tools/javap/classfile/deps/T6907575.java | 2 +- .../typeAnnotations/JSR175Annotations.java | 2 +- .../tools/javap/typeAnnotations/NewArray.java | 2 +- .../tools/javap/typeAnnotations/Presence.java | 2 +- .../javap/typeAnnotations/PresenceInner.java | 2 +- .../tools/javap/typeAnnotations/T6855990.java | 2 +- .../javap/typeAnnotations/TypeCasts.java | 2 +- .../javap/typeAnnotations/Visibility.java | 2 +- .../javap/typeAnnotations/Wildcards.java | 2 +- langtools/test/tools/jdeps/APIDeps.java | 4 +-- langtools/test/tools/jdeps/Basic.java | 2 +- langtools/test/tools/jdeps/DotFileTest.java | 2 +- .../VerboseFormat/JdepsDependencyClosure.java | 2 +- 310 files changed, 242 insertions(+), 241 deletions(-) rename langtools/make/gensrc/{Gensrc-jdk.dev.gmk => Gensrc-jdk.jdeps.gmk} (86%) rename langtools/src/{jdk.compiler => jdk.jdeps}/share/classes/com/sun/tools/classfile/AccessFlags.java (100%) rename langtools/src/{jdk.compiler => jdk.jdeps}/share/classes/com/sun/tools/classfile/Annotation.java (100%) rename langtools/src/{jdk.compiler => jdk.jdeps}/share/classes/com/sun/tools/classfile/AnnotationDefault_attribute.java (100%) rename langtools/src/{jdk.compiler => jdk.jdeps}/share/classes/com/sun/tools/classfile/Attribute.java (100%) rename langtools/src/{jdk.compiler => jdk.jdeps}/share/classes/com/sun/tools/classfile/AttributeException.java (100%) rename langtools/src/{jdk.compiler => jdk.jdeps}/share/classes/com/sun/tools/classfile/Attributes.java (100%) rename langtools/src/{jdk.compiler => jdk.jdeps}/share/classes/com/sun/tools/classfile/BootstrapMethods_attribute.java (100%) rename langtools/src/{jdk.compiler => jdk.jdeps}/share/classes/com/sun/tools/classfile/CharacterRangeTable_attribute.java (100%) rename langtools/src/{jdk.compiler => jdk.jdeps}/share/classes/com/sun/tools/classfile/ClassFile.java (100%) rename langtools/src/{jdk.compiler => jdk.jdeps}/share/classes/com/sun/tools/classfile/ClassReader.java (100%) rename langtools/src/{jdk.compiler => jdk.jdeps}/share/classes/com/sun/tools/classfile/ClassTranslator.java (100%) rename langtools/src/{jdk.compiler => jdk.jdeps}/share/classes/com/sun/tools/classfile/ClassWriter.java (100%) rename langtools/src/{jdk.compiler => jdk.jdeps}/share/classes/com/sun/tools/classfile/Code_attribute.java (100%) rename langtools/src/{jdk.compiler => jdk.jdeps}/share/classes/com/sun/tools/classfile/CompilationID_attribute.java (100%) rename langtools/src/{jdk.compiler => jdk.jdeps}/share/classes/com/sun/tools/classfile/ConstantPool.java (100%) rename langtools/src/{jdk.compiler => jdk.jdeps}/share/classes/com/sun/tools/classfile/ConstantPoolException.java (100%) rename langtools/src/{jdk.compiler => jdk.jdeps}/share/classes/com/sun/tools/classfile/ConstantValue_attribute.java (100%) rename langtools/src/{jdk.compiler => jdk.jdeps}/share/classes/com/sun/tools/classfile/DefaultAttribute.java (100%) rename langtools/src/{jdk.compiler => jdk.jdeps}/share/classes/com/sun/tools/classfile/Dependencies.java (100%) rename langtools/src/{jdk.compiler => jdk.jdeps}/share/classes/com/sun/tools/classfile/Dependency.java (100%) rename langtools/src/{jdk.compiler => jdk.jdeps}/share/classes/com/sun/tools/classfile/Deprecated_attribute.java (100%) rename langtools/src/{jdk.compiler => jdk.jdeps}/share/classes/com/sun/tools/classfile/Descriptor.java (100%) rename langtools/src/{jdk.compiler => jdk.jdeps}/share/classes/com/sun/tools/classfile/DescriptorException.java (100%) rename langtools/src/{jdk.compiler => jdk.jdeps}/share/classes/com/sun/tools/classfile/EnclosingMethod_attribute.java (100%) rename langtools/src/{jdk.compiler => jdk.jdeps}/share/classes/com/sun/tools/classfile/Exceptions_attribute.java (100%) rename langtools/src/{jdk.compiler => jdk.jdeps}/share/classes/com/sun/tools/classfile/Field.java (100%) rename langtools/src/{jdk.compiler => jdk.jdeps}/share/classes/com/sun/tools/classfile/InnerClasses_attribute.java (100%) rename langtools/src/{jdk.compiler => jdk.jdeps}/share/classes/com/sun/tools/classfile/Instruction.java (100%) rename langtools/src/{jdk.compiler => jdk.jdeps}/share/classes/com/sun/tools/classfile/LineNumberTable_attribute.java (100%) rename langtools/src/{jdk.compiler => jdk.jdeps}/share/classes/com/sun/tools/classfile/LocalVariableTable_attribute.java (100%) rename langtools/src/{jdk.compiler => jdk.jdeps}/share/classes/com/sun/tools/classfile/LocalVariableTypeTable_attribute.java (100%) rename langtools/src/{jdk.compiler => jdk.jdeps}/share/classes/com/sun/tools/classfile/Method.java (100%) rename langtools/src/{jdk.compiler => jdk.jdeps}/share/classes/com/sun/tools/classfile/MethodParameters_attribute.java (100%) rename langtools/src/{jdk.compiler => jdk.jdeps}/share/classes/com/sun/tools/classfile/Opcode.java (100%) rename langtools/src/{jdk.compiler => jdk.jdeps}/share/classes/com/sun/tools/classfile/ReferenceFinder.java (100%) rename langtools/src/{jdk.compiler => jdk.jdeps}/share/classes/com/sun/tools/classfile/RuntimeAnnotations_attribute.java (100%) rename langtools/src/{jdk.compiler => jdk.jdeps}/share/classes/com/sun/tools/classfile/RuntimeInvisibleAnnotations_attribute.java (100%) rename langtools/src/{jdk.compiler => jdk.jdeps}/share/classes/com/sun/tools/classfile/RuntimeInvisibleParameterAnnotations_attribute.java (100%) rename langtools/src/{jdk.compiler => jdk.jdeps}/share/classes/com/sun/tools/classfile/RuntimeInvisibleTypeAnnotations_attribute.java (100%) rename langtools/src/{jdk.compiler => jdk.jdeps}/share/classes/com/sun/tools/classfile/RuntimeParameterAnnotations_attribute.java (100%) rename langtools/src/{jdk.compiler => jdk.jdeps}/share/classes/com/sun/tools/classfile/RuntimeTypeAnnotations_attribute.java (100%) rename langtools/src/{jdk.compiler => jdk.jdeps}/share/classes/com/sun/tools/classfile/RuntimeVisibleAnnotations_attribute.java (100%) rename langtools/src/{jdk.compiler => jdk.jdeps}/share/classes/com/sun/tools/classfile/RuntimeVisibleParameterAnnotations_attribute.java (100%) rename langtools/src/{jdk.compiler => jdk.jdeps}/share/classes/com/sun/tools/classfile/RuntimeVisibleTypeAnnotations_attribute.java (100%) rename langtools/src/{jdk.compiler => jdk.jdeps}/share/classes/com/sun/tools/classfile/Signature.java (100%) rename langtools/src/{jdk.compiler => jdk.jdeps}/share/classes/com/sun/tools/classfile/Signature_attribute.java (100%) rename langtools/src/{jdk.compiler => jdk.jdeps}/share/classes/com/sun/tools/classfile/SourceDebugExtension_attribute.java (100%) rename langtools/src/{jdk.compiler => jdk.jdeps}/share/classes/com/sun/tools/classfile/SourceFile_attribute.java (100%) rename langtools/src/{jdk.compiler => jdk.jdeps}/share/classes/com/sun/tools/classfile/SourceID_attribute.java (100%) rename langtools/src/{jdk.compiler => jdk.jdeps}/share/classes/com/sun/tools/classfile/StackMapTable_attribute.java (100%) rename langtools/src/{jdk.compiler => jdk.jdeps}/share/classes/com/sun/tools/classfile/StackMap_attribute.java (100%) rename langtools/src/{jdk.compiler => jdk.jdeps}/share/classes/com/sun/tools/classfile/Synthetic_attribute.java (100%) rename langtools/src/{jdk.compiler => jdk.jdeps}/share/classes/com/sun/tools/classfile/Type.java (100%) rename langtools/src/{jdk.compiler => jdk.jdeps}/share/classes/com/sun/tools/classfile/TypeAnnotation.java (100%) rename langtools/src/{jdk.compiler => jdk.jdeps}/share/classes/com/sun/tools/classfile/package-info.java (100%) rename langtools/src/{jdk.compiler => jdk.jdeps}/share/classes/com/sun/tools/javap/AnnotationWriter.java (100%) rename langtools/src/{jdk.compiler => jdk.jdeps}/share/classes/com/sun/tools/javap/AttributeWriter.java (100%) rename langtools/src/{jdk.compiler => jdk.jdeps}/share/classes/com/sun/tools/javap/BasicWriter.java (100%) rename langtools/src/{jdk.compiler => jdk.jdeps}/share/classes/com/sun/tools/javap/ClassWriter.java (100%) rename langtools/src/{jdk.compiler => jdk.jdeps}/share/classes/com/sun/tools/javap/CodeWriter.java (100%) rename langtools/src/{jdk.compiler => jdk.jdeps}/share/classes/com/sun/tools/javap/ConstantWriter.java (100%) rename langtools/src/{jdk.compiler => jdk.jdeps}/share/classes/com/sun/tools/javap/Context.java (100%) rename langtools/src/{jdk.compiler => jdk.jdeps}/share/classes/com/sun/tools/javap/DisassemblerTool.java (100%) rename langtools/src/{jdk.compiler => jdk.jdeps}/share/classes/com/sun/tools/javap/InstructionDetailWriter.java (100%) rename langtools/src/{jdk.compiler => jdk.jdeps}/share/classes/com/sun/tools/javap/InternalError.java (100%) rename langtools/src/{jdk.compiler => jdk.jdeps}/share/classes/com/sun/tools/javap/JavapFileManager.java (100%) rename langtools/src/{jdk.compiler => jdk.jdeps}/share/classes/com/sun/tools/javap/JavapTask.java (100%) rename langtools/src/{jdk.compiler => jdk.jdeps}/share/classes/com/sun/tools/javap/LocalVariableTableWriter.java (100%) rename langtools/src/{jdk.compiler => jdk.jdeps}/share/classes/com/sun/tools/javap/LocalVariableTypeTableWriter.java (100%) rename langtools/src/{jdk.compiler => jdk.jdeps}/share/classes/com/sun/tools/javap/Main.java (100%) rename langtools/src/{jdk.compiler => jdk.jdeps}/share/classes/com/sun/tools/javap/Messages.java (100%) rename langtools/src/{jdk.compiler => jdk.jdeps}/share/classes/com/sun/tools/javap/Options.java (100%) rename langtools/src/{jdk.compiler => jdk.jdeps}/share/classes/com/sun/tools/javap/SourceWriter.java (100%) rename langtools/src/{jdk.compiler => jdk.jdeps}/share/classes/com/sun/tools/javap/StackMapWriter.java (100%) rename langtools/src/{jdk.compiler => jdk.jdeps}/share/classes/com/sun/tools/javap/TryBlockWriter.java (100%) rename langtools/src/{jdk.compiler => jdk.jdeps}/share/classes/com/sun/tools/javap/TypeAnnotationWriter.java (100%) rename langtools/src/{jdk.compiler => jdk.jdeps}/share/classes/com/sun/tools/javap/overview.html (100%) rename langtools/src/{jdk.compiler => jdk.jdeps}/share/classes/com/sun/tools/javap/package-info.java (100%) rename langtools/src/{jdk.compiler => jdk.jdeps}/share/classes/com/sun/tools/javap/resources/javap.properties (100%) rename langtools/src/{jdk.compiler => jdk.jdeps}/share/classes/com/sun/tools/javap/resources/javap_ja.properties (100%) rename langtools/src/{jdk.compiler => jdk.jdeps}/share/classes/com/sun/tools/javap/resources/javap_zh_CN.properties (100%) rename langtools/src/{jdk.compiler => jdk.jdeps}/share/classes/com/sun/tools/javap/resources/version.properties-template (100%) rename langtools/src/{jdk.dev => jdk.jdeps}/share/classes/com/sun/tools/jdeps/Analyzer.java (100%) rename langtools/src/{jdk.dev => jdk.jdeps}/share/classes/com/sun/tools/jdeps/Archive.java (100%) rename langtools/src/{jdk.dev => jdk.jdeps}/share/classes/com/sun/tools/jdeps/ClassFileReader.java (100%) rename langtools/src/{jdk.dev => jdk.jdeps}/share/classes/com/sun/tools/jdeps/JdepsTask.java (100%) rename langtools/src/{jdk.dev => jdk.jdeps}/share/classes/com/sun/tools/jdeps/Main.java (100%) rename langtools/src/{jdk.dev => jdk.jdeps}/share/classes/com/sun/tools/jdeps/Module.java (100%) rename langtools/src/{jdk.dev => jdk.jdeps}/share/classes/com/sun/tools/jdeps/ModulesXmlReader.java (100%) rename langtools/src/{jdk.dev => jdk.jdeps}/share/classes/com/sun/tools/jdeps/PlatformClassPath.java (100%) rename langtools/src/{jdk.dev => jdk.jdeps}/share/classes/com/sun/tools/jdeps/Profile.java (100%) rename langtools/src/{jdk.dev => jdk.jdeps}/share/classes/com/sun/tools/jdeps/resources/jdeps.properties (100%) rename langtools/src/{jdk.dev => jdk.jdeps}/share/classes/com/sun/tools/jdeps/resources/jdeps_ja.properties (100%) rename langtools/src/{jdk.dev => jdk.jdeps}/share/classes/com/sun/tools/jdeps/resources/jdeps_zh_CN.properties (100%) rename langtools/src/{jdk.dev => jdk.jdeps}/share/classes/com/sun/tools/jdeps/resources/jdkinternals.properties (100%) rename langtools/src/{jdk.dev => jdk.jdeps}/share/classes/com/sun/tools/jdeps/resources/version.properties-template (100%) diff --git a/langtools/make/CompileInterim.gmk b/langtools/make/CompileInterim.gmk index c957a904978..a0e1e144ef1 100644 --- a/langtools/make/CompileInterim.gmk +++ b/langtools/make/CompileInterim.gmk @@ -41,11 +41,11 @@ $(eval $(call SetupJavaCompilation,BUILD_INTERIM_LANGTOOLS, \ DISABLE_SJAVAC := true, \ SRC := $(LANGTOOLS_TOPDIR)/src/java.compiler/share/classes \ $(LANGTOOLS_TOPDIR)/src/jdk.compiler/share/classes \ - $(LANGTOOLS_TOPDIR)/src/jdk.dev/share/classes \ $(LANGTOOLS_TOPDIR)/src/jdk.javadoc/share/classes \ + $(LANGTOOLS_TOPDIR)/src/jdk.jdeps/share/classes \ $(SUPPORT_OUTPUTDIR)/gensrc/jdk.compiler \ - $(SUPPORT_OUTPUTDIR)/gensrc/jdk.dev \ - $(SUPPORT_OUTPUTDIR)/gensrc/jdk.javadoc, \ + $(SUPPORT_OUTPUTDIR)/gensrc/jdk.javadoc \ + $(SUPPORT_OUTPUTDIR)/gensrc/jdk.jdeps, \ EXCLUDES := sun jdk, \ COPY := .gif .xml .css .js javax.tools.JavaCompilerTool, \ BIN := $(BUILDTOOLS_OUTPUTDIR)/langtools_interim_classes, \ diff --git a/langtools/make/build.properties b/langtools/make/build.properties index dd902e0ad9e..9bb5f5095d4 100644 --- a/langtools/make/build.properties +++ b/langtools/make/build.properties @@ -47,11 +47,11 @@ boot.javac.source = 8 boot.javac.target = 8 #configuration of submodules (share by both the bootstrap and normal compilation): -langtools.modules=java.compiler:jdk.compiler:jdk.dev:jdk.javadoc +langtools.modules=java.compiler:jdk.compiler:jdk.jdeps:jdk.javadoc java.compiler.dependencies= jdk.compiler.dependencies=java.compiler jdk.javadoc.dependencies=java.compiler:jdk.compiler -jdk.dev.dependencies=java.compiler:jdk.compiler +jdk.jdeps.dependencies=java.compiler:jdk.compiler javac.resource.includes = \ com/sun/tools/javac/resources/compiler.properties diff --git a/langtools/make/build.xml b/langtools/make/build.xml index e88cf9e76c4..1876100101c 100644 --- a/langtools/make/build.xml +++ b/langtools/make/build.xml @@ -257,7 +257,7 @@ - + @@ -463,7 +463,7 @@ - + @@ -527,7 +527,7 @@ resource.includes="${javac.resource.includes}" /> - diff --git a/langtools/make/gensrc/Gensrc-jdk.compiler.gmk b/langtools/make/gensrc/Gensrc-jdk.compiler.gmk index 0caef1da1ae..2f8f8633ffd 100644 --- a/langtools/make/gensrc/Gensrc-jdk.compiler.gmk +++ b/langtools/make/gensrc/Gensrc-jdk.compiler.gmk @@ -31,11 +31,8 @@ $(eval $(call SetupVersionProperties,JAVAC_VERSION, \ $(eval $(call SetupVersionProperties,JAVAH_VERSION, \ com/sun/tools/javah/resources/version.properties)) -$(eval $(call SetupVersionProperties,JAVAP_VERSION, \ - com/sun/tools/javap/resources/version.properties)) - $(eval $(call SetupCompileProperties,COMPILE_PROPERTIES, \ - $(JAVAC_VERSION) $(JAVAH_VERSION) $(JAVAP_VERSION))) + $(JAVAC_VERSION) $(JAVAH_VERSION))) $(eval $(call SetupParseProperties,PARSE_PROPERTIES, \ com/sun/tools/javac/resources/compiler.properties)) diff --git a/langtools/make/gensrc/Gensrc-jdk.dev.gmk b/langtools/make/gensrc/Gensrc-jdk.jdeps.gmk similarity index 86% rename from langtools/make/gensrc/Gensrc-jdk.dev.gmk rename to langtools/make/gensrc/Gensrc-jdk.jdeps.gmk index bf35d05b0d0..91095437aff 100644 --- a/langtools/make/gensrc/Gensrc-jdk.dev.gmk +++ b/langtools/make/gensrc/Gensrc-jdk.jdeps.gmk @@ -25,9 +25,13 @@ include GensrcCommon.gmk +$(eval $(call SetupVersionProperties,JAVAP_VERSION, \ + com/sun/tools/javap/resources/version.properties)) + $(eval $(call SetupVersionProperties,JDEPS_VERSION,\ com/sun/tools/jdeps/resources/version.properties)) -$(eval $(call SetupCompileProperties,COMPILE_PROPERTIES, $(JDEPS_VERSION))) +$(eval $(call SetupCompileProperties,COMPILE_PROPERTIES,\ + $(JDEPS_VERSION) $(JAVAP_VERSION))) all: $(COMPILE_PROPERTIES) diff --git a/langtools/make/intellij/langtools.iml b/langtools/make/intellij/langtools.iml index 9619571d758..319eb7e188a 100644 --- a/langtools/make/intellij/langtools.iml +++ b/langtools/make/intellij/langtools.iml @@ -6,13 +6,13 @@ - + - + diff --git a/langtools/make/intellij/workspace.xml b/langtools/make/intellij/workspace.xml index 135f05a0fd3..8f453eabb05 100644 --- a/langtools/make/intellij/workspace.xml +++ b/langtools/make/intellij/workspace.xml @@ -10,7 +10,7 @@