jdk8-mips64-public/langtools: changeset 1424:da48ab364ea4

8003844: build-infra: docs target isn't working properly
Summary: Adding resources to bootstrap javadoc.jar. Adding missing .js resource suffix
Reviewed-by: ohair, jjg, ohrstrom

     1.1 --- a/makefiles/BuildLangtools.gmk	Fri Nov 09 14:47:22 2012 -0800
     1.2 +++ b/makefiles/BuildLangtools.gmk	Wed Nov 28 13:37:50 2012 +0100
     1.3 @@ -38,6 +38,9 @@
     1.4          SERVER_JVM:=$(SJAVAC_SERVER_JAVA),\
     1.5          FLAGS:=-XDignore.symbol.file=true -g -Xlint:all$(COMMA)-deprecation -Werror))
     1.6  
     1.7 +# javax.tools.JavaCompilerTool isn't really a suffix but this gets the file copied.
     1.8 +RESOURCE_SUFFIXES:=.gif .xml .css .js javax.tools.JavaCompilerTool
     1.9 +
    1.10  # Now setup the compilation of the properties compilation tool. You can depend
    1.11  # upon $(BUILD_TOOLS) to trigger a compilation of the tools. Note that we
    1.12  # add src/share/classes to the sourcepath. This is necessary since the GenStubs
    1.13 @@ -99,6 +102,7 @@
    1.14  		DISABLE_SJAVAC:=true,\
    1.15  		SRC:=$(LANGTOOLS_TOPDIR)/src/share/classes $(LANGTOOLS_OUTPUTDIR)/gensrc,\
    1.16  		EXCLUDES:=com/sun/tools/javac/nio,\
    1.17 +		COPY:=$(RESOURCE_SUFFIXES),\
    1.18  		BIN:=$(LANGTOOLS_OUTPUTDIR)/btclasses/bootstrap))
    1.19  
    1.20          $(eval $(call SetupArchive,ARCHIVE_BOOTSTRAP_JAVAC,$(BUILD_BOOTSTRAP_LANGTOOLS),\
    1.21 @@ -119,6 +123,7 @@
    1.22          $(eval $(call SetupArchive,ARCHIVE_BOOTSTRAP_JAVADOC,$(BUILD_BOOTSTRAP_LANGTOOLS),\
    1.23  		SRCS:=$(LANGTOOLS_OUTPUTDIR)/btclasses/bootstrap,\
    1.24  		JAR:=$(LANGTOOLS_OUTPUTDIR)/dist/bootstrap/lib/javadoc.jar,\
    1.25 +		SUFFIXES:=.class $(RESOURCE_SUFFIXES),\
    1.26  		JARMAIN:=com.sun.tools.javadoc.Main))
    1.27  
    1.28          # GenStubs is used to bootstrap any dependencies from javac to the new JDK that is not 
    1.29 @@ -172,9 +177,6 @@
    1.30                    SERVER_DIR:=$(SJAVAC_SERVER_DIR),\
    1.31                    SERVER_JVM:=$(SJAVAC_SERVER_JAVA)))
    1.32  
    1.33 -                # javax.tools.JavaCompilerTool isn't really a suffix but this gets the file copied.
    1.34 -		RESOURCE_SUFFIXES:=.gif .xml .css javax.tools.JavaCompilerTool
    1.35 -
    1.36                  $(eval $(call SetupJavaCompilation,BUILD_FULL_JAVAC,\
    1.37  			SETUP:=GENERATE_NEWBYTECODE,\
    1.38  			SRC:=$(LANGTOOLS_TOPDIR)/src/share/classes $(LANGTOOLS_OUTPUTDIR)/gensrc \

Mercurial > jdk8-mips64-public > langtools / changeset

changeset

8003844: build-infra: docs target isn't working properly