archive/jdk
1
0
Fork 0
mirror of https://github.com/openjdk/jdk.git synced 2025-08-28 07:14:30 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

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:08 +02:00
parent 27cab0e0c8
commit 10aa3f5f29
2 changed files with 26 additions and 26 deletions
Download patch file Download diff file Expand all files Collapse all files

34
jaxp/makefiles/BuildJaxp.gmk
View file

@ -30,23 +30,23 @@ default: all
include MakeBase.gmk include MakeBase.gmk
include JavaCompilation.gmk include JavaCompilation.gmk
DISABLE_JAXP_WARNINGS:=-Xlint:all,-deprecation,-unchecked,-rawtypes,-cast,-serial,-dep-ann,-static,-fallthrough DISABLE_JAXP_WARNINGS := -Xlint:all,-deprecation,-unchecked,-rawtypes,-cast,-serial,-dep-ann,-static,-fallthrough
# 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_JAXP_WARNINGS) -g,\ FLAGS := -XDignore.symbol.file=true $(DISABLE_JAXP_WARNINGS) -g, \
SERVER_DIR:=$(SJAVAC_SERVER_DIR),\ SERVER_DIR := $(SJAVAC_SERVER_DIR), \
SERVER_JVM:=$(SJAVAC_SERVER_JAVA))) SERVER_JVM := $(SJAVAC_SERVER_JAVA)))
$(eval $(call SetupJavaCompilation,BUILD_JAXP,\ $(eval $(call SetupJavaCompilation,BUILD_JAXP, \
SETUP:=GENERATE_NEWBYTECODE_DEBUG,\ SETUP := GENERATE_NEWBYTECODE_DEBUG, \
SRC:=$(JAXP_TOPDIR)/src,\ SRC := $(JAXP_TOPDIR)/src, \
BIN:=$(JAXP_OUTPUTDIR)/classes,\ BIN := $(JAXP_OUTPUTDIR)/classes, \
SRCZIP:=$(JAXP_OUTPUTDIR)/dist/lib/src.zip)) SRCZIP := $(JAXP_OUTPUTDIR)/dist/lib/src.zip))
# Imitate the property cleaning mechanism in the old build. This will likely be replaced # Imitate the property cleaning mechanism in the old build. This will likely be replaced
# by the unified functionality in JavaCompilation.gmk, but keep it the same as old build # by the unified functionality in JavaCompilation.gmk, but keep it the same as old build
@ -59,12 +59,12 @@ $(JAXP_OUTPUTDIR)/classes/%.properties: $(JAXP_TOPDIR)/src/%.properties
$(MV) $@.tmp $@ $(MV) $@.tmp $@
SRC_PROP_FILES := $(shell $(FIND) $(JAXP_TOPDIR)/src -name "*.properties") SRC_PROP_FILES := $(shell $(FIND) $(JAXP_TOPDIR)/src -name "*.properties")
TARGET_PROP_FILES := $(patsubst $(JAXP_TOPDIR)/src/%,$(JAXP_OUTPUTDIR)/classes/%,$(SRC_PROP_FILES)) TARGET_PROP_FILES := $(patsubst $(JAXP_TOPDIR)/src/%, $(JAXP_OUTPUTDIR)/classes/%, $(SRC_PROP_FILES))
$(eval $(call SetupArchive,ARCHIVE_JAXP,$(BUILD_JAXP) $(TARGET_PROP_FILES),\ $(eval $(call SetupArchive,ARCHIVE_JAXP, $(BUILD_JAXP) $(TARGET_PROP_FILES), \
SRCS:=$(JAXP_OUTPUTDIR)/classes,\ SRCS := $(JAXP_OUTPUTDIR)/classes, \
SUFFIXES:=.class .properties,\ SUFFIXES := .class .properties, \
JAR:=$(JAXP_OUTPUTDIR)/dist/lib/classes.jar)) JAR := $(JAXP_OUTPUTDIR)/dist/lib/classes.jar))
all: $(JAXP_OUTPUTDIR)/dist/lib/classes.jar $(JAXP_OUTPUTDIR)/dist/lib/src.zip all: $(JAXP_OUTPUTDIR)/dist/lib/classes.jar $(JAXP_OUTPUTDIR)/dist/lib/src.zip

14
jaxp/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 ===================================================)