# HG changeset patch # User ihse # Date 1505492280 25200 # Node ID fd36993f7bf56d4bcc2886255a1bf74a5aaa2064 # Parent 9187455618878260fd92a3d8b35ced7015091f7d 8187542: Remove superfluous *_TOPDIR variables Reviewed-by: erikj diff -r 918745561887 -r fd36993f7bf5 doc/building.html --- a/doc/building.html Tue Sep 12 19:03:59 2017 +0200 +++ b/doc/building.html Fri Sep 15 09:18:00 2017 -0700 @@ -885,7 +885,7 @@

While technically using make, the make source files of the OpenJDK does not resemble most other Makefiles. Instead of listing specific targets and actions (perhaps using patterns), the basic modus operandi is to call a high-level function (or properly, macro) from the API in make/common. For instance, to compile all classes in the jdk.internal.foo package in the jdk.foo module, a call like this would be made:

$(eval $(call SetupJavaCompilation, BUILD_FOO_CLASSES, \
     SETUP := GENERATE_OLDBYTECODE, \
-    SRC := $(JDK_TOPDIR)/src/jkd.foo/share/classes, \
+    SRC := $(TOPDIR)/src/jkd.foo/share/classes, \
     INCLUDES := jdk/internal/foo, \
     BIN := $(SUPPORT_OUTPUTDIR)/foo_classes, \
 ))
diff -r 918745561887 -r fd36993f7bf5 doc/building.md --- a/doc/building.md Tue Sep 12 19:03:59 2017 +0200 +++ b/doc/building.md Fri Sep 15 09:18:00 2017 -0700 @@ -296,7 +296,7 @@ ### gcc -The minimum accepted version of gcc is 4.7. Older versions will generate a warning +The minimum accepted version of gcc is 4.7. Older versions will generate a warning by `configure` and are unlikely to work. OpenJDK 9 includes patches that should allow gcc 6 to compile, but this should @@ -1703,7 +1703,7 @@ ``` $(eval $(call SetupJavaCompilation, BUILD_FOO_CLASSES, \ SETUP := GENERATE_OLDBYTECODE, \ - SRC := $(JDK_TOPDIR)/src/jkd.foo/share/classes, \ + SRC := $(TOPDIR)/src/jkd.foo/share/classes, \ INCLUDES := jdk/internal/foo, \ BIN := $(SUPPORT_OUTPUTDIR)/foo_classes, \ )) diff -r 918745561887 -r fd36993f7bf5 make/autoconf/configure.ac --- a/make/autoconf/configure.ac Tue Sep 12 19:03:59 2017 +0200 +++ b/make/autoconf/configure.ac Fri Sep 15 09:18:00 2017 -0700 @@ -1,4 +1,4 @@ -# +SRC# # Copyright (c) 2011, 2016, Oracle and/or its affiliates. All rights reserved. # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. # @@ -150,10 +150,7 @@ # ############################################################################### -SRCDIRS_SETUP_TOPDIRS -SRCDIRS_SETUP_ALTERNATIVE_TOPDIRS -SRCDIRS_SETUP_OUTPUT_DIRS - +SRCDIRS_SETUP_DIRS SRCDIRS_SETUP_IMPORT_MODULES ############################################################################### diff -r 918745561887 -r fd36993f7bf5 make/autoconf/source-dirs.m4 --- a/make/autoconf/source-dirs.m4 Tue Sep 12 19:03:59 2017 +0200 +++ b/make/autoconf/source-dirs.m4 Fri Sep 15 09:18:00 2017 -0700 @@ -1,5 +1,5 @@ # -# Copyright (c) 2011, 2016, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 2011, 2017, 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 @@ -23,48 +23,14 @@ # questions. # -AC_DEFUN_ONCE([SRCDIRS_SETUP_TOPDIRS], -[ - # Where are the sources. - LANGTOOLS_TOPDIR="$SRC_ROOT/langtools" - 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(TOPDIR) -]) - -AC_DEFUN_ONCE([SRCDIRS_SETUP_ALTERNATIVE_TOPDIRS], -[ - # This feature is no longer supported. - - BASIC_DEPRECATED_ARG_WITH(add-source-root) - BASIC_DEPRECATED_ARG_WITH(override-source-root) - BASIC_DEPRECATED_ARG_WITH(adds-and-overrides) - BASIC_DEPRECATED_ARG_WITH(override-langtools) - BASIC_DEPRECATED_ARG_WITH(override-corba) - BASIC_DEPRECATED_ARG_WITH(override-jaxp) - BASIC_DEPRECATED_ARG_WITH(override-jaxws) - BASIC_DEPRECATED_ARG_WITH(override-hotspot) - BASIC_DEPRECATED_ARG_WITH(override-nashorn) - BASIC_DEPRECATED_ARG_WITH(override-jdk) -]) - -AC_DEFUN_ONCE([SRCDIRS_SETUP_OUTPUT_DIRS], +AC_DEFUN_ONCE([SRCDIRS_SETUP_DIRS], [ BUILD_OUTPUT="$OUTPUT_ROOT" AC_SUBST(BUILD_OUTPUT) JDK_OUTPUTDIR="$OUTPUT_ROOT/jdk" - BASIC_DEPRECATED_ARG_WITH(import_hotspot) + # Where are the sources. + AC_SUBST(TOPDIR) ]) ################################################################################ diff -r 918745561887 -r fd36993f7bf5 make/autoconf/spec.gmk.in --- a/make/autoconf/spec.gmk.in Tue Sep 12 19:03:59 2017 +0200 +++ b/make/autoconf/spec.gmk.in Fri Sep 15 09:18:00 2017 -0700 @@ -133,13 +133,6 @@ SRC_ROOT:=@TOPDIR@ OUTPUT_ROOT:=@OUTPUT_ROOT@ -JDK_TOPDIR:=@JDK_TOPDIR@ -LANGTOOLS_TOPDIR:=@LANGTOOLS_TOPDIR@ -CORBA_TOPDIR:=@CORBA_TOPDIR@ -JAXP_TOPDIR:=@JAXP_TOPDIR@ -JAXWS_TOPDIR:=@JAXWS_TOPDIR@ -HOTSPOT_TOPDIR:=@HOTSPOT_TOPDIR@ -NASHORN_TOPDIR:=@NASHORN_TOPDIR@ IMPORT_MODULES_CLASSES:=@IMPORT_MODULES_CLASSES@ IMPORT_MODULES_CMDS:=@IMPORT_MODULES_CMDS@ diff -r 918745561887 -r fd36993f7bf5 make/hotspot/ide/CreateVSProject.gmk --- a/make/hotspot/ide/CreateVSProject.gmk Tue Sep 12 19:03:59 2017 +0200 +++ b/make/hotspot/ide/CreateVSProject.gmk Fri Sep 15 09:18:00 2017 -0700 @@ -107,9 +107,9 @@ # We hard-code gensrc dir to server (since this includes adfiles) PROJECT_CREATOR_ARGS := \ - -sourceBase $(call FixPath, $(HOTSPOT_TOPDIR)) \ - -startAt src \ - -relativeSrcInclude src \ + -sourceBase $(call FixPath, $(TOPDIR)/src) \ + -startAt hotspot \ + -relativeSrcInclude hotspot \ -hidePath .hg \ -hidePath .jcheck \ -hidePath jdk.aot \