makefiles/BuildJaxws.gmk

changeset 412
602fdd7bb765
parent 368
0989ad8c0860
child 430
17f1b13cd401
equal deleted inserted replaced
406:32edc7a2c866 412:602fdd7bb765
28 28
29 include $(SPEC) 29 include $(SPEC)
30 include MakeBase.gmk 30 include MakeBase.gmk
31 include JavaCompilation.gmk 31 include JavaCompilation.gmk
32 32
33 DISABLE_JAXWS_WARNINGS:=-Xlint:all,-varargs,-rawtypes,-deprecation,-unchecked,-serial,-dep-ann,-cast,-fallthrough,-static 33 DISABLE_JAXWS_WARNINGS := -Xlint:all,-varargs,-rawtypes,-deprecation,-unchecked,-serial,-dep-ann,-cast,-fallthrough,-static
34 34
35 # The generate new bytecode uses the new compiler for to generate bytecode 35 # The generate new bytecode uses the new compiler for to generate bytecode
36 # for the new jdk that is being built. The code compiled by this setup 36 # for the new jdk that is being built. The code compiled by this setup
37 # cannot necessarily be run with the boot jdk. 37 # cannot necessarily be run with the boot jdk.
38 $(eval $(call SetupJavaCompiler,GENERATE_NEWBYTECODE_DEBUG,\ 38 $(eval $(call SetupJavaCompiler,GENERATE_NEWBYTECODE_DEBUG, \
39 JVM:=$(JAVA),\ 39 JVM := $(JAVA), \
40 JAVAC:=$(NEW_JAVAC),\ 40 JAVAC := $(NEW_JAVAC), \
41 FLAGS:=-XDignore.symbol.file=true $(DISABLE_JAXWS_WARNINGS) -g,\ 41 FLAGS := -XDignore.symbol.file=true $(DISABLE_JAXWS_WARNINGS) -g, \
42 SERVER_DIR:=$(SJAVAC_SERVER_DIR),\ 42 SERVER_DIR := $(SJAVAC_SERVER_DIR), \
43 SERVER_JVM:=$(SJAVAC_SERVER_JAVA))) 43 SERVER_JVM := $(SJAVAC_SERVER_JAVA)))
44 44
45 # Dummy here is needed to trigger copying of META-INF 45 # Dummy here is needed to trigger copying of META-INF
46 $(eval $(call SetupJavaCompilation,BUILD_JAF,\ 46 $(eval $(call SetupJavaCompilation,BUILD_JAF, \
47 SETUP:=GENERATE_NEWBYTECODE_DEBUG,\ 47 SETUP := GENERATE_NEWBYTECODE_DEBUG, \
48 SRC:=$(JAXWS_TOPDIR)/src/share/jaf_classes,\ 48 SRC := $(JAXWS_TOPDIR)/src/share/jaf_classes, \
49 COPY:="dummy",\ 49 COPY := "dummy", \
50 BIN:=$(JAXWS_OUTPUTDIR)/jaf_classes)) 50 BIN := $(JAXWS_OUTPUTDIR)/jaf_classes))
51 51
52 $(eval $(call SetupJavaCompilation,BUILD_JAXWS,\ 52 $(eval $(call SetupJavaCompilation,BUILD_JAXWS, \
53 SETUP:=GENERATE_NEWBYTECODE_DEBUG,\ 53 SETUP := GENERATE_NEWBYTECODE_DEBUG, \
54 SRC:=$(JAXWS_TOPDIR)/src/share/jaxws_classes,\ 54 SRC := $(JAXWS_TOPDIR)/src/share/jaxws_classes, \
55 BIN:=$(JAXWS_OUTPUTDIR)/jaxws_classes,\ 55 BIN := $(JAXWS_OUTPUTDIR)/jaxws_classes, \
56 COPY:=.xsd,\ 56 COPY := .xsd, \
57 COPY_FILES:=$(JAXWS_TOPDIR)/src/share/jaxws_classes/com/sun/tools/internal/xjc/runtime/JAXBContextFactory.java \ 57 COPY_FILES := $(JAXWS_TOPDIR)/src/share/jaxws_classes/com/sun/tools/internal/xjc/runtime/JAXBContextFactory.java \
58 $(JAXWS_TOPDIR)/src/share/jaxws_classes/com/sun/tools/internal/xjc/runtime/ZeroOneBooleanAdapter.java \ 58 $(JAXWS_TOPDIR)/src/share/jaxws_classes/com/sun/tools/internal/xjc/runtime/ZeroOneBooleanAdapter.java \
59 $(JAXWS_TOPDIR)/src/share/jaxws_classes/com/sun/xml/internal/ws/assembler/jaxws-tubes-default.xml,\ 59 $(JAXWS_TOPDIR)/src/share/jaxws_classes/com/sun/xml/internal/ws/assembler/jaxws-tubes-default.xml, \
60 ADD_JAVAC_FLAGS=-cp $(OUTPUT_ROOT)/jaxp/dist/lib/classes.jar)) 60 ADD_JAVAC_FLAGS = -cp $(OUTPUT_ROOT)/jaxp/dist/lib/classes.jar))
61 61
62 $(JAXWS_OUTPUTDIR)/jaxws_classes/META-INF/services/com.sun.tools.internal.ws.wscompile.Plugin: \ 62 $(JAXWS_OUTPUTDIR)/jaxws_classes/META-INF/services/com.sun.tools.internal.ws.wscompile.Plugin: \
63 $(JAXWS_TOPDIR)/src/share/jaxws_classes/com/sun/tools/etc/META-INF/services/com.sun.tools.internal.ws.wscompile.Plugin 63 $(JAXWS_TOPDIR)/src/share/jaxws_classes/com/sun/tools/etc/META-INF/services/com.sun.tools.internal.ws.wscompile.Plugin
64 mkdir -p $(@D) 64 mkdir -p $(@D)
65 cp $< $@ 65 cp $< $@
66 66
67 $(JAXWS_OUTPUTDIR)/jaxws_classes/META-INF/services/com.sun.tools.internal.xjc.Plugin: \ 67 $(JAXWS_OUTPUTDIR)/jaxws_classes/META-INF/services/com.sun.tools.internal.xjc.Plugin: \
68 $(JAXWS_TOPDIR)/src/share/jaxws_classes/com/sun/tools/etc/META-INF/services/com.sun.tools.internal.xjc.Plugin 68 $(JAXWS_TOPDIR)/src/share/jaxws_classes/com/sun/tools/etc/META-INF/services/com.sun.tools.internal.xjc.Plugin
69 mkdir -p $(@D) 69 mkdir -p $(@D)
70 cp $< $@ 70 cp $< $@
71 71
72 # There are two META-INF services files that are needed, add these to the list of goals 72 # There are two META-INF services files that are needed, add these to the list of goals
73 BUILD_JAXWS += $(JAXWS_OUTPUTDIR)/jaxws_classes/META-INF/services/com.sun.tools.internal.ws.wscompile.Plugin \ 73 BUILD_JAXWS += $(JAXWS_OUTPUTDIR)/jaxws_classes/META-INF/services/com.sun.tools.internal.ws.wscompile.Plugin \
74 $(JAXWS_OUTPUTDIR)/jaxws_classes/META-INF/services/com.sun.tools.internal.xjc.Plugin 74 $(JAXWS_OUTPUTDIR)/jaxws_classes/META-INF/services/com.sun.tools.internal.xjc.Plugin
75 75
76 # Imitate the property cleaning mechanism in the old build. This will likely be replaced 76 # Imitate the property cleaning mechanism in the old build. This will likely be replaced
77 # by the unified functionality in JavaCompilation.gmk, but keep it the same as old build 77 # by the unified functionality in JavaCompilation.gmk, but keep it the same as old build
78 # for now, even though it actually breaks properties containing # in the value. 78 # for now, even though it actually breaks properties containing # in the value.
79 # Using nawk to avoid solaris sed. 79 # Using nawk to avoid solaris sed.
80 $(JAXWS_OUTPUTDIR)/jaxws_classes/%.properties: $(JAXWS_TOPDIR)/src/share/jaxws_classes/%.properties 80 $(JAXWS_OUTPUTDIR)/jaxws_classes/%.properties: $(JAXWS_TOPDIR)/src/share/jaxws_classes/%.properties
81 $(MKDIR) -p $(@D) 81 $(MKDIR) -p $(@D)
82 $(RM) $@ $@.tmp 82 $(RM) $@ $@.tmp
83 $(CAT) $< | LANG=C $(NAWK) '{ sub(/#.*$$/,"#"); print }' > $@.tmp 83 $(CAT) $< | LANG=C $(NAWK) '{ sub(/#.*$$/,"#"); print }' > $@.tmp
84 $(MV) $@.tmp $@ 84 $(MV) $@.tmp $@
85 85
86 JAXWS_SRC_PROP_FILES := $(shell $(FIND) $(JAXWS_TOPDIR)/src/share/jaxws_classes -name "*.properties") 86 JAXWS_SRC_PROP_FILES := $(shell $(FIND) $(JAXWS_TOPDIR)/src/share/jaxws_classes -name "*.properties")
87 TARGET_PROP_FILES := $(patsubst $(JAXWS_TOPDIR)/src/share/jaxws_classes/%,\ 87 TARGET_PROP_FILES := $(patsubst $(JAXWS_TOPDIR)/src/share/jaxws_classes/%, \
88 $(JAXWS_OUTPUTDIR)/jaxws_classes/%,$(JAXWS_SRC_PROP_FILES)) 88 $(JAXWS_OUTPUTDIR)/jaxws_classes/%, $(JAXWS_SRC_PROP_FILES))
89 89
90 $(JAXWS_OUTPUTDIR)/jaf_classes/%.properties: $(JAXWS_TOPDIR)/src/share/jaf_classes/%.properties 90 $(JAXWS_OUTPUTDIR)/jaf_classes/%.properties: $(JAXWS_TOPDIR)/src/share/jaf_classes/%.properties
91 $(MKDIR) -p $(@D) 91 $(MKDIR) -p $(@D)
92 $(RM) $@ $@.tmp 92 $(RM) $@ $@.tmp
93 $(CAT) $< | LANG=C $(NAWK) '{ sub(/#.*$$/,"#"); print }' > $@.tmp 93 $(CAT) $< | LANG=C $(NAWK) '{ sub(/#.*$$/,"#"); print }' > $@.tmp
94 $(MV) $@.tmp $@ 94 $(MV) $@.tmp $@
95 95
96 JAF_SRC_PROP_FILES := $(shell $(FIND) $(JAXWS_TOPDIR)/src/share/jaf_classes -name "*.properties") 96 JAF_SRC_PROP_FILES := $(shell $(FIND) $(JAXWS_TOPDIR)/src/share/jaf_classes -name "*.properties")
97 TARGET_PROP_FILES += $(patsubst $(JAXWS_TOPDIR)/src/share/jaf_classes/%,\ 97 TARGET_PROP_FILES += $(patsubst $(JAXWS_TOPDIR)/src/share/jaf_classes/%, \
98 $(JAXWS_OUTPUTDIR)/jaf_classes/%,$(JAF_SRC_PROP_FILES)) 98 $(JAXWS_OUTPUTDIR)/jaf_classes/%, $(JAF_SRC_PROP_FILES))
99 99
100 $(eval $(call SetupArchive,ARCHIVE_JAXWS,$(BUILD_JAXWS) $(BUILD_JAF) $(TARGET_PROP_FILES),\ 100 $(eval $(call SetupArchive,ARCHIVE_JAXWS, $(BUILD_JAXWS) $(BUILD_JAF) $(TARGET_PROP_FILES), \
101 SRCS:=$(JAXWS_OUTPUTDIR)/jaxws_classes $(JAXWS_OUTPUTDIR)/jaf_classes,\ 101 SRCS := $(JAXWS_OUTPUTDIR)/jaxws_classes $(JAXWS_OUTPUTDIR)/jaf_classes, \
102 SUFFIXES:=.class .properties .xsd .xml .java \ 102 SUFFIXES := .class .properties .xsd .xml .java \
103 com.sun.mirror.apt.AnnotationProcessorFactory \ 103 com.sun.mirror.apt.AnnotationProcessorFactory \
104 com.sun.tools.internal.xjc.Plugin,\ 104 com.sun.tools.internal.xjc.Plugin, \
105 JAR:=$(JAXWS_OUTPUTDIR)/dist/lib/classes.jar)) 105 JAR := $(JAXWS_OUTPUTDIR)/dist/lib/classes.jar))
106 106
107 $(eval $(call SetupZipArchive,ZIP_JAXWS_SOURCES,\ 107 $(eval $(call SetupZipArchive,ZIP_JAXWS_SOURCES, \
108 SRC:=$(JAXWS_TOPDIR)/src/share/jaf_classes $(JAXWS_TOPDIR)/src/share/jaxws_classes,\ 108 SRC := $(JAXWS_TOPDIR)/src/share/jaf_classes $(JAXWS_TOPDIR)/src/share/jaxws_classes, \
109 ZIP:=$(JAXWS_OUTPUTDIR)/dist/lib/src.zip)) 109 ZIP := $(JAXWS_OUTPUTDIR)/dist/lib/src.zip))
110 110
111 all: $(JAXWS_OUTPUTDIR)/dist/lib/classes.jar $(JAXWS_OUTPUTDIR)/dist/lib/src.zip 111 all: $(JAXWS_OUTPUTDIR)/dist/lib/classes.jar $(JAXWS_OUTPUTDIR)/dist/lib/src.zip
112 112
113 .PHONY: default all 113 .PHONY: default all

mercurial