Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
openanolis
dragonwell11
提交
fef545ac
D
dragonwell11
项目概览
openanolis
/
dragonwell11
通知
7
Star
2
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
D
dragonwell11
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
fef545ac
编写于
7月 05, 2017
作者:
D
duke
浏览文件
操作
浏览文件
下载
差异文件
Merge
上级
02388b9b
1c23facb
变更
6
隐藏空白更改
内联
并排
Showing
6 changed file
with
22 addition
and
20 deletion
+22
-20
.hgtags-top-repo
.hgtags-top-repo
+1
-0
common/autoconf/generated-configure.sh
common/autoconf/generated-configure.sh
+1
-7
common/autoconf/source-dirs.m4
common/autoconf/source-dirs.m4
+0
-6
common/conf/jib-profiles.js
common/conf/jib-profiles.js
+14
-1
make/Javadoc.gmk
make/Javadoc.gmk
+5
-2
make/common/Modules.gmk
make/common/Modules.gmk
+1
-4
未找到文件。
.hgtags-top-repo
浏览文件 @
fef545ac
...
...
@@ -396,3 +396,4 @@ b119012d1c2ab2570fe8718633840d0c1f1f441d jdk-9+149
71a766d4c18041a7f833ee22823125b02e1a7f1e jdk-9+151
ef056360ddf3977d7d2ddbeb456a4d612d19ea05 jdk-9+152
816a6d03a7c44edfbd8780110529f1bdc3964fb9 jdk-9+153
8d26916eaa21b689835ffc1c0dbf12470aa9be61 jdk-9+154
common/autoconf/generated-configure.sh
浏览文件 @
fef545ac
...
...
@@ -5180,7 +5180,7 @@ VS_SDK_PLATFORM_NAME_2013=
#CUSTOM_AUTOCONF_INCLUDE
# Do not change or remove the following line, it is needed for consistency checks:
DATE_WHEN_GENERATED=148
4571183
DATE_WHEN_GENERATED=148
5508515
###############################################################################
#
...
...
@@ -31283,12 +31283,6 @@ $as_echo "$as_me: The path of IMPORT_MODULES_TOPDIR, which resolves as \"$path\"
if test -d "$IMPORT_MODULES_TOPDIR/modules_src"; then
IMPORT_MODULES_SRC="$IMPORT_MODULES_TOPDIR/modules_src"
fi
# Workaround for using different imported module-info.java in Jake due to a
# change in format. Remove once new format is standard in JDK 9 and javafx
# delivers just that.
if test -d "$IMPORT_MODULES_TOPDIR/modules_src_jake"; then
IMPORT_MODULES_SRC="$IMPORT_MODULES_TOPDIR/modules_src_jake $IMPORT_MODULES_SRC"
fi
if test -d "$IMPORT_MODULES_TOPDIR/make"; then
IMPORT_MODULES_MAKE="$IMPORT_MODULES_TOPDIR/make"
fi
common/autoconf/source-dirs.m4
浏览文件 @
fef545ac
...
...
@@ -114,12 +114,6 @@ AC_DEFUN_ONCE([SRCDIRS_SETUP_IMPORT_MODULES],
if test -d "$IMPORT_MODULES_TOPDIR/modules_src"; then
IMPORT_MODULES_SRC="$IMPORT_MODULES_TOPDIR/modules_src"
fi
# Workaround for using different imported module-info.java in Jake due to a
# change in format. Remove once new format is standard in JDK 9 and javafx
# delivers just that.
if test -d "$IMPORT_MODULES_TOPDIR/modules_src_jake"; then
IMPORT_MODULES_SRC="$IMPORT_MODULES_TOPDIR/modules_src_jake $IMPORT_MODULES_SRC"
fi
if test -d "$IMPORT_MODULES_TOPDIR/make"; then
IMPORT_MODULES_MAKE="$IMPORT_MODULES_TOPDIR/make"
fi
...
...
common/conf/jib-profiles.js
浏览文件 @
fef545ac
...
...
@@ -610,6 +610,19 @@ var getJibProfilesProfiles = function (input, common, data) {
}
profiles
=
concatObjects
(
profiles
,
testOnlyProfilesPrebuilt
);
// On macosx add the devkit bin dir to the path in all the run-test profiles.
// This gives us a guaranteed working version of lldb for the jtreg failure handler.
if
(
input
.
build_os
==
"
macosx
"
)
{
macosxRunTestExtra
=
{
dependencies
:
[
"
devkit
"
],
environment_path
:
input
.
get
(
"
devkit
"
,
"
install_path
"
)
+
"
/Xcode.app/Contents/Developer/usr/bin
"
}
profiles
[
"
run-test
"
]
=
concatObjects
(
profiles
[
"
run-test
"
],
macosxRunTestExtra
);
profiles
[
"
run-test-jprt
"
]
=
concatObjects
(
profiles
[
"
run-test-jprt
"
],
macosxRunTestExtra
);
profiles
[
"
run-test-prebuilt
"
]
=
concatObjects
(
profiles
[
"
run-test-prebuilt
"
],
macosxRunTestExtra
);
}
//
// Define artifacts for profiles
//
...
...
@@ -844,7 +857,7 @@ var getJibProfilesDependencies = function (input, common) {
file
:
boot_jdk_platform
+
"
/jdk-
"
+
common
.
boot_jdk_revision
+
"
-
"
+
boot_jdk_platform
+
"
.tar.gz
"
,
configure_args
:
"
--with-boot-jdk=
"
+
common
.
boot_jdk_home
,
environment_path
:
common
.
boot_jdk_home
environment_path
:
common
.
boot_jdk_home
+
"
/bin
"
},
devkit
:
{
...
...
make/Javadoc.gmk
浏览文件 @
fef545ac
...
...
@@ -26,6 +26,7 @@ default: all
include $(SPEC)
include MakeBase.gmk
include $(JDK_TOPDIR)/make/Tools.gmk
################################################################################
...
...
@@ -180,6 +181,8 @@ DEFAULT_JAVADOC_TAGS := \
-tag see \
-tag 'jvms:a:See <cite>The Java™ Virtual Machine Specification</cite>:' \
-tag 'jls:a:See <cite>The Java™ Language Specification</cite>:' \
-taglet build.tools.taglet.Incubating \
-tagletpath $(BUILDTOOLS_OUTPUTDIR)/jdk_tools_classes \
#
DEFAULT_JAVADOC_OPTIONS := -XDignore.symbol.file=true -use -keywords -notimestamp \
...
...
@@ -311,7 +314,7 @@ define SetupJavadocGenerationBody
$1_INDEX_FILE := $$(JAVADOC_OUTPUTDIR)/$$($1_OUTPUT_DIRNAME)/index.html
# Rule for actually running javadoc
$$($1_INDEX_FILE): $$($1_VARDEPS_FILE) $$($1_PACKAGE_DEPS) $$($1_DEPS)
$$($1_INDEX_FILE): $
(BUILD_TOOLS_JDK) $
$($1_VARDEPS_FILE) $$($1_PACKAGE_DEPS) $$($1_DEPS)
$$(call LogWarn, Generating Javadoc from $$(words $$($1_PACKAGES)) package(s) for $$($1_OUTPUT_DIRNAME))
$$(call MakeDir, $$(@D))
ifneq ($$($1_PACKAGES_FILE), )
...
...
@@ -740,7 +743,7 @@ $(eval $(call IncludeCustomExtension, , Javadoc.gmk))
################################################################################
docs-javadoc: $(TARGETS)
docs-javadoc: $(
BUILD_TOOLS_JDK) $(
TARGETS)
docs-copy: $(COPY_TARGETS)
...
...
make/common/Modules.gmk
浏览文件 @
fef545ac
...
...
@@ -182,15 +182,12 @@ SRC_SUBDIRS += share/classes
# Find all module-info.java files for the current build target platform and
# configuration.
# TODO: The $(firstword call is part of a workaround for using different
# imported module-info.java in Jake due to a change in format. Remove once
# new format is standard in JDK 9 and javafx delivers just that.
# Param 1 - Module to find for, set to * for finding all
FindAllModuleInfos = \
$(wildcard \
$(foreach sub, $(SRC_SUBDIRS), \
$(patsubst %,%/$(strip $1)/$(sub)/module-info.java, $(TOP_SRC_DIRS))) \
$(patsubst %,%/$(strip $1)/module-info.java, $(
firstword $(IMPORT_MODULES_SRC)
)))
$(patsubst %,%/$(strip $1)/module-info.java, $(
IMPORT_MODULES_SRC
)))
# Find module-info.java files in the specific source dir
# Param 1 - Src dir to find module-info.java files in
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录