8074432: Move jdeps and javap to jdk.jdeps module
Reviewed-by: jjg, alanb, erikj
This commit is contained in:
parent
385f5d800a
commit
ab120497cf
langtools
make
src/jdk.jdeps/share/classes/com/sun/tools
classfile
AccessFlags.javaAnnotation.javaAnnotationDefault_attribute.javaAttribute.javaAttributeException.javaAttributes.javaBootstrapMethods_attribute.javaCharacterRangeTable_attribute.javaClassFile.javaClassReader.javaClassTranslator.javaClassWriter.javaCode_attribute.javaCompilationID_attribute.javaConstantPool.javaConstantPoolException.javaConstantValue_attribute.javaDefaultAttribute.javaDependencies.javaDependency.javaDeprecated_attribute.javaDescriptor.javaDescriptorException.javaEnclosingMethod_attribute.javaExceptions_attribute.javaField.javaInnerClasses_attribute.javaInstruction.javaLineNumberTable_attribute.javaLocalVariableTable_attribute.javaLocalVariableTypeTable_attribute.javaMethod.javaMethodParameters_attribute.javaOpcode.javaReferenceFinder.javaRuntimeAnnotations_attribute.javaRuntimeInvisibleAnnotations_attribute.javaRuntimeInvisibleParameterAnnotations_attribute.javaRuntimeInvisibleTypeAnnotations_attribute.javaRuntimeParameterAnnotations_attribute.javaRuntimeTypeAnnotations_attribute.javaRuntimeVisibleAnnotations_attribute.javaRuntimeVisibleParameterAnnotations_attribute.javaRuntimeVisibleTypeAnnotations_attribute.javaSignature.javaSignature_attribute.javaSourceDebugExtension_attribute.javaSourceFile_attribute.javaSourceID_attribute.javaStackMapTable_attribute.javaStackMap_attribute.javaSynthetic_attribute.javaType.javaTypeAnnotation.javapackage-info.java
javap
AnnotationWriter.javaAttributeWriter.javaBasicWriter.javaClassWriter.javaCodeWriter.javaConstantWriter.javaContext.javaDisassemblerTool.javaInstructionDetailWriter.javaInternalError.javaJavapFileManager.javaJavapTask.javaLocalVariableTableWriter.javaLocalVariableTypeTableWriter.javaMain.javaMessages.javaOptions.javaSourceWriter.javaStackMapWriter.javaTryBlockWriter.javaTypeAnnotationWriter.javaoverview.htmlpackage-info.java
resources
jdeps
@ -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, \
|
||||
|
@ -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
|
||||
|
@ -257,7 +257,7 @@
|
||||
<class location="${build.dir}/java.compiler/classes"/>
|
||||
<class location="${build.dir}/jdk.compiler/classes"/>
|
||||
<class location="${build.dir}/jdk.javadoc/classes"/>
|
||||
<class location="${build.dir}/jdk.dev/classes"/>
|
||||
<class location="${build.dir}/jdk.jdeps/classes"/>
|
||||
<sourcePath>
|
||||
<pathelement path="${langtools.sources}"/>
|
||||
</sourcePath>
|
||||
@ -463,7 +463,7 @@
|
||||
<build-module-jar module.name="java.compiler" compilation.kind="@{compilation.kind}" />
|
||||
<build-module-jar module.name="jdk.compiler" compilation.kind="@{compilation.kind}" />
|
||||
<build-module-jar module.name="jdk.javadoc" compilation.kind="@{compilation.kind}" />
|
||||
<build-module-jar module.name="jdk.dev" compilation.kind="@{compilation.kind}" />
|
||||
<build-module-jar module.name="jdk.jdeps" compilation.kind="@{compilation.kind}" />
|
||||
</sequential>
|
||||
</macrodef>
|
||||
</target>
|
||||
@ -527,7 +527,7 @@
|
||||
resource.includes="${javac.resource.includes}" />
|
||||
<build-module-classes module.name="jdk.javadoc"
|
||||
compilation.kind="@{compilation.kind}" />
|
||||
<build-module-classes module.name="jdk.dev"
|
||||
<build-module-classes module.name="jdk.jdeps"
|
||||
compilation.kind="@{compilation.kind}" />
|
||||
</sequential>
|
||||
</macrodef>
|
||||
|
@ -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))
|
||||
|
@ -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)
|
@ -6,13 +6,13 @@
|
||||
<content url="file://$MODULE_DIR$">
|
||||
<sourceFolder url="file://$MODULE_DIR$/src/java.compiler/share/classes" isTestSource="false" />
|
||||
<sourceFolder url="file://$MODULE_DIR$/src/jdk.compiler/share/classes" isTestSource="false" />
|
||||
<sourceFolder url="file://$MODULE_DIR$/src/jdk.dev/share/classes" isTestSource="false" />
|
||||
<sourceFolder url="file://$MODULE_DIR$/src/jdk.javadoc/share/classes" isTestSource="false" />
|
||||
<sourceFolder url="file://$MODULE_DIR$/src/jdk.jdeps/share/classes" isTestSource="false" />
|
||||
<sourceFolder url="file://$MODULE_DIR$/test" isTestSource="true" />
|
||||
<sourceFolder url="file://$MODULE_DIR$/build/bootstrap/java.compiler/gensrc" isTestSource="false" />
|
||||
<sourceFolder url="file://$MODULE_DIR$/build/bootstrap/jdk.compiler/gensrc" isTestSource="false" />
|
||||
<sourceFolder url="file://$MODULE_DIR$/build/bootstrap/jdk.dev/gensrc" isTestSource="false" />
|
||||
<sourceFolder url="file://$MODULE_DIR$/build/bootstrap/jdk.javadoc/gensrc" isTestSource="false" />
|
||||
<sourceFolder url="file://$MODULE_DIR$/build/bootstrap/jdk.jdeps/gensrc" isTestSource="false" />
|
||||
</content>
|
||||
<orderEntry type="sourceFolder" forTests="false" />
|
||||
<orderEntry type="inheritedJdk" />
|
||||
|
@ -10,7 +10,7 @@
|
||||
<!-- standard tools -->
|
||||
<configuration default="false" name="javac" type="Application" factoryName="Application">
|
||||
<option name="MAIN_CLASS_NAME" value="com.sun.tools.javac.Main" />
|
||||
<option name="VM_PARAMETERS" value="-Xbootclasspath/p:build@FILE_SEP@java.compiler@FILE_SEP@classes@PATH_SEP@build@FILE_SEP@jdk.compiler@FILE_SEP@classes@PATH_SEP@build@FILE_SEP@jdk.javadoc@FILE_SEP@classes@PATH_SEP@build@FILE_SEP@jdk.dev@FILE_SEP@classes" />
|
||||
<option name="VM_PARAMETERS" value="-Xbootclasspath/p:build@FILE_SEP@java.compiler@FILE_SEP@classes@PATH_SEP@build@FILE_SEP@jdk.compiler@FILE_SEP@classes@PATH_SEP@build@FILE_SEP@jdk.javadoc@FILE_SEP@classes@PATH_SEP@build@FILE_SEP@jdk.jdeps@FILE_SEP@classes" />
|
||||
<option name="PROGRAM_PARAMETERS" value="" />
|
||||
<option name="WORKING_DIRECTORY" value="file://$PROJECT_DIR$" />
|
||||
<option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" />
|
||||
@ -29,7 +29,7 @@
|
||||
</configuration>
|
||||
<configuration default="false" name="javadoc" type="Application" factoryName="Application">
|
||||
<option name="MAIN_CLASS_NAME" value="com.sun.tools.javadoc.Main" />
|
||||
<option name="VM_PARAMETERS" value="-Xbootclasspath/p:build@FILE_SEP@java.compiler@FILE_SEP@classes@PATH_SEP@build@FILE_SEP@jdk.compiler@FILE_SEP@classes@PATH_SEP@build@FILE_SEP@jdk.javadoc@FILE_SEP@classes@PATH_SEP@build@FILE_SEP@jdk.dev@FILE_SEP@classes" />
|
||||
<option name="VM_PARAMETERS" value="-Xbootclasspath/p:build@FILE_SEP@java.compiler@FILE_SEP@classes@PATH_SEP@build@FILE_SEP@jdk.compiler@FILE_SEP@classes@PATH_SEP@build@FILE_SEP@jdk.javadoc@FILE_SEP@classes@PATH_SEP@build@FILE_SEP@jdk.jdeps@FILE_SEP@classes" />
|
||||
<option name="PROGRAM_PARAMETERS" value="" />
|
||||
<option name="WORKING_DIRECTORY" value="file://$PROJECT_DIR$" />
|
||||
<option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" />
|
||||
@ -48,7 +48,7 @@
|
||||
</configuration>
|
||||
<configuration default="false" name="javap" type="Application" factoryName="Application">
|
||||
<option name="MAIN_CLASS_NAME" value="com.sun.tools.javap.Main" />
|
||||
<option name="VM_PARAMETERS" value="-Xbootclasspath/p:build@FILE_SEP@java.compiler@FILE_SEP@classes@PATH_SEP@build@FILE_SEP@jdk.compiler@FILE_SEP@classes@PATH_SEP@build@FILE_SEP@jdk.javadoc@FILE_SEP@classes@PATH_SEP@build@FILE_SEP@jdk.dev@FILE_SEP@classes" />
|
||||
<option name="VM_PARAMETERS" value="-Xbootclasspath/p:build@FILE_SEP@java.compiler@FILE_SEP@classes@PATH_SEP@build@FILE_SEP@jdk.compiler@FILE_SEP@classes@PATH_SEP@build@FILE_SEP@jdk.javadoc@FILE_SEP@classes@PATH_SEP@build@FILE_SEP@jdk.jdeps@FILE_SEP@classes" />
|
||||
<option name="PROGRAM_PARAMETERS" value="" />
|
||||
<option name="WORKING_DIRECTORY" value="file://$PROJECT_DIR$" />
|
||||
<option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" />
|
||||
@ -67,7 +67,7 @@
|
||||
</configuration>
|
||||
<configuration default="false" name="javah" type="Application" factoryName="Application">
|
||||
<option name="MAIN_CLASS_NAME" value="com.sun.tools.javah.Main" />
|
||||
<option name="VM_PARAMETERS" value="-Xbootclasspath/p:build@FILE_SEP@java.compiler@FILE_SEP@classes@PATH_SEP@build@FILE_SEP@jdk.compiler@FILE_SEP@classes@PATH_SEP@build@FILE_SEP@jdk.javadoc@FILE_SEP@classes@PATH_SEP@build@FILE_SEP@jdk.dev@FILE_SEP@classes" />
|
||||
<option name="VM_PARAMETERS" value="-Xbootclasspath/p:build@FILE_SEP@java.compiler@FILE_SEP@classes@PATH_SEP@build@FILE_SEP@jdk.compiler@FILE_SEP@classes@PATH_SEP@build@FILE_SEP@jdk.javadoc@FILE_SEP@classes@PATH_SEP@build@FILE_SEP@jdk.jdeps@FILE_SEP@classes" />
|
||||
<option name="PROGRAM_PARAMETERS" value="" />
|
||||
<option name="WORKING_DIRECTORY" value="file://$PROJECT_DIR$" />
|
||||
<option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" />
|
||||
@ -86,7 +86,7 @@
|
||||
</configuration>
|
||||
<configuration default="false" name="sjavac" type="Application" factoryName="Application">
|
||||
<option name="MAIN_CLASS_NAME" value="com.sun.tools.sjavac.Main" />
|
||||
<option name="VM_PARAMETERS" value="-Xbootclasspath/p:build@FILE_SEP@java.compiler@FILE_SEP@classes@PATH_SEP@build@FILE_SEP@jdk.compiler@FILE_SEP@classes@PATH_SEP@build@FILE_SEP@jdk.javadoc@FILE_SEP@classes@PATH_SEP@build@FILE_SEP@jdk.dev@FILE_SEP@classes" />
|
||||
<option name="VM_PARAMETERS" value="-Xbootclasspath/p:build@FILE_SEP@java.compiler@FILE_SEP@classes@PATH_SEP@build@FILE_SEP@jdk.compiler@FILE_SEP@classes@PATH_SEP@build@FILE_SEP@jdk.javadoc@FILE_SEP@classes@PATH_SEP@build@FILE_SEP@jdk.jdeps@FILE_SEP@classes" />
|
||||
<option name="PROGRAM_PARAMETERS" value="" />
|
||||
<option name="WORKING_DIRECTORY" value="file://$PROJECT_DIR$" />
|
||||
<option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" />
|
||||
@ -106,7 +106,7 @@
|
||||
<!-- bootstrap javac -->
|
||||
<configuration default="false" name="javac (bootstrap)" type="Application" factoryName="Application">
|
||||
<option name="MAIN_CLASS_NAME" value="com.sun.tools.javac.Main" />
|
||||
<option name="VM_PARAMETERS" value="-Xbootclasspath/p:build@FILE_SEP@bootstrap@FILE_SEP@java.compiler@FILE_SEP@classes@PATH_SEP@build@FILE_SEP@bootstrap@FILE_SEP@jdk.compiler@FILE_SEP@classes@PATH_SEP@build@FILE_SEP@bootstrap@FILE_SEP@jdk.javadoc@FILE_SEP@classes@PATH_SEP@build@FILE_SEP@bootstrap@FILE_SEP@jdk.dev@FILE_SEP@classes" />
|
||||
<option name="VM_PARAMETERS" value="-Xbootclasspath/p:build@FILE_SEP@bootstrap@FILE_SEP@java.compiler@FILE_SEP@classes@PATH_SEP@build@FILE_SEP@bootstrap@FILE_SEP@jdk.compiler@FILE_SEP@classes@PATH_SEP@build@FILE_SEP@bootstrap@FILE_SEP@jdk.javadoc@FILE_SEP@classes@PATH_SEP@build@FILE_SEP@bootstrap@FILE_SEP@jdk.jdeps@FILE_SEP@classes" />
|
||||
<option name="PROGRAM_PARAMETERS" value="" />
|
||||
<option name="WORKING_DIRECTORY" value="file://$PROJECT_DIR$" />
|
||||
<option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" />
|
||||
|
@ -67,9 +67,9 @@
|
||||
<location>${root}/src/jdk.compiler/share/classes</location>
|
||||
</source-folder>
|
||||
<source-folder>
|
||||
<label>Source files - jdk.dev</label>
|
||||
<label>Source files - jdk.jdeps</label>
|
||||
<type>java</type>
|
||||
<location>${root}/src/jdk.dev/share/classes</location>
|
||||
<location>${root}/src/jdk.jdeps/share/classes</location>
|
||||
</source-folder>
|
||||
<source-folder>
|
||||
<label>Source files - jdk.javadoc</label>
|
||||
@ -128,10 +128,10 @@
|
||||
</action>
|
||||
<action name="compile.single">
|
||||
<target>compile-single</target>
|
||||
<property name="module.name">jdk.dev</property>
|
||||
<property name="module.name">jdk.jdeps</property>
|
||||
<context>
|
||||
<property>includes</property>
|
||||
<folder>${root}/src/jdk.dev/share/classes</folder>
|
||||
<folder>${root}/src/jdk.jdeps/share/classes</folder>
|
||||
<pattern>\.java$</pattern>
|
||||
<format>relative-path</format>
|
||||
<arity>
|
||||
@ -195,7 +195,7 @@
|
||||
<target>run-single</target>
|
||||
<context>
|
||||
<property>run.classname</property>
|
||||
<folder>${root}/src/jdk.dev/share/classes</folder>
|
||||
<folder>${root}/src/jdk.jdeps/share/classes</folder>
|
||||
<pattern>\.java$</pattern>
|
||||
<format>java-name</format>
|
||||
<arity>
|
||||
@ -265,7 +265,7 @@
|
||||
<target>debug-single</target>
|
||||
<context>
|
||||
<property>debug.classname</property>
|
||||
<folder>${root}/src/jdk.dev/share/classes</folder>
|
||||
<folder>${root}/src/jdk.jdeps/share/classes</folder>
|
||||
<pattern>\.java$</pattern>
|
||||
<format>java-name</format>
|
||||
<arity>
|
||||
@ -329,10 +329,10 @@
|
||||
</action>
|
||||
<action name="debug.fix">
|
||||
<target>debug-fix</target>
|
||||
<property name="module.name">jdk.dev</property>
|
||||
<property name="module.name">jdk.jdeps</property>
|
||||
<context>
|
||||
<property>class</property>
|
||||
<folder>${root}/src/jdk.dev/share/classes</folder>
|
||||
<folder>${root}/src/jdk.jdeps/share/classes</folder>
|
||||
<pattern>\.java$</pattern>
|
||||
<format>relative-path-noext</format>
|
||||
<arity>
|
||||
@ -382,8 +382,8 @@
|
||||
<location>${root}/src/jdk.compiler/share/classes</location>
|
||||
</source-folder>
|
||||
<source-folder style="tree">
|
||||
<label>Source files - jdk.dev</label>
|
||||
<location>${root}/src/jdk.dev/share/classes</location>
|
||||
<label>Source files - jdk.jdeps</label>
|
||||
<location>${root}/src/jdk.jdeps/share/classes</location>
|
||||
</source-folder>
|
||||
<source-folder style="tree">
|
||||
<label>Source files - jdk.javadoc</label>
|
||||
@ -443,10 +443,10 @@
|
||||
<source-level>1.8</source-level>
|
||||
</compilation-unit>
|
||||
<compilation-unit>
|
||||
<package-root>${root}/src/jdk.dev/share/classes</package-root>
|
||||
<package-root>${root}/build/bootstrap/jdk.dev/gensrc</package-root>
|
||||
<package-root>${root}/src/jdk.jdeps/share/classes</package-root>
|
||||
<package-root>${root}/build/bootstrap/jdk.jdeps/gensrc</package-root>
|
||||
<classpath mode="compile">${root}/build/java.compiler/classes:${root}/build/jdk.compiler/classes</classpath>
|
||||
<built-to>${root}/build/jdk.dev/classes</built-to>
|
||||
<built-to>${root}/build/jdk.jdeps/classes</built-to>
|
||||
<source-level>1.8</source-level>
|
||||
</compilation-unit>
|
||||
<compilation-unit>
|
||||
|
Some files were not shown because too many files have changed in this diff Show More
Loading…
x
Reference in New Issue
Block a user