changeset 304:bea155fad00f lambda-b45

Merge
author mduigou
date Thu, 19 Apr 2012 15:46:00 -0700
parents 5bcc1bdcf460 d14f5247d3af
children 6bdb5c7bcf7e
files
diffstat 2 files changed, 67 insertions(+), 0 deletions(-) [+]
line wrap: on
line diff
--- a/.hgtags	Wed Mar 21 17:30:33 2012 -0700
+++ b/.hgtags	Thu Apr 19 15:46:00 2012 -0700
@@ -152,3 +152,8 @@
 f3244c1f04864d35c41fa8d13669faf4f65b81e2 jdk8-b28
 25099a745e1a43579b6af86b3e052b2e50958753 jdk8-b29
 3be30c25a8255803652b5c466336055d36e2ba21 jdk8-b30
+94aabe098916440ae7911866311c9617d8481a36 jdk8-b31
+60960fbc75df8be4c1a2504aa69fc1428cc94f93 jdk8-b32
+9bcab2b8b8ea578e594916a3d3df6dbec7984bcb jdk8-b33
+8b91a897a04486cf901af0de7f684a3eb31f121f jdk8-b34
+e187f3ede64965dc2979df9a211107cd3d38eacb jdk8-b35
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/makefiles/Makefile	Thu Apr 19 15:46:00 2012 -0700
@@ -0,0 +1,62 @@
+#
+# Copyright (c) 2007, 2012, Oracle and/or its affiliates. All rights reserved.
+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+#
+# This code is free software; you can redistribute it and/or modify it
+# under the terms of the GNU General Public License version 2 only, as
+# published by the Free Software Foundation.  Oracle designates this
+# particular file as subject to the "Classpath" exception as provided
+# by Oracle in the LICENSE file that accompanied this code.
+#
+# This code is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+# version 2 for more details (a copy is included in the LICENSE file that
+# accompanied this code).
+#
+# You should have received a copy of the GNU General Public License version
+# 2 along with this work; if not, write to the Free Software Foundation,
+# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+#
+# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+# or visit www.oracle.com if you need additional information or have any
+# questions.
+#
+
+-include $(SPEC)
+include MakeBase.gmk
+include JavaCompilation.gmk
+
+default: all
+
+JAVAC_JARS ?= "-Xbootclasspath/p:$(LANGTOOLS_OUTPUTDIR)/dist/bootstrap/lib/javac.jar" \
+		-jar $(LANGTOOLS_OUTPUTDIR)/dist/bootstrap/lib/javac.jar
+DISABLE_JAXP_WARNINGS:=-Xlint:all,-deprecation,-unchecked,-rawtypes,-cast,-serial,-dep-ann,-static,-fallthrough
+
+# The generate new bytecode uses the new compiler for to generate bytecode
+# for the new jdk that is being built. The code compiled by this setup
+# cannot necessarily be run with the boot jdk.
+$(eval $(call SetupJavaCompiler,GENERATE_NEWBYTECODE_DEBUG,\
+     JVM:=$(JAVA),\
+     JAVAC:=$(JAVAC_JARS),\
+     FLAGS:=-Xprefer:source -XDignore.symbol.file=true $(DISABLE_JAXP_WARNINGS) -g,\
+     SERVER_DIR:=$(JAVAC_SERVERS),\
+     SERVER_JVM:=$(SERVER_JAVA),\
+     MODE:=$(JAVAC_USE_MODE),\
+     USE_DEPS:=$(JAVAC_USE_DEPS)))
+
+$(eval $(call SetupJavaCompilation,BUILD_JAXP,\
+		SETUP:=GENERATE_NEWBYTECODE_DEBUG,\
+		SRC:=$(JAXP_TOPDIR)/src/share/classes,\
+		CLEAN:=.properties,\
+		BIN:=$(JAXP_OUTPUTDIR)/classes,\
+		SRCZIP:=$(JAXP_OUTPUTDIR)/dist/lib/src.zip))
+
+$(eval $(call SetupArchive,ARCHIVE_JAXP,$(BUILD_JAXP),\
+		SRCS:=$(JAXP_OUTPUTDIR)/classes,\
+		SUFFIXES:=.class .properties,\
+		JAR:=$(JAXP_OUTPUTDIR)/dist/lib/classes.jar))
+
+all: $(JAXP_OUTPUTDIR)/dist/lib/classes.jar $(JAXP_OUTPUTDIR)/dist/lib/src.zip
+
+.PHONY: default all