Mercurial > jdk8-mips64-public > jaxws / changeset
changeset
Merge
Thu, 05 Dec 2013 16:37:30 +0400
- author
- kizune
- date
- Thu, 05 Dec 2013 16:37:30 +0400
- changeset 452
- c99140027351
- parent 451
- f80c37c168f7
- parent 442
- 6c152deb600d
- child 453
- ca6bb6b558a6
- child 492
- fef660778ace
Merge
| make/jprt.properties | file | annotate | diff | comparison | revisions | |
| make/scripts/update_src.sh | file | annotate | diff | comparison | revisions | |
| makefiles/BuildJaxws.gmk | file | annotate | diff | comparison | revisions | |
| makefiles/Makefile | file | annotate | diff | comparison | revisions |
1.1 --- a/.hgtags Tue Dec 03 14:13:08 2013 +0400 1.2 +++ b/.hgtags Thu Dec 05 16:37:30 2013 +0400 1.3 @@ -240,3 +240,4 @@ 1.4 587560c222a2476066852224ed02d39b5090a299 jdk8-b116 1.5 fe56ba456fd32758c72db629938d69067468d89c jdk8-b117 1.6 76a598cf50c4e1dc1fc8adc08b451943aa1a3179 jdk8-b118 1.7 +172b8e056ff259044ca48c5425d643dc8e2e05c8 jdk8-b119
2.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 2.2 +++ b/make/BuildJaxws.gmk Thu Dec 05 16:37:30 2013 +0400 2.3 @@ -0,0 +1,113 @@ 2.4 +# 2.5 +# Copyright (c) 2007, 2013, Oracle and/or its affiliates. All rights reserved. 2.6 +# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. 2.7 +# 2.8 +# This code is free software; you can redistribute it and/or modify it 2.9 +# under the terms of the GNU General Public License version 2 only, as 2.10 +# published by the Free Software Foundation. Oracle designates this 2.11 +# particular file as subject to the "Classpath" exception as provided 2.12 +# by Oracle in the LICENSE file that accompanied this code. 2.13 +# 2.14 +# This code is distributed in the hope that it will be useful, but WITHOUT 2.15 +# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or 2.16 +# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License 2.17 +# version 2 for more details (a copy is included in the LICENSE file that 2.18 +# accompanied this code). 2.19 +# 2.20 +# You should have received a copy of the GNU General Public License version 2.21 +# 2 along with this work; if not, write to the Free Software Foundation, 2.22 +# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. 2.23 +# 2.24 +# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA 2.25 +# or visit www.oracle.com if you need additional information or have any 2.26 +# questions. 2.27 +# 2.28 + 2.29 +# This must be the first rule 2.30 +default: all 2.31 + 2.32 +include $(SPEC) 2.33 +include MakeBase.gmk 2.34 +include JavaCompilation.gmk 2.35 + 2.36 +DISABLE_JAXWS_WARNINGS := -Xlint:all,-varargs,-rawtypes,-deprecation,-unchecked,-serial,-dep-ann,-cast,-fallthrough,-static 2.37 + 2.38 +# The generate new bytecode uses the new compiler for to generate bytecode 2.39 +# for the new jdk that is being built. The code compiled by this setup 2.40 +# cannot necessarily be run with the boot jdk. 2.41 +$(eval $(call SetupJavaCompiler,GENERATE_NEWBYTECODE_DEBUG, \ 2.42 + JVM := $(JAVA), \ 2.43 + JAVAC := $(NEW_JAVAC), \ 2.44 + FLAGS := -XDignore.symbol.file=true $(DISABLE_JAXWS_WARNINGS) -g, \ 2.45 + SERVER_DIR := $(SJAVAC_SERVER_DIR), \ 2.46 + SERVER_JVM := $(SJAVAC_SERVER_JAVA))) 2.47 + 2.48 +# Dummy here is needed to trigger copying of META-INF 2.49 +$(eval $(call SetupJavaCompilation,BUILD_JAF, \ 2.50 + SETUP := GENERATE_NEWBYTECODE_DEBUG, \ 2.51 + SRC := $(JAXWS_TOPDIR)/src/share/jaf_classes, \ 2.52 + COPY := "dummy", \ 2.53 + BIN := $(JAXWS_OUTPUTDIR)/jaf_classes)) 2.54 + 2.55 +$(eval $(call SetupJavaCompilation,BUILD_JAXWS, \ 2.56 + SETUP := GENERATE_NEWBYTECODE_DEBUG, \ 2.57 + SRC := $(JAXWS_TOPDIR)/src/share/jaxws_classes, \ 2.58 + BIN := $(JAXWS_OUTPUTDIR)/jaxws_classes, \ 2.59 + COPY := .xsd, \ 2.60 + COPY_FILES := $(JAXWS_TOPDIR)/src/share/jaxws_classes/com/sun/tools/internal/xjc/runtime/JAXBContextFactory.java \ 2.61 + $(JAXWS_TOPDIR)/src/share/jaxws_classes/com/sun/tools/internal/xjc/runtime/ZeroOneBooleanAdapter.java \ 2.62 + $(JAXWS_TOPDIR)/src/share/jaxws_classes/com/sun/xml/internal/ws/assembler/jaxws-tubes-default.xml, \ 2.63 + ADD_JAVAC_FLAGS = -Xbootclasspath/p:$(OUTPUT_ROOT)/jaxp/dist/lib/classes.jar)) 2.64 + 2.65 +$(JAXWS_OUTPUTDIR)/jaxws_classes/META-INF/services/com.sun.tools.internal.ws.wscompile.Plugin: \ 2.66 + $(JAXWS_TOPDIR)/src/share/jaxws_classes/com/sun/tools/etc/META-INF/services/com.sun.tools.internal.ws.wscompile.Plugin 2.67 + mkdir -p $(@D) 2.68 + cp $< $@ 2.69 + 2.70 +$(JAXWS_OUTPUTDIR)/jaxws_classes/META-INF/services/com.sun.tools.internal.xjc.Plugin: \ 2.71 + $(JAXWS_TOPDIR)/src/share/jaxws_classes/com/sun/tools/etc/META-INF/services/com.sun.tools.internal.xjc.Plugin 2.72 + mkdir -p $(@D) 2.73 + cp $< $@ 2.74 + 2.75 +# There are two META-INF services files that are needed, add these to the list of goals 2.76 +BUILD_JAXWS += $(JAXWS_OUTPUTDIR)/jaxws_classes/META-INF/services/com.sun.tools.internal.ws.wscompile.Plugin \ 2.77 + $(JAXWS_OUTPUTDIR)/jaxws_classes/META-INF/services/com.sun.tools.internal.xjc.Plugin 2.78 + 2.79 +# Imitate the property cleaning mechanism in the old build. This will likely be replaced 2.80 +# by the unified functionality in JavaCompilation.gmk, but keep it the same as old build 2.81 +# for now, even though it actually breaks properties containing # in the value. 2.82 +# Using nawk to avoid solaris sed. 2.83 +$(JAXWS_OUTPUTDIR)/jaxws_classes/%.properties: $(JAXWS_TOPDIR)/src/share/jaxws_classes/%.properties 2.84 + $(MKDIR) -p $(@D) 2.85 + $(RM) $@ $@.tmp 2.86 + $(CAT) $< | LANG=C $(NAWK) '{ sub(/#.*$$/,"#"); print }' > $@.tmp 2.87 + $(MV) $@.tmp $@ 2.88 + 2.89 +JAXWS_SRC_PROP_FILES := $(shell $(FIND) $(JAXWS_TOPDIR)/src/share/jaxws_classes -name "*.properties") 2.90 +TARGET_PROP_FILES := $(patsubst $(JAXWS_TOPDIR)/src/share/jaxws_classes/%, \ 2.91 + $(JAXWS_OUTPUTDIR)/jaxws_classes/%, $(JAXWS_SRC_PROP_FILES)) 2.92 + 2.93 +$(JAXWS_OUTPUTDIR)/jaf_classes/%.properties: $(JAXWS_TOPDIR)/src/share/jaf_classes/%.properties 2.94 + $(MKDIR) -p $(@D) 2.95 + $(RM) $@ $@.tmp 2.96 + $(CAT) $< | LANG=C $(NAWK) '{ sub(/#.*$$/,"#"); print }' > $@.tmp 2.97 + $(MV) $@.tmp $@ 2.98 + 2.99 +JAF_SRC_PROP_FILES := $(shell $(FIND) $(JAXWS_TOPDIR)/src/share/jaf_classes -name "*.properties") 2.100 +TARGET_PROP_FILES += $(patsubst $(JAXWS_TOPDIR)/src/share/jaf_classes/%, \ 2.101 + $(JAXWS_OUTPUTDIR)/jaf_classes/%, $(JAF_SRC_PROP_FILES)) 2.102 + 2.103 +$(eval $(call SetupArchive,ARCHIVE_JAXWS, $(BUILD_JAXWS) $(BUILD_JAF) $(TARGET_PROP_FILES), \ 2.104 + SRCS := $(JAXWS_OUTPUTDIR)/jaxws_classes $(JAXWS_OUTPUTDIR)/jaf_classes, \ 2.105 + SUFFIXES := .class .properties .xsd .xml .java \ 2.106 + com.sun.mirror.apt.AnnotationProcessorFactory \ 2.107 + com.sun.tools.internal.xjc.Plugin, \ 2.108 + JAR := $(JAXWS_OUTPUTDIR)/dist/lib/classes.jar)) 2.109 + 2.110 +$(eval $(call SetupZipArchive,ZIP_JAXWS_SOURCES, \ 2.111 + SRC := $(JAXWS_TOPDIR)/src/share/jaf_classes $(JAXWS_TOPDIR)/src/share/jaxws_classes, \ 2.112 + ZIP := $(JAXWS_OUTPUTDIR)/dist/lib/src.zip)) 2.113 + 2.114 +all: $(JAXWS_OUTPUTDIR)/dist/lib/classes.jar $(JAXWS_OUTPUTDIR)/dist/lib/src.zip 2.115 + 2.116 +.PHONY: default all
3.1 --- a/make/Makefile Tue Dec 03 14:13:08 2013 +0400 3.2 +++ b/make/Makefile Thu Dec 05 16:37:30 2013 +0400 3.3 @@ -1,5 +1,5 @@ 3.4 # 3.5 -# Copyright (c) 2007, 2011, Oracle and/or its affiliates. All rights reserved. 3.6 +# Copyright (c) 2012, Oracle and/or its affiliates. All rights reserved. 3.7 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. 3.8 # 3.9 # This code is free software; you can redistribute it and/or modify it 3.10 @@ -23,172 +23,27 @@ 3.11 # questions. 3.12 # 3.13 3.14 -# Makefile wrapper around Ant build.xml file 3.15 +# Locate this Makefile 3.16 +ifeq ($(filter /%, $(lastword $(MAKEFILE_LIST))), ) 3.17 + makefile_path := $(CURDIR)/$(lastword $(MAKEFILE_LIST)) 3.18 +else 3.19 + makefile_path := $(lastword $(MAKEFILE_LIST)) 3.20 +endif 3.21 +repo_dir := $(patsubst %/make/Makefile, %, $(makefile_path)) 3.22 3.23 -# 3.24 -# On Solaris, the 'make' utility from Sun will not work with these makefiles. 3.25 -# This little rule is only understood by Sun's make, and is harmless 3.26 -# when seen by the GNU make tool. If using Sun's make, this causes the 3.27 -# make command to fail. 3.28 -# 3.29 -SUN_MAKE_TEST:sh = @echo "ERROR: PLEASE USE GNU VERSION OF MAKE"; exit 33 3.30 +# What is the name of this subsystem (langtools, corba, etc)? 3.31 +subsystem_name := $(notdir $(repo_dir)) 3.32 3.33 -ifdef QUIET 3.34 - ANT_OPTIONS += -quiet 3.35 +# Try to locate top-level makefile 3.36 +top_level_makefile := $(repo_dir)/../Makefile 3.37 +ifneq ($(wildcard $(top_level_makefile)), ) 3.38 + $(info Will run $(subsystem_name) target on top-level Makefile) 3.39 + $(info WARNING: This is a non-recommended way of building!) 3.40 + $(info ===================================================) 3.41 +else 3.42 + $(info Cannot locate top-level Makefile. Is this repo not checked out as part of a complete forest?) 3.43 + $(error Build from top-level Makefile instead) 3.44 endif 3.45 3.46 -ifdef VERBOSE 3.47 - ANT_OPTIONS += -verbose 3.48 -endif 3.49 - 3.50 -ifeq ($(VARIANT), OPT) 3.51 - ifneq ($(DEBUG_CLASSFILES), true) 3.52 - ANT_OPTIONS += -Djavac.debug=false 3.53 - endif 3.54 -endif 3.55 - 3.56 -# Note: jdk/make/common/Defs.gmk uses LANGUAGE_VERSION (-source NN) 3.57 -# and the somewhat misnamed CLASS_VERSION (-target NN) 3.58 -ifdef TARGET_CLASS_VERSION 3.59 - ANT_OPTIONS += -Djavac.target=$(TARGET_CLASS_VERSION) 3.60 -else 3.61 - ifdef JAVAC_TARGET_ARG 3.62 - ANT_OPTIONS += -Djavac.target=$(JAVAC_TARGET_ARG) 3.63 - endif 3.64 -endif 3.65 - 3.66 -ifdef SOURCE_LANGUAGE_VERSION 3.67 - ANT_OPTIONS += -Djavac.source=$(SOURCE_LANGUAGE_VERSION) 3.68 -else 3.69 - ifdef JAVAC_SOURCE_ARG 3.70 - ANT_OPTIONS += -Djavac.source=$(JAVAC_SOURCE_ARG) 3.71 - endif 3.72 -endif 3.73 - 3.74 -# If downloads are allowed 3.75 -ifeq ($(ALLOW_DOWNLOADS),true) 3.76 - ANT_OPTIONS += -Dallow.downloads=true 3.77 -endif 3.78 - 3.79 -# Figure out the platform we are using 3.80 -_SYSTEM_UNAME := $(shell uname) 3.81 -_PLATFORM_KIND = unix 3.82 -ifeq ($(_SYSTEM_UNAME), Windows_NT) 3.83 - _PLATFORM_KIND = windows 3.84 -endif 3.85 -ifneq (,$(findstring CYGWIN,$(_SYSTEM_UNAME))) 3.86 - _PLATFORM_KIND = windows 3.87 -endif 3.88 - 3.89 -# Where is /java in case we need it 3.90 -ifdef ALT_SLASH_JAVA 3.91 - _SLASHJAVA = $(ALT_SLASH_JAVA) 3.92 -else 3.93 - ifeq ($(_PLATFORM_KIND), windows) 3.94 - _SLASHJAVA=J:/ 3.95 - else 3.96 - _SLASHJAVA=/java 3.97 - endif 3.98 -endif 3.99 - 3.100 -ifdef ALT_OUTPUTDIR 3.101 - OUTPUTDIR = $(ALT_OUTPUTDIR) 3.102 - ANT_OPTIONS += -Doutput.dir=$(ALT_OUTPUTDIR) 3.103 -else 3.104 - OUTPUTDIR = .. 3.105 -endif 3.106 - 3.107 -ifdef ALT_LANGTOOLS_DIST 3.108 - ifdef ALT_BOOTDIR 3.109 - ANT_JAVA_HOME = JAVA_HOME=$(ALT_BOOTDIR) 3.110 - ANT_OPTIONS += -Djdk.home=$(ALT_BOOTDIR) 3.111 - endif 3.112 - ANT_OPTIONS += -Dbootstrap.dir=$(ALT_LANGTOOLS_DIST)/bootstrap 3.113 -else 3.114 - ifdef ALT_JDK_IMPORT_PATH 3.115 - ANT_JAVA_HOME = JAVA_HOME=$(ALT_JDK_IMPORT_PATH) 3.116 - ANT_OPTIONS += -Djdk.home=$(ALT_JDK_IMPORT_PATH) 3.117 - endif 3.118 -endif 3.119 - 3.120 -ifdef ANT_HOME 3.121 - ANT = $(ANT_HOME)/bin/ant 3.122 - ifneq ($(shell test -x $(ANT); echo $$?), 0) 3.123 - $(error "$(ANT) not found; please update ANT_HOME") 3.124 - endif 3.125 -else 3.126 - ANT = ant 3.127 - ifneq ($(shell which $(ANT) > /dev/null; echo $$?), 0) 3.128 - $(error "'ant' not found; please set ANT_HOME or put 'ant' on your PATH") 3.129 - endif 3.130 -endif 3.131 - 3.132 -# Default target and expected 'do everything' target 3.133 -default: all 3.134 - 3.135 -# All ant targets of interest 3.136 -ANT_TARGETS = all build dist clobber clean sanity 3.137 - 3.138 -# Create a make target for each 3.139 -$(ANT_TARGETS): 3.140 - cd .. && $(ANT_JAVA_HOME) $(ANT) $(ANT_OPTIONS) -version 3.141 - cd .. && $(ANT_JAVA_HOME) $(ANT) $(ANT_OPTIONS) $@ 3.142 - 3.143 -# Just for compat reasons, delete in future. 3.144 -drop_included: 3.145 -source: 3.146 - 3.147 -# Help target 3.148 -define helpenvline 3.149 -@echo " $1";echo " $2" 3.150 -endef 3.151 -help: 3.152 - @echo "----------------------------------------------------------" 3.153 - @echo " " 3.154 - @echo "Help information for this Makefile:" 3.155 - @echo " " 3.156 - @echo " Targets (see ant project information for descriptions):" 3.157 - @echo " $(ANT_TARGETS)" 3.158 - @echo " " 3.159 - @echo " Environment or command line variables (all optional):" 3.160 - $(call helpenvline, ALT_BOOTDIR,\ 3.161 - "JAVA_HOME to use when running ant") 3.162 - $(call helpenvline, ALT_LANGTOOLS_DIST,\ 3.163 - "path to langtools repository dist directory") 3.164 - $(call helpenvline, ALT_OUTPUTDIR,\ 3.165 - "path to root of output") 3.166 - $(call helpenvline, DEBUG_CLASSFILES,\ 3.167 - "if set makes sure ant property javac.debug is true") 3.168 - $(call helpenvline, JAVAC_SOURCE_ARG,\ 3.169 - "if SOURCE_LANGUAGE_VERSION not set uses this to set ant property javac.source") 3.170 - $(call helpenvline, JAVAC_TARGET_ARG,\ 3.171 - "if TARGET_CLASS_VERSION not set uses this to set ant property javac.target") 3.172 - $(call helpenvline, SOURCE_LANGUAGE_VERSION,\ 3.173 - "if set uses this to set ant property javac.source") 3.174 - $(call helpenvline, QUIET,\ 3.175 - "if set will pass -quiet to ant") 3.176 - $(call helpenvline, TARGET_CLASS_VERSION,\ 3.177 - "JAVA_HOME to use when running ant") 3.178 - $(call helpenvline, VARIANT,\ 3.179 - "if set to OPT means optimized build will set javac.debug to false") 3.180 - $(call helpenvline, VERBOSE,\ 3.181 - "if set will pass -verbose to ant") 3.182 - @echo " " 3.183 - @echo "----------------------------------------------------------" 3.184 - @echo " " 3.185 - @echo "Ant project file help information:" 3.186 - @echo " " 3.187 - @$(ANT_JAVA_HOME) cd .. && $(ANT) $(ANT_OPTIONS) -p 3.188 - @echo " " 3.189 - @echo "----------------------------------------------------------" 3.190 - 3.191 -# Targets for Sun's internal JPRT build system 3.192 -JPRT_ARCHIVE_BUNDLE=$(OUTPUTDIR)/jprt.zip 3.193 -jprt_build_product jprt_build_debug jprt_build_fastdebug: all 3.194 - $(RM) $(JPRT_ARCHIVE_BUNDLE) 3.195 - ( cd $(OUTPUTDIR)/dist && \ 3.196 - zip -q -r $(JPRT_ARCHIVE_BUNDLE) . ) 3.197 - 3.198 -# Declare these phony (not filenames) 3.199 -.PHONY: $(ANT_TARGETS) \ 3.200 - jprt_build_product jprt_build_debug jprt_build_fastdebug 3.201 +all: 3.202 + @$(MAKE) -f $(top_level_makefile) $(subsystem_name)
4.1 --- a/make/jprt.properties Tue Dec 03 14:13:08 2013 +0400 4.2 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 4.3 @@ -1,46 +0,0 @@ 4.4 -# 4.5 -# Copyright (c) 2006, 2013, Oracle and/or its affiliates. All rights reserved. 4.6 -# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. 4.7 -# 4.8 -# This code is free software; you can redistribute it and/or modify it 4.9 -# under the terms of the GNU General Public License version 2 only, as 4.10 -# published by the Free Software Foundation. Oracle designates this 4.11 -# particular file as subject to the "Classpath" exception as provided 4.12 -# by Oracle in the LICENSE file that accompanied this code. 4.13 -# 4.14 -# This code is distributed in the hope that it will be useful, but WITHOUT 4.15 -# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or 4.16 -# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License 4.17 -# version 2 for more details (a copy is included in the LICENSE file that 4.18 -# accompanied this code). 4.19 -# 4.20 -# You should have received a copy of the GNU General Public License version 4.21 -# 2 along with this work; if not, write to the Free Software Foundation, 4.22 -# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. 4.23 -# 4.24 -# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA 4.25 -# or visit www.oracle.com if you need additional information or have any 4.26 -# questions. 4.27 -# 4.28 - 4.29 -# Properties for jprt 4.30 - 4.31 -# Locked down to jdk8 4.32 -jprt.tools.default.release=jdk8 4.33 - 4.34 -# The different build flavors we want, we override here so we just get these 2 4.35 -jprt.build.flavors=product,fastdebug 4.36 - 4.37 -# Standard list of jprt build targets for this source tree 4.38 -jprt.build.targets= \ 4.39 - solaris_sparcv9_5.10-{product|fastdebug}, \ 4.40 - solaris_x64_5.10-{product|fastdebug}, \ 4.41 - linux_i586_2.6-{product|fastdebug}, \ 4.42 - linux_x64_2.6-{product|fastdebug}, \ 4.43 - macosx_x64_10.7-{product|fastdebug}, \ 4.44 - windows_i586_6.1-{product|fastdebug}, \ 4.45 - windows_x64_6.1-{product|fastdebug} 4.46 - 4.47 -# Directories to be excluded from the source bundles 4.48 -jprt.bundle.exclude.src.dirs=build dist webrev 4.49 -
5.1 --- a/make/scripts/update_src.sh Tue Dec 03 14:13:08 2013 +0400 5.2 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 5.3 @@ -1,90 +0,0 @@ 5.4 -# 5.5 -# Copyright (c) 2012, Oracle and/or its affiliates. All rights reserved. 5.6 -# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. 5.7 -# 5.8 -# This code is free software; you can redistribute it and/or modify it 5.9 -# under the terms of the GNU General Public License version 2 only, as 5.10 -# published by the Free Software Foundation. Oracle designates this 5.11 -# particular file as subject to the "Classpath" exception as provided 5.12 -# by Oracle in the LICENSE file that accompanied this code. 5.13 -# 5.14 -# This code is distributed in the hope that it will be useful, but WITHOUT 5.15 -# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or 5.16 -# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License 5.17 -# version 2 for more details (a copy is included in the LICENSE file that 5.18 -# accompanied this code). 5.19 -# 5.20 -# You should have received a copy of the GNU General Public License version 5.21 -# 2 along with this work; if not, write to the Free Software Foundation, 5.22 -# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. 5.23 -# 5.24 -# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA 5.25 -# or visit www.oracle.com if you need additional information or have any 5.26 -# questions. 5.27 -# 5.28 - 5.29 -# This script was used to copy the former drop source bundle source into 5.30 -# the repository. Exists as a form of documentation. 5.31 - 5.32 -curdir="`(cd . && pwd)`" 5.33 - 5.34 -# Whitespace normalizer script is in the top repository. 5.35 -normalizer="perl ${curdir}/../make/scripts/normalizer.pl" 5.36 - 5.37 -# Locations for bundle and root of source tree 5.38 -tmp=/tmp 5.39 -srcroot=${curdir}/src 5.40 -mkdir -p ${srcroot} 5.41 - 5.42 -# Bundle information 5.43 -drops_dir="/java/devtools/share/jdk8-drops" 5.44 -url1="http://download.java.net/glassfish/components/jax-ws/openjdk/jdk8" 5.45 -bundle1="jdk8-jaxws-2_2-SNAPSHOT-2012_01_11-patched.zip" 5.46 -srcdir1="${srcroot}/share/jaxws_classes" 5.47 -url2="http://download.java.net/glassfish/components/jax-ws/openjdk/jdk8" 5.48 -bundle2="jdk8-jaf-2011_07_22.zip" 5.49 -srcdir2="${srcroot}/share/jaf_classes" 5.50 - 5.51 -# Function to get a bundle and explode it and normalize the source files. 5.52 -getBundle() # drops_dir url bundlename bundledestdir srcrootdir 5.53 -{ 5.54 - # Get the bundle from drops_dir or downloaded 5.55 - mkdir -p $4 5.56 - rm -f $4/$3 5.57 - if [ -f $1/$3 ] ; then 5.58 - echo "Copy over bundle: $1/$3" 5.59 - cp $1/$3 $4 5.60 - else 5.61 - echo "Downloading bundle: $2/$3" 5.62 - (cd $4 && wget $2/$3) 5.63 - fi 5.64 - # Fail if it does not exist 5.65 - if [ ! -f $4/$3 ] ; then 5.66 - echo "ERROR: Could not get $3" 5.67 - exit 1 5.68 - fi 5.69 - # Wipe it out completely 5.70 - echo "Cleaning up $5" 5.71 - rm -f -r $5 5.72 - mkdir -p $5 5.73 - echo "Unzipping $4/$3" 5.74 - ( cd $5 && unzip -q $4/$3 && mv src/* . && rmdir src && rm LICENSE ) 5.75 - # Run whitespace normalizer 5.76 - echo "Normalizing the sources in $5" 5.77 - ( cd $5 && ${normalizer} . ) 5.78 - # Delete the bundle and leftover files 5.79 - rm -f $4/$3 $5/filelist 5.80 -} 5.81 - 5.82 -# Process the bundles. 5.83 -getBundle "${drops_dir}" "${url1}" "${bundle1}" ${tmp} ${srcdir1} 5.84 -getBundle "${drops_dir}" "${url2}" "${bundle2}" ${tmp} ${srcdir2} 5.85 -echo "Completed bundle extraction." 5.86 -echo " " 5.87 - 5.88 -# Appropriate Mercurial commands needed to run: 5.89 -echo "Run: hg addremove src" 5.90 -echo "Run: ksh ../make/scripts/webrev.ksh -N -o ${HOME}/webrev" 5.91 -echo "Get reviewer, get CR, then..." 5.92 -echo "Run: hg commit" 5.93 -
6.1 --- a/makefiles/BuildJaxws.gmk Tue Dec 03 14:13:08 2013 +0400 6.2 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 6.3 @@ -1,113 +0,0 @@ 6.4 -# 6.5 -# Copyright (c) 2007, 2013, Oracle and/or its affiliates. All rights reserved. 6.6 -# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. 6.7 -# 6.8 -# This code is free software; you can redistribute it and/or modify it 6.9 -# under the terms of the GNU General Public License version 2 only, as 6.10 -# published by the Free Software Foundation. Oracle designates this 6.11 -# particular file as subject to the "Classpath" exception as provided 6.12 -# by Oracle in the LICENSE file that accompanied this code. 6.13 -# 6.14 -# This code is distributed in the hope that it will be useful, but WITHOUT 6.15 -# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or 6.16 -# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License 6.17 -# version 2 for more details (a copy is included in the LICENSE file that 6.18 -# accompanied this code). 6.19 -# 6.20 -# You should have received a copy of the GNU General Public License version 6.21 -# 2 along with this work; if not, write to the Free Software Foundation, 6.22 -# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. 6.23 -# 6.24 -# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA 6.25 -# or visit www.oracle.com if you need additional information or have any 6.26 -# questions. 6.27 -# 6.28 - 6.29 -# This must be the first rule 6.30 -default: all 6.31 - 6.32 -include $(SPEC) 6.33 -include MakeBase.gmk 6.34 -include JavaCompilation.gmk 6.35 - 6.36 -DISABLE_JAXWS_WARNINGS := -Xlint:all,-varargs,-rawtypes,-deprecation,-unchecked,-serial,-dep-ann,-cast,-fallthrough,-static 6.37 - 6.38 -# The generate new bytecode uses the new compiler for to generate bytecode 6.39 -# for the new jdk that is being built. The code compiled by this setup 6.40 -# cannot necessarily be run with the boot jdk. 6.41 -$(eval $(call SetupJavaCompiler,GENERATE_NEWBYTECODE_DEBUG, \ 6.42 - JVM := $(JAVA), \ 6.43 - JAVAC := $(NEW_JAVAC), \ 6.44 - FLAGS := -XDignore.symbol.file=true $(DISABLE_JAXWS_WARNINGS) -g, \ 6.45 - SERVER_DIR := $(SJAVAC_SERVER_DIR), \ 6.46 - SERVER_JVM := $(SJAVAC_SERVER_JAVA))) 6.47 - 6.48 -# Dummy here is needed to trigger copying of META-INF 6.49 -$(eval $(call SetupJavaCompilation,BUILD_JAF, \ 6.50 - SETUP := GENERATE_NEWBYTECODE_DEBUG, \ 6.51 - SRC := $(JAXWS_TOPDIR)/src/share/jaf_classes, \ 6.52 - COPY := "dummy", \ 6.53 - BIN := $(JAXWS_OUTPUTDIR)/jaf_classes)) 6.54 - 6.55 -$(eval $(call SetupJavaCompilation,BUILD_JAXWS, \ 6.56 - SETUP := GENERATE_NEWBYTECODE_DEBUG, \ 6.57 - SRC := $(JAXWS_TOPDIR)/src/share/jaxws_classes, \ 6.58 - BIN := $(JAXWS_OUTPUTDIR)/jaxws_classes, \ 6.59 - COPY := .xsd, \ 6.60 - COPY_FILES := $(JAXWS_TOPDIR)/src/share/jaxws_classes/com/sun/tools/internal/xjc/runtime/JAXBContextFactory.java \ 6.61 - $(JAXWS_TOPDIR)/src/share/jaxws_classes/com/sun/tools/internal/xjc/runtime/ZeroOneBooleanAdapter.java \ 6.62 - $(JAXWS_TOPDIR)/src/share/jaxws_classes/com/sun/xml/internal/ws/assembler/jaxws-tubes-default.xml, \ 6.63 - ADD_JAVAC_FLAGS = -Xbootclasspath/p:$(OUTPUT_ROOT)/jaxp/dist/lib/classes.jar)) 6.64 - 6.65 -$(JAXWS_OUTPUTDIR)/jaxws_classes/META-INF/services/com.sun.tools.internal.ws.wscompile.Plugin: \ 6.66 - $(JAXWS_TOPDIR)/src/share/jaxws_classes/com/sun/tools/etc/META-INF/services/com.sun.tools.internal.ws.wscompile.Plugin 6.67 - mkdir -p $(@D) 6.68 - cp $< $@ 6.69 - 6.70 -$(JAXWS_OUTPUTDIR)/jaxws_classes/META-INF/services/com.sun.tools.internal.xjc.Plugin: \ 6.71 - $(JAXWS_TOPDIR)/src/share/jaxws_classes/com/sun/tools/etc/META-INF/services/com.sun.tools.internal.xjc.Plugin 6.72 - mkdir -p $(@D) 6.73 - cp $< $@ 6.74 - 6.75 -# There are two META-INF services files that are needed, add these to the list of goals 6.76 -BUILD_JAXWS += $(JAXWS_OUTPUTDIR)/jaxws_classes/META-INF/services/com.sun.tools.internal.ws.wscompile.Plugin \ 6.77 - $(JAXWS_OUTPUTDIR)/jaxws_classes/META-INF/services/com.sun.tools.internal.xjc.Plugin 6.78 - 6.79 -# Imitate the property cleaning mechanism in the old build. This will likely be replaced 6.80 -# by the unified functionality in JavaCompilation.gmk, but keep it the same as old build 6.81 -# for now, even though it actually breaks properties containing # in the value. 6.82 -# Using nawk to avoid solaris sed. 6.83 -$(JAXWS_OUTPUTDIR)/jaxws_classes/%.properties: $(JAXWS_TOPDIR)/src/share/jaxws_classes/%.properties 6.84 - $(MKDIR) -p $(@D) 6.85 - $(RM) $@ $@.tmp 6.86 - $(CAT) $< | LANG=C $(NAWK) '{ sub(/#.*$$/,"#"); print }' > $@.tmp 6.87 - $(MV) $@.tmp $@ 6.88 - 6.89 -JAXWS_SRC_PROP_FILES := $(shell $(FIND) $(JAXWS_TOPDIR)/src/share/jaxws_classes -name "*.properties") 6.90 -TARGET_PROP_FILES := $(patsubst $(JAXWS_TOPDIR)/src/share/jaxws_classes/%, \ 6.91 - $(JAXWS_OUTPUTDIR)/jaxws_classes/%, $(JAXWS_SRC_PROP_FILES)) 6.92 - 6.93 -$(JAXWS_OUTPUTDIR)/jaf_classes/%.properties: $(JAXWS_TOPDIR)/src/share/jaf_classes/%.properties 6.94 - $(MKDIR) -p $(@D) 6.95 - $(RM) $@ $@.tmp 6.96 - $(CAT) $< | LANG=C $(NAWK) '{ sub(/#.*$$/,"#"); print }' > $@.tmp 6.97 - $(MV) $@.tmp $@ 6.98 - 6.99 -JAF_SRC_PROP_FILES := $(shell $(FIND) $(JAXWS_TOPDIR)/src/share/jaf_classes -name "*.properties") 6.100 -TARGET_PROP_FILES += $(patsubst $(JAXWS_TOPDIR)/src/share/jaf_classes/%, \ 6.101 - $(JAXWS_OUTPUTDIR)/jaf_classes/%, $(JAF_SRC_PROP_FILES)) 6.102 - 6.103 -$(eval $(call SetupArchive,ARCHIVE_JAXWS, $(BUILD_JAXWS) $(BUILD_JAF) $(TARGET_PROP_FILES), \ 6.104 - SRCS := $(JAXWS_OUTPUTDIR)/jaxws_classes $(JAXWS_OUTPUTDIR)/jaf_classes, \ 6.105 - SUFFIXES := .class .properties .xsd .xml .java \ 6.106 - com.sun.mirror.apt.AnnotationProcessorFactory \ 6.107 - com.sun.tools.internal.xjc.Plugin, \ 6.108 - JAR := $(JAXWS_OUTPUTDIR)/dist/lib/classes.jar)) 6.109 - 6.110 -$(eval $(call SetupZipArchive,ZIP_JAXWS_SOURCES, \ 6.111 - SRC := $(JAXWS_TOPDIR)/src/share/jaf_classes $(JAXWS_TOPDIR)/src/share/jaxws_classes, \ 6.112 - ZIP := $(JAXWS_OUTPUTDIR)/dist/lib/src.zip)) 6.113 - 6.114 -all: $(JAXWS_OUTPUTDIR)/dist/lib/classes.jar $(JAXWS_OUTPUTDIR)/dist/lib/src.zip 6.115 - 6.116 -.PHONY: default all
7.1 --- a/makefiles/Makefile Tue Dec 03 14:13:08 2013 +0400 7.2 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 7.3 @@ -1,49 +0,0 @@ 7.4 -# 7.5 -# Copyright (c) 2012, Oracle and/or its affiliates. All rights reserved. 7.6 -# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. 7.7 -# 7.8 -# This code is free software; you can redistribute it and/or modify it 7.9 -# under the terms of the GNU General Public License version 2 only, as 7.10 -# published by the Free Software Foundation. Oracle designates this 7.11 -# particular file as subject to the "Classpath" exception as provided 7.12 -# by Oracle in the LICENSE file that accompanied this code. 7.13 -# 7.14 -# This code is distributed in the hope that it will be useful, but WITHOUT 7.15 -# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or 7.16 -# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License 7.17 -# version 2 for more details (a copy is included in the LICENSE file that 7.18 -# accompanied this code). 7.19 -# 7.20 -# You should have received a copy of the GNU General Public License version 7.21 -# 2 along with this work; if not, write to the Free Software Foundation, 7.22 -# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. 7.23 -# 7.24 -# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA 7.25 -# or visit www.oracle.com if you need additional information or have any 7.26 -# questions. 7.27 -# 7.28 - 7.29 -# Locate this Makefile 7.30 -ifeq ($(filter /%, $(lastword $(MAKEFILE_LIST))), ) 7.31 - makefile_path := $(CURDIR)/$(lastword $(MAKEFILE_LIST)) 7.32 -else 7.33 - makefile_path := $(lastword $(MAKEFILE_LIST)) 7.34 -endif 7.35 -repo_dir := $(patsubst %/makefiles/Makefile, %, $(makefile_path)) 7.36 - 7.37 -# What is the name of this subsystem (langtools, corba, etc)? 7.38 -subsystem_name := $(notdir $(repo_dir)) 7.39 - 7.40 -# Try to locate top-level makefile 7.41 -top_level_makefile := $(repo_dir)/../common/makefiles/Makefile 7.42 -ifneq ($(wildcard $(top_level_makefile)), ) 7.43 - $(info Will run $(subsystem_name) target on top-level Makefile) 7.44 - $(info WARNING: This is a non-recommended way of building!) 7.45 - $(info ===================================================) 7.46 -else 7.47 - $(info Cannot locate top-level Makefile. Is this repo not checked out as part of a complete forest?) 7.48 - $(error Build from top-level Makefile instead) 7.49 -endif 7.50 - 7.51 -all: 7.52 - @$(MAKE) -f $(top_level_makefile) $(subsystem_name)
