mirrors/JetBrainsRuntime
1
0
Fork 0
mirror of https://github.com/JetBrains/JetBrainsRuntime.git synced 2025-12-06 09:29:38 +01:00
Code Issues Packages Projects Releases Wiki Activity

8284891: Fix typos in build system files

Browse Source 
Reviewed-by: erikj
This commit is contained in:
Magnus Ihse Bursie
2022-04-14 19:33:28 +00:00
parent 48c7549806
commit 160eb2bd39
46 changed files with 72 additions and 72 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
make/CompileCommands.gmk
View File

@@ -29,7 +29,7 @@ include $(SPEC)
include MakeBase.gmk
# When FIXPATH is set, let it process the file to make sure all paths are usable
# by system native tools. The FIXPATH tool assumes arguments preceeded by an @
# by system native tools. The FIXPATH tool assumes arguments preceded by an @
# character points to a text file containing further arguments (similar to a
# linker). It replaces any such arguments with a different temporary filename,
# whose contents has been processed to make any paths native. To obtain a

2
make/CompileDemos.gmk
View File

@@ -104,7 +104,7 @@ define SetupBuildDemoBody
ifneq ($$($1_SRC_SUB_DIR), )
$1_MAIN_SRC := $$($1_SRC_BASE)/$$($1_SRC_SUB_DIR)
else
# for allmost all
# for almost all
$1_MAIN_SRC := $$($1_SRC_BASE)
endif

2
make/GraalBuilderImage.gmk
View File

@@ -23,7 +23,7 @@
# questions.
#
# This makefile creates a jdk image overlayed with statically linked core
# This makefile creates a jdk image overlaid with statically linked core
# libraries.
default: all

2
make/RunTests.gmk
View File

@@ -139,7 +139,7 @@ endif
################################################################################
# Each factor variable comes in 3 variants. The first one is reserved for users
# to use on command line. The other two are for predifined configurations in JDL
# to use on command line. The other two are for predefined configurations in JDL
# and for machine specific configurations respectively.
TEST_JOBS_FACTOR ?= 1
TEST_JOBS_FACTOR_JDL ?= 1

6
make/autoconf/basic.m4
View File

@@ -172,7 +172,7 @@ AC_DEFUN_ONCE([BASIC_SETUP_DEVKIT],
UTIL_PREPEND_TO_PATH([TOOLCHAIN_PATH],$DEVKIT_TOOLCHAIN_PATH)
# If DEVKIT_SYSROOT is set, use that, otherwise try a couple of known
# places for backwards compatiblity.
# places for backwards compatibility.
if test "x$DEVKIT_SYSROOT" != x; then
SYSROOT="$DEVKIT_SYSROOT"
elif test -d "$DEVKIT_ROOT/$host_alias/libc"; then
@@ -193,7 +193,7 @@ AC_DEFUN_ONCE([BASIC_SETUP_DEVKIT],
# You can force the sysroot if the sysroot encoded into the compiler tools
# is not correct.
AC_ARG_WITH(sys-root, [AS_HELP_STRING([--with-sys-root],
[alias for --with-sysroot for backwards compatability])],
[alias for --with-sysroot for backwards compatibility])],
[SYSROOT=$with_sys_root]
)
@@ -496,7 +496,7 @@ AC_DEFUN_ONCE([BASIC_SETUP_DEFAULT_MAKE_TARGET],
AC_DEFUN_ONCE([BASIC_SETUP_DEFAULT_LOG],
[
AC_ARG_WITH(log, [AS_HELP_STRING([--with-log],
[[default vaue for make LOG argument [warn]]])])
[[default value for make LOG argument [warn]]])])
AC_MSG_CHECKING([for default LOG value])
if test "x$with_log" = x; then
DEFAULT_LOG=""

2
make/autoconf/boot-jdk.m4
View File

@@ -27,7 +27,7 @@
# This file handles detection of the Boot JDK. The Boot JDK detection
# process has been developed as a response to solve a complex real-world
# problem. Initially, it was simple, but it has grown as platform after
# platform, idiosyncracy after idiosyncracy has been supported.
# platform, idiosyncrasy after idiosyncrasy has been supported.
#
# The basic idea is this:
# 1) You need an acceptable *) JDK to use as a Boot JDK

2
make/autoconf/build-aux/config.guess vendored
View File

