Mercurial > jdk8-mips64-public > jaxws / changeset
changeset
8027566: Remove the old build system
Mon, 04 Nov 2013 11:10:22 +0100
- author
- ihse
- date
- Mon, 04 Nov 2013 11:10:22 +0100
- changeset 439
- 1d1af4ce8eeb
- parent 435
- 587560c222a2
- child 440
- 4900fcaae498
8027566: Remove the old build system
Reviewed-by: erikj, tbell
| make/BuildJaxws.gmk | file | annotate | diff | comparison | revisions | |
| make/Makefile | file | annotate | diff | comparison | revisions | |
| 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 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 1.2 +++ b/make/BuildJaxws.gmk Mon Nov 04 11:10:22 2013 +0100 1.3 @@ -0,0 +1,113 @@ 1.4 +# 1.5 +# Copyright (c) 2007, 2013, 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 +# This must be the first rule 1.30 +default: all 1.31 + 1.32 +include $(SPEC) 1.33 +include MakeBase.gmk 1.34 +include JavaCompilation.gmk 1.35 + 1.36 +DISABLE_JAXWS_WARNINGS := -Xlint:all,-varargs,-rawtypes,-deprecation,-unchecked,-serial,-dep-ann,-cast,-fallthrough,-static 1.37 + 1.38 +# The generate new bytecode uses the new compiler for to generate bytecode 1.39 +# for the new jdk that is being built. The code compiled by this setup 1.40 +# cannot necessarily be run with the boot jdk. 1.41 +$(eval $(call SetupJavaCompiler,GENERATE_NEWBYTECODE_DEBUG, \ 1.42 + JVM := $(JAVA), \ 1.43 + JAVAC := $(NEW_JAVAC), \ 1.44 + FLAGS := -XDignore.symbol.file=true $(DISABLE_JAXWS_WARNINGS) -g, \ 1.45 + SERVER_DIR := $(SJAVAC_SERVER_DIR), \ 1.46 + SERVER_JVM := $(SJAVAC_SERVER_JAVA))) 1.47 + 1.48 +# Dummy here is needed to trigger copying of META-INF 1.49 +$(eval $(call SetupJavaCompilation,BUILD_JAF, \ 1.50 + SETUP := GENERATE_NEWBYTECODE_DEBUG, \ 1.51 + SRC := $(JAXWS_TOPDIR)/src/share/jaf_classes, \ 1.52 + COPY := "dummy", \ 1.53 + BIN := $(JAXWS_OUTPUTDIR)/jaf_classes)) 1.54 + 1.55 +$(eval $(call SetupJavaCompilation,BUILD_JAXWS, \ 1.56 + SETUP := GENERATE_NEWBYTECODE_DEBUG, \ 1.57 + SRC := $(JAXWS_TOPDIR)/src/share/jaxws_classes, \ 1.58 + BIN := $(JAXWS_OUTPUTDIR)/jaxws_classes, \ 1.59 + COPY := .xsd, \ 1.60 + COPY_FILES := $(JAXWS_TOPDIR)/src/share/jaxws_classes/com/sun/tools/internal/xjc/runtime/JAXBContextFactory.java \ 1.61 + $(JAXWS_TOPDIR)/src/share/jaxws_classes/com/sun/tools/internal/xjc/runtime/ZeroOneBooleanAdapter.java \ 1.62 + $(JAXWS_TOPDIR)/src/share/jaxws_classes/com/sun/xml/internal/ws/assembler/jaxws-tubes-default.xml, \ 1.63 + ADD_JAVAC_FLAGS = -Xbootclasspath/p:$(OUTPUT_ROOT)/jaxp/dist/lib/classes.jar)) 1.64 + 1.65 +$(JAXWS_OUTPUTDIR)/jaxws_classes/META-INF/services/com.sun.tools.internal.ws.wscompile.Plugin: \ 1.66 + $(JAXWS_TOPDIR)/src/share/jaxws_classes/com/sun/tools/etc/META-INF/services/com.sun.tools.internal.ws.wscompile.Plugin 1.67 + mkdir -p $(@D) 1.68 + cp $< $@ 1.69 + 1.70 +$(JAXWS_OUTPUTDIR)/jaxws_classes/META-INF/services/com.sun.tools.internal.xjc.Plugin: \ 1.71 + $(JAXWS_TOPDIR)/src/share/jaxws_classes/com/sun/tools/etc/META-INF/services/com.sun.tools.internal.xjc.Plugin 1.72 + mkdir -p $(@D) 1.73 + cp $< $@ 1.74 + 1.75 +# There are two META-INF services files that are needed, add these to the list of goals 1.76 +BUILD_JAXWS += $(JAXWS_OUTPUTDIR)/jaxws_classes/META-INF/services/com.sun.tools.internal.ws.wscompile.Plugin \ 1.77 + $(JAXWS_OUTPUTDIR)/jaxws_classes/META-INF/services/com.sun.tools.internal.xjc.Plugin 1.78 + 1.79 +# Imitate the property cleaning mechanism in the old build. This will likely be replaced 1.80 +# by the unified functionality in JavaCompilation.gmk, but keep it the same as old build 1.81 +# for now, even though it actually breaks properties containing # in the value. 1.82 +# Using nawk to avoid solaris sed. 1.83 +$(JAXWS_OUTPUTDIR)/jaxws_classes/%.properties: $(JAXWS_TOPDIR)/src/share/jaxws_classes/%.properties 1.84 + $(MKDIR) -p $(@D) 1.85 + $(RM) $@ $@.tmp 1.86 + $(CAT) $< | LANG=C $(NAWK) '{ sub(/#.*$$/,"#"); print }' > $@.tmp 1.87 + $(MV) $@.tmp $@ 1.88 + 1.89 +JAXWS_SRC_PROP_FILES := $(shell $(FIND) $(JAXWS_TOPDIR)/src/share/jaxws_classes -name "*.properties") 1.90 +TARGET_PROP_FILES := $(patsubst $(JAXWS_TOPDIR)/src/share/jaxws_classes/%, \ 1.91 + $(JAXWS_OUTPUTDIR)/jaxws_classes/%, $(JAXWS_SRC_PROP_FILES)) 1.92 + 1.93 +$(JAXWS_OUTPUTDIR)/jaf_classes/%.properties: $(JAXWS_TOPDIR)/src/share/jaf_classes/%.properties 1.94 + $(MKDIR) -p $(@D) 1.95 + $(RM) $@ $@.tmp 1.96 + $(CAT) $< | LANG=C $(NAWK) '{ sub(/#.*$$/,"#"); print }' > $@.tmp 1.97 + $(MV) $@.tmp $@ 1.98 + 1.99 +JAF_SRC_PROP_FILES := $(shell $(FIND) $(JAXWS_TOPDIR)/src/share/jaf_classes -name "*.properties") 1.100 +TARGET_PROP_FILES += $(patsubst $(JAXWS_TOPDIR)/src/share/jaf_classes/%, \ 1.101 + $(JAXWS_OUTPUTDIR)/jaf_classes/%, $(JAF_SRC_PROP_FILES)) 1.102 + 1.103 +$(eval $(call SetupArchive,ARCHIVE_JAXWS, $(BUILD_JAXWS) $(BUILD_JAF) $(TARGET_PROP_FILES), \ 1.104 + SRCS := $(JAXWS_OUTPUTDIR)/jaxws_classes $(JAXWS_OUTPUTDIR)/jaf_classes, \ 1.105 + SUFFIXES := .class .properties .xsd .xml .java \ 1.106 + com.sun.mirror.apt.AnnotationProcessorFactory \ 1.107 + com.sun.tools.internal.xjc.Plugin, \ 1.108 + JAR := $(JAXWS_OUTPUTDIR)/dist/lib/classes.jar)) 1.109 + 1.110 +$(eval $(call SetupZipArchive,ZIP_JAXWS_SOURCES, \ 1.111 + SRC := $(JAXWS_TOPDIR)/src/share/jaf_classes $(JAXWS_TOPDIR)/src/share/jaxws_classes, \ 1.112 + ZIP := $(JAXWS_OUTPUTDIR)/dist/lib/src.zip)) 1.113 + 1.114 +all: $(JAXWS_OUTPUTDIR)/dist/lib/classes.jar $(JAXWS_OUTPUTDIR)/dist/lib/src.zip 1.115 + 1.116 +.PHONY: default all
2.1 --- a/make/Makefile Thu Nov 07 08:16:23 2013 -0800 2.2 +++ b/make/Makefile Mon Nov 04 11:10:22 2013 +0100 2.3 @@ -1,5 +1,5 @@ 2.4 # 2.5 -# Copyright (c) 2007, 2011, Oracle and/or its affiliates. All rights reserved. 2.6 +# Copyright (c) 2012, Oracle and/or its affiliates. All rights reserved. 2.7 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. 2.8 # 2.9 # This code is free software; you can redistribute it and/or modify it 2.10 @@ -23,172 +23,27 @@ 2.11 # questions. 2.12 # 2.13 2.14 -# Makefile wrapper around Ant build.xml file 2.15 +# Locate this Makefile 2.16 +ifeq ($(filter /%, $(lastword $(MAKEFILE_LIST))), ) 2.17 + makefile_path := $(CURDIR)/$(lastword $(MAKEFILE_LIST)) 2.18 +else 2.19 + makefile_path := $(lastword $(MAKEFILE_LIST)) 2.20 +endif 2.21 +repo_dir := $(patsubst %/make/Makefile, %, $(makefile_path)) 2.22 2.23 -# 2.24 -# On Solaris, the 'make' utility from Sun will not work with these makefiles. 2.25 -# This little rule is only understood by Sun's make, and is harmless 2.26 -# when seen by the GNU make tool. If using Sun's make, this causes the 2.27 -# make command to fail. 2.28 -# 2.29 -SUN_MAKE_TEST:sh = @echo "ERROR: PLEASE USE GNU VERSION OF MAKE"; exit 33 2.30 +# What is the name of this subsystem (langtools, corba, etc)? 2.31 +subsystem_name := $(notdir $(repo_dir)) 2.32 2.33 -ifdef QUIET 2.34 - ANT_OPTIONS += -quiet 2.35 +# Try to locate top-level makefile 2.36 +top_level_makefile := $(repo_dir)/../Makefile 2.37 +ifneq ($(wildcard $(top_level_makefile)), ) 2.38 + $(info Will run $(subsystem_name) target on top-level Makefile) 2.39 + $(info WARNING: This is a non-recommended way of building!) 2.40 + $(info ===================================================) 2.41 +else 2.42 + $(info Cannot locate top-level Makefile. Is this repo not checked out as part of a complete forest?) 2.43 + $(error Build from top-level Makefile instead) 2.44 endif 2.45 2.46 -ifdef VERBOSE 2.47 - ANT_OPTIONS += -verbose 2.48 -endif 2.49 - 2.50 -ifeq ($(VARIANT), OPT) 2.51 - ifneq ($(DEBUG_CLASSFILES), true) 2.52 - ANT_OPTIONS += -Djavac.debug=false 2.53 - endif 2.54 -endif 2.55 - 2.56 -# Note: jdk/make/common/Defs.gmk uses LANGUAGE_VERSION (-source NN) 2.57 -# and the somewhat misnamed CLASS_VERSION (-target NN) 2.58 -ifdef TARGET_CLASS_VERSION 2.59 - ANT_OPTIONS += -Djavac.target=$(TARGET_CLASS_VERSION) 2.60 -else 2.61 - ifdef JAVAC_TARGET_ARG 2.62 - ANT_OPTIONS += -Djavac.target=$(JAVAC_TARGET_ARG) 2.63 - endif 2.64 -endif 2.65 - 2.66 -ifdef SOURCE_LANGUAGE_VERSION 2.67 - ANT_OPTIONS += -Djavac.source=$(SOURCE_LANGUAGE_VERSION) 2.68 -else 2.69 - ifdef JAVAC_SOURCE_ARG 2.70 - ANT_OPTIONS += -Djavac.source=$(JAVAC_SOURCE_ARG) 2.71 - endif 2.72 -endif 2.73 - 2.74 -# If downloads are allowed 2.75 -ifeq ($(ALLOW_DOWNLOADS),true) 2.76 - ANT_OPTIONS += -Dallow.downloads=true 2.77 -endif 2.78 - 2.79 -# Figure out the platform we are using 2.80 -_SYSTEM_UNAME := $(shell uname) 2.81 -_PLATFORM_KIND = unix 2.82 -ifeq ($(_SYSTEM_UNAME), Windows_NT) 2.83 - _PLATFORM_KIND = windows 2.84 -endif 2.85 -ifneq (,$(findstring CYGWIN,$(_SYSTEM_UNAME))) 2.86 - _PLATFORM_KIND = windows 2.87 -endif 2.88 - 2.89 -# Where is /java in case we need it 2.90 -ifdef ALT_SLASH_JAVA 2.91 - _SLASHJAVA = $(ALT_SLASH_JAVA) 2.92 -else 2.93 - ifeq ($(_PLATFORM_KIND), windows) 2.94 - _SLASHJAVA=J:/ 2.95 - else 2.96 - _SLASHJAVA=/java 2.97 - endif 2.98 -endif 2.99 - 2.100 -ifdef ALT_OUTPUTDIR 2.101 - OUTPUTDIR = $(ALT_OUTPUTDIR) 2.102 - ANT_OPTIONS += -Doutput.dir=$(ALT_OUTPUTDIR) 2.103 -else 2.104 - OUTPUTDIR = .. 2.105 -endif 2.106 - 2.107 -ifdef ALT_LANGTOOLS_DIST 2.108 - ifdef ALT_BOOTDIR 2.109 - ANT_JAVA_HOME = JAVA_HOME=$(ALT_BOOTDIR) 2.110 - ANT_OPTIONS += -Djdk.home=$(ALT_BOOTDIR) 2.111 - endif 2.112 - ANT_OPTIONS += -Dbootstrap.dir=$(ALT_LANGTOOLS_DIST)/bootstrap 2.113 -else 2.114 - ifdef ALT_JDK_IMPORT_PATH 2.115 - ANT_JAVA_HOME = JAVA_HOME=$(ALT_JDK_IMPORT_PATH) 2.116 - ANT_OPTIONS += -Djdk.home=$(ALT_JDK_IMPORT_PATH) 2.117 - endif 2.118 -endif 2.119 - 2.120 -ifdef ANT_HOME 2.121 - ANT = $(ANT_HOME)/bin/ant 2.122 - ifneq ($(shell test -x $(ANT); echo $$?), 0) 2.123 - $(error "$(ANT) not found; please update ANT_HOME") 2.124 - endif 2.125 -else 2.126 - ANT = ant 2.127 - ifneq ($(shell which $(ANT) > /dev/null; echo $$?), 0) 2.128 - $(error "'ant' not found; please set ANT_HOME or put 'ant' on your PATH") 2.129 - endif 2.130 -endif 2.131 - 2.132 -# Default target and expected 'do everything' target 2.133 -default: all 2.134 - 2.135 -# All ant targets of interest 2.136 -ANT_TARGETS = all build dist clobber clean sanity 2.137 - 2.138 -# Create a make target for each 2.139 -$(ANT_TARGETS): 2.140 - cd .. && $(ANT_JAVA_HOME) $(ANT) $(ANT_OPTIONS) -version 2.141 - cd .. && $(ANT_JAVA_HOME) $(ANT) $(ANT_OPTIONS) $@ 2.142 - 2.143 -# Just for compat reasons, delete in future. 2.144 -drop_included: 2.145 -source: 2.146 - 2.147 -# Help target 2.148 -define helpenvline 2.149 -@echo " $1";echo " $2" 2.150 -endef 2.151 -help: 2.152 - @echo "----------------------------------------------------------" 2.153 - @echo " " 2.154 - @echo "Help information for this Makefile:" 2.155 - @echo " " 2.156 - @echo " Targets (see ant project information for descriptions):" 2.157 - @echo " $(ANT_TARGETS)" 2.158 - @echo " " 2.159 - @echo " Environment or command line variables (all optional):" 2.160 - $(call helpenvline, ALT_BOOTDIR,\ 2.161 - "JAVA_HOME to use when running ant") 2.162 - $(call helpenvline, ALT_LANGTOOLS_DIST,\ 2.163 - "path to langtools repository dist directory") 2.164 - $(call helpenvline, ALT_OUTPUTDIR,\ 2.165 - "path to root of output") 2.166 - $(call helpenvline, DEBUG_CLASSFILES,\ 2.167 - "if set makes sure ant property javac.debug is true") 2.168 - $(call helpenvline, JAVAC_SOURCE_ARG,\ 2.169 - "if SOURCE_LANGUAGE_VERSION not set uses this to set ant property javac.source") 2.170 - $(call helpenvline, JAVAC_TARGET_ARG,\ 2.171 - "if TARGET_CLASS_VERSION not set uses this to set ant property javac.target") 2.172 - $(call helpenvline, SOURCE_LANGUAGE_VERSION,\ 2.173 - "if set uses this to set ant property javac.source") 2.174 - $(call helpenvline, QUIET,\ 2.175 - "if set will pass -quiet to ant") 2.176 - $(call helpenvline, TARGET_CLASS_VERSION,\ 2.177 - "JAVA_HOME to use when running ant") 2.178 - $(call helpenvline, VARIANT,\ 2.179 - "if set to OPT means optimized build will set javac.debug to false") 2.180 - $(call helpenvline, VERBOSE,\ 2.181 - "if set will pass -verbose to ant") 2.182 - @echo " " 2.183 - @echo "----------------------------------------------------------" 2.184 - @echo " " 2.185 - @echo "Ant project file help information:" 2.186 - @echo " " 2.187 - @$(ANT_JAVA_HOME) cd .. && $(ANT) $(ANT_OPTIONS) -p 2.188 - @echo " " 2.189 - @echo "----------------------------------------------------------" 2.190 - 2.191 -# Targets for Sun's internal JPRT build system 2.192 -JPRT_ARCHIVE_BUNDLE=$(OUTPUTDIR)/jprt.zip 2.193 -jprt_build_product jprt_build_debug jprt_build_fastdebug: all 2.194 - $(RM) $(JPRT_ARCHIVE_BUNDLE) 2.195 - ( cd $(OUTPUTDIR)/dist && \ 2.196 - zip -q -r $(JPRT_ARCHIVE_BUNDLE) . ) 2.197 - 2.198 -# Declare these phony (not filenames) 2.199 -.PHONY: $(ANT_TARGETS) \ 2.200 - jprt_build_product jprt_build_debug jprt_build_fastdebug 2.201 +all: 2.202 + @$(MAKE) -f $(top_level_makefile) $(subsystem_name)
3.1 --- a/make/jprt.properties Thu Nov 07 08:16:23 2013 -0800 3.2 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 3.3 @@ -1,46 +0,0 @@ 3.4 -# 3.5 -# Copyright (c) 2006, 2013, Oracle and/or its affiliates. All rights reserved. 3.6 -# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. 3.7 -# 3.8 -# This code is free software; you can redistribute it and/or modify it 3.9 -# under the terms of the GNU General Public License version 2 only, as 3.10 -# published by the Free Software Foundation. Oracle designates this 3.11 -# particular file as subject to the "Classpath" exception as provided 3.12 -# by Oracle in the LICENSE file that accompanied this code. 3.13 -# 3.14 -# This code is distributed in the hope that it will be useful, but WITHOUT 3.15 -# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or 3.16 -# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License 3.17 -# version 2 for more details (a copy is included in the LICENSE file that 3.18 -# accompanied this code). 3.19 -# 3.20 -# You should have received a copy of the GNU General Public License version 3.21 -# 2 along with this work; if not, write to the Free Software Foundation, 3.22 -# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. 3.23 -# 3.24 -# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA 3.25 -# or visit www.oracle.com if you need additional information or have any 3.26 -# questions. 3.27 -# 3.28 - 3.29 -# Properties for jprt 3.30 - 3.31 -# Locked down to jdk8 3.32 -jprt.tools.default.release=jdk8 3.33 - 3.34 -# The different build flavors we want, we override here so we just get these 2 3.35 -jprt.build.flavors=product,fastdebug 3.36 - 3.37 -# Standard list of jprt build targets for this source tree 3.38 -jprt.build.targets= \ 3.39 - solaris_sparcv9_5.10-{product|fastdebug}, \ 3.40 - solaris_x64_5.10-{product|fastdebug}, \ 3.41 - linux_i586_2.6-{product|fastdebug}, \ 3.42 - linux_x64_2.6-{product|fastdebug}, \ 3.43 - macosx_x64_10.7-{product|fastdebug}, \ 3.44 - windows_i586_6.1-{product|fastdebug}, \ 3.45 - windows_x64_6.1-{product|fastdebug} 3.46 - 3.47 -# Directories to be excluded from the source bundles 3.48 -jprt.bundle.exclude.src.dirs=build dist webrev 3.49 -
4.1 --- a/make/scripts/update_src.sh Thu Nov 07 08:16:23 2013 -0800 4.2 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 4.3 @@ -1,90 +0,0 @@ 4.4 -# 4.5 -# Copyright (c) 2012, 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 -# This script was used to copy the former drop source bundle source into 4.30 -# the repository. Exists as a form of documentation. 4.31 - 4.32 -curdir="`(cd . && pwd)`" 4.33 - 4.34 -# Whitespace normalizer script is in the top repository. 4.35 -normalizer="perl ${curdir}/../make/scripts/normalizer.pl" 4.36 - 4.37 -# Locations for bundle and root of source tree 4.38 -tmp=/tmp 4.39 -srcroot=${curdir}/src 4.40 -mkdir -p ${srcroot} 4.41 - 4.42 -# Bundle information 4.43 -drops_dir="/java/devtools/share/jdk8-drops" 4.44 -url1="http://download.java.net/glassfish/components/jax-ws/openjdk/jdk8" 4.45 -bundle1="jdk8-jaxws-2_2-SNAPSHOT-2012_01_11-patched.zip" 4.46 -srcdir1="${srcroot}/share/jaxws_classes" 4.47 -url2="http://download.java.net/glassfish/components/jax-ws/openjdk/jdk8" 4.48 -bundle2="jdk8-jaf-2011_07_22.zip" 4.49 -srcdir2="${srcroot}/share/jaf_classes" 4.50 - 4.51 -# Function to get a bundle and explode it and normalize the source files. 4.52 -getBundle() # drops_dir url bundlename bundledestdir srcrootdir 4.53 -{ 4.54 - # Get the bundle from drops_dir or downloaded 4.55 - mkdir -p $4 4.56 - rm -f $4/$3 4.57 - if [ -f $1/$3 ] ; then 4.58 - echo "Copy over bundle: $1/$3" 4.59 - cp $1/$3 $4 4.60 - else 4.61 - echo "Downloading bundle: $2/$3" 4.62 - (cd $4 && wget $2/$3) 4.63 - fi 4.64 - # Fail if it does not exist 4.65 - if [ ! -f $4/$3 ] ; then 4.66 - echo "ERROR: Could not get $3" 4.67 - exit 1 4.68 - fi 4.69 - # Wipe it out completely 4.70 - echo "Cleaning up $5" 4.71 - rm -f -r $5 4.72 - mkdir -p $5 4.73 - echo "Unzipping $4/$3" 4.74 - ( cd $5 && unzip -q $4/$3 && mv src/* . && rmdir src && rm LICENSE ) 4.75 - # Run whitespace normalizer 4.76 - echo "Normalizing the sources in $5" 4.77 - ( cd $5 && ${normalizer} . ) 4.78 - # Delete the bundle and leftover files 4.79 - rm -f $4/$3 $5/filelist 4.80 -} 4.81 - 4.82 -# Process the bundles. 4.83 -getBundle "${drops_dir}" "${url1}" "${bundle1}" ${tmp} ${srcdir1} 4.84 -getBundle "${drops_dir}" "${url2}" "${bundle2}" ${tmp} ${srcdir2} 4.85 -echo "Completed bundle extraction." 4.86 -echo " " 4.87 - 4.88 -# Appropriate Mercurial commands needed to run: 4.89 -echo "Run: hg addremove src" 4.90 -echo "Run: ksh ../make/scripts/webrev.ksh -N -o ${HOME}/webrev" 4.91 -echo "Get reviewer, get CR, then..." 4.92 -echo "Run: hg commit" 4.93 -
5.1 --- a/makefiles/BuildJaxws.gmk Thu Nov 07 08:16:23 2013 -0800 5.2 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 5.3 @@ -1,113 +0,0 @@ 5.4 -# 5.5 -# Copyright (c) 2007, 2013, 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 must be the first rule 5.30 -default: all 5.31 - 5.32 -include $(SPEC) 5.33 -include MakeBase.gmk 5.34 -include JavaCompilation.gmk 5.35 - 5.36 -DISABLE_JAXWS_WARNINGS := -Xlint:all,-varargs,-rawtypes,-deprecation,-unchecked,-serial,-dep-ann,-cast,-fallthrough,-static 5.37 - 5.38 -# The generate new bytecode uses the new compiler for to generate bytecode 5.39 -# for the new jdk that is being built. The code compiled by this setup 5.40 -# cannot necessarily be run with the boot jdk. 5.41 -$(eval $(call SetupJavaCompiler,GENERATE_NEWBYTECODE_DEBUG, \ 5.42 - JVM := $(JAVA), \ 5.43 - JAVAC := $(NEW_JAVAC), \ 5.44 - FLAGS := -XDignore.symbol.file=true $(DISABLE_JAXWS_WARNINGS) -g, \ 5.45 - SERVER_DIR := $(SJAVAC_SERVER_DIR), \ 5.46 - SERVER_JVM := $(SJAVAC_SERVER_JAVA))) 5.47 - 5.48 -# Dummy here is needed to trigger copying of META-INF 5.49 -$(eval $(call SetupJavaCompilation,BUILD_JAF, \ 5.50 - SETUP := GENERATE_NEWBYTECODE_DEBUG, \ 5.51 - SRC := $(JAXWS_TOPDIR)/src/share/jaf_classes, \ 5.52 - COPY := "dummy", \ 5.53 - BIN := $(JAXWS_OUTPUTDIR)/jaf_classes)) 5.54 - 5.55 -$(eval $(call SetupJavaCompilation,BUILD_JAXWS, \ 5.56 - SETUP := GENERATE_NEWBYTECODE_DEBUG, \ 5.57 - SRC := $(JAXWS_TOPDIR)/src/share/jaxws_classes, \ 5.58 - BIN := $(JAXWS_OUTPUTDIR)/jaxws_classes, \ 5.59 - COPY := .xsd, \ 5.60 - COPY_FILES := $(JAXWS_TOPDIR)/src/share/jaxws_classes/com/sun/tools/internal/xjc/runtime/JAXBContextFactory.java \ 5.61 - $(JAXWS_TOPDIR)/src/share/jaxws_classes/com/sun/tools/internal/xjc/runtime/ZeroOneBooleanAdapter.java \ 5.62 - $(JAXWS_TOPDIR)/src/share/jaxws_classes/com/sun/xml/internal/ws/assembler/jaxws-tubes-default.xml, \ 5.63 - ADD_JAVAC_FLAGS = -Xbootclasspath/p:$(OUTPUT_ROOT)/jaxp/dist/lib/classes.jar)) 5.64 - 5.65 -$(JAXWS_OUTPUTDIR)/jaxws_classes/META-INF/services/com.sun.tools.internal.ws.wscompile.Plugin: \ 5.66 - $(JAXWS_TOPDIR)/src/share/jaxws_classes/com/sun/tools/etc/META-INF/services/com.sun.tools.internal.ws.wscompile.Plugin 5.67 - mkdir -p $(@D) 5.68 - cp $< $@ 5.69 - 5.70 -$(JAXWS_OUTPUTDIR)/jaxws_classes/META-INF/services/com.sun.tools.internal.xjc.Plugin: \ 5.71 - $(JAXWS_TOPDIR)/src/share/jaxws_classes/com/sun/tools/etc/META-INF/services/com.sun.tools.internal.xjc.Plugin 5.72 - mkdir -p $(@D) 5.73 - cp $< $@ 5.74 - 5.75 -# There are two META-INF services files that are needed, add these to the list of goals 5.76 -BUILD_JAXWS += $(JAXWS_OUTPUTDIR)/jaxws_classes/META-INF/services/com.sun.tools.internal.ws.wscompile.Plugin \ 5.77 - $(JAXWS_OUTPUTDIR)/jaxws_classes/META-INF/services/com.sun.tools.internal.xjc.Plugin 5.78 - 5.79 -# Imitate the property cleaning mechanism in the old build. This will likely be replaced 5.80 -# by the unified functionality in JavaCompilation.gmk, but keep it the same as old build 5.81 -# for now, even though it actually breaks properties containing # in the value. 5.82 -# Using nawk to avoid solaris sed. 5.83 -$(JAXWS_OUTPUTDIR)/jaxws_classes/%.properties: $(JAXWS_TOPDIR)/src/share/jaxws_classes/%.properties 5.84 - $(MKDIR) -p $(@D) 5.85 - $(RM) $@ $@.tmp 5.86 - $(CAT) $< | LANG=C $(NAWK) '{ sub(/#.*$$/,"#"); print }' > $@.tmp 5.87 - $(MV) $@.tmp $@ 5.88 - 5.89 -JAXWS_SRC_PROP_FILES := $(shell $(FIND) $(JAXWS_TOPDIR)/src/share/jaxws_classes -name "*.properties") 5.90 -TARGET_PROP_FILES := $(patsubst $(JAXWS_TOPDIR)/src/share/jaxws_classes/%, \ 5.91 - $(JAXWS_OUTPUTDIR)/jaxws_classes/%, $(JAXWS_SRC_PROP_FILES)) 5.92 - 5.93 -$(JAXWS_OUTPUTDIR)/jaf_classes/%.properties: $(JAXWS_TOPDIR)/src/share/jaf_classes/%.properties 5.94 - $(MKDIR) -p $(@D) 5.95 - $(RM) $@ $@.tmp 5.96 - $(CAT) $< | LANG=C $(NAWK) '{ sub(/#.*$$/,"#"); print }' > $@.tmp 5.97 - $(MV) $@.tmp $@ 5.98 - 5.99 -JAF_SRC_PROP_FILES := $(shell $(FIND) $(JAXWS_TOPDIR)/src/share/jaf_classes -name "*.properties") 5.100 -TARGET_PROP_FILES += $(patsubst $(JAXWS_TOPDIR)/src/share/jaf_classes/%, \ 5.101 - $(JAXWS_OUTPUTDIR)/jaf_classes/%, $(JAF_SRC_PROP_FILES)) 5.102 - 5.103 -$(eval $(call SetupArchive,ARCHIVE_JAXWS, $(BUILD_JAXWS) $(BUILD_JAF) $(TARGET_PROP_FILES), \ 5.104 - SRCS := $(JAXWS_OUTPUTDIR)/jaxws_classes $(JAXWS_OUTPUTDIR)/jaf_classes, \ 5.105 - SUFFIXES := .class .properties .xsd .xml .java \ 5.106 - com.sun.mirror.apt.AnnotationProcessorFactory \ 5.107 - com.sun.tools.internal.xjc.Plugin, \ 5.108 - JAR := $(JAXWS_OUTPUTDIR)/dist/lib/classes.jar)) 5.109 - 5.110 -$(eval $(call SetupZipArchive,ZIP_JAXWS_SOURCES, \ 5.111 - SRC := $(JAXWS_TOPDIR)/src/share/jaf_classes $(JAXWS_TOPDIR)/src/share/jaxws_classes, \ 5.112 - ZIP := $(JAXWS_OUTPUTDIR)/dist/lib/src.zip)) 5.113 - 5.114 -all: $(JAXWS_OUTPUTDIR)/dist/lib/classes.jar $(JAXWS_OUTPUTDIR)/dist/lib/src.zip 5.115 - 5.116 -.PHONY: default all
6.1 --- a/makefiles/Makefile Thu Nov 07 08:16:23 2013 -0800 6.2 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 6.3 @@ -1,49 +0,0 @@ 6.4 -# 6.5 -# Copyright (c) 2012, 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 -# Locate this Makefile 6.30 -ifeq ($(filter /%, $(lastword $(MAKEFILE_LIST))), ) 6.31 - makefile_path := $(CURDIR)/$(lastword $(MAKEFILE_LIST)) 6.32 -else 6.33 - makefile_path := $(lastword $(MAKEFILE_LIST)) 6.34 -endif 6.35 -repo_dir := $(patsubst %/makefiles/Makefile, %, $(makefile_path)) 6.36 - 6.37 -# What is the name of this subsystem (langtools, corba, etc)? 6.38 -subsystem_name := $(notdir $(repo_dir)) 6.39 - 6.40 -# Try to locate top-level makefile 6.41 -top_level_makefile := $(repo_dir)/../common/makefiles/Makefile 6.42 -ifneq ($(wildcard $(top_level_makefile)), ) 6.43 - $(info Will run $(subsystem_name) target on top-level Makefile) 6.44 - $(info WARNING: This is a non-recommended way of building!) 6.45 - $(info ===================================================) 6.46 -else 6.47 - $(info Cannot locate top-level Makefile. Is this repo not checked out as part of a complete forest?) 6.48 - $(error Build from top-level Makefile instead) 6.49 -endif 6.50 - 6.51 -all: 6.52 - @$(MAKE) -f $(top_level_makefile) $(subsystem_name)
