Skip to content

Commit de261ec

Browse files
magicusmagicus
committed
8141414: Deprecate configure source overriding
Reviewed-by: erikj
1 parent 0ac445c commit de261ec

4 files changed

Lines changed: 71 additions & 467 deletions

File tree

‎common/autoconf/generated-configure.sh‎

Lines changed: 53 additions & 219 deletions
Original file line numberDiff line numberDiff line change
@@ -805,8 +805,6 @@ TOOLCHAIN_TYPE
805805
BUILD_HOTSPOT
806806
HOTSPOT_DIST
807807
BUILD_OUTPUT
808-
OVERRIDE_SRC_ROOT
809-
ADD_SRC_ROOT
810808
JDK_TOPDIR
811809
NASHORN_TOPDIR
812810
HOTSPOT_TOPDIR
@@ -1912,26 +1910,29 @@ Optional Packages:
19121910
--with-build-number Set build number value for build [b00]
19131911
--with-copyright-year Set copyright year value for build [current year]
19141912
--with-boot-jdk path to Boot JDK (used to bootstrap build) [probed]
1915-
--with-add-source-root for each and every source directory, look in this
1916-
additional source root for the same directory; if it
1917-
exists and have files in it, include it in the build
1913+
--with-add-source-root Deprecated. Option is kept for backwards
1914+
compatibility and is ignored
19181915
--with-override-source-root
1919-
for each and every source directory, look in this
1920-
override source root for the same directory; if it
1921-
exists, use that directory instead and ignore the
1922-
directory in the original source root
1916+
Deprecated. Option is kept for backwards
1917+
compatibility and is ignored
19231918
--with-adds-and-overrides
1924-
use the subdirs 'adds' and 'overrides' in the
1925-
specified directory as add-source-root and
1926-
override-source-root
1919+
Deprecated. Option is kept for backwards
1920+
compatibility and is ignored
19271921
--with-override-langtools
1928-
use this langtools dir for the build
1929-
--with-override-corba use this corba dir for the build
1930-
--with-override-jaxp use this jaxp dir for the build
1931-
--with-override-jaxws use this jaxws dir for the build
1932-
--with-override-hotspot use this hotspot dir for the build
1933-
--with-override-nashorn use this nashorn dir for the build
1934-
--with-override-jdk use this jdk dir for the build
1922+
Deprecated. Option is kept for backwards
1923+
compatibility and is ignored
1924+
--with-override-corba Deprecated. Option is kept for backwards
1925+
compatibility and is ignored
1926+
--with-override-jaxp Deprecated. Option is kept for backwards
1927+
compatibility and is ignored
1928+
--with-override-jaxws Deprecated. Option is kept for backwards
1929+
compatibility and is ignored
1930+
--with-override-hotspot Deprecated. Option is kept for backwards
1931+
compatibility and is ignored
1932+
--with-override-nashorn Deprecated. Option is kept for backwards
1933+
compatibility and is ignored
1934+
--with-override-jdk Deprecated. Option is kept for backwards
1935+
compatibility and is ignored
19351936
--with-import-hotspot import hotspot binaries from this jdk image or
19361937
hotspot build dist dir instead of building from
19371938
source
@@ -4354,7 +4355,7 @@ pkgadd_help() {
43544355

43554356

43564357
#
4357-
# Copyright (c) 2011, 2012, Oracle and/or its affiliates. All rights reserved.
4358+
# Copyright (c) 2011, 2015, Oracle and/or its affiliates. All rights reserved.
43584359
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
43594360
#
43604361
# This code is free software; you can redistribute it and/or modify it
@@ -4384,7 +4385,6 @@ pkgadd_help() {
43844385

43854386

43864387

4387-
43884388
#
43894389
# Copyright (c) 2011, 2015, Oracle and/or its affiliates. All rights reserved.
43904390
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -4597,7 +4597,7 @@ VS_SDK_PLATFORM_NAME_2013=
45974597
#CUSTOM_AUTOCONF_INCLUDE
45984598

45994599
# Do not change or remove the following line, it is needed for consistency checks:
4600-
DATE_WHEN_GENERATED=1446637466
4600+
DATE_WHEN_GENERATED=1446732848
46014601

46024602
###############################################################################
46034603
#
@@ -28868,8 +28868,7 @@ $as_echo "$BOOT_JDK_BITS" >&6; }
2886828868
###############################################################################
2886928869

2887028870

28871-
# Where are the sources. Any of these can be overridden
28872-
# using --with-override-corba and the likes.
28871+
# Where are the sources.
2887328872
LANGTOOLS_TOPDIR="$SRC_ROOT/langtools"
2887428873
CORBA_TOPDIR="$SRC_ROOT/corba"
2887528874
JAXP_TOPDIR="$SRC_ROOT/jaxp"
@@ -28886,263 +28885,98 @@ $as_echo "$BOOT_JDK_BITS" >&6; }
2888628885

