Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
openanolis
dragonwell11
提交
9bbfd1ce
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,发现更多精彩内容 >>
提交
9bbfd1ce
编写于
10月 16, 2013
作者:
K
katleman
浏览文件
操作
浏览文件
下载
差异文件
Merge
上级
7de8a938
e9ee8bb1
变更
2
隐藏空白更改
内联
并排
Showing
2 changed file
with
39 addition
and
38 deletion
+39
-38
nashorn/makefiles/BuildNashorn.gmk
nashorn/makefiles/BuildNashorn.gmk
+32
-31
nashorn/makefiles/Makefile
nashorn/makefiles/Makefile
+7
-7
未找到文件。
nashorn/makefiles/BuildNashorn.gmk
浏览文件 @
9bbfd1ce
...
...
@@ -37,35 +37,35 @@ NASHORN_VERSION := $(JDK_VERSION)
NASHORN_FULL_VERSION := $(FULL_VERSION)
ifdef MILESTONE
ifeq ($(MILESTONE),internal)
ifeq ($(MILESTONE),
internal)
NASHORN_VERSION = $(FULL_VERSION)
endif
endif
# Need to use source and target 7 for nasgen to work.
$(eval $(call SetupJavaCompiler,GENERATE_NEWBYTECODE_DEBUG,\
JVM
:=$(JAVA),
\
JAVAC
:=$(NEW_JAVAC),
\
FLAGS
:=-g -source 7 -target 7 -bootclasspath $(JDK_CLASSES),
\
SERVER_DIR
:=$(SJAVAC_SERVER_DIR),
\
SERVER_JVM
:=
$(SJAVAC_SERVER_JAVA)))
$(eval $(call SetupJavaCompiler,GENERATE_NEWBYTECODE_DEBUG,
\
JVM
:= $(JAVA),
\
JAVAC
:= $(NEW_JAVAC),
\
FLAGS
:= -g -source 7 -target 7 -bootclasspath $(JDK_CLASSES),
\
SERVER_DIR
:= $(SJAVAC_SERVER_DIR),
\
SERVER_JVM
:=
$(SJAVAC_SERVER_JAVA)))
# Build nashorn into intermediate directory
$(eval $(call SetupJavaCompilation,BUILD_NASHORN,\
SETUP
:=GENERATE_NEWBYTECODE_DEBUG,
\
SRC
:=$(NASHORN_TOPDIR)/src,
\
COPY
:=.properties .js,
\
BIN
:=
$(NASHORN_OUTPUTDIR)/nashorn_classes))
$(eval $(call SetupJavaCompilation,BUILD_NASHORN,
\
SETUP
:= GENERATE_NEWBYTECODE_DEBUG,
\
SRC
:= $(NASHORN_TOPDIR)/src,
\
COPY
:= .properties .js,
\
BIN
:=
$(NASHORN_OUTPUTDIR)/nashorn_classes))
NASGEN_SRC := $(NASHORN_TOPDIR)/buildtools/nasgen/src
ASM_SRC := $(JDK_TOPDIR)/src/share/classes/jdk/internal/org/objectweb/asm
# Build nasgen
$(eval $(call SetupJavaCompilation,BUILD_NASGEN,\
SETUP
:=GENERATE_NEWBYTECODE_DEBUG,
\
SRC
:=
$(NASGEN_SRC) $(ASM_SRC), \
BIN
:=$(NASHORN_OUTPUTDIR)/nasgen_classes,
\
ADD_JAVAC_FLAGS
:=
-cp $(NASHORN_OUTPUTDIR)/nashorn_classes))
$(eval $(call SetupJavaCompilation,BUILD_NASGEN,
\
SETUP
:= GENERATE_NEWBYTECODE_DEBUG,
\
SRC
:=
$(NASGEN_SRC) $(ASM_SRC), \
BIN
:= $(NASHORN_OUTPUTDIR)/nasgen_classes,
\
ADD_JAVAC_FLAGS
:=
-cp $(NASHORN_OUTPUTDIR)/nashorn_classes))
# Nasgen needs nashorn classes
$(BUILD_NASGEN): $(BUILD_NASHORN)
...
...
@@ -77,35 +77,36 @@ $(NASHORN_OUTPUTDIR)/classes/_the.nasgen.run: $(BUILD_NASGEN)
$(RM) -rf $(@D)/jdk $(@D)/netscape
$(CP) -R -p $(NASHORN_OUTPUTDIR)/nashorn_classes/* $(@D)/
$(FIXPATH) $(JAVA) \
-cp "$(NASHORN_OUTPUTDIR)/nasgen_classes$(PATH_SEP)$(NASHORN_OUTPUTDIR)/nashorn_classes" \
jdk.nashorn.internal.tools.nasgen.Main $(@D) jdk.nashorn.internal.objects $(@D)
-cp "$(NASHORN_OUTPUTDIR)/nasgen_classes$(PATH_SEP)$(NASHORN_OUTPUTDIR)/nashorn_classes" \
jdk.nashorn.internal.tools.nasgen.Main $(@D) jdk.nashorn.internal.objects $(@D)
$(TOUCH) $@
# Version file needs to be processed with version numbers
VERSION_FILE := $(NASHORN_OUTPUTDIR)/classes/jdk/nashorn/internal/runtime/resources/version.properties
# Needs to happen after nasgen run since nasgen run deletes it
$(VERSION_FILE): $(NASHORN_OUTPUTDIR)/classes/_the.nasgen.run
$(VERSION_FILE): $(NASHORN_TOPDIR)/src/jdk/nashorn/internal/runtime/resources/version.properties-template
$(ECHO) Creating version.properties
$(MKDIR) -p $(@D)
$(CAT) $< | $(SED) -e 's/$$(FULL_VERSION)/$(NASHORN_FULL_VERSION)/g' \
-e 's/$$(RELEASE)/$(NASHORN_VERSION)/g' \
-e '/^#.*$$/d' -e '/^$$/d' > $@
-e 's/$$(RELEASE)/$(NASHORN_VERSION)/g' \
-e '/^#.*$$/d' -e '/^$$/d' > $@
MANIFEST_ATTRIBUTES
:=
Name: jdk/nashorn/\nImplementation-Title: Oracle Nashorn\nImplementation-Version: $(NASHORN_FULL_VERSION)
MANIFEST_ATTRIBUTES
:=
Name: jdk/nashorn/\nImplementation-Title: Oracle Nashorn\nImplementation-Version: $(NASHORN_FULL_VERSION)
# Create nashorn.jar from the final classes dir
$(eval $(call SetupArchive,BUILD_NASHORN_JAR,\
$(eval $(call SetupArchive,BUILD_NASHORN_JAR,
\
$(NASHORN_OUTPUTDIR)/classes/_the.nasgen.run \
$(VERSION_FILE),\
SRCS
:=$(NASHORN_OUTPUTDIR)/classes,
\
SUFFIXES
:=.class .js .properties Factory,
\
MANIFEST
:=$(NASHORN_TOPDIR)/src/META-INF/MANIFEST.MF,
\
EXTRA_MANIFEST_ATTR
:=$(MANIFEST_ATTRIBUTES),
\
SKIP_METAINF
:=true,
\
JAR
:=
$(NASHORN_JAR)))
$(VERSION_FILE),
\
SRCS
:= $(NASHORN_OUTPUTDIR)/classes,
\
SUFFIXES
:= .class .js .properties Factory,
\
MANIFEST
:= $(NASHORN_TOPDIR)/src/META-INF/MANIFEST.MF,
\
EXTRA_MANIFEST_ATTR
:= $(MANIFEST_ATTRIBUTES),
\
SKIP_METAINF
:= true,
\
JAR
:=
$(NASHORN_JAR)))
all: $(NASHORN_JAR)
.PHONY: all
nashorn/makefiles/Makefile
浏览文件 @
9bbfd1ce
...
...
@@ -24,19 +24,19 @@
#
# Locate this Makefile
ifeq
($(filter /%,
$(lastword $(MAKEFILE_LIST))),
)
makefile_path
:=
$(CURDIR)
/
$(
lastword
$(MAKEFILE_LIST)
)
ifeq
($(filter /%,
$(lastword $(MAKEFILE_LIST))),
)
makefile_path
:=
$(CURDIR)
/
$(
lastword
$(MAKEFILE_LIST)
)
else
makefile_path
:=
$(
lastword
$(MAKEFILE_LIST)
)
makefile_path
:=
$(
lastword
$(MAKEFILE_LIST)
)
endif
repo_dir
:=
$(
patsubst
%/makefiles/Makefile,%,
$(makefile_path)
)
repo_dir
:=
$(
patsubst
%/makefiles/Makefile, %,
$(makefile_path)
)
# What is the name of this subsystem (langtools, corba, etc)?
subsystem_name
:=
$(
notdir
$(repo_dir)
)
subsystem_name
:=
$(
notdir
$(repo_dir)
)
# Try to locate top-level makefile
top_level_makefile
:=
$(repo_dir)
/../common/makefiles/Makefile
ifneq
($(wildcard $(top_level_makefile)),)
top_level_makefile
:=
$(repo_dir)
/../common/makefiles/Makefile
ifneq
($(wildcard $(top_level_makefile)),
)
$(info
Will
run
$(subsystem_name)
target
on
top-level
Makefile)
$(info WARNING
:
This is a non-recommended way of building!)
$(info
===================================================)
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录