Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
openanolis
dragonwell11
提交
5fc6fe52
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,发现更多精彩内容 >>
提交
5fc6fe52
编写于
7月 05, 2017
作者:
D
duke
浏览文件
操作
浏览文件
下载
差异文件
Merge
上级
1f4756b0
cc85de47
变更
5
隐藏空白更改
内联
并排
Showing
5 changed file
with
9 addition
and
115 deletion
+9
-115
.hgtags-top-repo
.hgtags-top-repo
+1
-0
Makefile
Makefile
+3
-94
README-builds.html
README-builds.html
+3
-8
make/Defs-internal.gmk
make/Defs-internal.gmk
+1
-12
test/Makefile
test/Makefile
+1
-1
未找到文件。
.hgtags-top-repo
浏览文件 @
5fc6fe52
...
...
@@ -101,3 +101,4 @@ ed6950da30cf1e8904b4bdb034d471647942271f jdk7-b123
024a6755895bf91b5a3c98984c89ee018efbf538 jdk7-b124
5c4df7e992775c102f08e9f1c0a124b324641b70 jdk7-b125
b566d490905691787f8931f69947a92c67c6d5e4 jdk7-b126
bd70f76b0309068f157ae759c36eac8f2c6d098e jdk7-b127
Makefile
浏览文件 @
5fc6fe52
...
...
@@ -29,15 +29,6 @@ ifndef TOPDIR
TOPDIR
:=
.
endif
# Openjdk sources (only used if SKIP_OPENJDK_BUILD!=true)
OPENJDK_SOURCETREE
=
$(TOPDIR)
/openjdk
OPENJDK_BUILDDIR
:=
$(
shell
\
if
[
-r
$(OPENJDK_SOURCETREE)
/Makefile
]
;
then
\
echo
"
$(OPENJDK_SOURCETREE)
"
;
\
else
\
echo
"."
;
\
fi
)
ifndef
JDK_TOPDIR
JDK_TOPDIR
=
$(TOPDIR)
/jdk
endif
...
...
@@ -70,7 +61,7 @@ include ./make/deploy-rules.gmk
all
::
@
$(START_ECHO)
all
::
openjdk_check
sanity
all
::
sanity
ifeq
($(SKIP_FASTDEBUG_BUILD), false)
all
::
fastdebug_build
...
...
@@ -80,10 +71,6 @@ ifeq ($(SKIP_DEBUG_BUILD), false)
all
::
debug_build
endif
ifneq
($(SKIP_OPENJDK_BUILD), true)
all
::
openjdk_build
endif
all
::
all_product_build
all
::
...
...
@@ -267,81 +254,6 @@ product_build:: build_product_image
debug_build
::
build_debug_image
fastdebug_build
::
build_fastdebug_image
# Check on whether we really can build the openjdk, need source etc.
openjdk_check
:
FRC
ifneq
($(SKIP_OPENJDK_BUILD), true)
@
$(ECHO)
" "
@
$(ECHO)
"================================================="
@
if
[
!
-r
$(OPENJDK_BUILDDIR)
/Makefile
]
;
then
\
$(ECHO)
"ERROR: No openjdk source tree available at:
$(OPENJDK_BUILDDIR)
"
;
\
exit
1
;
\
else
\
$(ECHO)
"OpenJDK will be built after JDK is built"
;
\
$(ECHO)
" OPENJDK_BUILDDIR=
$(OPENJDK_BUILDDIR)
"
;
\
fi
@
$(ECHO)
"================================================="
@
$(ECHO)
" "
endif
# If we have bundle rules, we have a chance here to do a complete cycle
# build, of production and open build.
# FIXUP: We should create the openjdk source bundle and build that?
# But how do we reliable create or get at a formal openjdk source tree?
# The one we have needs to be trimmed of built bits and closed dirs.
# The repositories might not be available.
# The openjdk source bundle is probably not available.
ifneq
($(SKIP_OPENJDK_BUILD), true)
ifeq
($(BUILD_JDK), true)
ifeq
($(BUNDLE_RULES_AVAILABLE), true)
OPENJDK_OUTPUTDIR
=
$(ABS_OUTPUTDIR)
/open-output
OPENJDK_BUILD_NAME
\
=
openjdk-$(JDK_MINOR_VERSION)-$(BUILD_NUMBER)-$(PLATFORM)-$(ARCH)-$(BUNDLE_DATE)
OPENJDK_BUILD_BINARY_ZIP
=
$(ABS_BIN_BUNDLEDIR)
/
$(OPENJDK_BUILD_NAME)
.zip
BUILT_IMAGE
=
$(ABS_OUTPUTDIR)
/j2sdk-image
ifeq
($(PLATFORM)$(ARCH_DATA_MODEL),solaris64)
OPENJDK_BOOTDIR
=
$(BOOTDIR)
OPENJDK_IMPORTJDK
=
$(JDK_IMPORT_PATH)
else
OPENJDK_BOOTDIR
=
$(BUILT_IMAGE)
OPENJDK_IMPORTJDK
=
$(BUILT_IMAGE)
endif
openjdk_build
:
@
$(START_ECHO)
@
$(ECHO)
" "
@
$(ECHO)
"================================================="
@
$(ECHO)
"Starting openjdk build"
@
$(ECHO)
" Using: ALT_JDK_DEVTOOLS_DIR=
$(JDK_DEVTOOLS_DIR)
"
@
$(ECHO)
"================================================="
@
$(ECHO)
" "
$(RM)
-r
$(OPENJDK_OUTPUTDIR)
$(MKDIR)
-p
$(OPENJDK_OUTPUTDIR)
(
$(CD)
$(OPENJDK_BUILDDIR)
&&
$(MAKE)
\
OPENJDK
=
true
\
GENERATE_DOCS
=
false
\
ALT_JDK_DEVTOOLS_DIR
=
$(JDK_DEVTOOLS_DIR)
\
ALT_OUTPUTDIR
=
$(OPENJDK_OUTPUTDIR)
\
ALT_BOOTDIR
=
$(OPENJDK_BOOTDIR)
\
ALT_JDK_IMPORT_PATH
=
$(OPENJDK_IMPORTJDK)
\
product_build
)
$(RM)
$(OPENJDK_BUILD_BINARY_ZIP)
(
$(CD)
$(OPENJDK_OUTPUTDIR)
/j2sdk-image
&&
\
$(ZIPEXE)
-q
-r
$(OPENJDK_BUILD_BINARY_ZIP)
.
)
$(RM)
-r
$(OPENJDK_OUTPUTDIR)
@
$(ECHO)
" "
@
$(ECHO)
"================================================="
@
$(ECHO)
"Finished openjdk build"
@
$(ECHO)
" Binary Bundle:
$(OPENJDK_BUILD_BINARY_ZIP)
"
@
$(ECHO)
"================================================="
@
$(ECHO)
" "
@
$(FINISH_ECHO)
endif
endif
endif
clobber
::
$(RM)
-r
$(OUTPUTDIR)
/
*
$(RM)
-r
$(OUTPUTDIR)
/../
$(PLATFORM)
-
$(ARCH)
-debug
/
*
...
...
@@ -448,7 +360,6 @@ CACERTS_FILE.desc = Location of certificates file
DEVTOOLS_PATH.desc
=
Directory containing zip and gnumake
CUPS_HEADERS_PATH.desc
=
Include directory location
for
CUPS header files
DXSDK_PATH.desc
=
Root directory of DirectX SDK
MSVCRT_DLL_PATH.desc
=
Directory containing mscvrt.dll
# Make variables to print out (description and value)
VARIABLE_PRINTVAL_LIST
+=
\
...
...
@@ -477,12 +388,10 @@ VARIABLE_CHECKFIL_LIST += \
ifeq
($(PLATFORM), windows)
VARIABLE_PRINTVAL_LIST
+=
\
DXSDK_PATH
\
MSVCRT_DLL_PATH
DXSDK_PATH
VARIABLE_CHECKDIR_LIST
+=
\
DXSDK_PATH
\
MSVCRT_DLL_PATH
DXSDK_PATH
endif
...
...
README-builds.html
浏览文件 @
5fc6fe52
...
...
@@ -1414,14 +1414,14 @@
but it's normally found via the DirectX environment variable
<tt>
DXSDK_DIR
</tt>
.
</blockquote>
<strong><a
name=
"msvcr
t
"
><tt>
MSVCR100.DLL
</tt></a></strong>
<strong><a
name=
"msvcr
NN
"
><tt>
MSVCR100.DLL
</tt></a></strong>
<blockquote>
The OpenJDK build requires access to a redistributable
<tt>
MSVCR100.DLL
</tt>
.
This is usually picked up automatically from the redist
directories of Visual Studio 2010.
If this cannot be found set the
<a
href=
"#ALT_MSVCR
T_DLL_PATH"
><tt>
ALT_MSVCRT
_DLL_PATH
</tt></a>
<a
href=
"#ALT_MSVCR
NN_DLL_PATH"
><tt>
ALT_MSVCRNN
_DLL_PATH
</tt></a>
variable to the location of this file.
<p>
</blockquote>
...
...
@@ -1671,15 +1671,10 @@
variable
<tt>
DXSDK_DIR
</tt>
,
failing that, look in
<tt>
C:/DXSDK
</tt>
.
</dd>
<dt><tt><a
name=
"ALT_MSVCRT_DLL_PATH"
>
ALT_MSVCRT_DLL_PATH
</a></tt>
</dt>
<dd>
The location of the
<a
href=
"#msvcrt"
><tt>
MSVCRT.DLL
</tt></a>
.
</dd>
<dt><tt><a
name=
"ALT_MSVCRNN_DLL_PATH"
>
ALT_MSVCRNN_DLL_PATH
</a></tt>
</dt>
<dd>
The location of the
<a
href=
"#msvcr
t
"
><tt>
MSVCR100.DLL
</tt></a>
.
<a
href=
"#msvcr
NN
"
><tt>
MSVCR100.DLL
</tt></a>
.
</dd>
</dl>
</dd>
...
...
make/Defs-internal.gmk
浏览文件 @
5fc6fe52
...
...
@@ -147,7 +147,7 @@ ifndef BUILD_SPONSORS
endif
# Do we build the source
and openjdk binary plug
bundles?
# Do we build the source bundles?
BUNDLE_RULES = $(JDK_TOPDIR)/make/closed/bundles.gmk
ifeq ($(SKIP_BUNDLES_BUILD), true)
BUNDLE_RULES_AVAILABLE := false
...
...
@@ -171,7 +171,6 @@ ifdef OPENJDK
ifndef SKIP_COMPARE_IMAGES
SKIP_COMPARE_IMAGES = true
endif
SKIP_OPENJDK_BUILD = true
else
# Various non-OPENJDK reasons to NOT build the deploy repository
...
...
@@ -187,21 +186,11 @@ else
endif
endif
ifndef SKIP_OPENJDK_BUILD
#SKIP_OPENJDK_BUILD = false
# Until 6675289 is resolved, or this feature is removed.
SKIP_OPENJDK_BUILD = true
endif
endif
ifndef SKIP_PRODUCT_BUILD
SKIP_PRODUCT_BUILD = false
endif
# Solaris 64 bit builds are not complete enough to ever do this
ifeq ($(PLATFORM)$(ARCH_DATA_MODEL),solaris64)
SKIP_OPENJDK_BUILD = true
endif
# Many reasons why we would want to skip the comparison to previous jdk
ifndef SKIP_COMPARE_IMAGES
ifeq ($(BUILD_JDK), false)
...
...
test/Makefile
浏览文件 @
5fc6fe52
...
...
@@ -79,7 +79,7 @@ all: $(JDK_TEST_LIST) $(LANGTOOLS_TEST_LIST)
# Test targets
$(LANGTOOLS_TEST_LIST)
:
@
$(NO_STOPPING)
$(
call
SUBDIR_TEST,
$(LANGTOOLS_DIR)
,
$(
subst
langtools_,,
$@
))
$(JDK_TEST_LIST)
:
$(JDK_TEST_LIST)
$(JDK_TEST_LIST2)
:
@
$(NO_STOPPING)
$(
call
SUBDIR_TEST,
$(JDK_DIR)
,
$@
)
clean
:
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录