Skip to content

Commit 2abe2ff

Browse files
magicusmagicus
committed
8339235: Fix indentation in build system
Reviewed-by: erikj
1 parent bb28b0d commit 2abe2ff

25 files changed

+122
-111
lines changed

‎make/CompileInterimLangtools.gmk‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@ $(BUILDTOOLS_OUTPUTDIR)/gensrc/java.compiler.interim/javax/tools/ToolProvider.ja
6565
$(SED) $(INTERIM_TOOL_PROVIDER_PATTERN) $< > $@
6666

6767
java.compiler.interim_EXTRA_FILES := \
68-
$(BUILDTOOLS_OUTPUTDIR)/gensrc/java.compiler.interim/javax/tools/ToolProvider.java
68+
$(BUILDTOOLS_OUTPUTDIR)/gensrc/java.compiler.interim/javax/tools/ToolProvider.java
6969

7070
TARGETS += $(BUILDTOOLS_OUTPUTDIR)/gensrc/java.compiler.interim/javax/tools/ToolProvider.java
7171

‎make/CompileJavaModules.gmk‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -75,12 +75,12 @@ $(JDK_OUTPUTDIR)/modules/%_zh_HK.properties: $(JDK_OUTPUTDIR)/modules/%_zh_TW.pr
7575

7676
CreateHkTargets = \
7777
$(call FilterExcludedTranslations, \
78-
$(patsubst $(TOPDIR)/src/%, $(JDK_OUTPUTDIR)/modules/%, \
79-
$(subst /share/classes,, \
80-
$(subst _zh_TW,_zh_HK, $(filter %_zh_TW.properties, $1)) \
81-
) \
82-
), \
83-
.properties \
78+
$(patsubst $(TOPDIR)/src/%, $(JDK_OUTPUTDIR)/modules/%, \
79+
$(subst /share/classes,, \
80+
$(subst _zh_TW,_zh_HK, $(filter %_zh_TW.properties, $1)) \
81+
) \
82+
), \
83+
.properties \
8484
)
8585

8686
################################################################################

‎make/InitSupport.gmk‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -205,7 +205,7 @@ ifeq ($(HAS_SPEC),)
205205
ifeq ($$(patsubst !%,,$$(CONF)),)
206206
# A CONF starting with ! means we should negate the search term
207207
matching_confs := $$(strip $$(foreach var, $$(all_confs), \
208-
$$(if $$(findstring $$(subst !,,$$(CONF)), $$(var)), ,$$(var))))
208+
$$(if $$(findstring $$(subst !,,$$(CONF)), $$(var)), ,$$(var))))
209209
else
210210
matching_confs := $$(strip $$(foreach var, $$(all_confs), \
211211
$$(if $$(findstring $$(CONF), $$(var)), $$(var))))

‎make/autoconf/basic_tools.m4‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -129,7 +129,7 @@ AC_DEFUN([BASIC_CHECK_MAKE_VERSION],
129129
if test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.cygwin"; then
130130
MAKE_VERSION_EXPR="-e 4\."
131131
MAKE_REQUIRED_VERSION="4.0"
132-
else
132+
else
133133
MAKE_VERSION_EXPR="-e 3\.8[[12]] -e 4\."
134134
MAKE_REQUIRED_VERSION="3.81"
135135
fi

‎make/autoconf/boot-jdk.m4‎

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -602,11 +602,12 @@ AC_DEFUN([BOOTJDK_SETUP_BUILD_JDK],
602602
BUILD_JDK_FOUND="no"
603603
if test "x$with_build_jdk" != "x"; then
604604
BOOTJDK_CHECK_BUILD_JDK([
605-
if test "x$with_build_jdk" != x; then
606-
BUILD_JDK=$with_build_jdk
607-
BUILD_JDK_FOUND=maybe
608-
AC_MSG_NOTICE([Found potential Build JDK using configure arguments])
609-
fi])
605+
if test "x$with_build_jdk" != x; then
606+
BUILD_JDK=$with_build_jdk
607+
BUILD_JDK_FOUND=maybe
608+
AC_MSG_NOTICE([Found potential Build JDK using configure arguments])
609+
fi
610+
])
610611
EXTERNAL_BUILDJDK=true
611612
else
612613
if test "x$COMPILE_TYPE" = "xcross"; then

