Mercurial > jdk8-mips64-public > jaxws / changeset
changeset
Merge
Wed, 16 Oct 2013 11:56:53 -0700
- author
- katleman
- date
- Wed, 16 Oct 2013 11:56:53 -0700
- changeset 413
- dbdd5c762509
- parent 411
- 7c0a7937f6ef
- parent 412
- 602fdd7bb765
- child 414
- 9ca9735d9966
Merge
1.1 --- a/makefiles/BuildJaxws.gmk Fri Oct 11 00:07:42 2013 -0700 1.2 +++ b/makefiles/BuildJaxws.gmk Wed Oct 16 11:56:53 2013 -0700 1.3 @@ -30,42 +30,42 @@ 1.4 include MakeBase.gmk 1.5 include JavaCompilation.gmk 1.6 1.7 -DISABLE_JAXWS_WARNINGS:=-Xlint:all,-varargs,-rawtypes,-deprecation,-unchecked,-serial,-dep-ann,-cast,-fallthrough,-static 1.8 +DISABLE_JAXWS_WARNINGS := -Xlint:all,-varargs,-rawtypes,-deprecation,-unchecked,-serial,-dep-ann,-cast,-fallthrough,-static 1.9 1.10 # The generate new bytecode uses the new compiler for to generate bytecode 1.11 # for the new jdk that is being built. The code compiled by this setup 1.12 # cannot necessarily be run with the boot jdk. 1.13 -$(eval $(call SetupJavaCompiler,GENERATE_NEWBYTECODE_DEBUG,\ 1.14 - JVM:=$(JAVA),\ 1.15 - JAVAC:=$(NEW_JAVAC),\ 1.16 - FLAGS:=-XDignore.symbol.file=true $(DISABLE_JAXWS_WARNINGS) -g,\ 1.17 - SERVER_DIR:=$(SJAVAC_SERVER_DIR),\ 1.18 - SERVER_JVM:=$(SJAVAC_SERVER_JAVA))) 1.19 +$(eval $(call SetupJavaCompiler,GENERATE_NEWBYTECODE_DEBUG, \ 1.20 + JVM := $(JAVA), \ 1.21 + JAVAC := $(NEW_JAVAC), \ 1.22 + FLAGS := -XDignore.symbol.file=true $(DISABLE_JAXWS_WARNINGS) -g, \ 1.23 + SERVER_DIR := $(SJAVAC_SERVER_DIR), \ 1.24 + SERVER_JVM := $(SJAVAC_SERVER_JAVA))) 1.25 1.26 # Dummy here is needed to trigger copying of META-INF 1.27 -$(eval $(call SetupJavaCompilation,BUILD_JAF,\ 1.28 - SETUP:=GENERATE_NEWBYTECODE_DEBUG,\ 1.29 - SRC:=$(JAXWS_TOPDIR)/src/share/jaf_classes,\ 1.30 - COPY:="dummy",\ 1.31 - BIN:=$(JAXWS_OUTPUTDIR)/jaf_classes)) 1.32 +$(eval $(call SetupJavaCompilation,BUILD_JAF, \ 1.33 + SETUP := GENERATE_NEWBYTECODE_DEBUG, \ 1.34 + SRC := $(JAXWS_TOPDIR)/src/share/jaf_classes, \ 1.35 + COPY := "dummy", \ 1.36 + BIN := $(JAXWS_OUTPUTDIR)/jaf_classes)) 1.37 1.38 -$(eval $(call SetupJavaCompilation,BUILD_JAXWS,\ 1.39 - SETUP:=GENERATE_NEWBYTECODE_DEBUG,\ 1.40 - SRC:=$(JAXWS_TOPDIR)/src/share/jaxws_classes,\ 1.41 - BIN:=$(JAXWS_OUTPUTDIR)/jaxws_classes,\ 1.42 - COPY:=.xsd,\ 1.43 - COPY_FILES:=$(JAXWS_TOPDIR)/src/share/jaxws_classes/com/sun/tools/internal/xjc/runtime/JAXBContextFactory.java \ 1.44 - $(JAXWS_TOPDIR)/src/share/jaxws_classes/com/sun/tools/internal/xjc/runtime/ZeroOneBooleanAdapter.java \ 1.45 - $(JAXWS_TOPDIR)/src/share/jaxws_classes/com/sun/xml/internal/ws/assembler/jaxws-tubes-default.xml,\ 1.46 - ADD_JAVAC_FLAGS=-cp $(OUTPUT_ROOT)/jaxp/dist/lib/classes.jar)) 1.47 +$(eval $(call SetupJavaCompilation,BUILD_JAXWS, \ 1.48 + SETUP := GENERATE_NEWBYTECODE_DEBUG, \ 1.49 + SRC := $(JAXWS_TOPDIR)/src/share/jaxws_classes, \ 1.50 + BIN := $(JAXWS_OUTPUTDIR)/jaxws_classes, \ 1.51 + COPY := .xsd, \ 1.52 + COPY_FILES := $(JAXWS_TOPDIR)/src/share/jaxws_classes/com/sun/tools/internal/xjc/runtime/JAXBContextFactory.java \ 1.53 + $(JAXWS_TOPDIR)/src/share/jaxws_classes/com/sun/tools/internal/xjc/runtime/ZeroOneBooleanAdapter.java \ 1.54 + $(JAXWS_TOPDIR)/src/share/jaxws_classes/com/sun/xml/internal/ws/assembler/jaxws-tubes-default.xml, \ 1.55 + ADD_JAVAC_FLAGS = -cp $(OUTPUT_ROOT)/jaxp/dist/lib/classes.jar)) 1.56 1.57 $(JAXWS_OUTPUTDIR)/jaxws_classes/META-INF/services/com.sun.tools.internal.ws.wscompile.Plugin: \ 1.58 - $(JAXWS_TOPDIR)/src/share/jaxws_classes/com/sun/tools/etc/META-INF/services/com.sun.tools.internal.ws.wscompile.Plugin 1.59 + $(JAXWS_TOPDIR)/src/share/jaxws_classes/com/sun/tools/etc/META-INF/services/com.sun.tools.internal.ws.wscompile.Plugin 1.60 mkdir -p $(@D) 1.61 cp $< $@ 1.62 1.63 $(JAXWS_OUTPUTDIR)/jaxws_classes/META-INF/services/com.sun.tools.internal.xjc.Plugin: \ 1.64 - $(JAXWS_TOPDIR)/src/share/jaxws_classes/com/sun/tools/etc/META-INF/services/com.sun.tools.internal.xjc.Plugin 1.65 + $(JAXWS_TOPDIR)/src/share/jaxws_classes/com/sun/tools/etc/META-INF/services/com.sun.tools.internal.xjc.Plugin 1.66 mkdir -p $(@D) 1.67 cp $< $@ 1.68 1.69 @@ -73,7 +73,7 @@ 1.70 BUILD_JAXWS += $(JAXWS_OUTPUTDIR)/jaxws_classes/META-INF/services/com.sun.tools.internal.ws.wscompile.Plugin \ 1.71 $(JAXWS_OUTPUTDIR)/jaxws_classes/META-INF/services/com.sun.tools.internal.xjc.Plugin 1.72 1.73 -# Imitate the property cleaning mechanism in the old build. This will likely be replaced 1.74 +# Imitate the property cleaning mechanism in the old build. This will likely be replaced 1.75 # by the unified functionality in JavaCompilation.gmk, but keep it the same as old build 1.76 # for now, even though it actually breaks properties containing # in the value. 1.77 # Using nawk to avoid solaris sed. 1.78 @@ -84,8 +84,8 @@ 1.79 $(MV) $@.tmp $@ 1.80 1.81 JAXWS_SRC_PROP_FILES := $(shell $(FIND) $(JAXWS_TOPDIR)/src/share/jaxws_classes -name "*.properties") 1.82 -TARGET_PROP_FILES := $(patsubst $(JAXWS_TOPDIR)/src/share/jaxws_classes/%,\ 1.83 - $(JAXWS_OUTPUTDIR)/jaxws_classes/%,$(JAXWS_SRC_PROP_FILES)) 1.84 +TARGET_PROP_FILES := $(patsubst $(JAXWS_TOPDIR)/src/share/jaxws_classes/%, \ 1.85 + $(JAXWS_OUTPUTDIR)/jaxws_classes/%, $(JAXWS_SRC_PROP_FILES)) 1.86 1.87 $(JAXWS_OUTPUTDIR)/jaf_classes/%.properties: $(JAXWS_TOPDIR)/src/share/jaf_classes/%.properties 1.88 $(MKDIR) -p $(@D) 1.89 @@ -94,20 +94,20 @@ 1.90 $(MV) $@.tmp $@ 1.91 1.92 JAF_SRC_PROP_FILES := $(shell $(FIND) $(JAXWS_TOPDIR)/src/share/jaf_classes -name "*.properties") 1.93 -TARGET_PROP_FILES += $(patsubst $(JAXWS_TOPDIR)/src/share/jaf_classes/%,\ 1.94 - $(JAXWS_OUTPUTDIR)/jaf_classes/%,$(JAF_SRC_PROP_FILES)) 1.95 +TARGET_PROP_FILES += $(patsubst $(JAXWS_TOPDIR)/src/share/jaf_classes/%, \ 1.96 + $(JAXWS_OUTPUTDIR)/jaf_classes/%, $(JAF_SRC_PROP_FILES)) 1.97 1.98 -$(eval $(call SetupArchive,ARCHIVE_JAXWS,$(BUILD_JAXWS) $(BUILD_JAF) $(TARGET_PROP_FILES),\ 1.99 - SRCS:=$(JAXWS_OUTPUTDIR)/jaxws_classes $(JAXWS_OUTPUTDIR)/jaf_classes,\ 1.100 - SUFFIXES:=.class .properties .xsd .xml .java \ 1.101 - com.sun.mirror.apt.AnnotationProcessorFactory \ 1.102 - com.sun.tools.internal.xjc.Plugin,\ 1.103 - JAR:=$(JAXWS_OUTPUTDIR)/dist/lib/classes.jar)) 1.104 +$(eval $(call SetupArchive,ARCHIVE_JAXWS, $(BUILD_JAXWS) $(BUILD_JAF) $(TARGET_PROP_FILES), \ 1.105 + SRCS := $(JAXWS_OUTPUTDIR)/jaxws_classes $(JAXWS_OUTPUTDIR)/jaf_classes, \ 1.106 + SUFFIXES := .class .properties .xsd .xml .java \ 1.107 + com.sun.mirror.apt.AnnotationProcessorFactory \ 1.108 + com.sun.tools.internal.xjc.Plugin, \ 1.109 + JAR := $(JAXWS_OUTPUTDIR)/dist/lib/classes.jar)) 1.110 1.111 -$(eval $(call SetupZipArchive,ZIP_JAXWS_SOURCES,\ 1.112 - SRC:=$(JAXWS_TOPDIR)/src/share/jaf_classes $(JAXWS_TOPDIR)/src/share/jaxws_classes,\ 1.113 - ZIP:=$(JAXWS_OUTPUTDIR)/dist/lib/src.zip)) 1.114 +$(eval $(call SetupZipArchive,ZIP_JAXWS_SOURCES, \ 1.115 + SRC := $(JAXWS_TOPDIR)/src/share/jaf_classes $(JAXWS_TOPDIR)/src/share/jaxws_classes, \ 1.116 + ZIP := $(JAXWS_OUTPUTDIR)/dist/lib/src.zip)) 1.117 1.118 all: $(JAXWS_OUTPUTDIR)/dist/lib/classes.jar $(JAXWS_OUTPUTDIR)/dist/lib/src.zip 1.119 1.120 -.PHONY: default all 1.121 +.PHONY: default all
2.1 --- a/makefiles/Makefile Fri Oct 11 00:07:42 2013 -0700 2.2 +++ b/makefiles/Makefile Wed Oct 16 11:56:53 2013 -0700 2.3 @@ -24,19 +24,19 @@ 2.4 # 2.5 2.6 # Locate this Makefile 2.7 -ifeq ($(filter /%,$(lastword $(MAKEFILE_LIST))),) 2.8 - makefile_path:=$(CURDIR)/$(lastword $(MAKEFILE_LIST)) 2.9 +ifeq ($(filter /%, $(lastword $(MAKEFILE_LIST))), ) 2.10 + makefile_path := $(CURDIR)/$(lastword $(MAKEFILE_LIST)) 2.11 else 2.12 - makefile_path:=$(lastword $(MAKEFILE_LIST)) 2.13 + makefile_path := $(lastword $(MAKEFILE_LIST)) 2.14 endif 2.15 -repo_dir:=$(patsubst %/makefiles/Makefile,%,$(makefile_path)) 2.16 +repo_dir := $(patsubst %/makefiles/Makefile, %, $(makefile_path)) 2.17 2.18 # What is the name of this subsystem (langtools, corba, etc)? 2.19 -subsystem_name:=$(notdir $(repo_dir)) 2.20 +subsystem_name := $(notdir $(repo_dir)) 2.21 2.22 # Try to locate top-level makefile 2.23 -top_level_makefile:=$(repo_dir)/../common/makefiles/Makefile 2.24 -ifneq ($(wildcard $(top_level_makefile)),) 2.25 +top_level_makefile := $(repo_dir)/../common/makefiles/Makefile 2.26 +ifneq ($(wildcard $(top_level_makefile)), ) 2.27 $(info Will run $(subsystem_name) target on top-level Makefile) 2.28 $(info WARNING: This is a non-recommended way of building!) 2.29 $(info ===================================================)
