Wed, 11 Apr 2012 14:08:09 -0700
Merge
1.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 1.2 +++ b/makefiles/Makefile Wed Apr 11 14:08:09 2012 -0700 1.3 @@ -0,0 +1,94 @@ 1.4 +# 1.5 +# Copyright (c) 2007, 2012, Oracle and/or its affiliates. All rights reserved. 1.6 +# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. 1.7 +# 1.8 +# This code is free software; you can redistribute it and/or modify it 1.9 +# under the terms of the GNU General Public License version 2 only, as 1.10 +# published by the Free Software Foundation. Oracle designates this 1.11 +# particular file as subject to the "Classpath" exception as provided 1.12 +# by Oracle in the LICENSE file that accompanied this code. 1.13 +# 1.14 +# This code is distributed in the hope that it will be useful, but WITHOUT 1.15 +# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or 1.16 +# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License 1.17 +# version 2 for more details (a copy is included in the LICENSE file that 1.18 +# accompanied this code). 1.19 +# 1.20 +# You should have received a copy of the GNU General Public License version 1.21 +# 2 along with this work; if not, write to the Free Software Foundation, 1.22 +# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. 1.23 +# 1.24 +# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA 1.25 +# or visit www.oracle.com if you need additional information or have any 1.26 +# questions. 1.27 +# 1.28 + 1.29 +include $(SPEC) 1.30 +include MakeBase.gmk 1.31 +include JavaCompilation.gmk 1.32 + 1.33 +default: all 1.34 + 1.35 +JAVAC_JARS ?= -Xbootclasspath/p:$(LANGTOOLS_OUTPUTDIR)/dist/bootstrap/lib/javac.jar \ 1.36 + -jar $(LANGTOOLS_OUTPUTDIR)/dist/bootstrap/lib/javac.jar 1.37 +DISABLE_JAXWS_WARNINGS:=-Xlint:all,-varargs,-rawtypes,-deprecation,-unchecked,-serial,-dep-ann,-cast,-fallthrough,-static 1.38 + 1.39 +# The generate new bytecode uses the new compiler for to generate bytecode 1.40 +# for the new jdk that is being built. The code compiled by this setup 1.41 +# cannot necessarily be run with the boot jdk. 1.42 +$(eval $(call SetupJavaCompiler,GENERATE_NEWBYTECODE_DEBUG,\ 1.43 + JVM:=$(JAVA),\ 1.44 + JAVAC:=$(JAVAC_JARS),\ 1.45 + FLAGS:=-Xprefer:source -XDignore.symbol.file=true -cp $(BOOT_JDK)/lib/tools.jar \ 1.46 + $(DISABLE_JAXWS_WARNINGS) -g,\ 1.47 + SERVER_DIR:=$(JAVAC_SERVERS),\ 1.48 + SERVER_JVM:=$(SERVER_JAVA),\ 1.49 + MODE:=$(JAVAC_USE_MODE),\ 1.50 + USE_DEPS:=$(JAVAC_USE_DEPS))) 1.51 + 1.52 +# Dummy here is needed to trigger copying of META-INF 1.53 +$(eval $(call SetupJavaCompilation,BUILD_JAF,\ 1.54 + SETUP:=GENERATE_NEWBYTECODE_DEBUG,\ 1.55 + SRC:=$(JAXWS_TOPDIR)/src/share/jaf_classes,\ 1.56 + CLEAN:=.properties,\ 1.57 + COPY:="dummy",\ 1.58 + BIN:=$(JAXWS_OUTPUTDIR)/jaf_classes)) 1.59 + 1.60 +$(eval $(call SetupJavaCompilation,BUILD_JAXWS,\ 1.61 + SETUP:=GENERATE_NEWBYTECODE_DEBUG,\ 1.62 + SRC:=$(JAXWS_TOPDIR)/src/share/jaxws_classes,\ 1.63 + CLEAN:=.properties,\ 1.64 + BIN:=$(JAXWS_OUTPUTDIR)/jaxws_classes,\ 1.65 + COPY:=.xsd,\ 1.66 + COPY_FILES:=$(JAXWS_TOPDIR)/src/share/jaxws_classes/com/sun/tools/internal/xjc/runtime/JAXBContextFactory.java \ 1.67 + $(JAXWS_TOPDIR)/src/share/jaxws_classes/com/sun/tools/internal/xjc/runtime/ZeroOneBooleanAdapter.java,\ 1.68 + ADD_JAVAC_FLAGS=-cp $(OUTPUT_ROOT)/jaxp/dist/lib/classes.jar)) 1.69 + 1.70 +$(JAXWS_OUTPUTDIR)/jaxws_classes/META-INF/services/com.sun.tools.internal.ws.wscompile.Plugin: \ 1.71 + $(JAXWS_TOPDIR)/src/share/jaxws_classes/com/sun/tools/etc/META-INF/services/com.sun.tools.internal.ws.wscompile.Plugin 1.72 + mkdir -p $(@D) 1.73 + cp $< $@ 1.74 + 1.75 +$(JAXWS_OUTPUTDIR)/jaxws_classes/META-INF/services/com.sun.tools.internal.xjc.Plugin: \ 1.76 + $(JAXWS_TOPDIR)/src/share/jaxws_classes/com/sun/tools/etc/META-INF/services/com.sun.tools.internal.xjc.Plugin 1.77 + mkdir -p $(@D) 1.78 + cp $< $@ 1.79 + 1.80 +# There are two META-INF services files that are needed, add these to the list of goals 1.81 +BUILD_JAXWS += $(JAXWS_OUTPUTDIR)/jaxws_classes/META-INF/services/com.sun.tools.internal.ws.wscompile.Plugin \ 1.82 + $(JAXWS_OUTPUTDIR)/jaxws_classes/META-INF/services/com.sun.tools.internal.xjc.Plugin 1.83 + 1.84 +$(eval $(call SetupArchive,ARCHIVE_JAXWS,$(BUILD_JAXWS) $(BUILD_JAF),\ 1.85 + SRCS:=$(JAXWS_OUTPUTDIR)/jaxws_classes $(JAXWS_OUTPUTDIR)/jaf_classes,\ 1.86 + SUFFIXES:=.class .properties .xsd .java \ 1.87 + com.sun.mirror.apt.AnnotationProcessorFactory \ 1.88 + com.sun.tools.internal.xjc.Plugin,\ 1.89 + JAR:=$(JAXWS_OUTPUTDIR)/dist/lib/classes.jar)) 1.90 + 1.91 +$(eval $(call SetupZipArchive,ZIP_JAXWS_SOURCES,\ 1.92 + SRC:=$(JAXWS_TOPDIR)/src/share/jaf_classes $(JAXWS_TOPDIR)/src/share/jaxws_classes,\ 1.93 + ZIP:=$(JAXWS_OUTPUTDIR)/dist/lib/src.zip)) 1.94 + 1.95 +all: $(JAXWS_OUTPUTDIR)/dist/lib/classes.jar $(JAXWS_OUTPUTDIR)/dist/lib/src.zip 1.96 + 1.97 +.PHONY: default all