openjdk/jdk9u
1
0
Fork 0
mirror of https://github.com/openjdk/jdk9u.git synced 2025-12-11 03:01:30 -06:00
Code Issues Packages Projects Releases Wiki Activity

Merge

Browse Source
This commit is contained in:
J. Duke 2021-02-05 12:06:09 -08:00
commit 5226be0a26
14 changed files with 1359 additions and 285 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
.hgtags-top-repo
View File

@ -417,9 +417,41 @@ b25838a28195f4b6dab34668411eedd2d366a16c jdk-9+169
2c25fc24103251f9711a1c280c31e1e41016d90f jdk-9+172 2c25fc24103251f9711a1c280c31e1e41016d90f jdk-9+172
88d7fd969e7df0e07a53b201cfd29393ca33ede9 jdk-9+173 88d7fd969e7df0e07a53b201cfd29393ca33ede9 jdk-9+173
5466f409346e0446ee9a6daeb7f5d75c8fc76823 jdk-9+174 5466f409346e0446ee9a6daeb7f5d75c8fc76823 jdk-9+174
023f93e511bae768203c33bb8681f82ee75014da jdk-9.0.1+00
023f93e511bae768203c33bb8681f82ee75014da jdk-9.0.3+00
8f7227c6012b0051ea4e0bcee040c627bf699b88 jdk-9+175 8f7227c6012b0051ea4e0bcee040c627bf699b88 jdk-9+175
84777531d994ef70163d35078ec9c4127f2eadb5 jdk-9+176 84777531d994ef70163d35078ec9c4127f2eadb5 jdk-9+176
a4371edb589c60db01142e45c317adb9ccbcb083 jdk-9+177 a4371edb589c60db01142e45c317adb9ccbcb083 jdk-9+177
ec4159ebe7050fcc5dcee8a2d150cf948ecc97db jdk-9+178 ec4159ebe7050fcc5dcee8a2d150cf948ecc97db jdk-9+178
252475ccfd84cc249f8d6faf4b7806b5e2c384ce jdk-9+179 252475ccfd84cc249f8d6faf4b7806b5e2c384ce jdk-9+179
d2982a786f53814367698e63efe6349c9128e1db jdk-9+180 d2982a786f53814367698e63efe6349c9128e1db jdk-9+180
b656dea9398ef601f7fc08d1a5157a560e0ccbe0 jdk-9+181
d73368c690d4f1ab188cf306f4b27218e28596b6 jdk-9.0.3+1
ede48839f34b0b74210e2e081872a3c12d5339ab jdk-9.0.3+2
086e9950ebfa8a0239018ade61f59b7c539bacc9 jdk-9.0.3+3
2c95bee2722f2396b709b384473c07291a7d1e4b jdk-9.0.3+4
d24281b60e0bb6d441ec3a9440e7daa322bbc822 jdk-9.0.3+5
489c57f8e1c0f6fa34de86f8ed8f98a809cba4a9 jdk-9.0.3+6
9d5aca497123931d52625b3539a8549d98728622 jdk-9.0.3+7
eaa4ea516c7f1e31c8e0faaec3ef981eb2919ae3 jdk-9.0.3+8
a31dfd85bee9c16aac1e65dfbe81d1c5fe443c2c jdk-9.0.3+9
9acb1002f33e257e932a188632969e45cc32e66c jdk-9.0.1+10
9acb1002f33e257e932a188632969e45cc32e66c jdk-9.0.1+10
0000000000000000000000000000000000000000 jdk-9.0.1+10
0000000000000000000000000000000000000000 jdk-9.0.1+10
5a9191c980ca3ada63b234e2b9ec6dc23bd37595 jdk-9.0.1+10
e6edc89f5b2dc6dacd6041305e942a3f04a25ce5 jdk-9.0.1+11
3a64fdb24a8c26e2d7d32864dad4425a9496b90d jdk-9.0.4+00
726bf8524f7d3780518ada8648488ad4a7bfe6a2 jdk-9.0.4+1
8055b6778ac8fc6bb165082230951cc8f146f8fd jdk-9.0.4+2
572ea0db1d87a1d2fcc01f73ffbcfb78bd5688f4 jdk-9.0.4+3
0053ace2e9e484fb52d00ec961e24805d0aae04a jdk-9.0.4+4
73d63ccf56f46f258f367ed72633f0f5cc229680 jdk-9.0.4+5
86219e4c9f8cd730bacd2f6080b6ac1dea7a0226 jdk-9.0.4+6
9aba57f3071362ed7f2326d737506863b9d2646f jdk-9.0.4+7
a4f0515fe6da55cfe74dec3e6e30b69c9693d133 jdk-9.0.4+8
a4f0515fe6da55cfe74dec3e6e30b69c9693d133 jdk-9.0.4+8
0000000000000000000000000000000000000000 jdk-9.0.4+8
0000000000000000000000000000000000000000 jdk-9.0.4+8
953d306b203e7d0808cb842a51e006fddc41b6c2 jdk-9.0.4+8
c6f4c28a56ef14fb9a41303390b9584976765502 jdk-9.0.4+9

