Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
openanolis
dragonwell8
提交
94e135ca
D
dragonwell8
项目概览
openanolis
/
dragonwell8
通知
5
Star
3
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
D
dragonwell8
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
提交
94e135ca
编写于
6月 30, 2011
作者:
J
jjg
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
7061195: Clean up makefiles for JDK 8
Reviewed-by: ohair, jjg Contributed-by: alexandre.boulgakov@oracle.com
上级
9a7efe26
变更
1
隐藏空白更改
内联
并排
Showing
1 changed file
with
3 addition
and
42 deletion
+3
-42
make/sanity-rules.gmk
make/sanity-rules.gmk
+3
-42
未找到文件。
make/sanity-rules.gmk
浏览文件 @
94e135ca
#
# Copyright (c) 2001, 201
0
, Oracle and/or its affiliates. All rights reserved.
# Copyright (c) 2001, 201
1
, Oracle and/or its affiliates. All rights reserved.
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
#
# This code is free software; you can redistribute it and/or modify it
...
...
@@ -56,7 +56,7 @@ endif
sanity:: post-sanity
source-sanity : pre-sanity
alt_bootdir bootdir
post-sanity
source-sanity : pre-sanity post-sanity
$(ERROR_FILE) $(WARNING_FILE) $(MESSAGE_FILE):
@$(prep-target)
...
...
@@ -223,45 +223,6 @@ ifdef DEV_ONLY
"" >> $(WARNING_FILE)
endif
######################################################
# if specified, ALT_BOOTDIR must point to non-relative path if set
######################################################
alt_bootdir:
ifdef ALT_BOOTDIR
@if [ `$(ECHO) $(subst \,/,$(ALT_BOOTDIR)) | $(EGREP) -c '^([A-Za-z]:)?/'` -ne 1 ]; then \
$(ECHO) "ERROR: ALT_BOOTDIR must be an Absolute Path Name, \n" \
" not a Relative Path Name. \n" \
" The current value of ALT_BOOTDIR is \n" \
" $(ALT_BOOTDIR) \n" \
" Please fix this and continue your build. \n" \
"" >> $(ERROR_FILE) ; \
fi
endif
######################################################
# BOOTDIR must point to a valid JDK.
######################################################
JAVA_VERSION := $(shell $(BOOTDIR)/bin/java$(EXE_SUFFIX) -version 2>&1 | $(NAWK) -F'"' '{ print $$2 }')
JAVA_VERSION_OK := $(shell $(ECHO) $(JAVA_VERSION) | $(EGREP) -c '^1.[5-6].[0-9]')
bootdir:
@if [ -x $(BOOTDIR)/bin/java$(EXE_SUFFIX) ]; then \
if [ $(JAVA_VERSION_OK) -ne 1 ]; then \
$(ECHO) "ERROR: Your BOOTDIR environment variable does not point \n" \
" to a valid JDK for bootstrapping this build. \n" \
" A JDK $(JDK_MKTG_VERSION) source generation process must be \n" \
" bootstrapped using JDK $(PREVIOUS_JDK_VERSION) fcs (or later). \n" \
" Apparently, your bootstrap JDK is version $(JAVA_VERSION) \n" \
" Please update your ALT_BOOTDIR setting and start your build again. \n" \
"" >> $(ERROR_FILE) ; \
fi \
else \
$(ECHO) "ERROR: BOOTDIR does not point to a valid Java 2 SDK \n" \
" Check that you have access to \n" \
" $(BOOTDIR)/bin/java$(EXE_SUFFIX) \n" \
" and/or check your value of ALT_BOOTDIR. \n" \
"" >> $(ERROR_FILE) ; \
fi
######################################################
# dump out the variable settings...
######################################################
...
...
@@ -350,4 +311,4 @@ endif
.PHONY: sanity settings pre-sanity insane \
post-sanity post-sanity-hotspot post-sanity-jdk \
post-sanity-install post-sanity-deploy \
alt_bootdir bootdir
environment
environment
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录