stan/jdk-24
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

8001931: The new build system whitespace cleanup

Browse Source 
Reviewed-by: tbell, simonis, erikj
This commit is contained in:
Magnus Ihse Bursie 2013-10-10 14:58:15 +02:00
parent 27cab0e0c8
commit 6f2bbea851
2 changed files with 45 additions and 45 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

64
jaxws/makefiles/BuildJaxws.gmk
View File

@ -30,34 +30,34 @@ include $(SPEC)
include MakeBase.gmk include MakeBase.gmk
include JavaCompilation.gmk include JavaCompilation.gmk
DISABLE_JAXWS_WARNINGS:=-Xlint:all,-varargs,-rawtypes,-deprecation,-unchecked,-serial,-dep-ann,-cast,-fallthrough,-static DISABLE_JAXWS_WARNINGS := -Xlint:all,-varargs,-rawtypes,-deprecation,-unchecked,-serial,-dep-ann,-cast,-fallthrough,-static
# The generate new bytecode uses the new compiler for to generate bytecode # The generate new bytecode uses the new compiler for to generate bytecode
# for the new jdk that is being built. The code compiled by this setup # for the new jdk that is being built. The code compiled by this setup
# cannot necessarily be run with the boot jdk. # cannot necessarily be run with the boot jdk.
$(eval $(call SetupJavaCompiler,GENERATE_NEWBYTECODE_DEBUG,\ $(eval $(call SetupJavaCompiler,GENERATE_NEWBYTECODE_DEBUG, \
JVM:=$(JAVA),\ JVM := $(JAVA), \
JAVAC:=$(NEW_JAVAC),\ JAVAC := $(NEW_JAVAC), \
FLAGS:=-XDignore.symbol.file=true $(DISABLE_JAXWS_WARNINGS) -g,\ FLAGS := -XDignore.symbol.file=true $(DISABLE_JAXWS_WARNINGS) -g, \
SERVER_DIR:=$(SJAVAC_SERVER_DIR),\ SERVER_DIR := $(SJAVAC_SERVER_DIR), \
SERVER_JVM:=$(SJAVAC_SERVER_JAVA))) SERVER_JVM := $(SJAVAC_SERVER_JAVA)))
# Dummy here is needed to trigger copying of META-INF # Dummy here is needed to trigger copying of META-INF
$(eval $(call SetupJavaCompilation,BUILD_JAF,\ $(eval $(call SetupJavaCompilation,BUILD_JAF, \
SETUP:=GENERATE_NEWBYTECODE_DEBUG,\ SETUP := GENERATE_NEWBYTECODE_DEBUG, \
SRC:=$(JAXWS_TOPDIR)/src/share/jaf_classes,\ SRC := $(JAXWS_TOPDIR)/src/share/jaf_classes, \
COPY:="dummy",\ COPY := "dummy", \
BIN:=$(JAXWS_OUTPUTDIR)/jaf_classes)) BIN := $(JAXWS_OUTPUTDIR)/jaf_classes))
$(eval $(call SetupJavaCompilation,BUILD_JAXWS,\ $(eval $(call SetupJavaCompilation,BUILD_JAXWS, \
SETUP:=GENERATE_NEWBYTECODE_DEBUG,\ SETUP := GENERATE_NEWBYTECODE_DEBUG, \
SRC:=$(JAXWS_TOPDIR)/src/share/jaxws_classes,\ SRC := $(JAXWS_TOPDIR)/src/share/jaxws_classes, \
BIN:=$(JAXWS_OUTPUTDIR)/jaxws_classes,\ BIN := $(JAXWS_OUTPUTDIR)/jaxws_classes, \
COPY:=.xsd,\ COPY := .xsd, \
COPY_FILES:=$(JAXWS_TOPDIR)/src/share/jaxws_classes/com/sun/tools/internal/xjc/runtime/JAXBContextFactory.java \ COPY_FILES := $(JAXWS_TOPDIR)/src/share/jaxws_classes/com/sun/tools/internal/xjc/runtime/JAXBContextFactory.java \
$(JAXWS_TOPDIR)/src/share/jaxws_classes/com/sun/tools/internal/xjc/runtime/ZeroOneBooleanAdapter.java \ $(JAXWS_TOPDIR)/src/share/jaxws_classes/com/sun/tools/internal/xjc/runtime/ZeroOneBooleanAdapter.java \
$(JAXWS_TOPDIR)/src/share/jaxws_classes/com/sun/xml/internal/ws/assembler/jaxws-tubes-default.xml,\ $(JAXWS_TOPDIR)/src/share/jaxws_classes/com/sun/xml/internal/ws/assembler/jaxws-tubes-default.xml, \
ADD_JAVAC_FLAGS=-cp $(OUTPUT_ROOT)/jaxp/dist/lib/classes.jar)) ADD_JAVAC_FLAGS = -cp $(OUTPUT_ROOT)/jaxp/dist/lib/classes.jar))
$(JAXWS_OUTPUTDIR)/jaxws_classes/META-INF/services/com.sun.tools.internal.ws.wscompile.Plugin: \ $(JAXWS_OUTPUTDIR)/jaxws_classes/META-INF/services/com.sun.tools.internal.ws.wscompile.Plugin: \
$(JAXWS_TOPDIR)/src/share/jaxws_classes/com/sun/tools/etc/META-INF/services/com.sun.tools.internal.ws.wscompile.Plugin $(JAXWS_TOPDIR)/src/share/jaxws_classes/com/sun/tools/etc/META-INF/services/com.sun.tools.internal.ws.wscompile.Plugin
@ -84,8 +84,8 @@ $(JAXWS_OUTPUTDIR)/jaxws_classes/%.properties: $(JAXWS_TOPDIR)/src/share/jaxws_c
$(MV) $@.tmp $@ $(MV) $@.tmp $@
JAXWS_SRC_PROP_FILES := $(shell $(FIND) $(JAXWS_TOPDIR)/src/share/jaxws_classes -name "*.properties") JAXWS_SRC_PROP_FILES := $(shell $(FIND) $(JAXWS_TOPDIR)/src/share/jaxws_classes -name "*.properties")
TARGET_PROP_FILES := $(patsubst $(JAXWS_TOPDIR)/src/share/jaxws_classes/%,\ TARGET_PROP_FILES := $(patsubst $(JAXWS_TOPDIR)/src/share/jaxws_classes/%, \
$(JAXWS_OUTPUTDIR)/jaxws_classes/%,$(JAXWS_SRC_PROP_FILES)) $(JAXWS_OUTPUTDIR)/jaxws_classes/%, $(JAXWS_SRC_PROP_FILES))
$(JAXWS_OUTPUTDIR)/jaf_classes/%.properties: $(JAXWS_TOPDIR)/src/share/jaf_classes/%.properties $(JAXWS_OUTPUTDIR)/jaf_classes/%.properties: $(JAXWS_TOPDIR)/src/share/jaf_classes/%.properties
$(MKDIR) -p $(@D) $(MKDIR) -p $(@D)
@ -94,19 +94,19 @@ $(JAXWS_OUTPUTDIR)/jaf_classes/%.properties: $(JAXWS_TOPDIR)/src/share/jaf_class
$(MV) $@.tmp $@ $(MV) $@.tmp $@
JAF_SRC_PROP_FILES := $(shell $(FIND) $(JAXWS_TOPDIR)/src/share/jaf_classes -name "*.properties") JAF_SRC_PROP_FILES := $(shell $(FIND) $(JAXWS_TOPDIR)/src/share/jaf_classes -name "*.properties")
TARGET_PROP_FILES += $(patsubst $(JAXWS_TOPDIR)/src/share/jaf_classes/%,\ TARGET_PROP_FILES += $(patsubst $(JAXWS_TOPDIR)/src/share/jaf_classes/%, \
$(JAXWS_OUTPUTDIR)/jaf_classes/%,$(JAF_SRC_PROP_FILES)) $(JAXWS_OUTPUTDIR)/jaf_classes/%, $(JAF_SRC_PROP_FILES))
$(eval $(call SetupArchive,ARCHIVE_JAXWS,$(BUILD_JAXWS) $(BUILD_JAF) $(TARGET_PROP_FILES),\ $(eval $(call SetupArchive,ARCHIVE_JAXWS, $(BUILD_JAXWS) $(BUILD_JAF) $(TARGET_PROP_FILES), \
SRCS:=$(JAXWS_OUTPUTDIR)/jaxws_classes $(JAXWS_OUTPUTDIR)/jaf_classes,\ SRCS := $(JAXWS_OUTPUTDIR)/jaxws_classes $(JAXWS_OUTPUTDIR)/jaf_classes, \
SUFFIXES:=.class .properties .xsd .xml .java \ SUFFIXES := .class .properties .xsd .xml .java \
com.sun.mirror.apt.AnnotationProcessorFactory \ com.sun.mirror.apt.AnnotationProcessorFactory \
com.sun.tools.internal.xjc.Plugin,\ com.sun.tools.internal.xjc.Plugin, \
JAR:=$(JAXWS_OUTPUTDIR)/dist/lib/classes.jar)) JAR := $(JAXWS_OUTPUTDIR)/dist/lib/classes.jar))
$(eval $(call SetupZipArchive,ZIP_JAXWS_SOURCES,\ $(eval $(call SetupZipArchive,ZIP_JAXWS_SOURCES, \
SRC:=$(JAXWS_TOPDIR)/src/share/jaf_classes $(JAXWS_TOPDIR)/src/share/jaxws_classes,\ SRC := $(JAXWS_TOPDIR)/src/share/jaf_classes $(JAXWS_TOPDIR)/src/share/jaxws_classes, \
ZIP:=$(JAXWS_OUTPUTDIR)/dist/lib/src.zip)) ZIP := $(JAXWS_OUTPUTDIR)/dist/lib/src.zip))
all: $(JAXWS_OUTPUTDIR)/dist/lib/classes.jar $(JAXWS_OUTPUTDIR)/dist/lib/src.zip all: $(JAXWS_OUTPUTDIR)/dist/lib/classes.jar $(JAXWS_OUTPUTDIR)/dist/lib/src.zip