1
.jcheck/conf
View File

@ -1 +1,2 @@
project=jdk9 project=jdk9
bugids=dup

37
ADDITIONAL_LICENSE_INFO Normal file
View File

@ -0,0 +1,37 @@
ADDITIONAL INFORMATION ABOUT LICENSING
Certain files distributed by Oracle America, Inc. and/or its affiliates are
subject to the following clarification and special exception to the GPLv2,
based on the GNU Project exception for its Classpath libraries, known as the
GNU Classpath Exception.
Note that Oracle includes multiple, independent programs in this software
package. Some of those programs are provided under licenses deemed
incompatible with the GPLv2 by the Free Software Foundation and others.
For example, the package includes programs licensed under the Apache
License, Version 2.0 and may include FreeType. Such programs are licensed
to you under their original licenses.
Oracle facilitates your further distribution of this package by adding the
Classpath Exception to the necessary parts of its GPLv2 code, which permits
you to use that code in combination with other independent modules not
licensed under the GPLv2. However, note that this would not permit you to
commingle code under an incompatible license with Oracle's GPLv2 licensed
code by, for example, cutting and pasting such code into a file also
containing Oracle's GPLv2 licensed code and then distributing the result.
Additionally, if you were to remove the Classpath Exception from any of the
files to which it applies and distribute the result, you would likely be
required to license some or all of the other code in that distribution under
the GPLv2 as well, and since the GPLv2 is incompatible with the license terms
of some items included in the distribution by Oracle, removing the Classpath
Exception could therefore effectively compromise your ability to further
distribute the package.
Failing to distribute notices associated with some files may also create
unexpected legal consequences.
Proceed with caution and we recommend that you obtain the advice of a lawyer
skilled in open source matters before removing the Classpath Exception or
making modifications to this package which may subsequently be redistributed
and/or involve the use of third party software.

4
common/autoconf/basics.m4
View File