2888728886

2888828887

28888+
# This feature is no longer supported.
28889+
2888928890

28890-
###############################################################################
28891-
#
28892-
# Pickup additional source for a component from outside of the source root
28893-
# or override source for a component.
28894-
#
2889528891

2889628892
# Check whether --with-add-source-root was given.
2889728893
if test "${with_add_source_root+set}" = set; then :
28898-
withval=$with_add_source_root;
28894+
withval=$with_add_source_root; { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Option --with-add-source-root is deprecated and will be ignored." >&5
28895+
$as_echo "$as_me: WARNING: Option --with-add-source-root is deprecated and will be ignored." >&2;}
2889928896
fi
2890028897

2890128898

2890228899

28900+
2890328901
# Check whether --with-override-source-root was given.
2890428902
if test "${with_override_source_root+set}" = set; then :
28905-
withval=$with_override_source_root;
28903+
withval=$with_override_source_root; { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Option --with-override-source-root is deprecated and will be ignored." >&5
28904+
$as_echo "$as_me: WARNING: Option --with-override-source-root is deprecated and will be ignored." >&2;}
2890628905
fi
2890728906

2890828907

2890928908

28909+
2891028910
# Check whether --with-adds-and-overrides was given.
2891128911
if test "${with_adds_and_overrides+set}" = set; then :
28912-
withval=$with_adds_and_overrides;
28912+
withval=$with_adds_and_overrides; { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Option --with-adds-and-overrides is deprecated and will be ignored." >&5
28913+
$as_echo "$as_me: WARNING: Option --with-adds-and-overrides is deprecated and will be ignored." >&2;}
2891328914
fi
2891428915

2891528916

