Mercurial > hg > openjdk > jigsaw > langtools
changeset 1662:2985b07bd288
Update new build to build jigsaw (images for now)
| author | erikj |
|---|---|
| date | Wed, 13 Feb 2013 15:38:52 +0000 |
| parents | c44894b927f5 |
| children | f9e6d666883e |
| files | makefiles/BuildLangtools.gmk |
| diffstat | 1 files changed, 7 insertions(+), 5 deletions(-) [+] |
line wrap: on
line diff
--- a/makefiles/BuildLangtools.gmk Fri Feb 08 11:56:40 2013 -0800 +++ b/makefiles/BuildLangtools.gmk Wed Feb 13 15:38:52 2013 +0000 @@ -105,7 +105,8 @@ SETUP:=BOOT_JAVAC,\ DISABLE_SJAVAC:=true,\ SRC:=$(LANGTOOLS_TOPDIR)/src/share/classes $(LANGTOOLS_OUTPUTDIR)/gensrc,\ - EXCLUDES:=com/sun/tools/javac/nio,\ + EXCLUDES:=com/sun/tools/javac/nio \ + com/sun/tools/javac/jigsaw,\ COPY:=$(RESOURCE_SUFFIXES),\ BIN:=$(LANGTOOLS_OUTPUTDIR)/btclasses/bootstrap)) @@ -139,10 +140,11 @@ genstubs.GenStubs # We fetch source from the JDK... JDKS=$(JDK_TOPDIR)/src/share/classes - # Build the list of classes to generate stubs from. java/util/Objects.java isn't - # currently needed, but is used as a demo for now. + # Build the list of classes to generate stubs from. STUBSOURCES:=$(shell $(FIND) $(JDKS) -name "*.java" | $(GREP) \ - -e "$(JDKS)/java/util/Objects.java") + -e "$(JDKS)/java/lang/module/" \ + -e "$(JDKS)/java/lang/reflect/Module.java" \ + -e "$(JDKS)/org/openjdk/jigsaw/") # Rewrite the file names into class names because the GenStubs tool require this. STUBCLASSES:=$(subst /,.,$(patsubst $(JDKS)/%.java,%,$(STUBSOURCES))) @@ -185,7 +187,7 @@ SETUP:=GENERATE_NEWBYTECODE,\ SRC:=$(LANGTOOLS_TOPDIR)/src/share/classes $(LANGTOOLS_OUTPUTDIR)/gensrc \ $(LANGTOOLS_OUTPUTDIR)/genstubs,\ - EXCLUDES:=java/util java/io java/nio,\ + EXCLUDES:=java/util java/io java/nio java/lang org/openjdk,\ COPY:=$(RESOURCE_SUFFIXES),\ BIN:=$(LANGTOOLS_OUTPUTDIR)/classes))