@ -1090,10 +1090,6 @@ AC_DEFUN_ONCE([BASIC_SETUP_COMPLEX_TOOLS],
# We can build without it. # We can build without it.
LDD="true" LDD="true"
fi fi
BASIC_PATH_PROGS(OTOOL, otool)
if test "x$OTOOL" = "x"; then
OTOOL="true"
fi
BASIC_PATH_PROGS(READELF, [greadelf readelf]) BASIC_PATH_PROGS(READELF, [greadelf readelf])
BASIC_PATH_PROGS(DOT, dot) BASIC_PATH_PROGS(DOT, dot)
BASIC_PATH_PROGS(HG, hg) BASIC_PATH_PROGS(HG, hg)

1359
common/autoconf/generated-configure.sh
View File

File diff suppressed because it is too large Load Diff

37
common/autoconf/lib-freetype.m4
View File

@ -443,20 +443,31 @@ AC_DEFUN_ONCE([LIB_SETUP_FREETYPE],
fi fi
AC_MSG_RESULT([$BUNDLE_FREETYPE]) AC_MSG_RESULT([$BUNDLE_FREETYPE])
fi # end freetype needed if test "x$BUNDLE_FREETYPE" = xyes; then
FREETYPE_LICENSE=""
FREETYPE_LICENSE="" AC_MSG_CHECKING([for freetype license])
if test "x$with_freetype_license" = "xyes"; then if test "x$with_freetype_license" = "xyes"; then
AC_MSG_ERROR([--with-freetype-license must have a value]) AC_MSG_RESULT([no])
elif test "x$with_freetype_license" != "x"; then AC_MSG_ERROR([--with-freetype-license must have a value])
AC_MSG_CHECKING([for freetype license]) elif test "x$with_freetype_license" != "x"; then
AC_MSG_RESULT([$with_freetype_license]) AC_MSG_RESULT([$with_freetype_license])
FREETYPE_LICENSE="$with_freetype_license" FREETYPE_LICENSE="$with_freetype_license"
BASIC_FIXUP_PATH(FREETYPE_LICENSE) BASIC_FIXUP_PATH(FREETYPE_LICENSE)
if test ! -f "$FREETYPE_LICENSE"; then if test ! -f "$FREETYPE_LICENSE"; then
AC_MSG_ERROR([$FREETYPE_LICENSE cannot be found]) AC_MSG_ERROR([$FREETYPE_LICENSE cannot be found])
fi
else
if test "x$with_freetype" != "x" && test -f $with_freetype/freetype.md; then
FREETYPE_LICENSE="$with_freetype/freetype.md"
AC_MSG_RESULT([$FREETYPE_LICENSE])
BASIC_FIXUP_PATH(FREETYPE_LICENSE)
else
AC_MSG_RESULT([no])
fi
fi
fi fi
fi
fi # end freetype needed
AC_SUBST(FREETYPE_BUNDLE_LIB_PATH) AC_SUBST(FREETYPE_BUNDLE_LIB_PATH)
AC_SUBST(FREETYPE_CFLAGS) AC_SUBST(FREETYPE_CFLAGS)

1
common/autoconf/spec.gmk.in
View File

@ -483,6 +483,7 @@ GNM:=@GNM@
STRIP:=@STRIP@ STRIP:=@STRIP@
LIPO:=@LIPO@ LIPO:=@LIPO@
INSTALL_NAME_TOOL:=@INSTALL_NAME_TOOL@
# Options to linker to specify a mapfile. # Options to linker to specify a mapfile.
# (Note absence of := assignment, because we do not want to evaluate the macro body here) # (Note absence of := assignment, because we do not want to evaluate the macro body here)

4
common/autoconf/toolchain.m4
View File

@ -628,6 +628,10 @@ AC_DEFUN_ONCE([TOOLCHAIN_DETECT_TOOLCHAIN_EXTRA],
if test "x$OPENJDK_TARGET_OS" = "xmacosx"; then if test "x$OPENJDK_TARGET_OS" = "xmacosx"; then
BASIC_PATH_PROGS(LIPO, lipo) BASIC_PATH_PROGS(LIPO, lipo)
BASIC_FIXUP_EXECUTABLE(LIPO) BASIC_FIXUP_EXECUTABLE(LIPO)
BASIC_REQUIRE_PROGS(OTOOL, otool)
BASIC_FIXUP_EXECUTABLE(OTOOL)
BASIC_REQUIRE_PROGS(INSTALL_NAME_TOOL, install_name_tool)
BASIC_FIXUP_EXECUTABLE(INSTALL_NAME_TOOL)
fi fi
if test "x$TOOLCHAIN_TYPE" = xmicrosoft; then if test "x$TOOLCHAIN_TYPE" = xmicrosoft; then

4
common/autoconf/version-numbers
View File

@ -1,5 +1,5 @@
# #
# Copyright (c) 2011, 2016, Oracle and/or its affiliates. All rights reserved. # Copyright (c) 2011, 2017, Oracle and/or its affiliates. All rights reserved.
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
# #
# This code is free software; you can redistribute it and/or modify it # This code is free software; you can redistribute it and/or modify it
@ -27,7 +27,7 @@
DEFAULT_VERSION_MAJOR=9 DEFAULT_VERSION_MAJOR=9
DEFAULT_VERSION_MINOR=0 DEFAULT_VERSION_MINOR=0
DEFAULT_VERSION_SECURITY=0 DEFAULT_VERSION_SECURITY=4
DEFAULT_VERSION_PATCH=0 DEFAULT_VERSION_PATCH=0
LAUNCHER_NAME=openjdk LAUNCHER_NAME=openjdk

121
common/conf/jib-profiles.js
View File

@ -387,7 +387,7 @@ var getJibProfilesCommon = function (input, data) {
// on such hardware. // on such hardware.
if (input.build_cpu == "sparcv9") { if (input.build_cpu == "sparcv9") {
var cpu_brand = $EXEC("bash -c \"kstat -m cpu_info | grep brand | head -n1 | awk '{ print \$2 }'\""); var cpu_brand = $EXEC("bash -c \"kstat -m cpu_info | grep brand | head -n1 | awk '{ print \$2 }'\"");
if (cpu_brand.trim().match('SPARC-.7')) { if (cpu_brand.trim().match('SPARC-.[78]')) {
boot_jdk_revision = "8u20"; boot_jdk_revision = "8u20";
boot_jdk_subdirpart = "1.8.0_20"; boot_jdk_subdirpart = "1.8.0_20";
} }
@ -435,7 +435,7 @@ var getJibProfilesProfiles = function (input, common, data) {
"macosx-x64": { "macosx-x64": {
target_os: "macosx", target_os: "macosx",
target_cpu: "x64", target_cpu: "x64",
dependencies: ["devkit"], dependencies: ["devkit", "freetype"],
configure_args: concat(common.configure_args_64bit, "--with-zlib=system"), configure_args: concat(common.configure_args_64bit, "--with-zlib=system"),
}, },
@ -728,9 +728,9 @@ var getJibProfilesProfiles = function (input, common, data) {
jdk: { jdk: {
local: "bundles/\\(jdk.*bin.tar.gz\\)", local: "bundles/\\(jdk.*bin.tar.gz\\)",
remote: [ remote: [
"bundles/openjdk/GPL/linux-x64/jdk-" + data.version "bundles/openjdk/GPL/linux-x64/openjdk-" + data.version
+ "_linux-x64_bin.tar.gz", + "_linux-x64_bin.tar.gz",
"bundles/openjdk/GPL/linux-x64/\\1" "bundles/openjdk/GPL/linux-x64/open\\1"
], ],
subdir: "jdk-" + data.version subdir: "jdk-" + data.version
}, },
@ -741,17 +741,17 @@ var getJibProfilesProfiles = function (input, common, data) {
test: { test: {
local: "bundles/\\(jdk.*bin-tests.tar.gz\\)", local: "bundles/\\(jdk.*bin-tests.tar.gz\\)",
remote: [ remote: [
"bundles/openjdk/GPL/linux-x64/jdk-" + data.version "bundles/openjdk/GPL/linux-x64/openjdk-" + data.version
+ "_linux-x64_bin-tests.tar.gz", + "_linux-x64_bin-tests.tar.gz",
"bundles/openjdk/GPL/linux-x64/\\1" "bundles/openjdk/GPL/linux-x64/open\\1"
] ]
}, },
jdk_symbols: { jdk_symbols: {
local: "bundles/\\(jdk.*bin-symbols.tar.gz\\)", local: "bundles/\\(jdk.*bin-symbols.tar.gz\\)",
remote: [ remote: [
"bundles/openjdk/GPL/linux-x64/jdk-" + data.version "bundles/openjdk/GPL/linux-x64/openjdk-" + data.version
+ "_linux-x64_bin-symbols.tar.gz", + "_linux-x64_bin-symbols.tar.gz",
"bundles/openjdk/GPL/linux-x64/\\1" "bundles/openjdk/GPL/linux-x64/open\\1"
], ],
subdir: "jdk-" + data.version subdir: "jdk-" + data.version
}, },
@ -771,27 +771,27 @@ var getJibProfilesProfiles = function (input, common, data) {
jdk: { jdk: {
local: "bundles/\\(jdk.*bin.tar.gz\\)", local: "bundles/\\(jdk.*bin.tar.gz\\)",
remote: [ remote: [
"bundles/openjdk/GPL/linux-x86/jdk-" + data.version "bundles/openjdk/GPL/linux-x86/openjdk-" + data.version
+ "_linux-x86_bin.tar.gz", + "_linux-x86_bin.tar.gz",
"bundles/openjdk/GPL/linux-x86/\\1" "bundles/openjdk/GPL/linux-x86/open\\1"
], ],
subdir: "jdk-" + data.version subdir: "jdk-" + data.version
}, },
jdk_symbols: { jdk_symbols: {
local: "bundles/\\(jdk.*bin-symbols.tar.gz\\)", local: "bundles/\\(jdk.*bin-symbols.tar.gz\\)",
remote: [ remote: [
"bundles/openjdk/GPL/linux-x86/jdk-" + data.version "bundles/openjdk/GPL/linux-x86/openjdk-" + data.version
+ "_linux-x86_bin-symbols.tar.gz", + "_linux-x86_bin-symbols.tar.gz",
"bundles/openjdk/GPL/linux-x86/\\1" "bundles/openjdk/GPL/linux-x86/open\\1"
], ],
subdir: "jdk-" + data.version subdir: "jdk-" + data.version
}, },
test: { test: {
local: "bundles/\\(jdk.*bin-tests.tar.gz\\)", local: "bundles/\\(jdk.*bin-tests.tar.gz\\)",
remote: [ remote: [
"bundles/openjdk/GPL/linux-x86/jdk-" + data.version "bundles/openjdk/GPL/linux-x86/openjdk-" + data.version
+ "_linux-x86_bin-tests.tar.gz", + "_linux-x86_bin-tests.tar.gz",
"bundles/openjdk/GPL/linux-x86/\\1" "bundles/openjdk/GPL/linux-x86/open\\1"
] ]
}, },
jre: { jre: {
@ -814,41 +814,84 @@ var getJibProfilesProfiles = function (input, common, data) {
} }
}, },
"windows-x86-open": { "macosx-x64-open": {
artifacts: { artifacts: {
jdk: { jdk: {
local: "bundles/\\(jdk.*bin.tar.gz\\)", local: "bundles/\\(jdk.*bin.tar.gz\\)",
remote: [ remote: [
"bundles/openjdk/GPL/windows-x86/jdk-" + data.version "bundles/openjdk/GPL/osx-x64/openjdk-" + data.version
+ "_windows-x86_bin.tar.gz", + "_osx-x64_bin.tar.gz",
"bundles/openjdk/GPL/windows-x86/\\1" "bundles/openjdk/GPL/osx-x64/open\\1"
], ],
subdir: "jdk-" + data.version subdir: "jdk-" + data.version
}, },
jre: { jre: {
local: "bundles/\\(jre.*bin.tar.gz\\)", local: "bundles/\\(jre.*bin.tar.gz\\)",
remote: "bundles/openjdk/GPL/windows-x86/\\1" remote: "bundles/openjdk/GPL/osx-x64/\\1",
}, },
test: { test: {
local: "bundles/\\(jdk.*bin-tests.tar.gz\\)", local: "bundles/\\(jdk.*bin-tests.tar.gz\\)",
remote: [ remote: [
"bundles/openjdk/GPL/windows-x86/jdk-" + data.version "bundles/openjdk/GPL/osx-x64/openjdk-" + data.version
+ "_windows-x86_bin-tests.tar.gz", + "_osx-x64_bin-tests.tar.gz",
"bundles/openjdk/GPL/windows-x86/\\1" "bundles/openjdk/GPL/osx-x64/open\\1"
] ]
}, },
jdk_symbols: { jdk_symbols: {
local: "bundles/\\(jdk.*bin-symbols.tar.gz\\)", local: "bundles/\\(jdk.*bin-symbols.tar.gz\\)",
remote: [ remote: [
"bundles/openjdk/GPL/windows-x86/jdk-" + data.version "bundles/openjdk/GPL/osx-x64/openjdk-" + data.version
+ "_windows-x86_bin-symbols.tar.gz", + "_osx-x64_bin-symbols.tar.gz",
"bundles/openjdk/GPL/windows-x86/\\1" "bundles/openjdk/GPL/osx-x64/open\\1"
], ],
subdir: "jdk-" + data.version subdir: "jdk-" + data.version
}, },
jre_symbols: { jre_symbols: {
local: "bundles/\\(jre.*bin-symbols.tar.gz\\)", local: "bundles/\\(jre.*bin-symbols.tar.gz\\)",
remote: "bundles/openjdk/GPL/windows-x86/\\1", remote: "bundles/openjdk/GPL/osx-x64/\\1",
},
doc_api_spec: {
local: "bundles/\\(jdk.*doc-api-spec.tar.gz\\)",
remote: "bundles/openjdk/GPL/osx-x64/\\1",
},
}
},
"windows-x64-open": {
artifacts: {
jdk: {
local: "bundles/\\(jdk.*bin.tar.gz\\)",
remote: [
"bundles/openjdk/GPL/windows-x64/openjdk-" + data.version
+ "_windows-x64_bin.tar.gz",
"bundles/openjdk/GPL/windows-x64/open\\1"
],
subdir: "jdk-" + data.version
},
jre: {
local: "bundles/\\(jre.*bin.tar.gz\\)",
remote: "bundles/openjdk/GPL/windows-x64/\\1"
},
test: {
local: "bundles/\\(jdk.*bin-tests.tar.gz\\)",
remote: [
"bundles/openjdk/GPL/windows-x64/openjdk-" + data.version
+ "_windows-x64_bin-tests.tar.gz",
"bundles/openjdk/GPL/windows-x64/open\\1"
]
},
jdk_symbols: {
local: "bundles/\\(jdk.*bin-symbols.tar.gz\\)",
remote: [
"bundles/openjdk/GPL/windows-x64/openjdk-" + data.version
+ "_windows-x64_bin-symbols.tar.gz",
"bundles/openjdk/GPL/windows-x64/open\\1"
],
subdir: "jdk-" + data.version
},
jre_symbols: {
local: "bundles/\\(jre.*bin-symbols.tar.gz\\)",
remote: "bundles/openjdk/GPL/windows-x64/\\1",
} }
} }
}, },
@ -880,10 +923,11 @@ var getJibProfilesProfiles = function (input, common, data) {
profiles["linux-x64-ri"] = clone(profiles["linux-x64-open"]); profiles["linux-x64-ri"] = clone(profiles["linux-x64-open"]);
profiles["linux-x86-ri"] = clone(profiles["linux-x86-open"]); profiles["linux-x86-ri"] = clone(profiles["linux-x86-open"]);
profiles["linux-x86-ri-debug"] = clone(profiles["linux-x86-open-debug"]); profiles["linux-x86-ri-debug"] = clone(profiles["linux-x86-open-debug"]);
profiles["windows-x86-ri"] = clone(profiles["windows-x86-open"]); profiles["macosx-x64-ri"] = clone(profiles["macosx-x64-open"]);
profiles["windows-x64-ri"] = clone(profiles["windows-x64-open"]);
// Generate artifacts for ri profiles // Generate artifacts for ri profiles
[ "linux-x64-ri", "linux-x86-ri", "linux-x86-ri-debug", "windows-x86-ri" ] [ "linux-x64-ri", "linux-x86-ri", "linux-x86-ri-debug", "macosx-x64-ri", "windows-x64-ri" ]
.forEach(function (name) { .forEach(function (name) {
// Rewrite all remote dirs to "bundles/openjdk/BCL/..." // Rewrite all remote dirs to "bundles/openjdk/BCL/..."
for (artifactName in profiles[name].artifacts) { for (artifactName in profiles[name].artifacts) {
@ -893,16 +937,6 @@ var getJibProfilesProfiles = function (input, common, data) {
} }
}); });
// The windows ri profile needs to add the freetype license file
profilesRiFreetype = {
"windows-x86-ri": {
configure_args: "--with-freetype-license="
+ input.get("freetype", "install_path")
+ "/freetype-2.7.1-v120-x86/freetype.md"
}
};
profiles = concatObjects(profiles, profilesRiFreetype);
// Generate the missing platform attributes // Generate the missing platform attributes
profiles = generatePlatformAttributes(profiles); profiles = generatePlatformAttributes(profiles);
profiles = generateDefaultMakeTargetsConfigureArg(common, profiles); profiles = generateDefaultMakeTargetsConfigureArg(common, profiles);
@ -934,6 +968,12 @@ var getJibProfilesDependencies = function (input, common) {
? input.target_os + "_x64" ? input.target_os + "_x64"
: input.target_platform); : input.target_platform);
var freetype_version = {
windows_x64: "2.7.1-v120+1.1",
windows_x86: "2.7.1-v120+1.1",
macosx_x64: "2.7.1-Xcode6.3-MacOSX10.9+1.0"
}[input.target_platform];
var dependencies = { var dependencies = {
boot_jdk: { boot_jdk: {
@ -998,7 +1038,7 @@ var getJibProfilesDependencies = function (input, common) {
freetype: { freetype: {
organization: common.organization, organization: common.organization,
ext: "tar.gz", ext: "tar.gz",
revision: "2.7.1-v120+1.0", revision: freetype_version,
module: "freetype-" + input.target_platform module: "freetype-" + input.target_platform
}, },
@ -1200,7 +1240,8 @@ var versionArgs = function(input, common) {
if (input.build_type == "promoted") { if (input.build_type == "promoted") {
args = concat(args, args = concat(args,
// This needs to be changed when we start building release candidates // This needs to be changed when we start building release candidates
"--with-version-pre=ea", // 'ea' for EA builds and empty value for 'fcs'
"--with-version-pre=",
"--without-version-opt"); "--without-version-opt");
} else { } else {
args = concat(args, "--with-version-opt=" + common.build_id); args = concat(args, "--with-version-opt=" + common.build_id);

4
make/CreateJmods.gmk
View File

@ -80,8 +80,8 @@ ifneq ($(MAN_DIR), )
endif endif
LEGAL_NOTICES := \ LEGAL_NOTICES := \
$(SUPPORT_OUTPUTDIR)/modules_legal/java.base \ $(call uniq, $(SUPPORT_OUTPUTDIR)/modules_legal/java.base \
$(call FindModuleLegalDirs, $(MODULE)) \ $(call FindModuleLegalDirs, $(MODULE))) \
# #
LEGAL_NOTICES_PATH := $(call PathList, $(LEGAL_NOTICES)) LEGAL_NOTICES_PATH := $(call PathList, $(LEGAL_NOTICES))

12
make/SourceRevision.gmk
View File

@ -39,8 +39,6 @@ include MakeBase.gmk
# revisions of all repos will be stored in a file in the top dir, which is then # revisions of all repos will be stored in a file in the top dir, which is then
# used when creating the tracker file. # used when creating the tracker file.
STORED_SOURCE_REVISION := $(TOPDIR)/.src-rev
# Are we using mercurial? # Are we using mercurial?
ifneq ($(and $(HG), $(wildcard $(TOPDIR)/.hg)), ) ifneq ($(and $(HG), $(wildcard $(TOPDIR)/.hg)), )
@ -108,7 +106,15 @@ else
$(call LogInfo, No mercurial configuration present$(COMMA) not updating .src-rev) $(call LogInfo, No mercurial configuration present$(COMMA) not updating .src-rev)
$(SOURCE_REVISION_TRACKER): $(STORED_SOURCE_REVISION) $(SOURCE_REVISION_TRACKER): $(STORED_SOURCE_REVISION)
$(install-file) $(call MakeDir, $(@D))
$(RM) $@
# Only include revisions for repos that are included in the current
# source set.
for r in `cat $<`; do \
if [ -d "$(TOPDIR)/`$(ECHO) $$r | $(CUT) -d':' -f1`" ]; then \
$(PRINTF) "$$r " >> $@; \
fi; \
done
create-source-revision-tracker: $(SOURCE_REVISION_TRACKER) create-source-revision-tracker: $(SOURCE_REVISION_TRACKER)
else else

22
make/common/MakeBase.gmk
View File

@ -342,11 +342,25 @@ endif # HAS_FILE_FUNCTION
# the build was created from # the build was created from
SOURCE_REVISION_TRACKER := $(SUPPORT_OUTPUTDIR)/src-rev/source-revision-tracker SOURCE_REVISION_TRACKER := $(SUPPORT_OUTPUTDIR)/src-rev/source-revision-tracker
# Locate all hg repositories included in the forest, as absolute paths # A cache of the mercurial information which can be dropped in the top of the
# source tree for inclusion in a source bundle.
STORED_SOURCE_REVISION := $(TOPDIR)/.src-rev
# Locate all hg repositories included in the forest, as absolute paths. Use .hg
# dirs if present, otherwise parse the .src-rev file and match dirs.
FindAllReposAbs = \ FindAllReposAbs = \
$(strip $(sort $(dir $(filter-out $(SRC_ROOT)/build/%, $(wildcard \ $(if $(and $(HG), $(wildcard $(TOPDIR)/.hg)), \
$(addprefix $(SRC_ROOT)/, .hg */.hg */*/.hg */*/*/.hg) \ $(strip $(sort $(dir $(filter-out $(SRC_ROOT)/build/%, $(wildcard \
))))) $(addprefix $(SRC_ROOT)/, .hg */.hg */*/.hg */*/*/.hg)))))) \
, \
$(if $(wildcard $(STORED_SOURCE_REVISION)), \
$(strip $(foreach r, $(call ReadFile, $(STORED_SOURCE_REVISION)), \
$(wildcard $(TOPDIR)/$(firstword $(subst :,$(SPACE),$r))/) \
)) \
, \
$(error No mercurial or .src-rev available, cannot list repositories) \
) \
)
# Locate all hg repositories included in the forest, as relative paths # Locate all hg repositories included in the forest, as relative paths
FindAllReposRel = \ FindAllReposRel = \

6
make/common/Modules.gmk
View File

@ -397,8 +397,10 @@ LEGAL_SUBDIRS += share/legal
# $1 - Module to find legal dirs for # $1 - Module to find legal dirs for
FindModuleLegalDirs = \ FindModuleLegalDirs = \
$(strip $(wildcard \ $(strip $(wildcard \
$(addsuffix /$(strip $1), $(IMPORT_MODULES_LEGAL)) \ $(addsuffix /$(strip $1), $(SUPPORT_OUTPUTDIR)/modules_legal \
$(foreach sub, $(LEGAL_SUBDIRS), $(addsuffix /$(strip $1)/$(sub), $(TOP_SRC_DIRS))))) $(IMPORT_MODULES_LEGAL)) \
$(foreach sub, $(LEGAL_SUBDIRS), $(addsuffix /$(strip $1)/$(sub), $(TOP_SRC_DIRS))) \
))
################################################################################ ################################################################################