Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
openanolis
dragonwell8_hotspot
提交
47cad987
D
dragonwell8_hotspot
项目概览
openanolis
/
dragonwell8_hotspot
通知
2
Star
2
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
D
dragonwell8_hotspot
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
提交
47cad987
编写于
11月 30, 2010
作者:
O
ohair
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
6987107: Add variable to add to but not modify non-fcs version string
Reviewed-by: jcoomes, dholmes, andrew, kvn
上级
68e86929
变更
5
隐藏空白更改
内联
并排
Showing
5 changed file
with
12 addition
and
12 deletion
+12
-12
make/defs.make
make/defs.make
+6
-7
make/jprt.gmk
make/jprt.gmk
+0
-3
make/linux/makefiles/buildtree.make
make/linux/makefiles/buildtree.make
+1
-1
make/solaris/makefiles/buildtree.make
make/solaris/makefiles/buildtree.make
+1
-1
make/windows/projectfiles/common/Makefile
make/windows/projectfiles/common/Makefile
+4
-0
未找到文件。
make/defs.make
浏览文件 @
47cad987
...
...
@@ -101,15 +101,14 @@ ifndef HOTSPOT_RELEASE_VERSION
endif
ifdef
HOTSPOT_BUILD_VERSION
# specified in command line
(PRT build)
# specified in command line
else
ifdef
JPRT_BUILD_VERSION
# JPR build
HOTSPOT_BUILD_VERSION
=
$(JPRT_BUILD_VERSION)
else
ifdef
COOKED_BUILD_NUMBER
ifdef
COOKED_BUILD_NUMBER
# JRE build
HOTSPOT_BUILD_VERSION
=
HOTSPOT_BUILD_VERSION
=
else
ifdef
USER_RELEASE_SUFFIX
HOTSPOT_BUILD_VERSION
=
internal
-
$(USER_RELEASE_SUFFIX)
else
HOTSPOT_BUILD_VERSION
=
internal
endif
...
...
make/jprt.gmk
浏览文件 @
47cad987
...
...
@@ -25,9 +25,6 @@
# JPRT rule to build this workspace
JPRT_ARCHIVE_BUNDLE=$(ABS_OUTPUTDIR)/$(JPRT_BUILD_FLAVOR)-bundle.zip
ifdef JPRT_BUILD_VERSION
MILESTONE=$(JPRT_BUILD_VERSION)
endif
ifeq ($(OSNAME),windows)
ZIPFLAGS=-q
...
...
make/linux/makefiles/buildtree.make
浏览文件 @
47cad987
...
...
@@ -37,7 +37,7 @@
# OS_FAMILY - operating system
# VARIANT - core, compiler1, compiler2, or tiered
# HOTSPOT_RELEASE_VERSION - <major>.<minor>-b<nn> (11.0-b07)
# HOTSPOT_BUILD_VERSION - internal,
PRTjob ID, JPRTjob ID
# HOTSPOT_BUILD_VERSION - internal,
internal-$(USER_RELEASE_SUFFIX) or empty
# JRE_RELEASE_VERSION - <major>.<minor>.<micro> (1.7.0)
#
# Builds the directory trees with makefiles plus some convenience files in
...
...
make/solaris/makefiles/buildtree.make
浏览文件 @
47cad987
...
...
@@ -37,7 +37,7 @@
# OS_FAMILY - operating system
# VARIANT - core, compiler1, compiler2, or tiered
# HOTSPOT_RELEASE_VERSION - <major>.<minor>-b<nn> (11.0-b07)
# HOTSPOT_BUILD_VERSION - internal,
PRTjob ID, JPRTjob ID
# HOTSPOT_BUILD_VERSION - internal,
internal-$(USER_RELEASE_SUFFIX) or empty
# JRE_RELEASE_VERSION - <major>.<minor>.<micro> (1.7.0)
#
# Builds the directory trees with makefiles plus some convenience files in
...
...
make/windows/projectfiles/common/Makefile
浏览文件 @
47cad987
...
...
@@ -108,7 +108,11 @@ HOTSPOT_RELEASE_VERSION="$(HOTSPOT_RELEASE_VERSION)"
!
else
HOTSPOT_RELEASE_VERSION
=
"
$(HS_MAJOR_VER)
.
$(HS_MINOR_VER)
-b
$(HS_BUILD_NUMBER)
"
!
endif
!if
"$(USER_RELEASE_SUFFIX)"
!=
""
HOTSPOT_BUILD_VERSION$(HOTSPOT_BUILD_VERSION)
=
internal-
$(USER_RELEASE_SUFFIX)
!
else
HOTSPOT_BUILD_VERSION$(HOTSPOT_BUILD_VERSION)
=
internal
!
endif
!if
"$(HOTSPOT_BUILD_VERSION)"
!=
""
HOTSPOT_RELEASE_VERSION
=
"
$(HOTSPOT_RELEASE_VERSION)
-
$(HOTSPOT_BUILD_VERSION)
"
!
endif
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录