Mercurial > jdk8-mips64-public > jaxws / changeset
changeset
Merge
Thu, 17 Oct 2013 16:12:58 -0700
- author
- lana
- date
- Thu, 17 Oct 2013 16:12:58 -0700
- changeset 429
- be7d1f874b96
- parent 428
- 01facfebe17b
- parent 414
- 9ca9735d9966
- child 431
- f20820d1582f
Merge
1.1 --- a/.hgtags Tue Oct 15 13:46:18 2013 +0100 1.2 +++ b/.hgtags Thu Oct 17 16:12:58 2013 -0700 1.3 @@ -233,3 +233,4 @@ 1.4 df5d4d01642572e77fd3c01e4c8703ed3f6eec87 jdk8-b109 1.5 cc682329886be2fc26220fc30597ee4e5bba43ed jdk8-b110 1.6 32edc7a2c86696dfcbdb6ffae641ff153f8e34bd jdk8-b111 1.7 +dbdd5c76250928582cb5342bcf7b299a6007d538 jdk8-b112
2.1 --- a/makefiles/BuildJaxws.gmk Tue Oct 15 13:46:18 2013 +0100 2.2 +++ b/makefiles/BuildJaxws.gmk Thu Oct 17 16:12:58 2013 -0700 2.3 @@ -30,42 +30,42 @@ 2.4 include MakeBase.gmk 2.5 include JavaCompilation.gmk 2.6 2.7 -DISABLE_JAXWS_WARNINGS:=-Xlint:all,-varargs,-rawtypes,-deprecation,-unchecked,-serial,-dep-ann,-cast,-fallthrough,-static 2.8 +DISABLE_JAXWS_WARNINGS := -Xlint:all,-varargs,-rawtypes,-deprecation,-unchecked,-serial,-dep-ann,-cast,-fallthrough,-static 2.9 2.10 # The generate new bytecode uses the new compiler for to generate bytecode 2.11 # for the new jdk that is being built. The code compiled by this setup 2.12 # cannot necessarily be run with the boot jdk. 2.13 -$(eval $(call SetupJavaCompiler,GENERATE_NEWBYTECODE_DEBUG,\ 2.14 - JVM:=$(JAVA),\ 2.15 - JAVAC:=$(NEW_JAVAC),\ 2.16 - FLAGS:=-XDignore.symbol.file=true $(DISABLE_JAXWS_WARNINGS) -g,\ 2.17 - SERVER_DIR:=$(SJAVAC_SERVER_DIR),\ 2.18 - SERVER_JVM:=$(SJAVAC_SERVER_JAVA))) 2.19 +$(eval $(call SetupJavaCompiler,GENERATE_NEWBYTECODE_DEBUG, \ 2.20 + JVM := $(JAVA), \ 2.21 + JAVAC := $(NEW_JAVAC), \ 2.22 + FLAGS := -XDignore.symbol.file=true $(DISABLE_JAXWS_WARNINGS) -g, \ 2.23 + SERVER_DIR := $(SJAVAC_SERVER_DIR), \ 2.24 + SERVER_JVM := $(SJAVAC_SERVER_JAVA))) 2.25 2.26 # Dummy here is needed to trigger copying of META-INF 2.27 -$(eval $(call SetupJavaCompilation,BUILD_JAF,\ 2.28 - SETUP:=GENERATE_NEWBYTECODE_DEBUG,\ 2.29 - SRC:=$(JAXWS_TOPDIR)/src/share/jaf_classes,\ 2.30 - COPY:="dummy",\ 2.31 - BIN:=$(JAXWS_OUTPUTDIR)/jaf_classes)) 2.32 +$(eval $(call SetupJavaCompilation,BUILD_JAF, \ 2.33 + SETUP := GENERATE_NEWBYTECODE_DEBUG, \ 2.34 + SRC := $(JAXWS_TOPDIR)/src/share/jaf_classes, \ 2.35 + COPY := "dummy", \ 2.36 + BIN := $(JAXWS_OUTPUTDIR)/jaf_classes)) 2.37 2.38 -$(eval $(call SetupJavaCompilation,BUILD_JAXWS,\ 2.39 - SETUP:=GENERATE_NEWBYTECODE_DEBUG,\ 2.40 - SRC:=$(JAXWS_TOPDIR)/src/share/jaxws_classes,\ 2.41 - BIN:=$(JAXWS_OUTPUTDIR)/jaxws_classes,\ 2.42 - COPY:=.xsd,\ 2.43 - COPY_FILES:=$(JAXWS_TOPDIR)/src/share/jaxws_classes/com/sun/tools/internal/xjc/runtime/JAXBContextFactory.java \ 2.44 - $(JAXWS_TOPDIR)/src/share/jaxws_classes/com/sun/tools/internal/xjc/runtime/ZeroOneBooleanAdapter.java \ 2.45 - $(JAXWS_TOPDIR)/src/share/jaxws_classes/com/sun/xml/internal/ws/assembler/jaxws-tubes-default.xml,\ 2.46 - ADD_JAVAC_FLAGS=-cp $(OUTPUT_ROOT)/jaxp/dist/lib/classes.jar)) 2.47 +$(eval $(call SetupJavaCompilation,BUILD_JAXWS, \ 2.48 + SETUP := GENERATE_NEWBYTECODE_DEBUG, \ 2.49 + SRC := $(JAXWS_TOPDIR)/src/share/jaxws_classes, \ 2.50 + BIN := $(JAXWS_OUTPUTDIR)/jaxws_classes, \ 2.51 + COPY := .xsd, \ 2.52 + COPY_FILES := $(JAXWS_TOPDIR)/src/share/jaxws_classes/com/sun/tools/internal/xjc/runtime/JAXBContextFactory.java \ 2.53 + $(JAXWS_TOPDIR)/src/share/jaxws_classes/com/sun/tools/internal/xjc/runtime/ZeroOneBooleanAdapter.java \ 2.54 + $(JAXWS_TOPDIR)/src/share/jaxws_classes/com/sun/xml/internal/ws/assembler/jaxws-tubes-default.xml, \ 2.55 + ADD_JAVAC_FLAGS = -cp $(OUTPUT_ROOT)/jaxp/dist/lib/classes.jar)) 2.56 2.57 $(JAXWS_OUTPUTDIR)/jaxws_classes/META-INF/services/com.sun.tools.internal.ws.wscompile.Plugin: \ 2.58 - $(JAXWS_TOPDIR)/src/share/jaxws_classes/com/sun/tools/etc/META-INF/services/com.sun.tools.internal.ws.wscompile.Plugin 2.59 + $(JAXWS_TOPDIR)/src/share/jaxws_classes/com/sun/tools/etc/META-INF/services/com.sun.tools.internal.ws.wscompile.Plugin 2.60 mkdir -p $(@D) 2.61 cp $< $@ 2.62 2.63 $(JAXWS_OUTPUTDIR)/jaxws_classes/META-INF/services/com.sun.tools.internal.xjc.Plugin: \ 2.64 - $(JAXWS_TOPDIR)/src/share/jaxws_classes/com/sun/tools/etc/META-INF/services/com.sun.tools.internal.xjc.Plugin 2.65 + $(JAXWS_TOPDIR)/src/share/jaxws_classes/com/sun/tools/etc/META-INF/services/com.sun.tools.internal.xjc.Plugin 2.66 mkdir -p $(@D) 2.67 cp $< $@ 2.68 2.69 @@ -73,7 +73,7 @@ 2.70 BUILD_JAXWS += $(JAXWS_OUTPUTDIR)/jaxws_classes/META-INF/services/com.sun.tools.internal.ws.wscompile.Plugin \ 2.71 $(JAXWS_OUTPUTDIR)/jaxws_classes/META-INF/services/com.sun.tools.internal.xjc.Plugin 2.72 2.73 -# Imitate the property cleaning mechanism in the old build. This will likely be replaced 2.74 +# Imitate the property cleaning mechanism in the old build. This will likely be replaced 2.75 # by the unified functionality in JavaCompilation.gmk, but keep it the same as old build 2.76 # for now, even though it actually breaks properties containing # in the value. 2.77 # Using nawk to avoid solaris sed. 2.78 @@ -84,8 +84,8 @@ 2.79 $(MV) $@.tmp $@ 2.80 2.81 JAXWS_SRC_PROP_FILES := $(shell $(FIND) $(JAXWS_TOPDIR)/src/share/jaxws_classes -name "*.properties") 2.82 -TARGET_PROP_FILES := $(patsubst $(JAXWS_TOPDIR)/src/share/jaxws_classes/%,\ 2.83 - $(JAXWS_OUTPUTDIR)/jaxws_classes/%,$(JAXWS_SRC_PROP_FILES)) 2.84 +TARGET_PROP_FILES := $(patsubst $(JAXWS_TOPDIR)/src/share/jaxws_classes/%, \ 2.85 + $(JAXWS_OUTPUTDIR)/jaxws_classes/%, $(JAXWS_SRC_PROP_FILES)) 2.86 2.87 $(JAXWS_OUTPUTDIR)/jaf_classes/%.properties: $(JAXWS_TOPDIR)/src/share/jaf_classes/%.properties 2.88 $(MKDIR) -p $(@D) 2.89 @@ -94,20 +94,20 @@ 2.90 $(MV) $@.tmp $@ 2.91 2.92 JAF_SRC_PROP_FILES := $(shell $(FIND) $(JAXWS_TOPDIR)/src/share/jaf_classes -name "*.properties") 2.93 -TARGET_PROP_FILES += $(patsubst $(JAXWS_TOPDIR)/src/share/jaf_classes/%,\ 2.94 - $(JAXWS_OUTPUTDIR)/jaf_classes/%,$(JAF_SRC_PROP_FILES)) 2.95 +TARGET_PROP_FILES += $(patsubst $(JAXWS_TOPDIR)/src/share/jaf_classes/%, \ 2.96 + $(JAXWS_OUTPUTDIR)/jaf_classes/%, $(JAF_SRC_PROP_FILES)) 2.97 2.98 -$(eval $(call SetupArchive,ARCHIVE_JAXWS,$(BUILD_JAXWS) $(BUILD_JAF) $(TARGET_PROP_FILES),\ 2.99 - SRCS:=$(JAXWS_OUTPUTDIR)/jaxws_classes $(JAXWS_OUTPUTDIR)/jaf_classes,\ 2.100 - SUFFIXES:=.class .properties .xsd .xml .java \ 2.101 - com.sun.mirror.apt.AnnotationProcessorFactory \ 2.102 - com.sun.tools.internal.xjc.Plugin,\ 2.103 - JAR:=$(JAXWS_OUTPUTDIR)/dist/lib/classes.jar)) 2.104 +$(eval $(call SetupArchive,ARCHIVE_JAXWS, $(BUILD_JAXWS) $(BUILD_JAF) $(TARGET_PROP_FILES), \ 2.105 + SRCS := $(JAXWS_OUTPUTDIR)/jaxws_classes $(JAXWS_OUTPUTDIR)/jaf_classes, \ 2.106 + SUFFIXES := .class .properties .xsd .xml .java \ 2.107 + com.sun.mirror.apt.AnnotationProcessorFactory \ 2.108 + com.sun.tools.internal.xjc.Plugin, \ 2.109 + JAR := $(JAXWS_OUTPUTDIR)/dist/lib/classes.jar)) 2.110 2.111 -$(eval $(call SetupZipArchive,ZIP_JAXWS_SOURCES,\ 2.112 - SRC:=$(JAXWS_TOPDIR)/src/share/jaf_classes $(JAXWS_TOPDIR)/src/share/jaxws_classes,\ 2.113 - ZIP:=$(JAXWS_OUTPUTDIR)/dist/lib/src.zip)) 2.114 +$(eval $(call SetupZipArchive,ZIP_JAXWS_SOURCES, \ 2.115 + SRC := $(JAXWS_TOPDIR)/src/share/jaf_classes $(JAXWS_TOPDIR)/src/share/jaxws_classes, \ 2.116 + ZIP := $(JAXWS_OUTPUTDIR)/dist/lib/src.zip)) 2.117 2.118 all: $(JAXWS_OUTPUTDIR)/dist/lib/classes.jar $(JAXWS_OUTPUTDIR)/dist/lib/src.zip 2.119 2.120 -.PHONY: default all 2.121 +.PHONY: default all
3.1 --- a/makefiles/Makefile Tue Oct 15 13:46:18 2013 +0100 3.2 +++ b/makefiles/Makefile Thu Oct 17 16:12:58 2013 -0700 3.3 @@ -24,19 +24,19 @@ 3.4 # 3.5 3.6 # Locate this Makefile 3.7 -ifeq ($(filter /%,$(lastword $(MAKEFILE_LIST))),) 3.8 - makefile_path:=$(CURDIR)/$(lastword $(MAKEFILE_LIST)) 3.9 +ifeq ($(filter /%, $(lastword $(MAKEFILE_LIST))), ) 3.10 + makefile_path := $(CURDIR)/$(lastword $(MAKEFILE_LIST)) 3.11 else 3.12 - makefile_path:=$(lastword $(MAKEFILE_LIST)) 3.13 + makefile_path := $(lastword $(MAKEFILE_LIST)) 3.14 endif 3.15 -repo_dir:=$(patsubst %/makefiles/Makefile,%,$(makefile_path)) 3.16 +repo_dir := $(patsubst %/makefiles/Makefile, %, $(makefile_path)) 3.17 3.18 # What is the name of this subsystem (langtools, corba, etc)? 3.19 -subsystem_name:=$(notdir $(repo_dir)) 3.20 +subsystem_name := $(notdir $(repo_dir)) 3.21 3.22 # Try to locate top-level makefile 3.23 -top_level_makefile:=$(repo_dir)/../common/makefiles/Makefile 3.24 -ifneq ($(wildcard $(top_level_makefile)),) 3.25 +top_level_makefile := $(repo_dir)/../common/makefiles/Makefile 3.26 +ifneq ($(wildcard $(top_level_makefile)), ) 3.27 $(info Will run $(subsystem_name) target on top-level Makefile) 3.28 $(info WARNING: This is a non-recommended way of building!) 3.29 $(info ===================================================)