28916-
if test "x$with_adds_and_overrides" != x; then
28917-
with_add_source_root="$with_adds_and_overrides/adds"
28918-
with_override_source_root="$with_adds_and_overrides/overrides"
28919-
fi
28920-
28921-
if test "x$with_add_source_root" != x; then
28922-
if ! test -d $with_add_source_root; then
28923-
as_fn_error $? "Trying to use a non-existant add-source-root $with_add_source_root" "$LINENO" 5
28924-
fi
28925-
CURDIR="$PWD"
28926-
cd "$with_add_source_root"
28927-
ADD_SRC_ROOT="`pwd`"
28928-
cd "$CURDIR"
28929-
# Verify that the addon source root does not have any root makefiles.
28930-
# If it does, then it is usually an error, prevent this.
28931-
if test -f $with_add_source_root/langtools/make/Makefile; then
28932-
as_fn_error $? "Your add source root seems to contain a full langtools repo! An add source root should only contain additional sources." "$LINENO" 5
28933-
fi
28934-
if test -f $with_add_source_root/corba/make/Makefile; then
28935-
as_fn_error $? "Your add source root seems to contain a full corba repo! An add source root should only contain additional sources." "$LINENO" 5
28936-
fi
28937-
if test -f $with_add_source_root/jaxp/make/Makefile; then
28938-
as_fn_error $? "Your add source root seems to contain a full jaxp repo! An add source root should only contain additional sources." "$LINENO" 5
28939-
fi
28940-
if test -f $with_add_source_root/jaxws/make/Makefile; then
28941-
as_fn_error $? "Your add source root seems to contain a full jaxws repo! An add source root should only contain additional sources." "$LINENO" 5
28942-
fi
28943-
if test -f $with_add_source_root/hotspot/make/Makefile; then
28944-
as_fn_error $? "Your add source root seems to contain a full hotspot repo! An add source root should only contain additional sources." "$LINENO" 5
28945-
fi
28946-
if test -f $with_add_source_root/nashorn/make/Makefile; then
28947-
as_fn_error $? "Your add source root seems to contain a full nashorn repo! An add source root should only contain additional sources." "$LINENO" 5
28948-
fi
28949-
if test -f $with_add_source_root/jdk/make/Makefile; then
28950-
as_fn_error $? "Your add source root seems to contain a full JDK repo! An add source root should only contain additional sources." "$LINENO" 5
28951-
fi
28952-
fi
28953-
28954-
28955-
if test "x$with_override_source_root" != x; then
28956-
if ! test -d $with_override_source_root; then
28957-
as_fn_error $? "Trying to use a non-existant override-source-root $with_override_source_root" "$LINENO" 5
28958-
fi
28959-
CURDIR="$PWD"
28960-
cd "$with_override_source_root"
28961-
OVERRIDE_SRC_ROOT="`pwd`"
28962-
cd "$CURDIR"
28963-
if test -f $with_override_source_root/langtools/make/Makefile; then
28964-
as_fn_error $? "Your override source root seems to contain a full langtools repo! An override source root should only contain sources that override." "$LINENO" 5
28965-
fi
28966-
if test -f $with_override_source_root/corba/make/Makefile; then
28967-
as_fn_error $? "Your override source root seems to contain a full corba repo! An override source root should only contain sources that override." "$LINENO" 5
28968-
fi
28969-
if test -f $with_override_source_root/jaxp/make/Makefile; then
28970-
as_fn_error $? "Your override source root seems to contain a full jaxp repo! An override source root should only contain sources that override." "$LINENO" 5
28971-
fi
28972-
if test -f $with_override_source_root/jaxws/make/Makefile; then
28973-
as_fn_error $? "Your override source root seems to contain a full jaxws repo! An override source root should only contain sources that override." "$LINENO" 5
28974-
fi
28975-
if test -f $with_override_source_root/hotspot/make/Makefile; then
28976-
as_fn_error $? "Your override source root seems to contain a full hotspot repo! An override source root should only contain sources that override." "$LINENO" 5
28977-
fi
28978-
if test -f $with_override_source_root/nashorn/make/Makefile; then
28979-
as_fn_error $? "Your override source root seems to contain a full nashorn repo! An override source root should only contain sources that override." "$LINENO" 5
28980-
fi
28981-
if test -f $with_override_source_root/jdk/make/Makefile; then
28982-
as_fn_error $? "Your override source root seems to contain a full JDK repo! An override source root should only contain sources that override." "$LINENO" 5
28983-
fi
28984-
fi
28985-
28986-
28987-
###############################################################################
28988-
#
28989-
# Override a repo completely, this is used for example when you have 3 small
28990-
# development sandboxes of the langtools sources and want to avoid having 3 full
28991-
# OpenJDK sources checked out on disk.
28992-
#
28993-
# Assuming that the 3 langtools sandboxes are located here:
28994-
# /home/fredrik/sandbox1/langtools
28995-
# /home/fredrik/sandbox2/langtools
28996-
# /home/fredrik/sandbox3/langtools
28997-
#
28998-
# From the source root you create build subdirs manually:
28999-
# mkdir -p build1 build2 build3
29000-
# in each build directory run:
29001-
# (cd build1 && ../configure --with-override-langtools=/home/fredrik/sandbox1 && make)
29002-
# (cd build2 && ../configure --with-override-langtools=/home/fredrik/sandbox2 && make)
29003-
# (cd build3 && ../configure --with-override-langtools=/home/fredrik/sandbox3 && make)
29004-
#
2900528917

2900628918

2900728919
# Check whether --with-override-langtools was given.
2900828920
if test "${with_override_langtools+set}" = set; then :
29009-
withval=$with_override_langtools;
28921+
withval=$with_override_langtools; { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Option --with-override-langtools is deprecated and will be ignored." >&5
28922+
$as_echo "$as_me: WARNING: Option --with-override-langtools is deprecated and will be ignored." >&2;}
2901028923
fi
2901128924

