diff --git a/doc/building.html b/doc/building.html
index d6f7b5a8c19dd229ae108f9f3decc9a16f5b3a88..e6ba2bb50b4021f4360540727354f19db144d087 100644
--- a/doc/building.html
+++ b/doc/building.html
@@ -369,10 +369,10 @@ CC: Sun C++ 5.13 SunOS_i386 151846-10 2015/10/30
On Linux you can also get a JDK from the Linux distribution. On apt-based distros (like Debian and Ubuntu), sudo apt-get install openjdk-<VERSION>-jdk
is typically enough to install a JDK <VERSION>. On rpm-based distros (like Fedora and Red Hat), try sudo yum install java-<VERSION>-openjdk-devel
.
External Library Requirements
Different platforms require different external libraries. In general, libraries are not optional - that is, they are either required or not used.
-If a required library is not detected by configure
, you need to provide the path to it. There are two forms of the configure
arguments to point to an external library: --with-<LIB>=<path>
or --with-<LIB>-include=<path to include> --with-<LIB>-lib=<path to lib>
. The first variant is more concise, but require the include files an library files to reside in a default hierarchy under this directory. In most cases, it works fine.
+If a required library is not detected by configure
, you need to provide the path to it. There are two forms of the configure
arguments to point to an external library: --with-<LIB>=<path>
or --with-<LIB>-include=<path to include> --with-<LIB>-lib=<path to lib>
. The first variant is more concise, but require the include files and library files to reside in a default hierarchy under this directory. In most cases, it works fine.
As a fallback, the second version allows you to point to the include directory and the lib directory separately.
FreeType
-FreeType2 from The FreeType Project is not required on any platform. The exception is on Unix-based platforms when configuring such that the build artifacts will reference a system installed library, rather than bundling the JDK’s own copy.
+FreeType2 from The FreeType Project is not required on any platform. The exception is on Unix-based platforms when configuring such that the build artifacts will reference a system installed library, rather than bundling the JDK's own copy.
- To install on an apt-based Linux, try running
sudo apt-get install libfreetype6-dev
.
- To install on an rpm-based Linux, try running
sudo yum install freetype-devel
.
@@ -433,7 +433,7 @@ CC: Sun C++ 5.13 SunOS_i386 151846-10 2015/10/30
To build the JDK, you need a "configuration", which consists of a directory where to store the build output, coupled with information about the platform, the specific build machine, and choices that affect how the JDK is built.
The configuration is created by the configure
script. The basic invocation of the configure
script looks like this:
bash configure [options]
-This will create an output directory containing the configuration and setup an area for the build result. This directory typically looks like build/linux-x64-normal-server-release
, but the actual name depends on your specific configuration. (It can also be set directly, see Using Multiple Configurations). This directory is referred to as $BUILD
in this documentation.
+This will create an output directory containing the configuration and setup an area for the build result. This directory typically looks like build/linux-x64-server-release
, but the actual name depends on your specific configuration. (It can also be set directly, see Using Multiple Configurations). This directory is referred to as $BUILD
in this documentation.
configure
will try to figure out what system you are running on and where all necessary build components are. If you have all prerequisites for building installed, it should find everything. If it fails to detect any component automatically, it will exit and inform you about the problem.
Some command line examples:
diff --git a/doc/building.md b/doc/building.md
index e5990a76300bb29d21549751df376b9959e3e197..e37c351938feaa967602c37b451645efb60a4fcc 100644
--- a/doc/building.md
+++ b/doc/building.md
@@ -436,8 +436,8 @@ If a required library is not detected by `configure`, you need to provide the
path to it. There are two forms of the `configure` arguments to point to an
external library: `--with-=` or `--with--include= --with--lib=`. The first variant is more concise,
-but require the include files an library files to reside in a default hierarchy
-under this directory. In most cases, it works fine.
+but require the include files and library files to reside in a default
+hierarchy under this directory. In most cases, it works fine.
As a fallback, the second version allows you to point to the include directory
and the lib directory separately.
@@ -447,7 +447,7 @@ and the lib directory separately.
FreeType2 from [The FreeType Project](http://www.freetype.org/) is not required
on any platform. The exception is on Unix-based platforms when configuring such
that the build artifacts will reference a system installed library,
-rather than bundling the JDK’s own copy.
+rather than bundling the JDK's own copy.
* To install on an apt-based Linux, try running `sudo apt-get install
libfreetype6-dev`.
@@ -586,8 +586,8 @@ bash configure [options]
This will create an output directory containing the configuration and setup an
area for the build result. This directory typically looks like
-`build/linux-x64-normal-server-release`, but the actual name depends on your
-specific configuration. (It can also be set directly, see [Using Multiple
+`build/linux-x64-server-release`, but the actual name depends on your specific
+configuration. (It can also be set directly, see [Using Multiple
Configurations](#using-multiple-configurations)). This directory is referred to
as `$BUILD` in this documentation.
diff --git a/make/Main.gmk b/make/Main.gmk
index f84d69660675592c8a53edb665b0d569945257d1..db07ca0545b4da20d233ee427883d007b498264d 100644
--- a/make/Main.gmk
+++ b/make/Main.gmk
@@ -80,7 +80,7 @@ ifneq ($(CREATING_BUILDJDK), true)
interim-cldrconverter:
+($(CD) $(TOPDIR)/make && $(MAKE) $(MAKE_ARGS) -f CopyInterimCLDRConverter.gmk)
-
+
interim-tzdb:
+($(CD) $(TOPDIR)/make && $(MAKE) $(MAKE_ARGS) -f CopyInterimTZDB.gmk)
@@ -140,7 +140,7 @@ ifneq ($(CREATING_BUILDJDK), true)
define DeclareModuleInfoRecipe
$1-gensrc-moduleinfo:
+($(CD) $(TOPDIR)/make && $(MAKE) $(MAKE_ARGS) \
- -f GensrcModuleInfo.gmk MODULE=$1)
+ -f gensrc/GensrcModuleInfo.gmk MODULE=$1)
$1-gensrc: $1-gensrc-moduleinfo
endef
diff --git a/make/UpdateBuildDocs.gmk b/make/UpdateBuildDocs.gmk
index 6d84690c9363677206b7220c51243605fe783a07..163b8ce2fcd131cebbf1dc842937f65edc999c70 100644
--- a/make/UpdateBuildDocs.gmk
+++ b/make/UpdateBuildDocs.gmk
@@ -1,5 +1,5 @@
#
-# Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2017, 2019, Oracle and/or its affiliates. All rights reserved.
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
#
# This code is free software; you can redistribute it and/or modify it
@@ -45,29 +45,13 @@ GLOBAL_SPECS_DEFAULT_CSS_FILE := $(TOPDIR)/make/data/docs-resources/resources/jd
DOCS_DIR := $(TOPDIR)/doc
-$(eval $(call SetupProcessMarkdown, building, \
- FILES := $(DOCS_DIR)/building.md, \
+$(eval $(call SetupProcessMarkdown, md_docs, \
+ FILES := $(call FindFiles, $(DOCS_DIR), *.md), \
DEST := $(DOCS_DIR), \
CSS := $(GLOBAL_SPECS_DEFAULT_CSS_FILE), \
OPTIONS := --toc, \
))
-TARGETS += $(building)
-
-$(eval $(call SetupProcessMarkdown, testing, \
- FILES := $(DOCS_DIR)/testing.md, \
- DEST := $(DOCS_DIR), \
- CSS := $(GLOBAL_SPECS_DEFAULT_CSS_FILE), \
- OPTIONS := --toc, \
-))
-TARGETS += $(testing)
-
-$(eval $(call SetupProcessMarkdown, ide, \
- FILES := $(DOCS_DIR)/ide.md, \
- DEST := $(DOCS_DIR), \
- CSS := $(GLOBAL_SPECS_DEFAULT_CSS_FILE), \
- OPTIONS := --toc, \
-))
-TARGETS += $(ide)
+TARGETS += $(md_docs)
################################################################################
diff --git a/make/autoconf/configure.ac b/make/autoconf/configure.ac
index 2b99cf12d85c87597f3beedde87f4c784ba18de4..708c1a906b64e5ee7f646f9e48f253dc7da75b69 100644
--- a/make/autoconf/configure.ac
+++ b/make/autoconf/configure.ac
@@ -1,5 +1,5 @@
-SRC#
-# Copyright (c) 2011, 2018, Oracle and/or its affiliates. All rights reserved.
+#
+# Copyright (c) 2011, 2019, Oracle and/or its affiliates. All rights reserved.
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
#
# This code is free software; you can redistribute it and/or modify it
diff --git a/make/common/JavaCompilation.gmk b/make/common/JavaCompilation.gmk
index 1664cc82ea0e1f204c9d35d93fbf124af467aeb5..aed23b16c381dfddb2ded2c6104f225aa7d06b03 100644
--- a/make/common/JavaCompilation.gmk
+++ b/make/common/JavaCompilation.gmk
@@ -221,7 +221,7 @@ define SetupJavaCompilationBody
) \
)
$$(call MakeDir,$$($1_BIN))
- # Order src files according to the order of the src dirs. Correct odering is
+ # Order src files according to the order of the src dirs. Correct ordering is
# needed for correct overriding between different source roots.
$1_ALL_SRC_RAW := $$(call FindFiles, $$($1_SRC))
$1_ALL_SRCS := $$($1_EXTRA_FILES) \
diff --git a/make/GensrcModuleInfo.gmk b/make/gensrc/GensrcModuleInfo.gmk
similarity index 100%
rename from make/GensrcModuleInfo.gmk
rename to make/gensrc/GensrcModuleInfo.gmk