Merge
This commit is contained in:
commit
f0c8e98793
@ -264,3 +264,4 @@ cf22a728521f91a4692b433d39d730a0a1b23155 jdk9-b16
|
||||
75a08df650eb3126bab0c4d15241f5886162393c jdk9-b19
|
||||
ee4fd72b2ec3d92497f37163352f294aa695c6fb jdk9-b20
|
||||
9052803f4d01feda28b3d65f2b64dd457d21c7b6 jdk9-b21
|
||||
8e4bdab4c362aadde2d321f968cd503a2f779e2f jdk9-b22
|
||||
|
@ -69,8 +69,8 @@ ISA_DIR=$(OPENJDK_TARGET_CPU_ISADIR)
|
||||
# Yet another name for arch used for an extra subdir below the jvm lib.
|
||||
# Uses i386 and amd64, instead of x86 and x86_64.
|
||||
LIBARCH=$(OPENJDK_TARGET_CPU_LEGACY_LIB)
|
||||
# Old name for OPENJDK_TARGET_CPU, uses i586 and amd64, instead of x86 and x86_64.
|
||||
ARCH=$(OPENJDK_TARGET_CPU_LEGACY)
|
||||
# Set the cpu architecture
|
||||
ARCH=$(OPENJDK_TARGET_CPU_ARCH)
|
||||
# Legacy setting for building for a 64 bit machine.
|
||||
# If yes then this expands to _LP64:=1
|
||||
@LP64@
|
||||
|
@ -25,11 +25,34 @@
|
||||
# questions.
|
||||
#
|
||||
|
||||
to_stderr() {
|
||||
echo "$@" >&2
|
||||
}
|
||||
|
||||
error() {
|
||||
to_stderr "ERROR: $1"
|
||||
exit ${2:-126}
|
||||
}
|
||||
|
||||
warning() {
|
||||
to_stderr "WARNING: $1"
|
||||
}
|
||||
|
||||
version_field() {
|
||||
# rev is typically omitted for minor and major releases
|
||||
field=`echo ${1}.0 | cut -f ${2} -d .`
|
||||
if expr 1 + $field >/dev/null 2> /dev/null; then
|
||||
echo $field
|
||||
else
|
||||
echo -1
|
||||
fi
|
||||
}
|
||||
|
||||
# Version check
|
||||
|
||||
# required
|
||||
reqdmajor=1
|
||||
reqdminor=5
|
||||
reqdminor=4
|
||||
reqdrev=0
|
||||
|
||||
# requested
|
||||
@ -37,34 +60,39 @@ rqstmajor=2
|
||||
rqstminor=6
|
||||
rqstrev=3
|
||||
|
||||
|
||||
# installed
|
||||
hgwhere="`which hg 2> /dev/null | grep -v '^no hg in '`"
|
||||
hgwhere="`command -v hg`"
|
||||
if [ "x$hgwhere" = "x" ]; then
|
||||
echo "ERROR: Could not locate Mercurial command" >&2
|
||||
exit 126
|
||||
error "Could not locate Mercurial command"
|
||||
fi
|
||||
|
||||
hgversion="`hg --version 2> /dev/null | sed -n -e 's@^Mercurial Distributed SCM (version \(.*\))\$@\1@p'`"
|
||||
hgversion="`hg --version 2> /dev/null | sed -n -e 's@^Mercurial Distributed SCM (version \([^+]*\).*)\$@\1@p'`"
|
||||
if [ "x${hgversion}" = "x" ] ; then
|
||||
echo "ERROR: Could not determine Mercurial version" >&2
|
||||
exit 126
|
||||
error "Could not determine Mercurial version of $hgwhere"
|
||||
fi
|
||||
|
||||
hgmajor="`version_field $hgversion 1`"
|
||||
hgminor="`version_field $hgversion 2`"
|
||||
hgrev="`version_field $hgversion 3`"
|
||||
|
||||
if [ $hgmajor -eq -1 -o $hgminor -eq -1 -o $hgrev -eq -1 ] ; then
|
||||
error "Could not determine Mercurial version of $hgwhere from \"$hgversion\""
|
||||
fi
|
||||
|
||||
hgmajor="`echo $hgversion | cut -f 1 -d .`"
|
||||
hgminor="`echo $hgversion | cut -f 2 -d .`"
|
||||
hgrev="`echo $hgversion.0 | cut -f 3 -d .`" # rev is omitted for minor and major releases
|
||||
|
||||
# Require
|
||||
if [ $hgmajor -lt $reqdmajor -o \( $hgmajor -eq $reqdmajor -a $hgminor -lt $reqdminor \) -o \( $hgmajor -eq $reqdmajor -a $hgminor -eq $reqdminor -a $hgrev -lt $reqdrev \) ] ; then
|
||||
echo "ERROR: Mercurial version $reqdmajor.$reqdminor.$reqdrev or later is required. $hgwhere is version $hgversion" >&2
|
||||
exit 126
|
||||
error "Mercurial version $reqdmajor.$reqdminor.$reqdrev or later is required. $hgwhere is version $hgversion"
|
||||
fi
|
||||
|
||||
|
||||
# Request
|
||||
if [ $hgmajor -lt $rqstmajor -o \( $hgmajor -eq $rqstmajor -a $hgminor -lt $rqstminor \) -o \( $hgmajor -eq $rqstmajor -a $hgminor -eq $rqstminor -a $hgrev -lt $rqstrev \) ] ; then
|
||||
echo "WARNING: Mercurial version $rqstmajor.$rqstminor.$rqstrev or later is recommended. $hgwhere is version $hgversion" >&2
|
||||
warning "Mercurial version $rqstmajor.$rqstminor.$rqstrev or later is recommended. $hgwhere is version $hgversion"
|
||||
fi
|
||||
|
||||
|
||||
# Get clones of all absent nested repositories (harmless if already exist)
|
||||
sh ./common/bin/hgforest.sh clone "$@" || exit $?
|
||||
|
||||
|
@ -193,9 +193,7 @@ my.make.rule.test.targets.all= \
|
||||
${my.make.rule.test.targets.core}, \
|
||||
${my.make.rule.test.targets.svc}, \
|
||||
${my.test.target.set:TESTNAME=jdk_awt}, \
|
||||
${my.test.target.set:TESTNAME=jdk_beans1}, \
|
||||
${my.test.target.set:TESTNAME=jdk_beans2}, \
|
||||
${my.test.target.set:TESTNAME=jdk_beans3}, \
|
||||
${my.test.target.set:TESTNAME=jdk_beans}, \
|
||||
${my.test.target.set:TESTNAME=jdk_sound}, \
|
||||
${my.test.target.set:TESTNAME=jdk_swing}
|
||||
|
||||
|
Loading…
x
Reference in New Issue
Block a user