equal
deleted
inserted
replaced
745 HOTSPOT_DIST |
745 HOTSPOT_DIST |
746 BUILD_OUTPUT |
746 BUILD_OUTPUT |
747 OVERRIDE_SRC_ROOT |
747 OVERRIDE_SRC_ROOT |
748 ADD_SRC_ROOT |
748 ADD_SRC_ROOT |
749 JDK_TOPDIR |
749 JDK_TOPDIR |
|
750 NASHORN_TOPDIR |
750 HOTSPOT_TOPDIR |
751 HOTSPOT_TOPDIR |
751 JAXWS_TOPDIR |
752 JAXWS_TOPDIR |
752 JAXP_TOPDIR |
753 JAXP_TOPDIR |
753 CORBA_TOPDIR |
754 CORBA_TOPDIR |
754 LANGTOOLS_TOPDIR |
755 LANGTOOLS_TOPDIR |
15661 LANGTOOLS_TOPDIR="$SRC_ROOT/langtools" |
15662 LANGTOOLS_TOPDIR="$SRC_ROOT/langtools" |
15662 CORBA_TOPDIR="$SRC_ROOT/corba" |
15663 CORBA_TOPDIR="$SRC_ROOT/corba" |
15663 JAXP_TOPDIR="$SRC_ROOT/jaxp" |
15664 JAXP_TOPDIR="$SRC_ROOT/jaxp" |
15664 JAXWS_TOPDIR="$SRC_ROOT/jaxws" |
15665 JAXWS_TOPDIR="$SRC_ROOT/jaxws" |
15665 HOTSPOT_TOPDIR="$SRC_ROOT/hotspot" |
15666 HOTSPOT_TOPDIR="$SRC_ROOT/hotspot" |
|
15667 NASHORN_TOPDIR="$SRC_ROOT/nashorn" |
15666 JDK_TOPDIR="$SRC_ROOT/jdk" |
15668 JDK_TOPDIR="$SRC_ROOT/jdk" |
|
15669 |
15667 |
15670 |
15668 |
15671 |
15669 |
15672 |
15670 |
15673 |
15671 |
15674 |
15900 fi |
15903 fi |
15901 { $as_echo "$as_me:${as_lineno-$LINENO}: checking if hotspot should be overridden" >&5 |
15904 { $as_echo "$as_me:${as_lineno-$LINENO}: checking if hotspot should be overridden" >&5 |
15902 $as_echo_n "checking if hotspot should be overridden... " >&6; } |
15905 $as_echo_n "checking if hotspot should be overridden... " >&6; } |
15903 { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes with $HOTSPOT_TOPDIR" >&5 |
15906 { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes with $HOTSPOT_TOPDIR" >&5 |
15904 $as_echo "yes with $HOTSPOT_TOPDIR" >&6; } |
15907 $as_echo "yes with $HOTSPOT_TOPDIR" >&6; } |
|
15908 fi |
|
15909 if test "x$with_override_nashorn" != x; then |
|
15910 CURDIR="$PWD" |
|
15911 cd "$with_override_nashorn" |
|
15912 NASHORN_TOPDIR="`pwd`" |
|
15913 cd "$CURDIR" |
|
15914 if ! test -f $NASHORN_TOPDIR/makefiles/BuildNashorn.gmk; then |
|
15915 as_fn_error $? "You have to override nashorn with a full nashorn repo!" "$LINENO" 5 |
|
15916 fi |
|
15917 { $as_echo "$as_me:${as_lineno-$LINENO}: checking if nashorn should be overridden" >&5 |
|
15918 $as_echo_n "checking if nashorn should be overridden... " >&6; } |
|
15919 { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes with $NASHORN_TOPDIR" >&5 |
|
15920 $as_echo "yes with $NASHORN_TOPDIR" >&6; } |
15905 fi |
15921 fi |
15906 if test "x$with_override_jdk" != x; then |
15922 if test "x$with_override_jdk" != x; then |
15907 CURDIR="$PWD" |
15923 CURDIR="$PWD" |
15908 cd "$with_override_jdk" |
15924 cd "$with_override_jdk" |
15909 JDK_TOPDIR="`pwd`" |
15925 JDK_TOPDIR="`pwd`" |