@@ -67,7 +67,7 @@ fi
# Test and fix architecture string on AIX
# On AIX 'config.guess' returns 'powerpc' as architecture but 'powerpc' is
# implicitely handled as 32-bit architecture in 'platform.m4' so we check
# implicitly handled as 32-bit architecture in 'platform.m4' so we check
# for the kernel mode rewrite it to 'powerpc64' if we'Re running in 64-bit mode.
# The check could also be done with `/usr/sbin/prtconf | grep "Kernel Type" | grep "64-bit"`
echo $OUT | grep powerpc-ibm-aix > /dev/null 2> /dev/null

4
make/autoconf/flags-cflags.m4
View File

@@ -221,7 +221,7 @@ AC_DEFUN([FLAGS_SETUP_QUALITY_CHECKS],
;;
slowdebug )
# FIXME: By adding this to C(XX)FLAGS_DEBUG_OPTIONS/JVM_CFLAGS_SYMBOLS it
# get's added conditionally on whether we produce debug symbols or not.
# gets added conditionally on whether we produce debug symbols or not.
# This is most likely not really correct.
# Add runtime stack smashing and undefined behavior checks.
@@ -667,7 +667,7 @@ AC_DEFUN([FLAGS_SETUP_CFLAGS_CPU_DEP],
$1_DEFINES_CPU_JVM="${$1_DEFINES_CPU_JVM} -D_LP64=1"
fi
# toolchain dependend, per-cpu
# toolchain dependent, per-cpu
if test "x$TOOLCHAIN_TYPE" = xmicrosoft; then
if test "x$FLAGS_CPU" = xaarch64; then
$1_DEFINES_CPU_JDK="${$1_DEFINES_CPU_JDK} -D_ARM64_ -Darm64"

2
make/autoconf/flags.m4
View File

@@ -340,7 +340,7 @@ AC_DEFUN([FLAGS_SETUP_TOOLCHAIN_CONTROL],
# Check if @file is supported by gcc
if test "x$TOOLCHAIN_TYPE" = xgcc; then
AC_MSG_CHECKING([if @file is supported by gcc])
# Extra emtpy "" to prevent ECHO from interpreting '--version' as argument
# Extra empty "" to prevent ECHO from interpreting '--version' as argument
$ECHO "" "--version" > command.file
if $CXX @command.file 2>&AS_MESSAGE_LOG_FD >&AS_MESSAGE_LOG_FD; then
AC_MSG_RESULT(yes)

2
make/autoconf/libraries.m4
View File

@@ -149,7 +149,7 @@ AC_DEFUN_ONCE([LIB_SETUP_LIBRARIES],
fi
fi
# Because RISC-V only has word-sized atomics, it requries libatomic where
# Because RISC-V only has word-sized atomics, it requires libatomic where
# other common architectures do not. So link libatomic by default.
if test "x$OPENJDK_TARGET_OS" = xlinux && test "x$OPENJDK_TARGET_CPU" = xriscv64; then
BASIC_JVM_LIBS="$BASIC_JVM_LIBS -latomic"

6
make/autoconf/spec.gmk.in
View File

@@ -38,7 +38,7 @@ CONFIGURE_START_DIR:=@CONFIGURE_START_DIR@
# A self-referential reference to this file.
SPEC:=@SPEC@
# Path to autoconf if overriden by the user, to be used by "make reconfigure"
# Path to autoconf if overridden by the user, to be used by "make reconfigure"
AUTOCONF := @AUTOCONF@
# SPACE and COMMA are defined in MakeBase.gmk, but they are also used in
@@ -148,7 +148,7 @@ ifneq ($(findstring windows.wsl, @OPENJDK_BUILD_OS_ENV@), )
# Tell WSL to convert PATH between linux and windows
export WSLENV := PATH/l
else ifeq (@OPENJDK_BUILD_OS_ENV@, windows.msys2)
# Prohibit msys2 from attemping any path wrangling
# Prohibit msys2 from attempting any path wrangling
export MSYS2_ARG_CONV_EXCL := "*"
endif
@@ -623,7 +623,7 @@ SET_SHARED_LIBRARY_NAME=@SET_SHARED_LIBRARY_NAME@
SHARED_LIBRARY_FLAGS=@SHARED_LIBRARY_FLAGS@
# Set origin using the linker, ie use the relative path to the dependent library to find the dependees.
# Set origin using the linker, ie use the relative path to the dependent library to find the dependencies.
# (Note absence of := assignment, because we do not want to evaluate the macro body here)
SET_SHARED_LIBRARY_ORIGIN=@SET_SHARED_LIBRARY_ORIGIN@
SET_EXECUTABLE_ORIGIN=@SET_EXECUTABLE_ORIGIN@

10
make/autoconf/toolchain.m4
View File

@@ -698,10 +698,10 @@ AC_DEFUN_ONCE([TOOLCHAIN_DETECT_TOOLCHAIN_CORE],
AS="$CC -c"
else
if test "x$OPENJDK_TARGET_CPU_BITS" = "x64"; then
# On 64 bit windows, the assember is "ml64.exe"
# On 64 bit windows, the assembler is "ml64.exe"
UTIL_LOOKUP_TOOLCHAIN_PROGS(AS, ml64)
else
# otherwise, the assember is "ml.exe"
# otherwise, the assembler is "ml.exe"
UTIL_LOOKUP_TOOLCHAIN_PROGS(AS, ml)
fi
fi
@@ -881,13 +881,13 @@ AC_DEFUN_ONCE([TOOLCHAIN_SETUP_BUILD_COMPILERS],
UTIL_REQUIRE_PROGS(BUILD_CC, cl, [$VS_PATH])
UTIL_REQUIRE_PROGS(BUILD_CXX, cl, [$VS_PATH])
# On windows, the assember is "ml.exe". We currently don't need this so
# On windows, the assembler is "ml.exe". We currently don't need this so
# do not require.
if test "x$OPENJDK_BUILD_CPU_BITS" = "x64"; then
# On 64 bit windows, the assember is "ml64.exe"
# On 64 bit windows, the assembler is "ml64.exe"
UTIL_LOOKUP_PROGS(BUILD_AS, ml64, [$VS_PATH])
else
# otherwise the assember is "ml.exe"
# otherwise the assembler is "ml.exe"
UTIL_LOOKUP_PROGS(BUILD_AS, ml, [$VS_PATH])
fi

2
make/autoconf/toolchain_microsoft.m4
View File

@@ -355,7 +355,7 @@ AC_DEFUN([TOOLCHAIN_EXTRACT_VISUAL_STUDIO_ENV],
PATH="$OLDPATH"
if test ! -s $VS_ENV_TMP_DIR/set-vs-env.sh; then
AC_MSG_NOTICE([Could not succesfully extract the environment variables needed for the VS setup.])
AC_MSG_NOTICE([Could not successfully extract the environment variables needed for the VS setup.])
AC_MSG_NOTICE([Try setting --with-tools-dir to the VC/bin directory within the VS installation.])
AC_MSG_NOTICE([To analyze the problem, see extract-vs-env.log and extract-vs-env.bat in])
AC_MSG_NOTICE([$VS_ENV_TMP_DIR.])

6
make/common/JarArchive.gmk
View File

@@ -118,7 +118,7 @@ define SetupJarArchiveBody
$1_JARINDEX = true
endif
# When this macro is run in the same makefile as the java compilation, dependencies are
# transfered in make variables. When the macro is run in a different makefile than the
# transferred in make variables. When the macro is run in a different makefile than the
# java compilation, the dependencies need to be found in the filesystem.
$1_ORIG_DEPS := $$($1_DEPENDENCIES)
ifeq ($$($1_DEPENDENCIES), )
@@ -150,9 +150,9 @@ define SetupJarArchiveBody
# Capture extra files is the same for both CAPTURE_CONTENTS and SCAPTURE_CONTENTS so
# only define it once to avoid duplication.
# The list of extra files might be long, so need to use ListPathsSafely to print
# them out to a separte file. Then process the contents of that file to rewrite
# them out to a separate file. Then process the contents of that file to rewrite
# into -C <dir> <file> lines.
# The EXTRA_FILES_RESOLVED varible must be set in the macro so that it's evaluated
# The EXTRA_FILES_RESOLVED variable must be set in the macro so that it's evaluated
# in the recipe when the files are guaranteed to exist.
$1_CAPTURE_EXTRA_FILES=\
$$(eval $1_EXTRA_FILES_RESOLVED:=$$(call DoubleDollar, \

4
make/common/JavaCompilation.gmk
View File

@@ -99,7 +99,7 @@ define add_file_to_clean
$2_TARGET:=$2
# Remove the source prefix.
$$(foreach i,$$($1_SRC),$$(eval $$(call remove_string,$$i,$2_TARGET)))
# Now we can setup the depency that will trigger the copying.
# Now we can setup the dependency that will trigger the copying.
# To allow for automatic overrides, do not create a rule for a target file that
# already has one
ifneq ($$($1_CLEAN_$$($2_TARGET)), 1)
@@ -161,7 +161,7 @@ endef
# EXTRA_FILES:=List of extra source files to include in compilation. Can be used to
# specify files that need to be generated by other rules first.
# HEADERS:=path to directory where all generated c-headers are written.
# DEPENDS:=Extra dependecy
# DEPENDS:=Extra dependency
# KEEP_DUPS:=Do not remove duplicate file names from different source roots.
# FAIL_NO_SRC:=Set to false to not fail the build if no source files are found,
# default is true.

2
make/common/MakeIO.gmk
View File

@@ -37,7 +37,7 @@ endif
################################################################################
# ListPathsSafely can be used to print command parameters to a file. This is
# typically done if the command line lenght risk being too long for the
# typically done if the command line length risk being too long for the
# OS/shell. In later make versions, the file function can be used for this
# purpose. For earlier versions, a more complex implementation is provided.
#

6
make/common/NativeCompilation.gmk
View File

@@ -61,7 +61,7 @@ endef
################################################################################
# Creates a recipe that creates a compile_commands.json fragment. Remove any
# occurences of FIXPATH programs from the command to show the actual invocation.
# occurrences of FIXPATH programs from the command to show the actual invocation.
#
# Param 1: Name of file to create
# Param 2: Working directory
@@ -236,7 +236,7 @@ ifeq ($(ALLOW_ABSOLUTE_PATHS_IN_OUTPUT)-$(FILE_MACRO_CFLAGS), false-)
# add WORKSPACE_ROOT to any line not starting with /, while allowing for
# leading spaces. There may also be multiple entries on the same line, so start
# with splitting such lines.
# Non GNU sed (BSD on macosx) cannot substitue in literal \n using regex.
# Non GNU sed (BSD on macosx) cannot substitute in literal \n using regex.
# Instead use a bash escaped literal newline. To avoid having unmatched quotes
# ruin the ability for an editor to properly syntax highlight this file, define
# that newline sequence as a separate variable and add the closing quote behind
@@ -661,7 +661,7 @@ define SetupNativeCompilationBody
ifneq ($$($1_SUPERFLUOUS_OBJS), )
$$(shell $(RM) -f $$($1_SUPERFLUOUS_OBJS))
endif
# Sort to remove dupliates and provide a reproducable order on the input files to the linker.
# Sort to remove duplicates and provide a reproducible order on the input files to the linker.
$1_ALL_OBJS := $$(sort $$($1_EXPECTED_OBJS) $$($1_EXTRA_OBJECT_FILES))
# Pickup extra OPENJDK_TARGET_OS_TYPE, OPENJDK_TARGET_OS, and/or OPENJDK_TARGET_OS plus

2
make/common/TextFileProcessing.gmk
View File

@@ -65,7 +65,7 @@ endef
# SOURCE_DIRS)
# EXCLUDE_FILES exclude files matching these patterns (used only with
# SOURCE_DIRS)
# INCLUDES replace the occurances of a pattern with the contents of a file;
# INCLUDES replace the occurrences of a pattern with the contents of a file;
# one or more such include pattern, using the syntax:
# PLACEHOLDER => FILE_TO_INCLUDE ; ...
# Each PLACEHOLDER must be on a single, otherwise empty line (whitespace

2
make/common/Utils.gmk
View File

@@ -146,7 +146,7 @@ RelativePathHelper = \
$(if $($2_dotdots), $($2_dotdots), .))
################################################################################
# Filter out duplicate sub strings while preserving order. Keeps the first occurance.
# Filter out duplicate sub strings while preserving order. Keeps the first occurrence.
uniq = \
$(strip $(if $1,$(firstword $1) $(call uniq,$(filter-out $(firstword $1),$1))))

2
make/common/ZipArchive.gmk
View File

@@ -139,7 +139,7 @@ define SetupZipArchiveBody
# Now $1_ALL_SRCS should contain all sources that are going to be put into the zip.
# I.e. the zip -i and -x options should match the filtering done in the makefile.
# Explicitly excluded files can be given with absolute path. The patsubst solution
# isn't perfect but the likelyhood of an absolute path to match something in a src
# isn't perfect but the likelihood of an absolute path to match something in a src
# dir is very small.
# If zip has nothing to do, it returns 12 and would fail the build. Check for 12
# and only fail if it's not.

2
make/common/modules/GensrcProperties.gmk
View File

@@ -61,7 +61,7 @@ endef
# EXTRA_FILES Also include these specifically named files
# EXCLUDE Exclude files matching this pattern.
# CLASS The super class for the generated classes.
# TYPE Wether to use "langtools" or normal compiler.
# TYPE Whether to use "langtools" or normal compiler.
# MODULE_PATH_ROOT Module path root, defaults to $(TOPDIR)/src.
# KEEP_ALL_TRANSLATIONS Set to true to skip filtering of excluded translations.
SetupCompileProperties = $(NamedParamsMacroTemplate)

8
make/conf/jib-profiles.js
View File

@@ -244,7 +244,7 @@ var getJibProfilesCommon = function (input, data) {
"linux-aarch64", "linux-arm32", "linux-ppc64le", "linux-s390x"
];
// These are the base setttings for all the main build profiles.
// These are the base settings for all the main build profiles.
common.main_profile_base = {
dependencies: ["boot_jdk", "gnumake", "jtreg", "jib", "autoconf", "jmh", "jcov"],
default_make_targets: ["product-bundles", "test-bundles", "static-libs-bundles"],
@@ -620,7 +620,7 @@ var getJibProfilesProfiles = function (input, common, data) {
});
// Define a profile with precompiled headers disabled. This is just used for
// verfication of this build configuration.
// verification of this build configuration.
var noPchProfiles = {
"linux-x64-debug-nopch": {
target_os: "linux",
@@ -1022,10 +1022,10 @@ var getJibProfilesProfiles = function (input, common, data) {
// get src.full as a dependency, and define the work_dir (where make gets
// run) to be in the src.full install path. By running in the install path,
// the same cached installation of the full src can be reused for multiple
// test tasks. Care must however be taken not to polute that work dir by
// test tasks. Care must however be taken not to pollute that work dir by
// setting the appropriate make variables to control output directories.
//
// Use the existance of the top level README.md as indication of if this is
// Use the existence of the top level README.md as indication of if this is
// the full source or just src.conf.
if (!new java.io.File(__DIR__, "../../README.md").exists()) {
var runTestPrebuiltSrcFullExtra = {

2
make/devkit/createMacosxDevkit.sh
View File

@@ -62,7 +62,7 @@ mkdir -p $DEVKIT_ROOT
################################################################################
# Copy the relevant parts of Xcode.app, removing things that are both big and
# unecessary for our purposes, without building an impossibly long exclude list.
# unnecessary for our purposes, without building an impossibly long exclude list.
EXCLUDE_DIRS=" \
Contents/_CodeSignature \
Contents/Applications \

2
make/hotspot/lib/JvmMapfile.gmk
View File

@@ -78,7 +78,7 @@ else ifeq ($(call isTargetOs, macosx), true)
}'
# NOTE: The script is from the old build. It is broken and finds no symbols.
# The script below might be what was intended, but it failes to link with tons
# The script below might be what was intended, but it fails to link with tons
# of 'cannot export hidden symbol vtable for X'.
# '{ if ($$1 ~ /^__ZTV/ || $$1 ~ /^_gHotSpotVM/) print substr($$1, 2) }'
else ifeq ($(call isTargetOs, aix), true)

2
make/ide/netbeans/langtools/README
View File

@@ -32,7 +32,7 @@ name of a tool to execute.
As an alternative, you can focus on a single tool. When you do
this, you will still see all the source code for all the tools,
but the various Ant targets will now be focussed on the selected tool.
but the various Ant targets will now be focused on the selected tool.
To focus on a tool, bring up the context menu on the "langtools"
project (i.e. right-click on the project) and select "Select Tool".
This brings up a dialog which allows you to specify which tool you

2
make/ide/netbeans/langtools/build.xml
View File

@@ -230,7 +230,7 @@
</macrodef>
</target>
<!-- Macro to start the debugger and set a property containg the args needed by the run task -->
<!-- Macro to start the debugger and set a property containing the args needed by the run task -->
<target name="-def-start-debugger" if="netbeans.home">
<macrodef name="start-debugger">
<attribute name="jpda.jvmargs.property" default="jpda.jvmargs"/>

2
make/ide/visualstudio/hotspot/CreateVSProject.gmk
View File

@@ -33,7 +33,7 @@ include Execute.gmk
ifeq ($(call isTargetOs, windows), true)
# The next part is a bit hacky. We include the CompileJvm.gmk to be
# able to extact flags, but we do not wish to execute the rules.
# able to extract flags, but we do not wish to execute the rules.
# Use server as base for defines and includes
JVM_VARIANT=server

4
make/ide/visualstudio/hotspot/src/classes/build/tools/projectcreator/FileTreeCreatorVC10.java
View File

@@ -96,7 +96,7 @@ public class FileTreeCreatorVC10 extends FileTreeCreator {
cfg.collectRelevantVectors(rv, "AdditionalFile");
for(String addFile : rv) {
if (addFile.equals(fileName)) {
// supress any ignore
// suppress any ignore
// TODO - may need some adjustments
if (file.toAbsolutePath().toString().contains(cfg.get("Flavour"))) {
currentFileAttr.removeFromIgnored(cfg);
@@ -154,7 +154,7 @@ public class FileTreeCreatorVC10 extends FileTreeCreator {
newAttr.setIgnore(cfg);
}
// Hide is always on all configs. And additional files are never hiddden
// Hide is always on all configs. And additional files are never hidden
if (cfg.matchesHidePath(path.toAbsolutePath().toString())) {
hide = true;
break;

2
make/ide/visualstudio/hotspot/src/classes/build/tools/projectcreator/WinGammaPlatformVC10.java
View File

@@ -244,7 +244,7 @@ public class WinGammaPlatformVC10 extends WinGammaPlatform {
}
void writeFiles(Vector<BuildConfig> allConfigs, String projDir) {
// This code assummes there are no config specific includes.
// This code assumes there are no config specific includes.
startTag("ItemGroup");
String sourceBase = BuildConfig.getFieldString(null, "SourceBase");

2
make/jdk/src/classes/build/tools/charsetmapping/HKSCS.java
View File

@@ -104,7 +104,7 @@ public class HKSCS {
boolean[] b2cBmp = new boolean[0x100];
boolean[] b2cSupp = new boolean[0x100];
// pua should be in range of e000-f8ff. Expand
// it to 0xf93b becase the hkscs2001.c2b has
// it to 0xf93b because the hkscs2001.c2b has
// the f920-f93b filled
//char[] pua = new char[0xF8FF - 0xE000 + 1];
char[] pua = new char[0xF93b - 0xE000 + 1];

2
make/jdk/src/classes/build/tools/dtdbuilder/DTDParser.java
View File

@@ -812,7 +812,7 @@ class DTDParser implements DTDConstants {
}
/**
* Parse a section of the input upto EOF or ']'.
* Parse a section of the input up to EOF or ']'.
*/
@SuppressWarnings("fallthrough")
void parseSection() throws IOException {

2
make/jdk/src/classes/build/tools/fixuppandoc/Main.java
View File

@@ -393,7 +393,7 @@ public class Main {
case "tr":
case "td":
case "th":
// ending any of these elements implicity or explicitly ends the
// ending any of these elements implicitly or explicitly ends the
// current cell
table.endCell();
break;

2
make/jdk/src/classes/build/tools/generatebreakiteratordata/CharSet.java
View File

@@ -174,7 +174,7 @@ class CharSet {
}
// use charSetForCategory() to parse the text in the colons,
// and either add or substract the result from our running
// and either add or subtract the result from our running
// result depending on whether the :: expression was
// preceded by a ^
if (!haveTilde) {

6
make/jdk/src/classes/build/tools/generatebreakiteratordata/RuleBasedBreakIteratorBuilder.java
View File

@@ -878,7 +878,7 @@ class RuleBasedBreakIteratorBuilder {
// It will not always work right when nested in parentheses or braces (although
// sometimes it will). It also will not work right if the group of repeating
// characters and the group of characters that follows overlap partially
// (e.g., "[a-g]*?[e-j]"). None of these capabilites was deemed necessary for
// (e.g., "[a-g]*?[e-j]"). None of these capabilities was deemed necessary for
// describing breaking rules we know about, so we left them out for
// expeditiousness.
// - Rules such as "[a-z]*?abc;" will be treated the same as "[a-z]*?aa*bc;"--
@@ -998,7 +998,7 @@ class RuleBasedBreakIteratorBuilder {
if (pendingChars.length() != 0) {
// if the expression is followed by an asterisk, then push a copy
// of the current desicion point list onto the stack (this is
// of the current decision point list onto the stack (this is
// the same thing we do on an opening brace)
if (p + 1 < rule.length() && rule.charAt(p + 1) == '*') {
@SuppressWarnings("unchecked")
@@ -1287,7 +1287,7 @@ class RuleBasedBreakIteratorBuilder {
* @param rows The list of rows that need updating (the decision point list)
* @param pendingChars A character category list, encoded in a String. This is the
* list of the columns that need updating.
* @param newValue Update the cells specfied above to contain this value
* @param newValue Update the cells specified above to contain this value
*/
private void updateStateTable(Vector<Integer> rows,
String pendingChars,

2
make/jdk/src/classes/build/tools/generatecharacter/GenerateCharacter.java
View File

@@ -340,7 +340,7 @@ public class GenerateCharacter {
++codePoint;
}
else {
System.out.println("An error has occured during spec mapping.");
System.out.println("An error has occurred during spec mapping.");
System.exit(0);
}
}

2
make/jdk/src/classes/build/tools/generatecharacter/UnicodeSpec.java
View File

@@ -569,7 +569,7 @@ public class UnicodeSpec {
int codePoint; // the characters UTF-32 code value
String name; // the ASCII name
byte generalCategory; // general category, available via Characte.getType()
byte generalCategory; // general category, available via Character.getType()
byte bidiCategory; // available via Character.getBidiType()
int combiningClass; // not used in Character
String decomposition; // not used in Character

6
make/jdk/src/classes/build/tools/generatenimbus/PainterGenerator.java
View File

@@ -60,7 +60,7 @@ public class PainterGenerator {
private static final boolean debug = false;
//a handful of counters, incremented whenever the associated object type is encounted.
//a handful of counters, incremented whenever the associated object type is encountered.
//These counters form the basis of the field and method suffixes.
//These are all 1 based, because I felt like it :-)
private int colorCounter = 1;
@@ -536,10 +536,10 @@ public class PainterGenerator {
}
index++;
}
// Check boundry conditions
// Check boundary conditions
for (int i = 1; i < fractions.length; i++) {
//to avoid an error with LinearGradientPaint where two fractions
//are identical, bump up the fraction value by a miniscule amount
//are identical, bump up the fraction value by a minuscule amount
//if it is identical to the previous one
//NOTE: The <= is critical because the previous value may already
//have been bumped up

2
make/jdk/src/classes/build/tools/jdwpgen/Parse.java
View File

@@ -106,7 +106,7 @@ class Parse {
Node item() throws IOException {
switch (izer.nextToken()) {
case StreamTokenizer.TT_EOF:
error("Unexpect end-of-file");
error("Unexpected end-of-file");
return null;
case StreamTokenizer.TT_WORD: {

2
make/jdk/src/classes/build/tools/tzdb/TzdbZoneRulesCompiler.java
View File

@@ -298,7 +298,7 @@ public final class TzdbZoneRulesCompiler {
private boolean verbose;
/**
* private contructor
* private constructor
*/
private TzdbZoneRulesCompiler() {}

8
make/jdk/src/classes/build/tools/x11wrappergen/WrapperGenerator.java
View File

@@ -135,7 +135,7 @@ public class WrapperGenerator {
type = TYPE_ARRAY;
else if (str.equals("ulong"))
type = TYPE_ULONG;
else throw new IllegalArgumentException("Uknown type string: " + str);
else throw new IllegalArgumentException("Unknown type string: " + str);
return type;
}
@@ -321,7 +321,7 @@ public class WrapperGenerator {
else if (access.equals("Short")) return 2;
else if (access.equals("ULong")) return 8;
else if (access.equals("UInt")) return 4;
else throw new IllegalArgumentException("Unknow access type: " + access);
else throw new IllegalArgumentException("Unknown access type: " + access);
}
String getJavaConversion(String offset, String value) {
@@ -440,7 +440,7 @@ public class WrapperGenerator {
return "Long";
case TYPE_ULONG:
return "ULong";
default: throw new IllegalArgumentException("Uknown type");
default: throw new IllegalArgumentException("Unknown type");
}
}
public int getOffset()
@@ -468,7 +468,7 @@ public class WrapperGenerator {
/**
* Construct new structured type.
* Description is used for name and type definition and has the following format:
* structName [ '[' base classe ']' ] [ '{' interfaces '}' ] [ '|' javaClassName ]
* structName [ '[' base class ']' ] [ '{' interfaces '}' ] [ '|' javaClassName ]
*/
public StructType(String _desc)
{

2
make/langtools/build.xml
View File

@@ -109,7 +109,7 @@
<os family="windows"/>
</condition>
<!-- Standard property values, if not overriden by earlier settings. -->
<!-- Standard property values, if not overridden by earlier settings. -->
<property file="${make.dir}/build.properties"/>
<condition property="langtools.jdk.home" value="${jdk.home}">

2
make/langtools/src/classes/build/tools/symbolgenerator/JavadocElementList.java
View File

@@ -101,7 +101,7 @@ public class JavadocElementList {
throw new IllegalStateException("Missing: " + current);
}
//use the internal structure to avoid unnecesarily completing the symbol using the UsesProvidesVisitor:
//use the internal structure to avoid unnecessarily completing the symbol using the UsesProvidesVisitor:
modulesAndExports.put(mod.getQualifiedName().toString(),
mod.exports
.stream()

2
make/langtools/src/classes/build/tools/symbolgenerator/TransitiveDependencies.java
View File

@@ -97,7 +97,7 @@ public class TransitiveDependencies {
throw new IllegalStateException("Missing: " + current);
}
//use the internal structure to avoid unnecesarily completing the symbol using the UsesProvidesVisitor:
//use the internal structure to avoid unnecessarily completing the symbol using the UsesProvidesVisitor:
for (RequiresDirective rd : mod.requires) {
if (rd.isTransitive()) {
todo.offerLast(rd.getDependency().getQualifiedName().toString());

4
make/modules/java.base/gensrc/GensrcLocaleData.gmk
View File

@@ -75,7 +75,7 @@ SED_BASEARGS += -e 's/$(HASH)Lang$(HASH)/Base/' \
SED_NONBASEARGS += -e 's/$(HASH)Lang$(HASH)/NonBase/' \
-e 's/$(HASH)Package$(HASH)/sun.util.resources.provider/'
# This macro creates a sed expression that substitues for example:
# This macro creates a sed expression that substitutes for example:
# #FormatData_Locales# with: en-US locales.
define CaptureLocale
$1_LOCALES := $$(subst _,-,$$(filter-out $1, $$(subst $1_,,$$(filter $1_%, $(LOCALE_RESOURCES)))))
@@ -89,7 +89,7 @@ define CaptureLocale
$1_NON_BASE_LOCALES := $$(subst zh-MO,zh-MO$$(SPACE)zh-Hant-MO, $$($1_NON_BASE_LOCALES))
$1_NON_BASE_LOCALES := $$(subst zh-TW,zh-TW$$(SPACE)zh-Hant-TW, $$($1_NON_BASE_LOCALES))
# Adding implict locales nb nn-NO and nb-NO
# Adding implicit locales nb nn-NO and nb-NO
$1_NON_BASE_LOCALES += nb nn-NO nb-NO
$1_NON_BASE_LOCALES := $$(sort $$($1_NON_BASE_LOCALES))

2
make/scripts/compare.sh
View File

@@ -1122,7 +1122,7 @@ if [ -z "$1" ] || [ "$1" = "-h" ] || [ "$1" = "-?" ] || [ "$1" = "/h" ] || [ "$1
echo "-names Compare the file names and directory structure"
echo "-perms Compare the permission bits on all files and directories"
echo "-types Compare the output of the file command on all files"
echo "-general Compare the files not convered by the specialized comparisons"
echo "-general Compare the files not covered by the specialized comparisons"
echo "-zips Compare the contents of all zip files and files in them"
echo "-zips-names Compare the file names inside all zip files"
echo "-jars Compare the contents of all jar files"

2
make/scripts/fixpath.sh
View File

@@ -339,7 +339,7 @@ function convert_path() {
fi
}
# Treat $1 as name of a file containg paths. Convert those paths to Windows style,
# Treat $1 as name of a file containing paths. Convert those paths to Windows style,
# in a new temporary file, and return a string "@<temp file>" pointing to that
# new file.
function convert_at_file() {