Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
openanolis
dragonwell11
提交
d97b5c80
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,发现更多精彩内容 >>
提交
d97b5c80
编写于
7月 05, 2017
作者:
D
duke
浏览文件
操作
浏览文件
下载
差异文件
Merge
上级
f9b03ab4
13df9540
变更
10
展开全部
隐藏空白更改
内联
并排
Showing
10 changed file
with
503 addition
and
498 deletion
+503
-498
.hgtags-top-repo
.hgtags-top-repo
+1
-0
NewMakefile.gmk
NewMakefile.gmk
+4
-3
README-builds.html
README-builds.html
+26
-11
common/autoconf/autogen.sh
common/autoconf/autogen.sh
+0
-6
common/autoconf/configure.ac
common/autoconf/configure.ac
+1
-1
common/autoconf/generated-configure.sh
common/autoconf/generated-configure.sh
+457
-424
common/autoconf/help.m4
common/autoconf/help.m4
+3
-3
common/autoconf/libraries.m4
common/autoconf/libraries.m4
+2
-2
common/makefiles/Main.gmk
common/makefiles/Main.gmk
+2
-2
test/Makefile
test/Makefile
+7
-46
未找到文件。
.hgtags-top-repo
浏览文件 @
d97b5c80
...
...
@@ -226,3 +226,4 @@ d2dcb110e9dbaf9903c05b211df800e78e4b394e jdk8-b100
5eb3c1dc348f72a7f84f7d9d07834e8bbe09a799 jdk8-b102
b7e64be81c8a7690703df5711f4fc2375da8a9cb jdk8-b103
96c1b9b7524b52c3fcefc90ffad4c767396727c8 jdk8-b104
5166118c59178b5d31001bc4058e92486ee07d9b jdk8-b105
NewMakefile.gmk
浏览文件 @
d97b5c80
...
...
@@ -69,11 +69,11 @@ else
# Run the makefile with an arbitraty SPEC using -p -q (quiet dry-run and dump rules) to find
# available PHONY targets. Use this list as valid targets to pass on to the repeated calls.
all_phony_targets=$(filter-out $(global_targets) bundles-only, $(strip $(shell \
$(MAKE) -p -q -f common/makefiles/Main.gmk SPEC=$(firstword $(SPEC)) | \
$(MAKE) -p -q -f common/makefiles/Main.gmk
FRC
SPEC=$(firstword $(SPEC)) | \
grep ^.PHONY: | head -n 1 | cut -d " " -f 2-)))
$(all_phony_targets):
$(foreach spec,$(SPEC),($(MAKE) -f NewMakefile.gmk SPEC=$(spec) \
@
$(foreach spec,$(SPEC),($(MAKE) -f NewMakefile.gmk SPEC=$(spec) \
$(VERBOSE) VERBOSE=$(VERBOSE) LOG_LEVEL=$(LOG_LEVEL) $@) &&) true
.PHONY: $(all_phony_targets)
...
...
@@ -98,6 +98,7 @@ help:
$(info . # corba and jdk)
$(info . make all # Compile everything, all repos and images)
$(info . make images # Create complete j2sdk and j2re images)
$(info . make docs # Create javadocs)
$(info . make overlay-images # Create limited images for sparc 64 bit platforms)
$(info . make profiles # Create complete j2re compact profile images)
$(info . make bootcycle-images # Build images twice, second time with newly build JDK)
...
...
@@ -109,7 +110,7 @@ help:
$(info . make test # Run tests, default is all tests (see TEST below))
$(info )
$(info Targets for specific components)
$(info (Component is any of langtools, corba, jaxp, jaxws, hotspot, jdk,
images or overlay-images
))
$(info (Component is any of langtools, corba, jaxp, jaxws, hotspot, jdk,
nashorn, images, overlay-images, docs or test
))
$(info . make <component> # Build <component> and everything it depends on. )
$(info . make <component>-only # Build <component> only, without dependencies. This)
$(info . # is faster but can result in incorrect build results!)
...
...
README-builds.html
浏览文件 @
d97b5c80
...
...
@@ -1210,19 +1210,18 @@
<blockquote>
<p>
<b>
Q:
</b>
The
<code>
configure
</code>
file looks horrible!
<b>
Q:
</b>
The
<code>
generated-configure.sh
</code>
file looks horrible!
How are you going to edit it?
<br>
<b>
A:
</b>
The
<code>
configure
</code>
file is generated (think
<b>
A:
</b>
The
<code>
generated-configure.sh
</code>
file is generated (think
"compiled") by the autoconf tools. The source code is
in
<code>
configure.ac
</code>
various .m4 files in common/autoconf,
which are
much more readable.
in
<code>
configure.ac
</code>
and various .m4 files in common/autoconf,
which are much more readable.
</p>
<p>
<b>
Q:
</b>
Why is the
<code>
configure
</code>
file checked in,
Why is the
<code>
generated-configure.sh
</code>
file checked in,
if it is generated?
<br>
<b>
A:
</b>
...
...
@@ -1237,13 +1236,29 @@
<p>
<b>
Q:
</b>
Do you require a specific version of autoconf for regenerating
<code>
configure
</code>
?
<code>
generated-configure.sh
</code>
?
<br>
<b>
A:
</b>
Currently, no, but this will likely be the case when things have
settled down a bit more. (The reason for this is to avoid
large spurious changes in
<code>
configure
</code>
in commits that made small changes to
<code>
configure.ac
</code>
).
Yes, version 2.69 is required and should be easy
enough to aquire on all supported operating
systems. The reason for this is to avoid
large spurious changes in
<code>
generated-configure.sh
</code>
.
</p>
<p>
<b>
Q:
</b>
How do you regenerate
<code>
generated-configure.sh
</code>
after making changes to the input files?
<br>
<b>
A:
</b>
Regnerating
<code>
generated-configure.sh
</code>
should always be done using the
script
<code>
common/autoconf/autogen.sh
</code>
to
ensure that the correct files get updated. This
script should also be run after mercurial tries to
merge
<code>
generated-configure.sh
</code>
as a
merge of the generated file is not guaranteed to
be correct.
</p>
<p>
...
...
common/autoconf/autogen.sh
浏览文件 @
d97b5c80
...
...
@@ -44,10 +44,8 @@ fi
custom_hook
=
$custom_script_dir
/custom-hook.m4
AUTOCONF
=
"
`
which autoconf 2> /dev/null |
grep
-v
'^no autoconf in'
`
"
AUTOCONF_267
=
"
`
which autoconf-2.67 2> /dev/null |
grep
-v
'^no autoconf-2.67 in'
`
"
echo
"Autoconf found:
${
AUTOCONF
}
"
echo
"Autoconf-2.67 found:
${
AUTOCONF_267
}
"
if
test
"x
${
AUTOCONF
}
"
=
x
;
then
echo
You need autoconf installed to be able to regenerate the configure script
...
...
@@ -55,10 +53,6 @@ if test "x${AUTOCONF}" = x; then
exit
1
fi
if
test
"x
${
AUTOCONF_267
}
"
!=
x
;
then
AUTOCONF
=
${
AUTOCONF_267
}
;
fi
echo
Generating generated-configure.sh with
${
AUTOCONF
}
cat
$script_dir
/configure.ac |
sed
-e
"s|@DATE_WHEN_GENERATED@|
$TIMESTAMP
|"
|
${
AUTOCONF
}
-W
all
-I
$script_dir
-
>
$script_dir
/generated-configure.sh
rm
-rf
autom4te.cache
...
...
common/autoconf/configure.ac
浏览文件 @
d97b5c80
...
...
@@ -30,7 +30,7 @@
###############################################################################
AC_PREREQ([2.6
1
])
AC_PREREQ([2.6
9
])
AC_INIT(OpenJDK, jdk8, build-dev@openjdk.java.net,,http://openjdk.java.net)
AC_CONFIG_AUX_DIR([build-aux])
...
...
common/autoconf/generated-configure.sh
浏览文件 @
d97b5c80
此差异已折叠。
点击以展开。
common/autoconf/help.m4
浏览文件 @
d97b5c80
...
...
@@ -83,7 +83,7 @@ apt_help() {
pulse)
PKGHANDLER_COMMAND="sudo apt-get install libpulse-dev" ;;
x11)
PKGHANDLER_COMMAND="sudo apt-get install libX11-dev libxext-dev libxrender-dev libxtst-dev" ;;
PKGHANDLER_COMMAND="sudo apt-get install libX11-dev libxext-dev libxrender-dev libxtst-dev
libxt-dev
" ;;
ccache)
PKGHANDLER_COMMAND="sudo apt-get install ccache" ;;
* )
...
...
@@ -102,11 +102,11 @@ yum_help() {
cups)
PKGHANDLER_COMMAND="sudo yum install cups-devel" ;;
freetype2)
PKGHANDLER_COMMAND="sudo yum install freetype
2
-devel" ;;
PKGHANDLER_COMMAND="sudo yum install freetype-devel" ;;
pulse)
PKGHANDLER_COMMAND="sudo yum install pulseaudio-libs-devel" ;;
x11)
PKGHANDLER_COMMAND="sudo yum install libXtst-devel" ;;
PKGHANDLER_COMMAND="sudo yum install libXtst-devel
libXt-devel libXrender-devel
" ;;
ccache)
PKGHANDLER_COMMAND="sudo yum install ccache" ;;
* )
...
...
common/autoconf/libraries.m4
浏览文件 @
d97b5c80
...
...
@@ -185,7 +185,7 @@ OLD_CFLAGS="$CFLAGS"
CFLAGS="$CFLAGS $X_CFLAGS"
# Need to include Xlib.h and Xutil.h to avoid "present but cannot be compiled" warnings on Solaris 10
AC_CHECK_HEADERS([X11/extensions/shape.h X11/extensions/Xrender.h X11/extensions/XTest.h],
AC_CHECK_HEADERS([X11/extensions/shape.h X11/extensions/Xrender.h X11/extensions/XTest.h
X11/Intrinsic.h
],
[X11_A_OK=yes],
[X11_A_OK=no; break],
[ # include <X11/Xlib.h>
...
...
@@ -197,7 +197,7 @@ AC_LANG_POP(C)
if test "x$X11_A_OK" = xno && test "x$X11_NOT_NEEDED" != xyes; then
HELP_MSG_MISSING_DEPENDENCY([x11])
AC_MSG_ERROR([Could not find all X11 headers (shape.h Xrender.h XTest.h). $HELP_MSG])
AC_MSG_ERROR([Could not find all X11 headers (shape.h Xrender.h XTest.h
Intrinsic.h
). $HELP_MSG])
fi
AC_SUBST(X_CFLAGS)
...
...
common/makefiles/Main.gmk
浏览文件 @
d97b5c80
...
...
@@ -183,7 +183,7 @@ bootcycle-images-only: start-make
test: images test-only
test-only: start-make
@$(call TargetEnter)
@($(CD) $(SRC_ROOT)/test && $(BUILD_LOG_WRAPPER) $(MAKE) -j1 -k MAKEFLAGS= JT_HOME=$(JT_HOME) PRODUCT_HOME=$(JDK_IMAGE_DIR)
JPRT_JAVA_HOME=$(JDK_IMAGE_DIR)
ALT_OUTPUTDIR=$(OUTPUT_ROOT) CONCURRENCY=$(JOBS) $(TEST)) || true
@($(CD) $(SRC_ROOT)/test && $(BUILD_LOG_WRAPPER) $(MAKE) -j1 -k MAKEFLAGS= JT_HOME=$(JT_HOME) PRODUCT_HOME=$(JDK_IMAGE_DIR) ALT_OUTPUTDIR=$(OUTPUT_ROOT) CONCURRENCY=$(JOBS) $(TEST)) || true
@$(call TargetExit)
# Stores the tips for each repository. This file is be used when constructing the jdk image and can be
...
...
@@ -242,7 +242,7 @@ clean-test:
.PHONY: langtools corba jaxp jaxws hotspot jdk nashorn images overlay-images install test docs
.PHONY: langtools-only corba-only jaxp-only jaxws-only hotspot-only jdk-only nashorn-only images-only overlay-images-only install-only test-only docs-only
.PHONY: all clean dist-clean bootcycle-images start-make
.PHONY:
default
all clean dist-clean bootcycle-images start-make
.PHONY: clean-langtools clean-corba clean-jaxp clean-jaxws clean-hotspot clean-jdk clean-nashorn clean-images clean-docs clean-test clean-overlay-images clean-bootcycle-build
.PHONY: profiles profiles-only profiles-oscheck
...
...
test/Makefile
浏览文件 @
d97b5c80
...
...
@@ -49,61 +49,22 @@ else \
fi
endef
# Test target list for langtools repository
LANGTOOLS_TEST_LIST
=
langtools_jtreg
# Test target list for jdk repository
JDK_ALL_TEST_LIST
=
\
jdk_beans1
\
jdk_io
\
jdk_lang
\
jdk_math
\
jdk_other
\
jdk_net
\
jdk_nio
\
jdk_security1
\
jdk_text
\
jdk_util
\
jdk_time
\
jdk_awt
\
jdk_beans2 jdk_beans3
\
jdk_management
\
jdk_jmx
\
jdk_security2 jdk_security3
\
jdk_rmi
\
jdk_sound
\
jdk_swing
\
jdk_tools
\
jdk_jdi
\
jdk_jfr
# Theses are meta test targets in jdk
JDK_META_TEST_LIST
=
jdk_all jdk_default jdk_core
# These are the current jck test targets in the jdk repository
JDK_JCK7_LIST
=
jck7devtools jck7compiler jck7runtime
# Default test target (core)
default
:
jdk_core
$(LANGTOOLS_TEST_LIST)
default
:
jdk_core
langtools_jtreg
# All testing
all
:
$(JDK_ALL_TEST_LIST) $(LANGTOOLS_TEST_LIST)
all
:
jdk_all langtools_all
# Test targets
$(LANGTOOLS_TEST_LIST)
:
@
$(NO_STOPPING)
$(
call
SUBDIR_TEST,
$(LANGTOOLS_DIR)
,
$(
subst
langtools_,,
$@
))
$(JDK_ALL_TEST_LIST) $(JDK_META_TEST_LIST) $(JDK_JCK7_LIST)
:
@
$(NO_STOPPING)
$(
call
SUBDIR_TEST,
$(JDK_DIR)
,
$@
)
langtools_%
:
@
$(NO_STOPPING)
$(
call
SUBDIR_TEST,
$(LANGTOOLS_DIR)
,
JT_JAVA
=
$(PRODUCT_HOME)
JTREG_HOME
=
$(JT_HOME)
TEST
=
"
$(
subst
langtools_,,
$@
)
"
$(
subst
langtools_,,
$@
))
clean
:
jdk_%
:
@
$(NO_STOPPING)
$(
call
SUBDIR_TEST,
$(JDK_DIR)
,
TEST
=
"
$@
"
$@
)
################################################################
# Phony targets (e.g. these are not filenames)
.PHONY
:
all clean
\
$(JDK_ALL_TEST_LIST) $(JDK_META_TEST_LIST) $(JDK_JCK7_LIST)
\
$(LANGTOOLS_TEST_LIST)
.PHONY
:
all clean
################################################################
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录