8001931: The new build system whitespace cleanup
Reviewed-by: tbell, simonis, erikj
This commit is contained in:
parent
7aa221ebc3
commit
c0c561895a
@ -187,6 +187,7 @@ ifndef OPENJDK
|
|||||||
BUILD_DEMOS += $(patsubst $(JDK_TOPDIR)/src/closed/share/demo/nbproject/%, \
|
BUILD_DEMOS += $(patsubst $(JDK_TOPDIR)/src/closed/share/demo/nbproject/%, \
|
||||||
$(JDK_OUTPUTDIR)/demo/nbproject/%, \
|
$(JDK_OUTPUTDIR)/demo/nbproject/%, \
|
||||||
$(call CacheFind, $(JDK_TOPDIR)/src/closed/share/demo/nbproject))
|
$(call CacheFind, $(JDK_TOPDIR)/src/closed/share/demo/nbproject))
|
||||||
|
|
||||||
$(JDK_OUTPUTDIR)/demo/nbproject/%: $(JDK_TOPDIR)/src/closed/share/demo/nbproject/%
|
$(JDK_OUTPUTDIR)/demo/nbproject/%: $(JDK_TOPDIR)/src/closed/share/demo/nbproject/%
|
||||||
$(call install-file)
|
$(call install-file)
|
||||||
$(CHMOD) -f ug+w $@
|
$(CHMOD) -f ug+w $@
|
||||||
|
@ -687,6 +687,7 @@ ifeq ($(OPENJDK_TARGET_OS),windows)
|
|||||||
OGLVertexCache.c \
|
OGLVertexCache.c \
|
||||||
WGLGraphicsConfig.c \
|
WGLGraphicsConfig.c \
|
||||||
WGLSurfaceData.c
|
WGLSurfaceData.c
|
||||||
|
|
||||||
LIBAWT_LANG := C++
|
LIBAWT_LANG := C++
|
||||||
LIBAWT_CFLAGS += -EHsc -DUNICODE -D_UNICODE
|
LIBAWT_CFLAGS += -EHsc -DUNICODE -D_UNICODE
|
||||||
ifeq ($(OPENJDK_TARGET_CPU_BITS), 64)
|
ifeq ($(OPENJDK_TARGET_CPU_BITS), 64)
|
||||||
@ -978,6 +979,7 @@ $(eval $(call SetupNativeCompilation,BUILD_LIBZIP,\
|
|||||||
OBJECT_DIR := $(JDK_OUTPUTDIR)/objs/libzip, \
|
OBJECT_DIR := $(JDK_OUTPUTDIR)/objs/libzip, \
|
||||||
DEBUG_SYMBOLS := $(DEBUG_ALL_BINARIES)))
|
DEBUG_SYMBOLS := $(DEBUG_ALL_BINARIES)))
|
||||||
|
|
||||||
|
|
||||||
$(BUILD_LIBZIP): $(BUILD_LIBJAVA)
|
$(BUILD_LIBZIP): $(BUILD_LIBJAVA)
|
||||||
|
|
||||||
BUILD_LIBRARIES += $(BUILD_LIBZIP)
|
BUILD_LIBRARIES += $(BUILD_LIBZIP)
|
||||||
|
@ -323,7 +323,6 @@ else
|
|||||||
$(JVMCFG):
|
$(JVMCFG):
|
||||||
$(MKDIR) -p $(@D)
|
$(MKDIR) -p $(@D)
|
||||||
$(RM) $(@)
|
$(RM) $(@)
|
||||||
|
|
||||||
# Now check for other permutations
|
# Now check for other permutations
|
||||||
ifeq ($(JVM_VARIANT_SERVER), true)
|
ifeq ($(JVM_VARIANT_SERVER), true)
|
||||||
$(PRINTF) "-server KNOWN\n">>$(@)
|
$(PRINTF) "-server KNOWN\n">>$(@)
|
||||||
|
@ -87,4 +87,3 @@ GENDATA_BFONT_CONFIGS := $(GENDATA_FONT_CONFIG_SRC_FILES:%.properties=$(GENDATA_
|
|||||||
GENDATA_FONT_CONFIG := $(GENDATA_FONT_CONFIGS) $(GENDATA_BFONT_CONFIGS)
|
GENDATA_FONT_CONFIG := $(GENDATA_FONT_CONFIGS) $(GENDATA_BFONT_CONFIGS)
|
||||||
|
|
||||||
###
|
###
|
||||||
|
|
||||||
|
@ -94,7 +94,6 @@ GENSRC_CHARSET_PROVIDER_CMD := $(JDK_TOPDIR)/makefiles/scripts/genCharsetProvide
|
|||||||
$(GENSRC_DST)/StandardCharsets.java: $(JDK_TOPDIR)/src/share/classes/sun/nio/cs/standard-charsets \
|
$(GENSRC_DST)/StandardCharsets.java: $(JDK_TOPDIR)/src/share/classes/sun/nio/cs/standard-charsets \
|
||||||
$(GENSRC_CHARSET_PROVIDER_CMD) \
|
$(GENSRC_CHARSET_PROVIDER_CMD) \
|
||||||
$(GENSRC_TMP)/_the.charsetmapping.dir
|
$(GENSRC_TMP)/_the.charsetmapping.dir
|
||||||
|
|
||||||
NAWK="$(NAWK)" TEMPDIR="$(GENSRC_TMP)" SH="$(SH)" \
|
NAWK="$(NAWK)" TEMPDIR="$(GENSRC_TMP)" SH="$(SH)" \
|
||||||
HASHER="$(TOOL_HASHER)" \
|
HASHER="$(TOOL_HASHER)" \
|
||||||
SCRIPTS="$(JDK_TOPDIR)/makefiles/scripts" \
|
SCRIPTS="$(JDK_TOPDIR)/makefiles/scripts" \
|
||||||
|
@ -128,4 +128,3 @@ $(GENSRC_OSX_ICONS_DST)/AWTIconData.h: $(GENSRC_OSX_ICONS_SRC)
|
|||||||
$(MV) $@.tmp $@
|
$(MV) $@.tmp $@
|
||||||
|
|
||||||
endif
|
endif
|
||||||
|
|
||||||
|
@ -234,7 +234,6 @@ ifeq ($(OPENJDK_TARGET_OS), windows)
|
|||||||
$(AB_GENSRC_DIR)/64bit/com/sun/java/accessibility/AccessBridge.java
|
$(AB_GENSRC_DIR)/64bit/com/sun/java/accessibility/AccessBridge.java
|
||||||
|
|
||||||
endif
|
endif
|
||||||
|
|
||||||
endif
|
endif
|
||||||
endif
|
endif
|
||||||
|
|
||||||
|
@ -119,4 +119,3 @@ ifneq ($(COMPILE_TYPE),cross)
|
|||||||
|
|
||||||
GENSRC_X11WRAPPERS += $(GENSRC_X11WRAPPERS_TMP)/sizes.$(OPENJDK_TARGET_CPU_BITS).verification
|
GENSRC_X11WRAPPERS += $(GENSRC_X11WRAPPERS_TMP)/sizes.$(OPENJDK_TARGET_CPU_BITS).verification
|
||||||
endif
|
endif
|
||||||
|
|
||||||
|
@ -28,4 +28,3 @@ COMPILER 5.8 Sparc 109508-03 x86 109509-03 REQ "For Forte Development 6 upd
|
|||||||
COMPILER 5.8 Sparc 109510-03 x86 109511-03 REQ "For Forte 6.1 Debugger"
|
COMPILER 5.8 Sparc 109510-03 x86 109511-03 REQ "For Forte 6.1 Debugger"
|
||||||
COMPILER 5.8 Sparc 109516-02 x86 109517-02 REQ "For Forte 6.1 Performance Analyzer"
|
COMPILER 5.8 Sparc 109516-02 x86 109517-02 REQ "For Forte 6.1 Performance Analyzer"
|
||||||
COMPILER 5.8 Sparc 110480-01 x86 110481-01 REQ "For Forte TeamWare"
|
COMPILER 5.8 Sparc 110480-01 x86 110481-01 REQ "For Forte TeamWare"
|
||||||
|
|
||||||
|
@ -61,4 +61,3 @@ profile_version_number = $(patsubst $(JDK_OUTPUTDIR)/gen_profile_%/$(VERSION_JAV
|
|||||||
# Function to go from a profile Version.java target to profile name. If not
|
# Function to go from a profile Version.java target to profile name. If not
|
||||||
# a profile version target then we need a number that maps to an empty name
|
# a profile version target then we need a number that maps to an empty name
|
||||||
profile_version_name = $(word $(if $(filter-out $(call profile_version_number, $(1)), $(1)), $(call profile_version_number, $(1)), $(words $(PROFILE_NAMES) extra)), $(PROFILE_NAMES))
|
profile_version_name = $(word $(if $(filter-out $(call profile_version_number, $(1)), $(1)), $(call profile_version_number, $(1)), $(words $(PROFILE_NAMES) extra)), $(PROFILE_NAMES))
|
||||||
|
|
||||||
|
@ -330,4 +330,3 @@ endif
|
|||||||
|
|
||||||
|
|
||||||
endif # profile
|
endif # profile
|
||||||
|
|
||||||
|
@ -42,7 +42,6 @@ $(eval $(call SetupJavaCompilation,BUILD_TOOLS,\
|
|||||||
SETUP := GENERATE_OLDBYTECODE, \
|
SETUP := GENERATE_OLDBYTECODE, \
|
||||||
SRC := $(TOOLS_SRC), \
|
SRC := $(TOOLS_SRC), \
|
||||||
BIN := $(JDK_OUTPUTDIR)/btclasses))
|
BIN := $(JDK_OUTPUTDIR)/btclasses))
|
||||||
|
|
||||||
endif
|
endif
|
||||||
|
|
||||||
$(JDK_OUTPUTDIR)/btclasses/build/tools/generatenimbus/resources/%.template: \
|
$(JDK_OUTPUTDIR)/btclasses/build/tools/generatenimbus/resources/%.template: \
|
||||||
|
@ -3144,5 +3144,3 @@ JDWP "Java(tm) Debug Wire Protocol"
|
|||||||
(Constant INVOKE_NONVIRTUAL = 0x02
|
(Constant INVOKE_NONVIRTUAL = 0x02
|
||||||
"otherwise, normal virtual invoke (instance methods only)")
|
"otherwise, normal virtual invoke (instance methods only)")
|
||||||
)
|
)
|
||||||
|
|
||||||
|
|
||||||
|
@ -43,4 +43,3 @@ jprt_build_debug: debug images
|
|||||||
# Phonies to avoid accidents.
|
# Phonies to avoid accidents.
|
||||||
#
|
#
|
||||||
.PHONY: jprt_build_product jprt_build_fastdebug jprt_build_debug
|
.PHONY: jprt_build_product jprt_build_fastdebug jprt_build_debug
|
||||||
|
|
||||||
|
@ -306,4 +306,3 @@ jprt.make.rule.test.targets=${jprt.make.rule.${jprt.my.test.set}.test.targets}
|
|||||||
|
|
||||||
# Directories to be excluded from the source bundles
|
# Directories to be excluded from the source bundles
|
||||||
jprt.bundle.exclude.src.dirs=build dist webrev
|
jprt.bundle.exclude.src.dirs=build dist webrev
|
||||||
|
|
||||||
|
@ -282,4 +282,3 @@ SUNWprivate_1.1 {
|
|||||||
local:
|
local:
|
||||||
*;
|
*;
|
||||||
};
|
};
|
||||||
|
|
||||||
|
@ -195,4 +195,3 @@ SUNWprivate_1.1 {
|
|||||||
local:
|
local:
|
||||||
*;
|
*;
|
||||||
};
|
};
|
||||||
|
|
||||||
|
@ -314,4 +314,3 @@ SUNWprivate_1.1 {
|
|||||||
local:
|
local:
|
||||||
*;
|
*;
|
||||||
};
|
};
|
||||||
|
|
||||||
|
@ -106,4 +106,3 @@ SUNWprivate_1.1 {
|
|||||||
local:
|
local:
|
||||||
*;
|
*;
|
||||||
};
|
};
|
||||||
|
|
||||||
|
@ -255,4 +255,3 @@ FULL_JRE_JAR_FILES := \
|
|||||||
ext/nashorn.jar \
|
ext/nashorn.jar \
|
||||||
ext/zipfs.jar \
|
ext/zipfs.jar \
|
||||||
jfr.jar
|
jfr.jar
|
||||||
|
|
||||||
|
@ -254,5 +254,3 @@ FULL_JRE_INCLUDE_METAINF_SERVICES := \
|
|||||||
META-INF/services/javax.sound.sampled.spi.MixerProvider \
|
META-INF/services/javax.sound.sampled.spi.MixerProvider \
|
||||||
META-INF/services/sun.java2d.cmm.PCMM \
|
META-INF/services/sun.java2d.cmm.PCMM \
|
||||||
META-INF/services/sun.java2d.pipe.RenderingEngine
|
META-INF/services/sun.java2d.pipe.RenderingEngine
|
||||||
|
|
||||||
|
|
||||||
|
@ -104,6 +104,3 @@ done
|
|||||||
|
|
||||||
$SED -e "s@^#warn .*@// -- This file was mechanically generated: Do not edit! -- //@" \
|
$SED -e "s@^#warn .*@// -- This file was mechanically generated: Do not edit! -- //@" \
|
||||||
-e "s/#LOCALE_LIST#/$JAVA_LOCALES/g" $2 > $3
|
-e "s/#LOCALE_LIST#/$JAVA_LOCALES/g" $2 > $3
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user