‎make/autoconf/flags-ldflags.m4‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -168,9 +168,9 @@ AC_DEFUN([FLAGS_SETUP_LDFLAGS_CPU_DEP],
168168
169169
# MIPS ABI does not support GNU hash style
170170
if test "x${OPENJDK_$1_CPU}" = xmips ||
171-
test "x${OPENJDK_$1_CPU}" = xmipsel ||
172-
test "x${OPENJDK_$1_CPU}" = xmips64 ||
173-
test "x${OPENJDK_$1_CPU}" = xmips64el; then
171+
test "x${OPENJDK_$1_CPU}" = xmipsel ||
172+
test "x${OPENJDK_$1_CPU}" = xmips64 ||
173+
test "x${OPENJDK_$1_CPU}" = xmips64el; then
174174
$1_CPU_LDFLAGS="${$1_CPU_LDFLAGS} -Wl,--hash-style=sysv"
175175
else
176176
$1_CPU_LDFLAGS="${$1_CPU_LDFLAGS} -Wl,--hash-style=gnu"

‎make/autoconf/jdk-options.m4‎

Lines changed: 7 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -235,8 +235,8 @@ AC_DEFUN_ONCE([JDKOPT_SETUP_JDK_OPTIONS],
235235
else
236236
HOTSPOT_OVERRIDE_LIBPATH=${with_jni_libpath}
237237
if test "x$OPENJDK_TARGET_OS" != "xlinux" &&
238-
test "x$OPENJDK_TARGET_OS" != "xbsd" &&
239-
test "x$OPENJDK_TARGET_OS" != "xaix"; then
238+
test "x$OPENJDK_TARGET_OS" != "xbsd" &&
239+
test "x$OPENJDK_TARGET_OS" != "xaix"; then
240240
AC_MSG_RESULT([fail])
241241
AC_MSG_ERROR([Overriding JNI library path is supported only on Linux, BSD and AIX.])
242242
fi
@@ -421,8 +421,8 @@ AC_DEFUN_ONCE([JDKOPT_SETUP_ADDRESS_SANITIZER],
421421
CHECK_AVAILABLE: [
422422
AC_MSG_CHECKING([if AddressSanitizer (asan) is available])
423423
if test "x$TOOLCHAIN_TYPE" = "xgcc" ||
424-
test "x$TOOLCHAIN_TYPE" = "xclang" ||
425-
test "x$TOOLCHAIN_TYPE" = "xmicrosoft"; then
424+
test "x$TOOLCHAIN_TYPE" = "xclang" ||
425+
test "x$TOOLCHAIN_TYPE" = "xmicrosoft"; then
426426
AC_MSG_RESULT([yes])
427427
else
428428
AC_MSG_RESULT([no])
@@ -431,7 +431,7 @@ AC_DEFUN_ONCE([JDKOPT_SETUP_ADDRESS_SANITIZER],
431431
],
432432
IF_ENABLED: [
433433
if test "x$TOOLCHAIN_TYPE" = "xgcc" ||
434-
test "x$TOOLCHAIN_TYPE" = "xclang"; then
434+
test "x$TOOLCHAIN_TYPE" = "xclang"; then
435435
# ASan is simply incompatible with gcc -Wstringop-truncation. See
436436
# https://gcc.gnu.org/bugzilla/show_bug.cgi?id=85650
437437
# It's harmless to be suppressed in clang as well.
@@ -707,9 +707,8 @@ AC_DEFUN([JDKOPT_ALLOW_ABSOLUTE_PATHS_IN_OUTPUT],
707707
[
708708
AC_ARG_ENABLE([absolute-paths-in-output],
709709
[AS_HELP_STRING([--disable-absolute-paths-in-output],
710-
[Set to disable to prevent any absolute paths from the build to end up in
711-
any of the build output. @<:@disabled in release builds, otherwise enabled@:>@])
712-
])
710+
[Set to disable to prevent any absolute paths from the build to end up in
711+
any of the build output. @<:@disabled in release builds, otherwise enabled@:>@])])
713712
714713
AC_MSG_CHECKING([if absolute paths should be allowed in the build output])
715714
if test "x$enable_absolute_paths_in_output" = "xno"; then

‎make/autoconf/jdk-version.m4‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -93,7 +93,7 @@ AC_DEFUN_ONCE([JDKVER_SETUP_JDK_VERSION_NUMBERS],
9393
UTIL_ARG_WITH(NAME: jdk-rc-name, TYPE: string,
9494
DEFAULT: $PRODUCT_NAME $JDK_RC_PLATFORM_NAME,
9595
DESC: [Set JDK RC name. This is used for FileDescription and ProductName
96-
properties of MS Windows binaries.],
96+
properties of MS Windows binaries.],
9797
DEFAULT_DESC: [from branding.conf],
9898
CHECK_VALUE: [UTIL_CHECK_STRING_NON_EMPTY_PRINTABLE])
9999
AC_SUBST(JDK_RC_NAME)
@@ -105,7 +105,7 @@ AC_DEFUN_ONCE([JDKVER_SETUP_JDK_VERSION_NUMBERS],
105105
RESULT: COMPANY_NAME,
106106
DEFAULT: $COMPANY_NAME,
107107
DESC: [Set vendor name. Among others, used to set the 'java.vendor'
108-
and 'java.vm.vendor' system properties.],
108+
and 'java.vm.vendor' system properties.],
109109
DEFAULT_DESC: [from branding.conf],
110110
CHECK_VALUE: [UTIL_CHECK_STRING_NON_EMPTY_PRINTABLE])
111111
AC_SUBST(COMPANY_NAME)

‎make/autoconf/lib-bundled.m4‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -119,7 +119,7 @@ AC_DEFUN_ONCE([LIB_SETUP_GIFLIB],
119119
AC_DEFUN_ONCE([LIB_SETUP_LIBPNG],
120120
[
121121
AC_ARG_WITH(libpng, [AS_HELP_STRING([--with-libpng],
122-
[use libpng from build system or OpenJDK source (system, bundled) @<:@bundled@:>@])])
122+
[use libpng from build system or OpenJDK source (system, bundled) @<:@bundled@:>@])])
123123
124124
PKG_CHECK_MODULES(PNG, libpng, [LIBPNG_FOUND=yes], [LIBPNG_FOUND=no])
125125
AC_MSG_CHECKING([for which libpng to use])

‎make/autoconf/lib-freetype.m4‎

Lines changed: 11 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -73,11 +73,11 @@ AC_DEFUN_ONCE([LIB_SETUP_FREETYPE],
7373
[
7474
AC_ARG_WITH(freetype, [AS_HELP_STRING([--with-freetype],
7575
[specify whether to use 'system' or 'bundled' freetype.
76-
The selected option applies to both build time and run time.
77-
The default behaviour can be platform dependent.
78-
If using 'system' and either the include files or libraries cannot be
79-
located automatically, then additionally specify both using
80-
--with-freetype-include and --with-freetype-lib.])])
76+
The selected option applies to both build time and run time.
77+
The default behaviour can be platform dependent.
78+
If using 'system' and either the include files or libraries cannot be
79+
located automatically, then additionally specify both using
80+
--with-freetype-include and --with-freetype-lib.])])
8181
AC_ARG_WITH(freetype-include, [AS_HELP_STRING([--with-freetype-include],
8282
[specify directory for the freetype include files])])
8383
AC_ARG_WITH(freetype-lib, [AS_HELP_STRING([--with-freetype-lib],
@@ -95,8 +95,10 @@ AC_DEFUN_ONCE([LIB_SETUP_FREETYPE],
9595
FREETYPE_CFLAGS=
9696
FREETYPE_LIBS=
9797
98-
if (test "x$with_freetype_include" = "x" && test "x$with_freetype_lib" != "x") || \
99-
(test "x$with_freetype_include" != "x" && test "x$with_freetype_lib" = "x"); then
98+
if (test "x$with_freetype_include" = "x" && \
99+
test "x$with_freetype_lib" != "x") || \
100+
(test "x$with_freetype_include" != "x" && \
101+
test "x$with_freetype_lib" = "x"); then
100102
AC_MSG_ERROR([Must specify both or neither of --with-freetype-include and --with-freetype-lib])
101103
fi
102104
@@ -126,8 +128,8 @@ AC_DEFUN_ONCE([LIB_SETUP_FREETYPE],
126128
fi
127129
128130
if test "x$FREETYPE_TO_USE" = "xsystem" && \
129-
(test "x$OPENJDK_TARGET_OS" = "xwindows" || \
130-
test "x$OPENJDK_TARGET_OS" = "xmacosx"); then
131+
(test "x$OPENJDK_TARGET_OS" = "xwindows" || \
132+
test "x$OPENJDK_TARGET_OS" = "xmacosx"); then
131133
AC_MSG_ERROR([Only bundled freetype can be specified on Mac and Windows])
132134
fi
133135

0 commit comments

Comments
 (0)