2901228925

2901328926

28927+
2901428928
# Check whether --with-override-corba was given.
2901528929
if test "${with_override_corba+set}" = set; then :
29016-
withval=$with_override_corba;
28930+
withval=$with_override_corba; { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Option --with-override-corba is deprecated and will be ignored." >&5
28931+
$as_echo "$as_me: WARNING: Option --with-override-corba is deprecated and will be ignored." >&2;}
2901728932
fi
2901828933

2901928934

2902028935

28936+
2902128937
# Check whether --with-override-jaxp was given.
2902228938
if test "${with_override_jaxp+set}" = set; then :
29023-
withval=$with_override_jaxp;
28939+
withval=$with_override_jaxp; { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Option --with-override-jaxp is deprecated and will be ignored." >&5
28940+
$as_echo "$as_me: WARNING: Option --with-override-jaxp is deprecated and will be ignored." >&2;}
2902428941
fi
2902528942

2902628943

2902728944

28945+
2902828946
# Check whether --with-override-jaxws was given.
2902928947
if test "${with_override_jaxws+set}" = set; then :
29030-
withval=$with_override_jaxws;
28948+
withval=$with_override_jaxws; { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Option --with-override-jaxws is deprecated and will be ignored." >&5
28949+
$as_echo "$as_me: WARNING: Option --with-override-jaxws is deprecated and will be ignored." >&2;}
2903128950
fi
2903228951

2903328952

2903428953

28954+
2903528955
# Check whether --with-override-hotspot was given.
2903628956
if test "${with_override_hotspot+set}" = set; then :
29037-
withval=$with_override_hotspot;
28957+
withval=$with_override_hotspot; { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Option --with-override-hotspot is deprecated and will be ignored." >&5
28958+
$as_echo "$as_me: WARNING: Option --with-override-hotspot is deprecated and will be ignored." >&2;}
2903828959
fi
2903928960

2904028961

2904128962

28963+
2904228964
# Check whether --with-override-nashorn was given.
2904328965
if test "${with_override_nashorn+set}" = set; then :
29044-
withval=$with_override_nashorn;
28966+
withval=$with_override_nashorn; { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Option --with-override-nashorn is deprecated and will be ignored." >&5
28967+
$as_echo "$as_me: WARNING: Option --with-override-nashorn is deprecated and will be ignored." >&2;}
2904528968
fi
2904628969

2904728970

2904828971

28972+
2904928973
# Check whether --with-override-jdk was given.
2905028974
if test "${with_override_jdk+set}" = set; then :
29051-
withval=$with_override_jdk;
28975+
withval=$with_override_jdk; { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Option --with-override-jdk is deprecated and will be ignored." >&5
28976+
$as_echo "$as_me: WARNING: Option --with-override-jdk is deprecated and will be ignored." >&2;}
2905228977
fi
2905328978

2905428979

