changeset 2196:8043b9cf31ab

8027566: Remove the old build system Reviewed-by: erikj, tbell
author ihse
date Mon, 04 Nov 2013 11:08:41 +0100
parents d4cbb671de1c
children f42a22e2b2cd
files make/BuildLangtools.gmk make/Makefile make/jprt.properties makefiles/BuildLangtools.gmk makefiles/Makefile
diffstat 5 files changed, 221 insertions(+), 515 deletions(-) [+]
line wrap: on
line diff
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/make/BuildLangtools.gmk	Mon Nov 04 11:08:41 2013 +0100
@@ -0,0 +1,201 @@
+#
+# Copyright (c) 2011, 2013, 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
+# under the terms of the GNU General Public License version 2 only, as
+# published by the Free Software Foundation.  Oracle designates this
+# particular file as subject to the "Classpath" exception as provided
+# by Oracle in the LICENSE file that accompanied this code.
+#
+# This code is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+# version 2 for more details (a copy is included in the LICENSE file that
+# accompanied this code).
+#
+# You should have received a copy of the GNU General Public License version
+# 2 along with this work; if not, write to the Free Software Foundation,
+# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+#
+# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+# or visit www.oracle.com if you need additional information or have any
+# questions.
+#
+
+# This must be the first rule
+default: all
+
+include $(SPEC)
+include MakeBase.gmk
+include JavaCompilation.gmk
+
+# The BOOT_JAVAC setup uses the bootdir compiler to compile the tools
+# and the bootstrap javac, to be run by the bootdir jvm.
+$(eval $(call SetupJavaCompiler,BOOT_JAVAC, \
+    JAVAC := $(JAVAC), \
+    SERVER_DIR := $(SJAVAC_SERVER_DIR), \
+    SERVER_JVM := $(SJAVAC_SERVER_JAVA), \
+    FLAGS := -XDignore.symbol.file=true -g -Xlint:all$(COMMA)-deprecation -Werror))
+
+# javax.tools.JavaCompilerTool isn't really a suffix but this gets the file copied.
+RESOURCE_SUFFIXES := .gif .xml .css .js javax.tools.JavaCompilerTool
+
+# Now setup the compilation of the properties compilation tool. You can depend
+# upon $(BUILD_TOOLS) to trigger a compilation of the tools. Note that we
+# add src/share/classes to the sourcepath. This is necessary since the GenStubs
+# program needs to be linked and run towards the new javac sources.
+$(eval $(call SetupJavaCompilation,BUILD_TOOLS, \
+    SETUP := BOOT_JAVAC, \
+    DISABLE_SJAVAC := true, \
+    ADD_JAVAC_FLAGS := -Xprefer:source, \
+    SRC := $(LANGTOOLS_TOPDIR)/make/tools $(LANGTOOLS_TOPDIR)/src/share/classes, \
+    INCLUDES := compileproperties genstubs, \
+    BIN := $(LANGTOOLS_OUTPUTDIR)/btclasses))
+
+# The compileprops tools compiles a properties file into a resource bundle.
+TOOL_COMPILEPROPS_CMD := $(JAVA) -cp $(LANGTOOLS_OUTPUTDIR)/btclasses compileproperties.CompileProperties -quiet
+
+# Lookup the properties that need to be compiled into resource bundles.
+PROPSOURCES := $(shell $(FIND) $(LANGTOOLS_TOPDIR)/src/share/classes -name "*.properties")
+
+# Strip away prefix and suffix, leaving for example only: "com/sun/tools/javac/resources/javac_zh_CN"
+PROPPATHS := $(patsubst $(LANGTOOLS_TOPDIR)/src/share/classes/%.properties, %, $(PROPSOURCES))
+
+# Generate the list of java files to be created.
+PROPJAVAS := $(patsubst %, $(LANGTOOLS_OUTPUTDIR)/gensrc/%.java, $(PROPPATHS))
+
+# Generate the package dirs for the tobe generated java files.
+PROPDIRS := $(dir $(PROPJAVAS))
+
+# Now generate a sequence of "-compile ...javac_zh_CN.properties ...javac_zh_CN.java java.util.ListResourceBundle"
+# suitable to be fed into the CompileProperties command.
+PROPCMDLINE := $(subst _SPACE_, $(SPACE), $(join $(addprefix -compile_SPACE_, $(PROPSOURCES)), \
+    $(addsuffix _SPACE_java.util.ListResourceBundle, $(addprefix _SPACE_$(LANGTOOLS_OUTPUTDIR)/gensrc/, $(addsuffix .java, $(PROPPATHS))))))
+
+# Now setup the rule for the generation of the resource bundles.
+$(LANGTOOLS_OUTPUTDIR)/gensrc/_the_props.d: $(PROPSOURCES) $(BUILD_TOOLS)
+	$(RM) -r $(@D)/*
+	$(MKDIR) -p $(@D) $(PROPDIRS)
+	$(PRINTF) "jdk=$(JDK_VERSION)\nfull=$(FULL_VERSION)\nrelease=$(RELEASE)\n" > $(LANGTOOLS_OUTPUTDIR)/gensrc/com/sun/tools/javah/resources/version.properties
+	$(PRINTF) "jdk=$(JDK_VERSION)\nfull=$(FULL_VERSION)\nrelease=$(RELEASE)\n" > $(LANGTOOLS_OUTPUTDIR)/gensrc/com/sun/tools/javap/resources/version.properties
+	$(PRINTF) "jdk=$(JDK_VERSION)\nfull=$(FULL_VERSION)\nrelease=$(RELEASE)\n" > $(LANGTOOLS_OUTPUTDIR)/gensrc/com/sun/tools/javac/resources/version.properties
+	$(PRINTF) "jdk=$(JDK_VERSION)\nfull=$(FULL_VERSION)\nrelease=$(RELEASE)\n" > $(LANGTOOLS_OUTPUTDIR)/gensrc/com/sun/tools/jdeps/resources/version.properties
+	$(ECHO) Compiling $(words $(PROPSOURCES) v1 v2 v3) properties into resource bundles
+	$(TOOL_COMPILEPROPS_CMD) $(PROPCMDLINE) \
+	    -compile $(LANGTOOLS_OUTPUTDIR)/gensrc/com/sun/tools/javah/resources/version.properties \
+	        $(LANGTOOLS_OUTPUTDIR)/gensrc/com/sun/tools/javah/resources/version.java \
+	        java.util.ListResourceBundle \
+	    -compile $(LANGTOOLS_OUTPUTDIR)/gensrc/com/sun/tools/javap/resources/version.properties \
+	        $(LANGTOOLS_OUTPUTDIR)/gensrc/com/sun/tools/javap/resources/version.java \
+	        java.util.ListResourceBundle \
+	    -compile $(LANGTOOLS_OUTPUTDIR)/gensrc/com/sun/tools/javac/resources/version.properties \
+	        $(LANGTOOLS_OUTPUTDIR)/gensrc/com/sun/tools/javac/resources/version.java \
+	        java.util.ListResourceBundle \
+	    -compile $(LANGTOOLS_OUTPUTDIR)/gensrc/com/sun/tools/jdeps/resources/version.properties \
+	        $(LANGTOOLS_OUTPUTDIR)/gensrc/com/sun/tools/jdeps/resources/version.java \
+	        java.util.ListResourceBundle
+	$(ECHO) PROPS_ARE_CREATED = yes > $@
+
+# Trigger the generation of the resource bundles. After the resource bundles have
+# been compiled, then the makefile will restart and the newly created java files
+# will become part of the build further along in the makefile.
+-include $(LANGTOOLS_OUTPUTDIR)/gensrc/_the_props.d
+
+ifeq ($(PROPS_ARE_CREATED), yes)
+  # Setup the rules to build a dist/bootstrap/lib/javac.jar, ie a smaller intermediate javac
+  # that can be compiled with an old javac. The intermediate javac is then used
+  # to compile javac again and to build the complete new jdk.
+  $(eval $(call SetupJavaCompilation,BUILD_BOOTSTRAP_LANGTOOLS, \
+      SETUP := BOOT_JAVAC, \
+      DISABLE_SJAVAC := true, \
+      SRC := $(LANGTOOLS_TOPDIR)/src/share/classes $(LANGTOOLS_OUTPUTDIR)/gensrc, \
+      EXCLUDES := com/sun/tools/javac/nio, \
+      COPY := $(RESOURCE_SUFFIXES), \
+      BIN := $(LANGTOOLS_OUTPUTDIR)/btclasses/bootstrap))
+
+  $(eval $(call SetupArchive,ARCHIVE_BOOTSTRAP_JAVAC, $(BUILD_BOOTSTRAP_LANGTOOLS), \
+      SRCS := $(LANGTOOLS_OUTPUTDIR)/btclasses/bootstrap, \
+      JAR := $(LANGTOOLS_OUTPUTDIR)/dist/bootstrap/lib/javac.jar, \
+      SUFFIXES := .class $(RESOURCE_SUFFIXES)))
+
+  # GenStubs is used to bootstrap any dependencies from javac to the new JDK that is not
+  # yet built. It is currently not needed but might be again in the future. The following
+  # exercises the functionality to verify that it works.
+  TOOL_GENSTUBS_CMD = $(JAVA) \
+       "-Xbootclasspath/p:$(LANGTOOLS_OUTPUTDIR)/dist/bootstrap/lib/javac.jar" \
+       -classpath $(LANGTOOLS_OUTPUTDIR)/btclasses \
+       genstubs.GenStubs
+
+  # We fetch source from the JDK...
+  JDKS = $(JDK_TOPDIR)/src/share/classes
+
+  # Build the list of classes to generate stubs from. java/util/function/Predicate.java isn't
+  # currently needed, but is used as a demo for now.
+
+  STUBSOURCES := $(shell $(FIND) $(JDKS) -name "*.java" | $(GREP) \
+      -e "$(JDKS)/java/util/function/Predicate.java")
+
+  # Rewrite the file names into class names because the GenStubs tool require this.
+  STUBCLASSES := $(subst /,., $(patsubst $(JDKS)/%.java, %, $(STUBSOURCES)))
+
+  # Now setup the build recipe for genstubs.
+  $(LANGTOOLS_OUTPUTDIR)/genstubs/_the_stubs.d: $(STUBSOURCES) $(BUILD_TOOLS) \
+      $(LANGTOOLS_OUTPUTDIR)/dist/bootstrap/lib/javac.jar \
+      $(LANGTOOLS_OUTPUTDIR)/gensrc/_the_props.d
+	$(MKDIR) -p $(@D)
+	$(MKDIR) -p $(LANGTOOLS_OUTPUTDIR)/tmpstubs
+	$(ECHO) $(LOG_INFO) Generating stubs from JDK sources.
+	($(TOOL_GENSTUBS_CMD) -s $(LANGTOOLS_OUTPUTDIR)/tmpstubs -sourcepath $(JDKS) $(STUBCLASSES) && $(ECHO) STUBS_ARE_CREATED = yes > $@)
+	if $(DIFF) -x "_the*" -rq $(LANGTOOLS_OUTPUTDIR)/tmpstubs $(LANGTOOLS_OUTPUTDIR)/genstubs > /dev/null 2>&1; then \
+	  $(ECHO) $(LOG_INFO) No changes in the stubs!; \
+	  $(RM) -r $(LANGTOOLS_OUTPUTDIR)/tmpstubs; \
+	else \
+	  $(ECHO) $(LOG_INFO) Changes in stubs detected!; \
+	  $(RM) -r $(@D); \
+	  $(MV) $(LANGTOOLS_OUTPUTDIR)/tmpstubs $(@D); \
+	fi
+	$(ECHO) STUBS_ARE_CREATED = yes > $@
+
+  # Trigger a generation of the genstubs java source code and a restart
+  # of the makefile to make sure that the following build setup use the
+  # newly created java files.
+  -include $(LANGTOOLS_OUTPUTDIR)/genstubs/_the_stubs.d
+
+  ifeq ($(STUBS_ARE_CREATED), yes)
+    # Setup a compiler configuration using the intermediate javac in dist/bootstrap/lib/javac.jar
+    # that generates code for the new jdk that is being built.
+    # The code compiled by this compiler setup, cannot necessarily be run with the bootstrap jvm.
+    $(eval $(call SetupJavaCompiler,GENERATE_NEWBYTECODE, \
+        JVM := $(JAVA), \
+        JAVAC := "-Xbootclasspath/p:$(LANGTOOLS_OUTPUTDIR)/dist/bootstrap/lib/javac.jar" \
+            -cp $(LANGTOOLS_OUTPUTDIR)/dist/bootstrap/lib/javac.jar \
+            com.sun.tools.javac.Main, \
+        FLAGS := -XDignore.symbol.file=true -Xlint:all$(COMMA)-deprecation -Werror, \
+        SERVER_DIR := $(SJAVAC_SERVER_DIR), \
+        SERVER_JVM := $(SJAVAC_SERVER_JAVA)))
+
+    $(eval $(call SetupJavaCompilation,BUILD_FULL_JAVAC, \
+        SETUP := GENERATE_NEWBYTECODE, \
+        SRC := $(LANGTOOLS_TOPDIR)/src/share/classes $(LANGTOOLS_OUTPUTDIR)/gensrc \
+            $(LANGTOOLS_OUTPUTDIR)/genstubs, \
+        EXCLUDES := java/util java/io java/nio, \
+        COPY := $(RESOURCE_SUFFIXES), \
+        BIN := $(LANGTOOLS_OUTPUTDIR)/classes))
+
+    $(eval $(call SetupArchive,ARCHIVE_FULL_JAVAC, $(BUILD_FULL_JAVAC), \
+        SETUP := GENERATE_NEWBYTECODE, \
+        SRCS := $(LANGTOOLS_OUTPUTDIR)/classes, \
+        SUFFIXES := .class $(RESOURCE_SUFFIXES), \
+        JAR := $(LANGTOOLS_OUTPUTDIR)/dist/lib/classes.jar))
+
+    $(eval $(call SetupZipArchive,ZIP_FULL_JAVAC_SOURCE, \
+        SRC := $(LANGTOOLS_TOPDIR)/src/share/classes $(LANGTOOLS_OUTPUTDIR)/gensrc, \
+        ZIP := $(LANGTOOLS_OUTPUTDIR)/dist/lib/src.zip))
+
+    all: $(LANGTOOLS_OUTPUTDIR)/dist/lib/classes.jar \
+        $(LANGTOOLS_OUTPUTDIR)/dist/lib/src.zip \
+        $(LANGTOOLS_OUTPUTDIR)/dist/bootstrap/lib/javac.jar
+
+  endif
+endif
--- a/make/Makefile	Fri Nov 15 11:08:12 2013 +0000
+++ b/make/Makefile	Mon Nov 04 11:08:41 2013 +0100
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2007, 2010, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2012, 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,199 +23,27 @@
 # questions.
 #
 
-# Makefile for langtools: wrapper around Ant build.xml file
+# Locate this Makefile
+ifeq ($(filter /%, $(lastword $(MAKEFILE_LIST))), )
+  makefile_path := $(CURDIR)/$(lastword $(MAKEFILE_LIST))
+else
+  makefile_path := $(lastword $(MAKEFILE_LIST))
+endif
+repo_dir := $(patsubst %/make/Makefile, %, $(makefile_path))
 
-#
-# On Solaris, the standard 'make' utility will not work with these makefiles.
-#    This little rule is only understood by Solaris make, and is harmless
-#    when seen by the GNU make tool. If using Solaris make, this causes the
-#    make command to fail.
-#
-SUN_MAKE_TEST:sh = @echo "ERROR: PLEASE USE GNU VERSION OF MAKE"; exit 33
+# What is the name of this subsystem (langtools, corba, etc)?
+subsystem_name := $(notdir $(repo_dir))
 
-#
-# Minimal platform defs
-# Need FullPath because we can't rely on gnumake abspath, until we use v3.81
-#
-
-SYSTEM_UNAME := $(shell uname)
-
-# Where is unwanted output to be delivered?
-# On Windows, MKS uses the special file "NUL", cygwin uses the customary unix file.
-ifeq ($(SYSTEM_UNAME), Windows_NT)
-DEV_NULL = NUL
+# Try to locate top-level makefile
+top_level_makefile := $(repo_dir)/../Makefile
+ifneq ($(wildcard $(top_level_makefile)), )
+  $(info Will run $(subsystem_name) target on top-level Makefile)
+  $(info WARNING: This is a non-recommended way of building!)
+  $(info ===================================================)
 else
-DEV_NULL = /dev/null 
+  $(info Cannot locate top-level Makefile. Is this repo not checked out as part of a complete forest?)
+  $(error Build from top-level Makefile instead)
 endif
 
-ifneq (,$(findstring CYGWIN,$(SYSTEM_UNAME)))
-USING_CYGWIN = true
-endif
-
-ifdef USING_CYGWIN
-define FullPath
-$(shell cygpath -a -s -m $1 2> $(DEV_NULL))
-endef
-else
-define FullPath
-$(shell cd $1 2> $(DEV_NULL) && pwd)
-endef
-endif
-
-#
-# Makefile args
-#
-
-ifdef QUIET
-  ANT_OPTIONS += -quiet
-endif
-
-ifdef VERBOSE
-  ANT_OPTIONS += -verbose -debug
-endif
-
-ifdef JDK_VERSION
-  ANT_OPTIONS += -Djdk.version=$(JDK_VERSION)
-endif 
-
-ifdef FULL_VERSION
-  ANT_OPTIONS += -Dfull.version='$(FULL_VERSION)' # will contain spaces
-endif 
-
-ifdef MILESTONE
-ifneq ($(MILESTONE),fcs)
-  ANT_OPTIONS += -Dmilestone=$(MILESTONE)
-else
-  ANT_OPTIONS += -Drelease=$(JDK_VERSION)
-endif
-endif
-
-ifdef BUILD_NUMBER
-  ANT_OPTIONS += -Dbuild.number=$(BUILD_NUMBER)
-else
-  ifdef JDK_BUILD_NUMBER
-    ANT_OPTIONS += -Dbuild.number=$(JDK_BUILD_NUMBER)
-  endif
-endif
-
-ifeq ($(VARIANT), DBG)
-  ANT_OPTIONS += -Djavac.debug=true
-else
-  ifeq ($(VARIANT), OPT)
-    ANT_OPTIONS += -Djavac.debug=false
-  endif
-endif
-
-ifeq ($(DEBUG_CLASSFILES), true)
-  ANT_OPTIONS += -Djavac.debug=true
-  ANT_OPTIONS += -Ddebug.classfiles=true
-endif
-
-# Note: jdk/make/common/Defs.gmk uses LANGUAGE_VERSION (-source NN)
-# and the somewhat misnamed CLASS_VERSION (-target NN)
-ifdef TARGET_CLASS_VERSION
-  ANT_OPTIONS += -Djavac.target=$(TARGET_CLASS_VERSION)
-else
-  ifdef JAVAC_TARGET_ARG 
-    ANT_OPTIONS += -Djavac.target=$(JAVAC_TARGET_ARG)
-  endif
-endif 
-
-ifdef SOURCE_LANGUAGE_VERSION
-  ANT_OPTIONS += -Djavac.source=$(SOURCE_LANGUAGE_VERSION)
-else
-  ifdef JAVAC_SOURCE_ARG 
-    ANT_OPTIONS += -Djavac.source=$(JAVAC_SOURCE_ARG)
-  endif
-endif 
-
-ifdef ALT_BOOTDIR
-  ANT_OPTIONS += -Dboot.java.home=$(ALT_BOOTDIR)
-  ANT_JAVA_HOME = JAVA_HOME=$(ALT_BOOTDIR)
-endif
-
-# To facilitate bootstrapping, much of langtools can be compiled with (just)
-# a boot JDK. However, some source files need to be compiled against 
-# new JDK API. In a bootstrap build, an import JDK may not be available,
-# so build.xml can also build against the source files in a jdk repo,
-# in which case it will automatically generate stub files for the new JDK API.
-ifdef JDK_TOPDIR
-  ANT_OPTIONS += -Dimport.jdk=$(JDK_TOPDIR)
-else 
-  ifdef ALT_JDK_TOPDIR
-    ANT_OPTIONS += -Dimport.jdk=$(ALT_JDK_TOPDIR)
-  else 
-    ifdef ALT_JDK_IMPORT_PATH
-      ANT_OPTIONS += -Dimport.jdk=$(ALT_JDK_IMPORT_PATH)
-    endif
-  endif
-endif
-
-ifdef ALT_OUTPUTDIR
-  OUTPUTDIR = $(ALT_OUTPUTDIR)
-  ANT_OPTIONS += -Dbuild.dir=$(ALT_OUTPUTDIR)/build
-  ANT_OPTIONS += -Ddist.dir=$(ALT_OUTPUTDIR)/dist
-else
-  OUTPUTDIR = ..
-endif
-#ABS_OUTPUTDIR = $(abspath $(OUTPUTDIR))
-ABS_OUTPUTDIR = $(call FullPath,$(OUTPUTDIR))
-
-ANT_TMPDIR = $(ABS_OUTPUTDIR)/build/ant-tmp
-ANT_OPTS = ANT_OPTS=-Djava.io.tmpdir='$(ANT_TMPDIR)'
-
-ifdef FINDBUGS_HOME
-  ANT_OPTIONS += -Dfindbugs.home=$(FINDBUGS_HOME)
-endif
-
-ifdef ANT_HOME
-  ANT = $(ANT_HOME)/bin/ant
-  ifneq ($(shell test -x $(ANT) && echo OK), OK)
-    $(error $(ANT) not found -- please update ANT_HOME)
-  endif
-else
-  ANT = ant
-  ifneq ($(shell test -x "`which $(ANT)`" && echo OK), OK)
-    $(error 'ant' not found -- please set ANT_HOME or put 'ant' on your PATH)
-  endif
-endif
-
-# Default target and expected 'do everything' target
-all: build
-
-# Standard make clobber target
-clobber: clean
-
-# All ant targets of interest
-ANT_TARGETS = build clean sanity post-sanity diagnostics build-all-tools  # for now
-
-# Create diagnostics log (careful, ant 1.8.0 -diagnostics always does an exit 1)
-$(OUTPUTDIR)/build/ant-diagnostics.log:
-	@mkdir -p $(OUTPUTDIR)/build $(ANT_TMPDIR)
-	@$(RM) $@
-	$(ANT_JAVA_HOME) $(ANT_OPTS) $(ANT) -diagnostics > $@ ; \
-	  $(ANT_JAVA_HOME) $(ANT_OPTS) $(ANT) -version >> $@
-
-# Create a make target for each
-$(ANT_TARGETS): $(OUTPUTDIR)/build/ant-diagnostics.log
-	@ mkdir -p $(OUTPUTDIR)/build $(ANT_TMPDIR)
-	$(ANT_JAVA_HOME) $(ANT_OPTS) $(ANT) $(ANT_OPTIONS) $@
-
-#-------------------------------------------------------------------
-#
-# Targets for Oracle's internal JPRT build system
-
-CD = cd
-ZIP = zip
-
-JPRT_ARCHIVE_BUNDLE=$(ABS_OUTPUTDIR)/$(JPRT_BUILD_FLAVOR)-bundle.zip
-
-jprt_build_product jprt_build_debug jprt_build_fastdebug: all
-	( $(CD) $(OUTPUTDIR) && \
-	  $(ZIP) -q -r $(JPRT_ARCHIVE_BUNDLE) build dist )
-
-#-------------------------------------------------------------------
-
-# Declare these phony (not filenames)
-.PHONY: $(ANT_TARGETS) all clobber \
-	jprt_build_product jprt_build_debug jprt_build_fastdebug
+all:
+	@$(MAKE) -f $(top_level_makefile) $(subsystem_name)
--- a/make/jprt.properties	Fri Nov 15 11:08:12 2013 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,73 +0,0 @@
-#
-# Copyright (c) 2006, 2013, 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
-# under the terms of the GNU General Public License version 2 only, as
-# published by the Free Software Foundation.  Oracle designates this
-# particular file as subject to the "Classpath" exception as provided
-# by Oracle in the LICENSE file that accompanied this code.
-#
-# This code is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
-# version 2 for more details (a copy is included in the LICENSE file that
-# accompanied this code).
-#
-# You should have received a copy of the GNU General Public License version
-# 2 along with this work; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-#
-# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-# or visit www.oracle.com if you need additional information or have any
-# questions.
-#
-
-# Properties for jprt
-
-# Locked down to jdk8
-jprt.tools.default.release=jdk8
-
-# The different build flavors we want, we override here so we just get these 2
-jprt.build.flavors=product,fastdebug
-
-# Standard list of jprt build targets for this source tree
-jprt.build.targets=                                             \
-    solaris_sparcv9_5.10-{product|fastdebug},                   \
-    solaris_x64_5.10-{product|fastdebug},                       \
-    linux_i586_2.6-{product|fastdebug},                         \
-    linux_x64_2.6-{product|fastdebug},                          \
-    macosx_x64_10.7-{product|fastdebug},                        \
-    windows_i586_6.1-{product|fastdebug},                       \
-    windows_x64_6.1-{product|fastdebug}
-
-# Test target list (no fastdebug & limited c2 testing)
-jprt.my.test.target.set= 					\
-    solaris_sparcv9_5.10-product-c2-TESTNAME,                   \
-    solaris_x64_5.10-product-c2-TESTNAME,                       \
-    linux_i586_2.6-product-{c1|c2}-TESTNAME,                    \
-    linux_x64_2.6-product-c2-TESTNAME,                          \
-    macosx_x64_10.7-product-c2-TESTNAME,                        \
-    windows_i586_6.1-product-c1-TESTNAME,                       \
-    windows_x64_6.1-product-c2-TESTNAME
-
-# Default test targets
-jprt.make.rule.test.targets=					\
-    ${jprt.my.test.target.set:TESTNAME=jtreg}
-
-# Directories to be excluded from the source bundles
-jprt.bundle.exclude.src.dirs=build dist webrev
-
-# Test target list (no fastdebug & limited c2 testing)
-jprt.my.test.target.set= 					\
-    solaris_sparcv9_5.10-product-c2-TESTNAME,                   \
-    solaris_x64_5.10-product-c2-TESTNAME,                       \
-    linux_i586_2.6-product-{c1|c2}-TESTNAME,                    \
-    linux_x64_2.6-product-c2-TESTNAME,                          \
-    macosx_x64_10.7-product-c2-TESTNAME,                        \
-    windows_i586_6.1-product-c1-TESTNAME,                       \
-    windows_x64_6.1-product-c2-TESTNAME
-
-# Default test targets
-jprt.make.rule.test.targets=					\
-    ${jprt.my.test.target.set:TESTNAME=jtreg}
--- a/makefiles/BuildLangtools.gmk	Fri Nov 15 11:08:12 2013 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,201 +0,0 @@
-#
-# Copyright (c) 2011, 2013, 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
-# under the terms of the GNU General Public License version 2 only, as
-# published by the Free Software Foundation.  Oracle designates this
-# particular file as subject to the "Classpath" exception as provided
-# by Oracle in the LICENSE file that accompanied this code.
-#
-# This code is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
-# version 2 for more details (a copy is included in the LICENSE file that
-# accompanied this code).
-#
-# You should have received a copy of the GNU General Public License version
-# 2 along with this work; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-#
-# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-# or visit www.oracle.com if you need additional information or have any
-# questions.
-#
-
-# This must be the first rule
-default: all
-
-include $(SPEC)
-include MakeBase.gmk
-include JavaCompilation.gmk
-
-# The BOOT_JAVAC setup uses the bootdir compiler to compile the tools
-# and the bootstrap javac, to be run by the bootdir jvm.
-$(eval $(call SetupJavaCompiler,BOOT_JAVAC, \
-    JAVAC := $(JAVAC), \
-    SERVER_DIR := $(SJAVAC_SERVER_DIR), \
-    SERVER_JVM := $(SJAVAC_SERVER_JAVA), \
-    FLAGS := -XDignore.symbol.file=true -g -Xlint:all$(COMMA)-deprecation -Werror))
-
-# javax.tools.JavaCompilerTool isn't really a suffix but this gets the file copied.
-RESOURCE_SUFFIXES := .gif .xml .css .js javax.tools.JavaCompilerTool
-
-# Now setup the compilation of the properties compilation tool. You can depend
-# upon $(BUILD_TOOLS) to trigger a compilation of the tools. Note that we
-# add src/share/classes to the sourcepath. This is necessary since the GenStubs
-# program needs to be linked and run towards the new javac sources.
-$(eval $(call SetupJavaCompilation,BUILD_TOOLS, \
-    SETUP := BOOT_JAVAC, \
-    DISABLE_SJAVAC := true, \
-    ADD_JAVAC_FLAGS := -Xprefer:source, \
-    SRC := $(LANGTOOLS_TOPDIR)/make/tools $(LANGTOOLS_TOPDIR)/src/share/classes, \
-    INCLUDES := compileproperties genstubs, \
-    BIN := $(LANGTOOLS_OUTPUTDIR)/btclasses))
-
-# The compileprops tools compiles a properties file into a resource bundle.
-TOOL_COMPILEPROPS_CMD := $(JAVA) -cp $(LANGTOOLS_OUTPUTDIR)/btclasses compileproperties.CompileProperties -quiet
-
-# Lookup the properties that need to be compiled into resource bundles.
-PROPSOURCES := $(shell $(FIND) $(LANGTOOLS_TOPDIR)/src/share/classes -name "*.properties")
-
-# Strip away prefix and suffix, leaving for example only: "com/sun/tools/javac/resources/javac_zh_CN"
-PROPPATHS := $(patsubst $(LANGTOOLS_TOPDIR)/src/share/classes/%.properties, %, $(PROPSOURCES))
-
-# Generate the list of java files to be created.
-PROPJAVAS := $(patsubst %, $(LANGTOOLS_OUTPUTDIR)/gensrc/%.java, $(PROPPATHS))
-
-# Generate the package dirs for the tobe generated java files.
-PROPDIRS := $(dir $(PROPJAVAS))
-
-# Now generate a sequence of "-compile ...javac_zh_CN.properties ...javac_zh_CN.java java.util.ListResourceBundle"
-# suitable to be fed into the CompileProperties command.
-PROPCMDLINE := $(subst _SPACE_, $(SPACE), $(join $(addprefix -compile_SPACE_, $(PROPSOURCES)), \
-    $(addsuffix _SPACE_java.util.ListResourceBundle, $(addprefix _SPACE_$(LANGTOOLS_OUTPUTDIR)/gensrc/, $(addsuffix .java, $(PROPPATHS))))))
-
-# Now setup the rule for the generation of the resource bundles.
-$(LANGTOOLS_OUTPUTDIR)/gensrc/_the_props.d: $(PROPSOURCES) $(BUILD_TOOLS)
-	$(RM) -r $(@D)/*
-	$(MKDIR) -p $(@D) $(PROPDIRS)
-	$(PRINTF) "jdk=$(JDK_VERSION)\nfull=$(FULL_VERSION)\nrelease=$(RELEASE)\n" > $(LANGTOOLS_OUTPUTDIR)/gensrc/com/sun/tools/javah/resources/version.properties
-	$(PRINTF) "jdk=$(JDK_VERSION)\nfull=$(FULL_VERSION)\nrelease=$(RELEASE)\n" > $(LANGTOOLS_OUTPUTDIR)/gensrc/com/sun/tools/javap/resources/version.properties
-	$(PRINTF) "jdk=$(JDK_VERSION)\nfull=$(FULL_VERSION)\nrelease=$(RELEASE)\n" > $(LANGTOOLS_OUTPUTDIR)/gensrc/com/sun/tools/javac/resources/version.properties
-	$(PRINTF) "jdk=$(JDK_VERSION)\nfull=$(FULL_VERSION)\nrelease=$(RELEASE)\n" > $(LANGTOOLS_OUTPUTDIR)/gensrc/com/sun/tools/jdeps/resources/version.properties
-	$(ECHO) Compiling $(words $(PROPSOURCES) v1 v2 v3) properties into resource bundles
-	$(TOOL_COMPILEPROPS_CMD) $(PROPCMDLINE) \
-	    -compile $(LANGTOOLS_OUTPUTDIR)/gensrc/com/sun/tools/javah/resources/version.properties \
-	        $(LANGTOOLS_OUTPUTDIR)/gensrc/com/sun/tools/javah/resources/version.java \
-	        java.util.ListResourceBundle \
-	    -compile $(LANGTOOLS_OUTPUTDIR)/gensrc/com/sun/tools/javap/resources/version.properties \
-	        $(LANGTOOLS_OUTPUTDIR)/gensrc/com/sun/tools/javap/resources/version.java \
-	        java.util.ListResourceBundle \
-	    -compile $(LANGTOOLS_OUTPUTDIR)/gensrc/com/sun/tools/javac/resources/version.properties \
-	        $(LANGTOOLS_OUTPUTDIR)/gensrc/com/sun/tools/javac/resources/version.java \
-	        java.util.ListResourceBundle \
-	    -compile $(LANGTOOLS_OUTPUTDIR)/gensrc/com/sun/tools/jdeps/resources/version.properties \
-	        $(LANGTOOLS_OUTPUTDIR)/gensrc/com/sun/tools/jdeps/resources/version.java \
-	        java.util.ListResourceBundle
-	$(ECHO) PROPS_ARE_CREATED = yes > $@
-
-# Trigger the generation of the resource bundles. After the resource bundles have
-# been compiled, then the makefile will restart and the newly created java files
-# will become part of the build further along in the makefile.
--include $(LANGTOOLS_OUTPUTDIR)/gensrc/_the_props.d
-
-ifeq ($(PROPS_ARE_CREATED), yes)
-  # Setup the rules to build a dist/bootstrap/lib/javac.jar, ie a smaller intermediate javac
-  # that can be compiled with an old javac. The intermediate javac is then used
-  # to compile javac again and to build the complete new jdk.
-  $(eval $(call SetupJavaCompilation,BUILD_BOOTSTRAP_LANGTOOLS, \
-      SETUP := BOOT_JAVAC, \
-      DISABLE_SJAVAC := true, \
-      SRC := $(LANGTOOLS_TOPDIR)/src/share/classes $(LANGTOOLS_OUTPUTDIR)/gensrc, \
-      EXCLUDES := com/sun/tools/javac/nio, \
-      COPY := $(RESOURCE_SUFFIXES), \
-      BIN := $(LANGTOOLS_OUTPUTDIR)/btclasses/bootstrap))
-
-  $(eval $(call SetupArchive,ARCHIVE_BOOTSTRAP_JAVAC, $(BUILD_BOOTSTRAP_LANGTOOLS), \
-      SRCS := $(LANGTOOLS_OUTPUTDIR)/btclasses/bootstrap, \
-      JAR := $(LANGTOOLS_OUTPUTDIR)/dist/bootstrap/lib/javac.jar, \
-      SUFFIXES := .class $(RESOURCE_SUFFIXES)))
-
-  # GenStubs is used to bootstrap any dependencies from javac to the new JDK that is not
-  # yet built. It is currently not needed but might be again in the future. The following
-  # exercises the functionality to verify that it works.
-  TOOL_GENSTUBS_CMD = $(JAVA) \
-       "-Xbootclasspath/p:$(LANGTOOLS_OUTPUTDIR)/dist/bootstrap/lib/javac.jar" \
-       -classpath $(LANGTOOLS_OUTPUTDIR)/btclasses \
-       genstubs.GenStubs
-
-  # We fetch source from the JDK...
-  JDKS = $(JDK_TOPDIR)/src/share/classes
-
-  # Build the list of classes to generate stubs from. java/util/function/Predicate.java isn't
-  # currently needed, but is used as a demo for now.
-
-  STUBSOURCES := $(shell $(FIND) $(JDKS) -name "*.java" | $(GREP) \
-      -e "$(JDKS)/java/util/function/Predicate.java")
-
-  # Rewrite the file names into class names because the GenStubs tool require this.
-  STUBCLASSES := $(subst /,., $(patsubst $(JDKS)/%.java, %, $(STUBSOURCES)))
-
-  # Now setup the build recipe for genstubs.
-  $(LANGTOOLS_OUTPUTDIR)/genstubs/_the_stubs.d: $(STUBSOURCES) $(BUILD_TOOLS) \
-      $(LANGTOOLS_OUTPUTDIR)/dist/bootstrap/lib/javac.jar \
-      $(LANGTOOLS_OUTPUTDIR)/gensrc/_the_props.d
-	$(MKDIR) -p $(@D)
-	$(MKDIR) -p $(LANGTOOLS_OUTPUTDIR)/tmpstubs
-	$(ECHO) $(LOG_INFO) Generating stubs from JDK sources.
-	($(TOOL_GENSTUBS_CMD) -s $(LANGTOOLS_OUTPUTDIR)/tmpstubs -sourcepath $(JDKS) $(STUBCLASSES) && $(ECHO) STUBS_ARE_CREATED = yes > $@)
-	if $(DIFF) -x "_the*" -rq $(LANGTOOLS_OUTPUTDIR)/tmpstubs $(LANGTOOLS_OUTPUTDIR)/genstubs > /dev/null 2>&1; then \
-	  $(ECHO) $(LOG_INFO) No changes in the stubs!; \
-	  $(RM) -r $(LANGTOOLS_OUTPUTDIR)/tmpstubs; \
-	else \
-	  $(ECHO) $(LOG_INFO) Changes in stubs detected!; \
-	  $(RM) -r $(@D); \
-	  $(MV) $(LANGTOOLS_OUTPUTDIR)/tmpstubs $(@D); \
-	fi
-	$(ECHO) STUBS_ARE_CREATED = yes > $@
-
-  # Trigger a generation of the genstubs java source code and a restart
-  # of the makefile to make sure that the following build setup use the
-  # newly created java files.
-  -include $(LANGTOOLS_OUTPUTDIR)/genstubs/_the_stubs.d
-
-  ifeq ($(STUBS_ARE_CREATED), yes)
-    # Setup a compiler configuration using the intermediate javac in dist/bootstrap/lib/javac.jar
-    # that generates code for the new jdk that is being built.
-    # The code compiled by this compiler setup, cannot necessarily be run with the bootstrap jvm.
-    $(eval $(call SetupJavaCompiler,GENERATE_NEWBYTECODE, \
-        JVM := $(JAVA), \
-        JAVAC := "-Xbootclasspath/p:$(LANGTOOLS_OUTPUTDIR)/dist/bootstrap/lib/javac.jar" \
-            -cp $(LANGTOOLS_OUTPUTDIR)/dist/bootstrap/lib/javac.jar \
-            com.sun.tools.javac.Main, \
-        FLAGS := -XDignore.symbol.file=true -Xlint:all$(COMMA)-deprecation -Werror, \
-        SERVER_DIR := $(SJAVAC_SERVER_DIR), \
-        SERVER_JVM := $(SJAVAC_SERVER_JAVA)))
-
-    $(eval $(call SetupJavaCompilation,BUILD_FULL_JAVAC, \
-        SETUP := GENERATE_NEWBYTECODE, \
-        SRC := $(LANGTOOLS_TOPDIR)/src/share/classes $(LANGTOOLS_OUTPUTDIR)/gensrc \
-            $(LANGTOOLS_OUTPUTDIR)/genstubs, \
-        EXCLUDES := java/util java/io java/nio, \
-        COPY := $(RESOURCE_SUFFIXES), \
-        BIN := $(LANGTOOLS_OUTPUTDIR)/classes))
-
-    $(eval $(call SetupArchive,ARCHIVE_FULL_JAVAC, $(BUILD_FULL_JAVAC), \
-        SETUP := GENERATE_NEWBYTECODE, \
-        SRCS := $(LANGTOOLS_OUTPUTDIR)/classes, \
-        SUFFIXES := .class $(RESOURCE_SUFFIXES), \
-        JAR := $(LANGTOOLS_OUTPUTDIR)/dist/lib/classes.jar))
-
-    $(eval $(call SetupZipArchive,ZIP_FULL_JAVAC_SOURCE, \
-        SRC := $(LANGTOOLS_TOPDIR)/src/share/classes $(LANGTOOLS_OUTPUTDIR)/gensrc, \
-        ZIP := $(LANGTOOLS_OUTPUTDIR)/dist/lib/src.zip))
-
-    all: $(LANGTOOLS_OUTPUTDIR)/dist/lib/classes.jar \
-        $(LANGTOOLS_OUTPUTDIR)/dist/lib/src.zip \
-        $(LANGTOOLS_OUTPUTDIR)/dist/bootstrap/lib/javac.jar
-
-  endif
-endif
--- a/makefiles/Makefile	Fri Nov 15 11:08:12 2013 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,49 +0,0 @@
-#
-# Copyright (c) 2012, 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
-# under the terms of the GNU General Public License version 2 only, as
-# published by the Free Software Foundation.  Oracle designates this
-# particular file as subject to the "Classpath" exception as provided
-# by Oracle in the LICENSE file that accompanied this code.
-#
-# This code is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
-# version 2 for more details (a copy is included in the LICENSE file that
-# accompanied this code).
-#
-# You should have received a copy of the GNU General Public License version
-# 2 along with this work; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-#
-# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-# or visit www.oracle.com if you need additional information or have any
-# questions.
-#
-
-# Locate this Makefile
-ifeq ($(filter /%, $(lastword $(MAKEFILE_LIST))), )
-  makefile_path := $(CURDIR)/$(lastword $(MAKEFILE_LIST))
-else
-  makefile_path := $(lastword $(MAKEFILE_LIST))
-endif
-repo_dir := $(patsubst %/makefiles/Makefile, %, $(makefile_path))
-
-# What is the name of this subsystem (langtools, corba, etc)?
-subsystem_name := $(notdir $(repo_dir))
-
-# Try to locate top-level makefile
-top_level_makefile := $(repo_dir)/../common/makefiles/Makefile
-ifneq ($(wildcard $(top_level_makefile)), )
-  $(info Will run $(subsystem_name) target on top-level Makefile)
-  $(info WARNING: This is a non-recommended way of building!)
-  $(info ===================================================)
-else
-  $(info Cannot locate top-level Makefile. Is this repo not checked out as part of a complete forest?)
-  $(error Build from top-level Makefile instead)
-endif
-
-all:
-	@$(MAKE) -f $(top_level_makefile) $(subsystem_name)