Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
openanolis
dragonwell8
提交
a98cfe0e
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看板
提交
a98cfe0e
编写于
3月 12, 2013
作者:
L
lana
浏览文件
操作
浏览文件
下载
差异文件
Merge
上级
9138c5cc
242eaf3a
变更
15
隐藏空白更改
内联
并排
Showing
15 changed file
with
200 addition
and
42 deletion
+200
-42
Makefile
Makefile
+7
-0
common/autoconf/generated-configure.sh
common/autoconf/generated-configure.sh
+38
-14
common/autoconf/source-dirs.m4
common/autoconf/source-dirs.m4
+14
-1
common/autoconf/spec.gmk.in
common/autoconf/spec.gmk.in
+3
-0
common/autoconf/toolchain.m4
common/autoconf/toolchain.m4
+21
-13
common/bin/hgforest.sh
common/bin/hgforest.sh
+1
-1
common/makefiles/Main.gmk
common/makefiles/Main.gmk
+16
-7
common/makefiles/MakeBase.gmk
common/makefiles/MakeBase.gmk
+2
-1
common/makefiles/javadoc/NON_CORE_PKGS.gmk
common/makefiles/javadoc/NON_CORE_PKGS.gmk
+6
-3
make/Defs-internal.gmk
make/Defs-internal.gmk
+14
-0
make/jdk-rules.gmk
make/jdk-rules.gmk
+3
-0
make/nashorn-rules.gmk
make/nashorn-rules.gmk
+59
-0
make/sanity-rules.gmk
make/sanity-rules.gmk
+14
-0
make/scripts/hgforest.sh
make/scripts/hgforest.sh
+1
-1
make/scripts/webrev.ksh
make/scripts/webrev.ksh
+1
-1
未找到文件。
Makefile
浏览文件 @
a98cfe0e
...
...
@@ -90,6 +90,7 @@ include ./make/corba-rules.gmk
include
./make/jaxp-rules.gmk
include
./make/jaxws-rules.gmk
include
./make/jdk-rules.gmk
include
./make/nashorn-rules.gmk
include
./make/install-rules.gmk
include
./make/sponsors-rules.gmk
include
./make/deploy-rules.gmk
...
...
@@ -174,6 +175,11 @@ ifeq ($(BUILD_JDK), true)
clobber
::
jdk-clobber
endif
ifeq
($(BUILD_NASHORN), true)
generic_build_repo_series
::
$(NASHORN)
clobber
::
nashorn-clobber
endif
ifeq
($(BUILD_DEPLOY), true)
generic_build_repo_series
::
$(DEPLOY)
clobber
::
deploy-clobber
...
...
@@ -336,6 +342,7 @@ deploy_fastdebug_only:
BUILD_HOTSPOT
=
false
\
BUILD_JDK
=
false
\
BUILD_LANGTOOLS
=
false
\
BUILD_NASHORN
=
false
\
BUILD_CORBA
=
false
\
BUILD_JAXP
=
false
\
BUILD_JAXWS
=
false
\
...
...
common/autoconf/generated-configure.sh
浏览文件 @
a98cfe0e
...
...
@@ -739,6 +739,7 @@ BUILD_OUTPUT
OVERRIDE_SRC_ROOT
ADD_SRC_ROOT
JDK_TOPDIR
NASHORN_TOPDIR
HOTSPOT_TOPDIR
JAXWS_TOPDIR
JAXP_TOPDIR
...
...
@@ -3729,7 +3730,7 @@ fi
#CUSTOM_AUTOCONF_INCLUDE
# Do not change or remove the following line, it is needed for consistency checks:
DATE_WHEN_GENERATED=1362
411827
DATE_WHEN_GENERATED=1362
540061
###############################################################################
#
...
...
@@ -15660,6 +15661,7 @@ CORBA_TOPDIR="$SRC_ROOT/corba"
JAXP_TOPDIR="$SRC_ROOT/jaxp"
JAXWS_TOPDIR="$SRC_ROOT/jaxws"
HOTSPOT_TOPDIR="$SRC_ROOT/hotspot"
NASHORN_TOPDIR="$SRC_ROOT/nashorn"
JDK_TOPDIR="$SRC_ROOT/jdk"
...
...
@@ -15670,6 +15672,7 @@ JDK_TOPDIR="$SRC_ROOT/jdk"
###############################################################################
#
# Pickup additional source for a component from outside of the source root
...
...
@@ -15900,6 +15903,19 @@ $as_echo_n "checking if hotspot should be overridden... " >&6; }
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes with $HOTSPOT_TOPDIR" >&5
$as_echo "yes with $HOTSPOT_TOPDIR" >&6; }
fi
if test "x$with_override_nashorn" != x; then
CURDIR="$PWD"
cd "$with_override_nashorn"
NASHORN_TOPDIR="`pwd`"
cd "$CURDIR"
if ! test -f $NASHORN_TOPDIR/makefiles/BuildNashorn.gmk; then
as_fn_error $? "You have to override nashorn with a full nashorn repo!" "$LINENO" 5
fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if nashorn should be overridden" >&5
$as_echo_n "checking if nashorn should be overridden... " >&6; }
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes with $NASHORN_TOPDIR" >&5
$as_echo "yes with $NASHORN_TOPDIR" >&6; }
fi
if test "x$with_override_jdk" != x; then
CURDIR="$PWD"
cd "$with_override_jdk"
...
...
@@ -18086,14 +18102,18 @@ fi
### Locate C compiler (CC)
# gcc is almost always present, but on Windows we
# prefer cl.exe and on Solaris we prefer CC.
# Thus test for them in this order.
if test "x$OPENJDK_TARGET_OS" = xmacosx; then
# Do not probe for cc on MacOSX.
COMPILER_CHECK_LIST="cl gcc"
# On windows, only cl.exe is supported.
# On Solaris, cc is preferred to gcc.
# Elsewhere, gcc is preferred to cc.
if test "x$CC" != x; then
COMPILER_CHECK_LIST="$CC"
elif test "x$OPENJDK_TARGET_OS" = "xwindows"; then
COMPILER_CHECK_LIST="cl"
elif test "x$OPENJDK_TARGET_OS" = "xsolaris"; then
COMPILER_CHECK_LIST="cc gcc"
else
COMPILER_CHECK_LIST="
cl cc g
cc"
COMPILER_CHECK_LIST="
gcc
cc"
fi
...
...
@@ -19057,7 +19077,7 @@ $as_echo "$as_me: The result from running with --version was: \"$COMPILER_VERSIO
$as_echo "$as_me: Using $COMPILER_VENDOR $COMPILER_NAME compiler version $COMPILER_VERSION (located at $COMPILER)" >&6;}
# Now that we have resolved CC ourself, let autoconf have it
'
s go at it
# Now that we have resolved CC ourself, let autoconf have its go at it
ac_ext=c
ac_cpp='$CPP $CPPFLAGS'
ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
...
...
@@ -19659,13 +19679,17 @@ ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
### Locate C++ compiler (CXX)
if test "x$OPENJDK_TARGET_OS" = xmacosx; then
# Do not probe for CC on MacOSX.
COMPILER_CHECK_LIST="cl g++"
if test "x$CXX" != x; then
COMPILER_CHECK_LIST="$CXX"
elif test "x$OPENJDK_TARGET_OS" = "xwindows"; then
COMPILER_CHECK_LIST="cl"
elif test "x$OPENJDK_TARGET_OS" = "xsolaris"; then
COMPILER_CHECK_LIST="CC g++"
else
COMPILER_CHECK_LIST="
cl CC g++
"
COMPILER_CHECK_LIST="
g++ CC
"
fi
COMPILER_NAME=C++
CXX=
...
...
@@ -20626,7 +20650,7 @@ $as_echo "$as_me: The result from running with --version was: \"$COMPILER_VERSIO
$as_echo "$as_me: Using $COMPILER_VENDOR $COMPILER_NAME compiler version $COMPILER_VERSION (located at $COMPILER)" >&6;}
# Now that we have resolved CXX ourself, let autoconf have it
'
s go at it
# Now that we have resolved CXX ourself, let autoconf have its go at it
ac_ext=cpp
ac_cpp='$CXXCPP $CPPFLAGS'
ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
common/autoconf/source-dirs.m4
浏览文件 @
a98cfe0e
...
...
@@ -33,12 +33,14 @@ CORBA_TOPDIR="$SRC_ROOT/corba"
JAXP_TOPDIR="$SRC_ROOT/jaxp"
JAXWS_TOPDIR="$SRC_ROOT/jaxws"
HOTSPOT_TOPDIR="$SRC_ROOT/hotspot"
NASHORN_TOPDIR="$SRC_ROOT/nashorn"
JDK_TOPDIR="$SRC_ROOT/jdk"
AC_SUBST(LANGTOOLS_TOPDIR)
AC_SUBST(CORBA_TOPDIR)
AC_SUBST(JAXP_TOPDIR)
AC_SUBST(JAXWS_TOPDIR)
AC_SUBST(HOTSPOT_TOPDIR)
AC_SUBST(NASHORN_TOPDIR)
AC_SUBST(JDK_TOPDIR)
])
...
...
@@ -233,7 +235,18 @@ if test "x$with_override_hotspot" != x; then
fi
AC_MSG_CHECKING([if hotspot should be overridden])
AC_MSG_RESULT([yes with $HOTSPOT_TOPDIR])
fi
fi
if test "x$with_override_nashorn" != x; then
CURDIR="$PWD"
cd "$with_override_nashorn"
NASHORN_TOPDIR="`pwd`"
cd "$CURDIR"
if ! test -f $NASHORN_TOPDIR/makefiles/BuildNashorn.gmk; then
AC_MSG_ERROR([You have to override nashorn with a full nashorn repo!])
fi
AC_MSG_CHECKING([if nashorn should be overridden])
AC_MSG_RESULT([yes with $NASHORN_TOPDIR])
fi
if test "x$with_override_jdk" != x; then
CURDIR="$PWD"
cd "$with_override_jdk"
...
...
common/autoconf/spec.gmk.in
浏览文件 @
a98cfe0e
...
...
@@ -141,6 +141,7 @@ CORBA_TOPDIR:=@CORBA_TOPDIR@
JAXP_TOPDIR:=@JAXP_TOPDIR@
JAXWS_TOPDIR:=@JAXWS_TOPDIR@
HOTSPOT_TOPDIR:=@HOTSPOT_TOPDIR@
NASHORN_TOPDIR:=@NASHORN_TOPDIR@
COPYRIGHT_YEAR:=@COPYRIGHT_YEAR@
# Location where build customization files may be found
...
...
@@ -230,6 +231,7 @@ JAXP_OUTPUTDIR=$(BUILD_OUTPUT)/jaxp
JAXWS_OUTPUTDIR=$(BUILD_OUTPUT)/jaxws
HOTSPOT_OUTPUTDIR=$(BUILD_OUTPUT)/hotspot
JDK_OUTPUTDIR=$(BUILD_OUTPUT)/jdk
NASHORN_OUTPUTDIR=$(BUILD_OUTPUT)/nashorn
IMAGES_OUTPUTDIR=$(BUILD_OUTPUT)/images
JCE_OUTPUTDIR=$(BUILD_OUTPUT)/jce-release
...
...
@@ -238,6 +240,7 @@ CORBA_DIST=$(CORBA_OUTPUTDIR)/dist
JAXP_DIST=$(JAXP_OUTPUTDIR)/dist
JAXWS_DIST=$(JAXWS_OUTPUTDIR)/dist
HOTSPOT_DIST=@HOTSPOT_DIST@
NASHORN_DIST=$(NASHORN_OUTPUTDIR)/dist
BUILD_HOTSPOT=@BUILD_HOTSPOT@
...
...
common/autoconf/toolchain.m4
浏览文件 @
a98cfe0e
...
...
@@ -248,30 +248,38 @@ fi
### Locate C compiler (CC)
# gcc is almost always present, but on Windows we
# prefer cl.exe and on Solaris we prefer CC.
# Thus test for them in this order.
if test "x$OPENJDK_TARGET_OS" = xmacosx; then
# Do not probe for cc on MacOSX.
COMPILER_CHECK_LIST="cl gcc"
# On windows, only cl.exe is supported.
# On Solaris, cc is preferred to gcc.
# Elsewhere, gcc is preferred to cc.
if test "x$CC" != x; then
COMPILER_CHECK_LIST="$CC"
elif test "x$OPENJDK_TARGET_OS" = "xwindows"; then
COMPILER_CHECK_LIST="cl"
elif test "x$OPENJDK_TARGET_OS" = "xsolaris"; then
COMPILER_CHECK_LIST="cc gcc"
else
COMPILER_CHECK_LIST="
cl cc g
cc"
COMPILER_CHECK_LIST="
gcc
cc"
fi
TOOLCHAIN_FIND_COMPILER([CC],[C],[$COMPILER_CHECK_LIST])
# Now that we have resolved CC ourself, let autoconf have it
'
s go at it
# Now that we have resolved CC ourself, let autoconf have its go at it
AC_PROG_CC([$CC])
### Locate C++ compiler (CXX)
if test "x$OPENJDK_TARGET_OS" = xmacosx; then
# Do not probe for CC on MacOSX.
COMPILER_CHECK_LIST="cl g++"
if test "x$CXX" != x; then
COMPILER_CHECK_LIST="$CXX"
elif test "x$OPENJDK_TARGET_OS" = "xwindows"; then
COMPILER_CHECK_LIST="cl"
elif test "x$OPENJDK_TARGET_OS" = "xsolaris"; then
COMPILER_CHECK_LIST="CC g++"
else
COMPILER_CHECK_LIST="
cl CC g++
"
COMPILER_CHECK_LIST="
g++ CC
"
fi
TOOLCHAIN_FIND_COMPILER([CXX],[C++],[$COMPILER_CHECK_LIST])
# Now that we have resolved CXX ourself, let autoconf have it
'
s go at it
# Now that we have resolved CXX ourself, let autoconf have its go at it
AC_PROG_CXX([$CXX])
### Locate other tools
...
...
common/bin/hgforest.sh
浏览文件 @
a98cfe0e
...
...
@@ -96,7 +96,7 @@ pull_default=""
repos
=
""
repos_extra
=
""
if
[
"
${
command
}
"
=
"clone"
-o
"
${
command
}
"
=
"fclone"
]
;
then
subrepos
=
"corba jaxp jaxws langtools jdk hotspot"
subrepos
=
"corba jaxp jaxws langtools jdk hotspot
nashorn
"
if
[
-f
.hg/hgrc
]
;
then
pull_default
=
`
hg paths default
`
if
[
"
${
pull_default
}
"
=
""
]
;
then
...
...
common/makefiles/Main.gmk
浏览文件 @
a98cfe0e
...
...
@@ -120,6 +120,12 @@ jdk-only: start-make
@($(CD) $(JDK_TOPDIR)/makefiles && $(BUILD_LOG_WRAPPER) $(MAKE) $(MAKE_ARGS) -f BuildJdk.gmk $(JDK_TARGET))
@$(call TargetExit)
nashorn: jdk nashorn-only
nashorn-only: start-make
@$(call TargetEnter)
@($(CD) $(NASHORN_TOPDIR)/makefiles && $(BUILD_LOG_WRAPPER) $(MAKE) $(MAKE_ARGS) -f BuildNashorn.gmk)
@$(call TargetExit)
demos: jdk demos-only
demos-only: start-make
@$(call TargetEnter)
...
...
@@ -128,7 +134,7 @@ demos-only: start-make
# Note: This double-colon rule is intentional, to support
# custom make file integration.
images:: source-tips demos images-only
images:: source-tips demos
nashorn
images-only
images-only: start-make
@$(call TargetEnter)
@($(CD) $(JDK_TOPDIR)/makefiles && $(BUILD_LOG_WRAPPER) $(MAKE) $(MAKE_ARGS) -f BuildJdk.gmk images)
...
...
@@ -175,9 +181,10 @@ bootcycle-images:
@$(ECHO) Boot cycle build step 2: Building a new JDK image using previously built image
@($(CD) $(SRC_ROOT)/common/makefiles && $(BUILD_LOG_WRAPPER) $(MAKE) SPEC=$(dir $(SPEC))bootcycle-spec.gmk images)
test: start-make
test: images test-only
test-only: start-make
@$(call TargetEnter)
@($(CD) $(SRC_ROOT)/test && $(BUILD_LOG_WRAPPER) $(MAKE) -j1 -k MAKEFLAGS= PRODUCT_HOME=$(
OUTPUT_ROOT)/jdk JPRT_JAVA_HOME=$(OUTPUT_ROOT)/jdk
ALT_OUTPUTDIR=$(OUTPUT_ROOT) $(TEST)) || true
@($(CD) $(SRC_ROOT)/test && $(BUILD_LOG_WRAPPER) $(MAKE) -j1 -k MAKEFLAGS= PRODUCT_HOME=$(
JDK_IMAGE_DIR) JPRT_JAVA_HOME=$(JDK_IMAGE_DIR)
ALT_OUTPUTDIR=$(OUTPUT_ROOT) $(TEST)) || true
@$(call TargetExit)
# Stores the tips for each repository. This file is be used when constructing the jdk image and can be
...
...
@@ -190,7 +197,7 @@ $(OUTPUT_ROOT)/source_tips: FRC
# Remove everything, except the output from configure.
clean: clean-langtools clean-corba clean-jaxp clean-jaxws clean-hotspot clean-jdk clean-images clean-overlay-images clean-bootcycle-build clean-docs
clean: clean-langtools clean-corba clean-jaxp clean-jaxws clean-hotspot clean-jdk clean-
nashorn clean-
images clean-overlay-images clean-bootcycle-build clean-docs
@($(CD) $(OUTPUT_ROOT) && $(RM) -r tmp source_tips build.log* build-trace*.log*)
@$(ECHO) Cleaned all build artifacts.
...
...
@@ -220,6 +227,8 @@ clean-hotspot:
$(call CleanComponent,hotspot)
clean-jdk:
$(call CleanComponent,jdk)
clean-nashorn:
$(call CleanComponent,nashorn)
clean-images:
$(call CleanComponent,images)
clean-overlay-images:
...
...
@@ -230,10 +239,10 @@ clean-docs:
$(call CleanComponent,docs)
$(call CleanComponent,docstemp)
.PHONY: langtools corba jaxp jaxws hotspot jdk images overlay-images install
.PHONY: langtools-only corba-only jaxp-only jaxws-only hotspot-only jdk-only images-only overlay-images-only install-only
.PHONY: langtools corba jaxp jaxws hotspot jdk
nashorn
images overlay-images install
.PHONY: langtools-only corba-only jaxp-only jaxws-only hotspot-only jdk-only
nashorn-only
images-only overlay-images-only install-only
.PHONY: all test clean dist-clean bootcycle-images start-make
.PHONY: clean-langtools clean-corba clean-jaxp clean-jaxws clean-hotspot clean-jdk clean-images clean-overlay-images clean-bootcycle-build
.PHONY: clean-langtools clean-corba clean-jaxp clean-jaxws clean-hotspot clean-jdk clean-
nashorn clean-
images clean-overlay-images clean-bootcycle-build
.PHONY: profiles profiles-only profiles-oscheck
FRC: # Force target
common/makefiles/MakeBase.gmk
浏览文件 @
a98cfe0e
...
...
@@ -51,8 +51,9 @@ decompress_paths=$(SED) -f $(SRC_ROOT)/common/makefiles/support/ListPathsSafely-
-e 's|X98|$(OUTPUT_ROOT)|g' -e 's|X97|$(SRC_ROOT)|g' \
-e 's|X00|X|g' | tr '\n' '$2'
# Subst in an extra $ to prevent it from disappearing.
define ListPathsSafely_If
$(if $(word $3,$($1)),$(eval $1_LPS$3:=$(call compress_paths,$(
wordlist $3,$4,$($1
)))))
$(if $(word $3,$($1)),$(eval $1_LPS$3:=$(call compress_paths,$(
subst $$,$$$$,$(wordlist $3,$4,$($1)
)))))
endef
define ListPathsSafely_Printf
...
...
common/makefiles/javadoc/NON_CORE_PKGS.gmk
浏览文件 @
a98cfe0e
...
...
@@ -80,7 +80,8 @@ JCONSOLE_PKGS = com.sun.tools.jconsole
TREEAPI_PKGS = com.sun.source.doctree \
com.sun.source.tree \
com.sun.source.util
com.sun.source.util \
jdk
SMARTCARDIO_PKGS = javax.smartcardio
...
...
@@ -93,6 +94,8 @@ APPLE_EXT_PKGS = com.apple.concurrent \
com.apple.eio
endif
JDK_PKGS = jdk
# non-core packages in rt.jar
NON_CORE_PKGS = $(DOMAPI_PKGS) \
$(MGMT_PKGS) \
...
...
@@ -103,5 +106,5 @@ NON_CORE_PKGS = $(DOMAPI_PKGS) \
$(HTTPSERVER_PKGS) \
$(SMARTCARDIO_PKGS) \
$(SCTPAPI_PKGS) \
$(APPLE_EXT_PKGS)
$(APPLE_EXT_PKGS)
\
$(JDK_PKGS)
make/Defs-internal.gmk
浏览文件 @
a98cfe0e
...
...
@@ -100,6 +100,7 @@ ABS_JAXP_TOPDIR:=$(call OptFullPath,"$(JAXP_TOPDIR)")
ABS_JAXWS_TOPDIR:=$(call OptFullPath,"$(JAXWS_TOPDIR)")
ABS_JDK_TOPDIR:=$(call OptFullPath,"$(JDK_TOPDIR)")
ABS_HOTSPOT_TOPDIR:=$(call OptFullPath,"$(HOTSPOT_TOPDIR)")
ABS_NASHORN_TOPDIR:=$(call OptFullPath,"$(NASHORN_TOPDIR)")
ABS_INSTALL_TOPDIR:=$(call OptFullPath,"$(INSTALL_TOPDIR)")
ABS_SPONSORS_TOPDIR:=$(call OptFullPath,"$(SPONSORS_TOPDIR)")
ABS_DEPLOY_TOPDIR:=$(call OptFullPath,"$(DEPLOY_TOPDIR)")
...
...
@@ -165,6 +166,15 @@ ifeq ($(JDK_SRC_AVAILABLE),true)
endif
endif
NASHORN_SRC_AVAILABLE := $(call MkExists,$(NASHORN_TOPDIR)/make/Makefile)
ifndef BUILD_NASHORN
ifdef ALT_NASHORN_DIST
BUILD_NASHORN := false
else
BUILD_NASHORN := $(NASHORN_SRC_AVAILABLE)
endif
endif
DEPLOY_SRC_AVAILABLE := $(call MkExists,$(DEPLOY_TOPDIR)/make/Makefile)
ifndef BUILD_DEPLOY
BUILD_DEPLOY := $(DEPLOY_SRC_AVAILABLE)
...
...
@@ -308,6 +318,10 @@ ifndef ALT_JAXWS_DIST
JAXWS_OUTPUTDIR = $(ABS_OUTPUTDIR)/jaxws
ABS_JAXWS_DIST = $(JAXWS_OUTPUTDIR)/dist
endif
ifndef ALT_NASHORN_DIST
NASHORN_OUTPUTDIR = $(ABS_OUTPUTDIR)/nashorn
ABS_NASHORN_DIST = $(NASHORN_OUTPUTDIR)/dist
endif
# Common make arguments (supplied to all component builds)
COMMON_BUILD_ARGUMENTS = \
...
...
make/jdk-rules.gmk
浏览文件 @
a98cfe0e
...
...
@@ -62,6 +62,9 @@ endif
ifeq ($(BUILD_JAXWS), true)
JDK_BUILD_ARGUMENTS += ALT_JAXWS_DIST=$(ABS_JAXWS_DIST)
endif
ifeq ($(BUILD_NASHORN), true)
JDK_BUILD_ARGUMENTS += ALT_NASHORN_DIST=$(ABS_NASHORN_DIST)
endif
ifeq ($(BUILD_HOTSPOT), true)
JDK_BUILD_ARGUMENTS += ALT_HOTSPOT_IMPORT_PATH=$(HOTSPOT_DIR)/import
...
...
make/nashorn-rules.gmk
0 → 100644
浏览文件 @
a98cfe0e
#
# Copyright (c) 2001, 2011, 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
# under the terms of the GNU General Public License version 2 only, as
# published by the Free Software Foundation. Oracle designates this
# particular file as subject to the "Classpath" exception as provided
# by Oracle in the LICENSE file that accompanied this code.
#
# This code is distributed in the hope that it will be useful, but WITHOUT
# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
# version 2 for more details (a copy is included in the LICENSE file that
# accompanied this code).
#
# You should have received a copy of the GNU General Public License version
# 2 along with this work; if not, write to the Free Software Foundation,
# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
#
# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
# or visit www.oracle.com if you need additional information or have any
# questions.
#
################################################################
# NASHORN TARGETS
################################################################
NASHORN_BUILD_ARGUMENTS = \
$(COMMON_BUILD_ARGUMENTS) \
ALT_OUTPUTDIR=$(NASHORN_OUTPUTDIR) \
ALT_BOOTDIR=$(BOOTDIR) \
ALT_JDK_IMPORT_PATH=$(JDK_IMPORT_PATH)
ifeq ($(BUILD_LANGTOOLS), true)
NASHORN_BUILD_ARGUMENTS += ALT_LANGTOOLS_DIST=$(ABS_LANGTOOLS_DIST)
endif
# Default targets
NASHORN = nashorn-build
nashorn: nashorn-build
nashorn-build:
$(MKDIR) -p $(NASHORN_OUTPUTDIR)
@$(call MakeStart,nashorn,all)
($(CD) $(NASHORN_TOPDIR)/make && \
$(MAKE) $(NASHORN_BUILD_ARGUMENTS) all)
@$(call MakeFinish,nashorn,all)
nashorn-clobber::
$(MKDIR) -p $(NASHORN_OUTPUTDIR)
@$(call MakeStart,nashorn,clobber)
($(CD) $(NASHORN_TOPDIR)/make && \
$(MAKE) $(NASHORN_BUILD_ARGUMENTS) clobber)
@$(call MakeFinish,nashorn,clobber)
.PHONY: nashorn nashorn-build nashorn-clobber
make/sanity-rules.gmk
浏览文件 @
a98cfe0e
...
...
@@ -182,6 +182,14 @@ ifeq ($(JDK_SRC_AVAILABLE), true)
"" >> $(WARNING_FILE)
endif
endif
ifeq ($(NASHORN_SRC_AVAILABLE), true)
ifneq ($(BUILD_NASHORN), true)
@$(ECHO) "WARNING: You are not building the NASHORN sources.\n" \
" The nashorn files will be obtained from \n" \
" the location set in ALT_JDK_IMPORT_PATH. \n" \
"" >> $(WARNING_FILE)
endif
endif
ifeq ($(DEPLOY_SRC_AVAILABLE), true)
ifneq ($(BUILD_DEPLOY), true)
@$(ECHO) "WARNING: You are not building the DEPLOY sources.\n" \
...
...
@@ -268,6 +276,9 @@ endif
ifeq ($(JDK_SRC_AVAILABLE), true)
@$(ECHO) " JDK_TOPDIR = $(JDK_TOPDIR)" >> $(MESSAGE_FILE)
endif
ifeq ($(NASHORN_SRC_AVAILABLE), true)
@$(ECHO) " NASHORN_TOPDIR = $(NASHORN_TOPDIR)" >> $(MESSAGE_FILE)
endif
ifeq ($(DEPLOY_SRC_AVAILABLE), true)
@$(ECHO) " DEPLOY_TOPDIR = $(DEPLOY_TOPDIR)" >> $(MESSAGE_FILE)
endif
...
...
@@ -303,6 +314,9 @@ endif
ifeq ($(JDK_SRC_AVAILABLE), true)
@$(ECHO) " BUILD_JDK = $(BUILD_JDK) " >> $(MESSAGE_FILE)
endif
ifeq ($(NASHORN_SRC_AVAILABLE), true)
@$(ECHO) " BUILD_NASHORN = $(BUILD_NASHORN) " >> $(MESSAGE_FILE)
endif
ifeq ($(DEPLOY_SRC_AVAILABLE), true)
@$(ECHO) " BUILD_DEPLOY = $(BUILD_DEPLOY) " >> $(MESSAGE_FILE)
endif
...
...
make/scripts/hgforest.sh
浏览文件 @
a98cfe0e
...
...
@@ -40,7 +40,7 @@ pull_default=""
repos
=
""
repos_extra
=
""
if
[
"
${
command
}
"
=
"clone"
-o
"
${
command
}
"
=
"fclone"
]
;
then
subrepos
=
"corba jaxp jaxws langtools jdk hotspot"
subrepos
=
"corba jaxp jaxws langtools jdk hotspot
nashorn
"
if
[
-f
.hg/hgrc
]
;
then
pull_default
=
`
hg paths default
`
if
[
"
${
pull_default
}
"
=
""
]
;
then
...
...
make/scripts/webrev.ksh
浏览文件 @
a98cfe0e
...
...
@@ -3023,7 +3023,7 @@ if [[ -n $CRID ]]; then
cleanup
=
's|\[#\(JDK-[0-9]\{5,\}\)\] \(.*\)|\1 : \2|'
fi
if
[[
-n
$WGET
]]
;
then
msg
=
`
$WGET
--timeout
=
10
--tries
=
1
-q
$url
-O
- |
grep
'<title>'
|
sed
's/<title>\(.*\)<\/title>/\1/'
|
sed
"
$cleanup
"
`
msg
=
`
$WGET
--timeout
=
10
--tries
=
1
-q
$url
-O
- |
grep
'<title>'
|
sed
's/<title>\(.*\)<\/title>/\1/'
|
sed
"
$cleanup
"
| html_quote
`
fi
if
[[
-z
$msg
]]
;
then
msg
=
"
${
id
}
"
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录