14
jaxws/makefiles/Makefile
View File

@ -24,19 +24,19 @@
# #
# Locate this Makefile # Locate this Makefile
ifeq ($(filter /%,$(lastword $(MAKEFILE_LIST))),) ifeq ($(filter /%, $(lastword $(MAKEFILE_LIST))), )
makefile_path:=$(CURDIR)/$(lastword $(MAKEFILE_LIST)) makefile_path := $(CURDIR)/$(lastword $(MAKEFILE_LIST))
else else
makefile_path:=$(lastword $(MAKEFILE_LIST)) makefile_path := $(lastword $(MAKEFILE_LIST))
endif endif
repo_dir:=$(patsubst %/makefiles/Makefile,%,$(makefile_path)) repo_dir := $(patsubst %/makefiles/Makefile, %, $(makefile_path))
# What is the name of this subsystem (langtools, corba, etc)? # What is the name of this subsystem (langtools, corba, etc)?
subsystem_name:=$(notdir $(repo_dir)) subsystem_name := $(notdir $(repo_dir))
# Try to locate top-level makefile # Try to locate top-level makefile
top_level_makefile:=$(repo_dir)/../common/makefiles/Makefile top_level_makefile := $(repo_dir)/../common/makefiles/Makefile
ifneq ($(wildcard $(top_level_makefile)),) ifneq ($(wildcard $(top_level_makefile)), )
$(info Will run $(subsystem_name) target on top-level Makefile) $(info Will run $(subsystem_name) target on top-level Makefile)
$(info WARNING: This is a non-recommended way of building!) $(info WARNING: This is a non-recommended way of building!)
$(info ===================================================) $(info ===================================================)