29055-
if test "x$with_override_langtools" != x; then
29056-
CURDIR="$PWD"
29057-
cd "$with_override_langtools"
29058-
LANGTOOLS_TOPDIR="`pwd`"
29059-
cd "$CURDIR"
29060-
if ! test -f $LANGTOOLS_TOPDIR/make/Makefile; then
29061-
as_fn_error $? "You have to override langtools with a full langtools repo!" "$LINENO" 5
29062-
fi
29063-
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if langtools should be overridden" >&5
29064-
$as_echo_n "checking if langtools should be overridden... " >&6; }
29065-
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes with $LANGTOOLS_TOPDIR" >&5
29066-
$as_echo "yes with $LANGTOOLS_TOPDIR" >&6; }
29067-
fi
29068-
if test "x$with_override_corba" != x; then
29069-
CURDIR="$PWD"
29070-
cd "$with_override_corba"
29071-
CORBA_TOPDIR="`pwd`"
29072-
cd "$CURDIR"
29073-
if ! test -f $CORBA_TOPDIR/make/Makefile; then
29074-
as_fn_error $? "You have to override corba with a full corba repo!" "$LINENO" 5
29075-
fi
29076-
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if corba should be overridden" >&5
29077-
$as_echo_n "checking if corba should be overridden... " >&6; }
29078-
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes with $CORBA_TOPDIR" >&5
29079-
$as_echo "yes with $CORBA_TOPDIR" >&6; }
29080-
fi
29081-
if test "x$with_override_jaxp" != x; then
29082-
CURDIR="$PWD"
29083-
cd "$with_override_jaxp"
29084-
JAXP_TOPDIR="`pwd`"
29085-
cd "$CURDIR"
29086-
if ! test -f $JAXP_TOPDIR/make/Makefile; then
29087-
as_fn_error $? "You have to override jaxp with a full jaxp repo!" "$LINENO" 5
29088-
fi
29089-
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if jaxp should be overridden" >&5
29090-
$as_echo_n "checking if jaxp should be overridden... " >&6; }
29091-
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes with $JAXP_TOPDIR" >&5
29092-
$as_echo "yes with $JAXP_TOPDIR" >&6; }
29093-
fi
29094-
if test "x$with_override_jaxws" != x; then
29095-
CURDIR="$PWD"
29096-
cd "$with_override_jaxws"
29097-
JAXWS_TOPDIR="`pwd`"
29098-
cd "$CURDIR"
29099-
if ! test -f $JAXWS_TOPDIR/make/Makefile; then
29100-
as_fn_error $? "You have to override jaxws with a full jaxws repo!" "$LINENO" 5
29101-
fi
29102-
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if jaxws should be overridden" >&5
29103-
$as_echo_n "checking if jaxws should be overridden... " >&6; }
29104-
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes with $JAXWS_TOPDIR" >&5
29105-
$as_echo "yes with $JAXWS_TOPDIR" >&6; }
29106-
fi
29107-
if test "x$with_override_hotspot" != x; then
29108-
CURDIR="$PWD"
29109-
cd "$with_override_hotspot"
29110-
HOTSPOT_TOPDIR="`pwd`"
29111-
cd "$CURDIR"
29112-
if ! test -f $HOTSPOT_TOPDIR/make/Makefile; then
29113-
as_fn_error $? "You have to override hotspot with a full hotspot repo!" "$LINENO" 5
29114-
fi
29115-
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if hotspot should be overridden" >&5
29116-
$as_echo_n "checking if hotspot should be overridden... " >&6; }
29117-
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes with $HOTSPOT_TOPDIR" >&5
29118-
$as_echo "yes with $HOTSPOT_TOPDIR" >&6; }
29119-
fi
29120-
if test "x$with_override_nashorn" != x; then
29121-
CURDIR="$PWD"
29122-
cd "$with_override_nashorn"
29123-
NASHORN_TOPDIR="`pwd`"
29124-
cd "$CURDIR"
29125-
if ! test -f $NASHORN_TOPDIR/make/Makefile; then
29126-
as_fn_error $? "You have to override nashorn with a full nashorn repo!" "$LINENO" 5
29127-
fi
29128-
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if nashorn should be overridden" >&5
29129-
$as_echo_n "checking if nashorn should be overridden... " >&6; }
29130-
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes with $NASHORN_TOPDIR" >&5
29131-
$as_echo "yes with $NASHORN_TOPDIR" >&6; }
29132-
fi
29133-
if test "x$with_override_jdk" != x; then
29134-
CURDIR="$PWD"
29135-
cd "$with_override_jdk"
29136-
JDK_TOPDIR="`pwd`"
29137-
cd "$CURDIR"
29138-
if ! test -f $JDK_TOPDIR/make/Makefile; then
29139-
as_fn_error $? "You have to override JDK with a full JDK repo!" "$LINENO" 5
29140-
fi
29141-
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if JDK should be overridden" >&5
29142-
$as_echo_n "checking if JDK should be overridden... " >&6; }
29143-
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes with $JDK_TOPDIR" >&5
29144-
$as_echo "yes with $JDK_TOPDIR" >&6; }
29145-
fi
2914628980

2914728981

2914828982
BUILD_OUTPUT="$OUTPUT_ROOT"

0 commit comments

Comments
 (0)