Skip to content

Commit 5a6cea1

Browse files
author
ihse
committed
8027566: Remove the old build system
Reviewed-by: erikj, tbell
1 parent 205aa6b commit 5a6cea1

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

46 files changed

+863
-3939
lines changed

‎Makefile

+95-532
Large diffs are not rendered by default.

‎NewMakefile.gmk

-134
This file was deleted.

‎common/autoconf/Makefile.in

+1-1
Original file line numberDiff line numberDiff line change
@@ -24,4 +24,4 @@
2424
# This Makefile was generated by configure @DATE_WHEN_CONFIGURED@
2525
# GENERATED FILE, DO NOT EDIT
2626
SPEC:=@OUTPUT_ROOT@/spec.gmk
27-
include @SRC_ROOT@/NewMakefile.gmk
27+
include @SRC_ROOT@/Makefile

‎common/autoconf/basics.m4

+1-1
Original file line numberDiff line numberDiff line change
@@ -412,7 +412,7 @@ AC_DEFUN_ONCE([BASIC_SETUP_OUTPUT_DIR],
412412
# Test from where we are running configure, in or outside of src root.
413413
if test "x$CURDIR" = "x$SRC_ROOT" || test "x$CURDIR" = "x$SRC_ROOT/common" \
414414
|| test "x$CURDIR" = "x$SRC_ROOT/common/autoconf" \
415-
|| test "x$CURDIR" = "x$SRC_ROOT/common/makefiles" ; then
415+
|| test "x$CURDIR" = "x$SRC_ROOT/make" ; then
416416
# We are running configure from the src root.
417417
# Create a default ./build/target-variant-debuglevel output root.
418418
if test "x${CONF_NAME}" = x; then

‎common/autoconf/generated-configure.sh

+23-38
Original file line numberDiff line numberDiff line change
@@ -3865,7 +3865,7 @@ fi
38653865
#CUSTOM_AUTOCONF_INCLUDE
38663866

38673867
# Do not change or remove the following line, it is needed for consistency checks:
3868-
DATE_WHEN_GENERATED=1383151988
3868+
DATE_WHEN_GENERATED=1384422786
38693869

38703870
###############################################################################
38713871
#
@@ -8042,7 +8042,7 @@ fi
80428042
# Test from where we are running configure, in or outside of src root.
80438043
if test "x$CURDIR" = "x$SRC_ROOT" || test "x$CURDIR" = "x$SRC_ROOT/common" \
80448044
|| test "x$CURDIR" = "x$SRC_ROOT/common/autoconf" \
8045-
|| test "x$CURDIR" = "x$SRC_ROOT/common/makefiles" ; then
8045+
|| test "x$CURDIR" = "x$SRC_ROOT/make" ; then
80468046
# We are running configure from the src root.
80478047
# Create a default ./build/target-variant-debuglevel output root.
80488048
if test "x${CONF_NAME}" = x; then
@@ -16201,32 +16201,25 @@ fi
1620116201
cd "$CURDIR"
1620216202
# Verify that the addon source root does not have any root makefiles.
1620316203
# If it does, then it is usually an error, prevent this.
16204-
if test -f $with_add_source_root/langtools/makefiles/Makefile || \
16205-
test -f $with_add_source_root/langtools/make/Makefile; then
16204+
if test -f $with_add_source_root/langtools/make/Makefile; then
1620616205
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
1620716206
fi
16208-
if test -f $with_add_source_root/corba/makefiles/Makefile || \
16209-
test -f $with_add_source_root/corba/make/Makefile; then
16207+
if test -f $with_add_source_root/corba/make/Makefile; then
1621016208
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
1621116209
fi
16212-
if test -f $with_add_source_root/jaxp/makefiles/Makefile || \
16213-
test -f $with_add_source_root/jaxp/make/Makefile; then
16210+
if test -f $with_add_source_root/jaxp/make/Makefile; then
1621416211
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
1621516212
fi
16216-
if test -f $with_add_source_root/jaxws/makefiles/Makefile || \
16217-
test -f $with_add_source_root/jaxws/make/Makefile; then
16213+
if test -f $with_add_source_root/jaxws/make/Makefile; then
1621816214
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
1621916215
fi
16220-
if test -f $with_add_source_root/hotspot/makefiles/Makefile || \
16221-
test -f $with_add_source_root/hotspot/make/Makefile; then
16216+
if test -f $with_add_source_root/hotspot/make/Makefile; then
1622216217
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
1622316218
fi
16224-
if test -f $with_add_source_root/nashorn/makefiles/Makefile || \
16225-
test -f $with_add_source_root/nashorn/make/Makefile; then
16219+
if test -f $with_add_source_root/nashorn/make/Makefile; then
1622616220
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
1622716221
fi
16228-
if test -f $with_add_source_root/jdk/makefiles/Makefile || \
16229-
test -f $with_add_source_root/jdk/make/Makefile; then
16222+
if test -f $with_add_source_root/jdk/make/Makefile; then
1623016223
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
1623116224
fi
1623216225
fi
@@ -16240,32 +16233,25 @@ fi
1624016233
cd "$with_override_source_root"
1624116234
OVERRIDE_SRC_ROOT="`pwd`"
1624216235
cd "$CURDIR"
16243-
if test -f $with_override_source_root/langtools/makefiles/Makefile || \
16244-
test -f $with_override_source_root/langtools/make/Makefile; then
16236+
if test -f $with_override_source_root/langtools/make/Makefile; then
1624516237
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
1624616238
fi
16247-
if test -f $with_override_source_root/corba/makefiles/Makefile || \
16248-
test -f $with_override_source_root/corba/make/Makefile; then
16239+
if test -f $with_override_source_root/corba/make/Makefile; then
1624916240
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
1625016241
fi
16251-
if test -f $with_override_source_root/jaxp/makefiles/Makefile || \
16252-
test -f $with_override_source_root/jaxp/make/Makefile; then
16242+
if test -f $with_override_source_root/jaxp/make/Makefile; then
1625316243
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
1625416244
fi
16255-
if test -f $with_override_source_root/jaxws/makefiles/Makefile || \
16256-
test -f $with_override_source_root/jaxws/make/Makefile; then
16245+
if test -f $with_override_source_root/jaxws/make/Makefile; then
1625716246
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
1625816247
fi
16259-
if test -f $with_override_source_root/hotspot/makefiles/Makefile || \
16260-
test -f $with_override_source_root/hotspot/make/Makefile; then
16248+
if test -f $with_override_source_root/hotspot/make/Makefile; then
1626116249
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
1626216250
fi
16263-
if test -f $with_override_source_root/nashorn/makefiles/Makefile || \
16264-
test -f $with_override_source_root/nashorn/make/Makefile; then
16251+
if test -f $with_override_source_root/nashorn/make/Makefile; then
1626516252
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
1626616253
fi
16267-
if test -f $with_override_source_root/jdk/makefiles/Makefile || \
16268-
test -f $with_override_source_root/jdk/make/Makefile; then
16254+
if test -f $with_override_source_root/jdk/make/Makefile; then
1626916255
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
1627016256
fi
1627116257
fi
@@ -16344,7 +16330,7 @@ fi
1634416330
cd "$with_override_langtools"
1634516331
LANGTOOLS_TOPDIR="`pwd`"
1634616332
cd "$CURDIR"
16347-
if ! test -f $LANGTOOLS_TOPDIR/makefiles/Makefile; then
16333+
if ! test -f $LANGTOOLS_TOPDIR/make/Makefile; then
1634816334
as_fn_error $? "You have to override langtools with a full langtools repo!" "$LINENO" 5
1634916335
fi
1635016336
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if langtools should be overridden" >&5
@@ -16357,7 +16343,7 @@ $as_echo "yes with $LANGTOOLS_TOPDIR" >&6; }
1635716343
cd "$with_override_corba"
1635816344
CORBA_TOPDIR="`pwd`"
1635916345
cd "$CURDIR"
16360-
if ! test -f $CORBA_TOPDIR/makefiles/Makefile; then
16346+
if ! test -f $CORBA_TOPDIR/make/Makefile; then
1636116347
as_fn_error $? "You have to override corba with a full corba repo!" "$LINENO" 5
1636216348
fi
1636316349
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if corba should be overridden" >&5
@@ -16370,7 +16356,7 @@ $as_echo "yes with $CORBA_TOPDIR" >&6; }
1637016356
cd "$with_override_jaxp"
1637116357
JAXP_TOPDIR="`pwd`"
1637216358
cd "$CURDIR"
16373-
if ! test -f $JAXP_TOPDIR/makefiles/Makefile; then
16359+
if ! test -f $JAXP_TOPDIR/make/Makefile; then
1637416360
as_fn_error $? "You have to override jaxp with a full jaxp repo!" "$LINENO" 5
1637516361
fi
1637616362
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if jaxp should be overridden" >&5
@@ -16383,7 +16369,7 @@ $as_echo "yes with $JAXP_TOPDIR" >&6; }
1638316369
cd "$with_override_jaxws"
1638416370
JAXWS_TOPDIR="`pwd`"
1638516371
cd "$CURDIR"
16386-
if ! test -f $JAXWS_TOPDIR/makefiles/Makefile; then
16372+
if ! test -f $JAXWS_TOPDIR/make/Makefile; then
1638716373
as_fn_error $? "You have to override jaxws with a full jaxws repo!" "$LINENO" 5
1638816374
fi
1638916375
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if jaxws should be overridden" >&5
@@ -16396,8 +16382,7 @@ $as_echo "yes with $JAXWS_TOPDIR" >&6; }
1639616382
cd "$with_override_hotspot"
1639716383
HOTSPOT_TOPDIR="`pwd`"
1639816384
cd "$CURDIR"
16399-
if ! test -f $HOTSPOT_TOPDIR/make/Makefile && \
16400-
! test -f $HOTSPOT_TOPDIR/makefiles/Makefile; then
16385+
if ! test -f $HOTSPOT_TOPDIR/make/Makefile; then
1640116386
as_fn_error $? "You have to override hotspot with a full hotspot repo!" "$LINENO" 5
1640216387
fi
1640316388
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if hotspot should be overridden" >&5
@@ -16410,7 +16395,7 @@ $as_echo "yes with $HOTSPOT_TOPDIR" >&6; }
1641016395
cd "$with_override_nashorn"
1641116396
NASHORN_TOPDIR="`pwd`"
1641216397
cd "$CURDIR"
16413-
if ! test -f $NASHORN_TOPDIR/makefiles/Makefile; then
16398+
if ! test -f $NASHORN_TOPDIR/make/Makefile; then
1641416399
as_fn_error $? "You have to override nashorn with a full nashorn repo!" "$LINENO" 5
1641516400
fi
1641616401
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if nashorn should be overridden" >&5
@@ -16423,7 +16408,7 @@ $as_echo "yes with $NASHORN_TOPDIR" >&6; }
1642316408
cd "$with_override_jdk"
1642416409
JDK_TOPDIR="`pwd`"
1642516410
cd "$CURDIR"
16426-
if ! test -f $JDK_TOPDIR/makefiles/Makefile; then
16411+
if ! test -f $JDK_TOPDIR/make/Makefile; then
1642716412
as_fn_error $? "You have to override JDK with a full JDK repo!" "$LINENO" 5
1642816413
fi
1642916414
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if JDK should be overridden" >&5

‎common/autoconf/hotspot-spec.gmk.in

+1-1
Original file line numberDiff line numberDiff line change
@@ -129,4 +129,4 @@ endif
129129

130130
# Sneak this in via the spec.gmk file, since we don't want to mess around too much with the Hotspot make files.
131131
# This is needed to get the LOG setting to work properly.
132-
include $(SRC_ROOT)/common/makefiles/MakeBase.gmk
132+
include $(SRC_ROOT)/make/common/MakeBase.gmk

0 commit comments

Comments
 (0)