Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
openanolis
dragonwell11
提交
5bb1134f
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,发现更多精彩内容 >>
提交
5bb1134f
编写于
2月 05, 2014
作者:
E
erikj
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
8026773: Failing compilation in Corba does not fail the build
Reviewed-by: ihse, tbell
上级
7d0606fb
变更
2
隐藏空白更改
内联
并排
Showing
2 changed file
with
18 addition
and
5 deletion
+18
-5
common/autoconf/spec.gmk.in
common/autoconf/spec.gmk.in
+7
-4
make/common/JavaCompilation.gmk
make/common/JavaCompilation.gmk
+11
-1
未找到文件。
common/autoconf/spec.gmk.in
浏览文件 @
5bb1134f
...
@@ -456,10 +456,13 @@ NATIVE2ASCII:=@FIXPATH@ @NATIVE2ASCII@
...
@@ -456,10 +456,13 @@ NATIVE2ASCII:=@FIXPATH@ @NATIVE2ASCII@
JARSIGNER:=@FIXPATH@ @JARSIGNER@
JARSIGNER:=@FIXPATH@ @JARSIGNER@
# You run the new javac using the boot jdk with $(BOOT_JDK)/bin/java $(NEW_JAVAC) ...
# You run the new javac using the boot jdk with $(BOOT_JDK)/bin/java $(NEW_JAVAC) ...
BOOTSTRAP_JAVAC_JAR:=$(LANGTOOLS_OUTPUTDIR)/dist/bootstrap/lib/javac.jar
INTERIM_LANGTOOLS_JAR := $(LANGTOOLS_OUTPUTDIR)/dist/interim_langtools.jar
BOOTSTRAP_JAVAC_ARGS:="-Xbootclasspath/p:$(BOOTSTRAP_JAVAC_JAR)" -cp $(BOOTSTRAP_JAVAC_JAR)
INTERIM_LANGTOOLS_ARGS := "-Xbootclasspath/p:$(INTERIM_LANGTOOLS_JAR)" -cp $(INTERIM_LANGTOOLS_JAR)
NEW_JAVAC = $(BOOTSTRAP_JAVAC_ARGS) com.sun.tools.javac.Main
NEW_JAVAC = $(INTERIM_LANGTOOLS_ARGS) com.sun.tools.javac.Main
NEW_JAVADOC = $(BOOTSTRAP_JAVAC_ARGS) com.sun.tools.javadoc.Main
NEW_JAVADOC = $(INTERIM_LANGTOOLS_ARGS) com.sun.tools.javadoc.Main
# The interim corba jar is needed for running rmic
INTERIM_CORBA_JAR := $(CORBA_OUTPUTDIR)/dist/interim_corba.jar
# Base flags for RC
# Base flags for RC
# Guarding this against resetting value. Legacy make files include spec multiple
# Guarding this against resetting value. Legacy make files include spec multiple
...
...
make/common/JavaCompilation.gmk
浏览文件 @
5bb1134f
...
@@ -247,6 +247,8 @@ define SetupArchive
...
@@ -247,6 +247,8 @@ define SetupArchive
$$($1_SUPDATE_CONTENTS) \
$$($1_SUPDATE_CONTENTS) \
$$($1_JARINDEX) && true )
$$($1_JARINDEX) && true )
# Add jar to target list
$1 += $$($1_JAR)
endef
endef
define SetupZipArchive
define SetupZipArchive
...
@@ -307,6 +309,9 @@ define SetupZipArchive
...
@@ -307,6 +309,9 @@ define SetupZipArchive
$(ECHO) Updating $$($1_NAME)
$(ECHO) Updating $$($1_NAME)
$$(foreach i,$$($1_SRC),(cd $$i && $(ZIP) -qru $$@ . $$($1_ZIP_INCLUDES) $$($1_ZIP_EXCLUDES) -x \*_the.\* $$(addprefix -x$(SPACE),$$(patsubst $$i/%,%,$$($1_EXCLUDE_FILES))) || test "$$$$?" = "12" )$$(NEWLINE)) true
$$(foreach i,$$($1_SRC),(cd $$i && $(ZIP) -qru $$@ . $$($1_ZIP_INCLUDES) $$($1_ZIP_EXCLUDES) -x \*_the.\* $$(addprefix -x$(SPACE),$$(patsubst $$i/%,%,$$($1_EXCLUDE_FILES))) || test "$$$$?" = "12" )$$(NEWLINE)) true
$(TOUCH) $$@
$(TOUCH) $$@
# Add zip to target list
$1 += $$($1_ZIP)
endef
endef
define add_file_to_copy
define add_file_to_copy
...
@@ -579,6 +584,9 @@ define SetupJavaCompilation
...
@@ -579,6 +584,9 @@ define SetupJavaCompilation
JARINDEX:=$$($1_JARINDEX), \
JARINDEX:=$$($1_JARINDEX), \
HEADERS:=$$($1_HEADERS), \
HEADERS:=$$($1_HEADERS), \
SETUP:=$$($1_SETUP)))
SETUP:=$$($1_SETUP)))
# Add jar to target list
$1 += $$($1_JAR)
endif
endif
# Check if a srczip was specified, then setup the rules for the srczip.
# Check if a srczip was specified, then setup the rules for the srczip.
...
@@ -589,6 +597,8 @@ define SetupJavaCompilation
...
@@ -589,6 +597,8 @@ define SetupJavaCompilation
INCLUDES:=$$($1_INCLUDES), \
INCLUDES:=$$($1_INCLUDES), \
EXCLUDES:=$$($1_EXCLUDES), \
EXCLUDES:=$$($1_EXCLUDES), \
EXCLUDE_FILES:=$$($1_EXCLUDE_FILES)))
EXCLUDE_FILES:=$$($1_EXCLUDE_FILES)))
endif
# Add zip to target list
$1 += $$($1_SRCZIP)
endif
endef
endef
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录