8027566: Remove the old build system

Thu, 14 Nov 2013 10:53:23 +0100

author
ihse
date
Thu, 14 Nov 2013 10:53:23 +0100
changeset 912
a667caba1e84
parent 906
40e892e2a4f2
child 913
9937f406e27e

8027566: Remove the old build system
Reviewed-by: erikj, tbell

Makefile file | annotate | diff | comparison | revisions
NewMakefile.gmk file | annotate | diff | comparison | revisions
common/autoconf/Makefile.in file | annotate | diff | comparison | revisions
common/autoconf/basics.m4 file | annotate | diff | comparison | revisions
common/autoconf/generated-configure.sh file | annotate | diff | comparison | revisions
common/autoconf/hotspot-spec.gmk.in file | annotate | diff | comparison | revisions
common/autoconf/source-dirs.m4 file | annotate | diff | comparison | revisions
common/autoconf/spec.gmk.in file | annotate | diff | comparison | revisions
common/bin/compare.sh file | annotate | diff | comparison | revisions
common/makefiles/HotspotWrapper.gmk file | annotate | diff | comparison | revisions
common/makefiles/IdlCompilation.gmk file | annotate | diff | comparison | revisions
common/makefiles/JavaCompilation.gmk file | annotate | diff | comparison | revisions
common/makefiles/Jprt.gmk file | annotate | diff | comparison | revisions
common/makefiles/Main.gmk file | annotate | diff | comparison | revisions
common/makefiles/MakeBase.gmk file | annotate | diff | comparison | revisions
common/makefiles/MakeHelpers.gmk file | annotate | diff | comparison | revisions
common/makefiles/Makefile file | annotate | diff | comparison | revisions
common/makefiles/NativeCompilation.gmk file | annotate | diff | comparison | revisions
common/makefiles/RMICompilation.gmk file | annotate | diff | comparison | revisions
common/makefiles/devkit/Makefile file | annotate | diff | comparison | revisions
common/makefiles/devkit/Tools.gmk file | annotate | diff | comparison | revisions
common/makefiles/javadoc/CORE_PKGS.gmk file | annotate | diff | comparison | revisions
common/makefiles/javadoc/Javadoc.gmk file | annotate | diff | comparison | revisions
common/makefiles/javadoc/NON_CORE_PKGS.gmk file | annotate | diff | comparison | revisions
common/makefiles/javadoc/Notes.html file | annotate | diff | comparison | revisions
common/makefiles/support/ListPathsSafely-post-compress.incl file | annotate | diff | comparison | revisions
common/makefiles/support/ListPathsSafely-pre-compress.incl file | annotate | diff | comparison | revisions
common/makefiles/support/ListPathsSafely-uncompress.sed file | annotate | diff | comparison | revisions
common/makefiles/support/unicode2x.sed file | annotate | diff | comparison | revisions
common/nb_native/nbproject/configurations.xml file | annotate | diff | comparison | revisions
make/Defs-internal.gmk file | annotate | diff | comparison | revisions
make/HotspotWrapper.gmk file | annotate | diff | comparison | revisions
make/Javadoc.gmk file | annotate | diff | comparison | revisions
make/Jprt.gmk file | annotate | diff | comparison | revisions
make/Main.gmk file | annotate | diff | comparison | revisions
make/MakeHelpers.gmk file | annotate | diff | comparison | revisions
make/README.pre-components file | annotate | diff | comparison | revisions
make/common/CORE_PKGS.gmk file | annotate | diff | comparison | revisions
make/common/IdlCompilation.gmk file | annotate | diff | comparison | revisions
make/common/JavaCompilation.gmk file | annotate | diff | comparison | revisions
make/common/MakeBase.gmk file | annotate | diff | comparison | revisions
make/common/NON_CORE_PKGS.gmk file | annotate | diff | comparison | revisions
make/common/NativeCompilation.gmk file | annotate | diff | comparison | revisions
make/common/RMICompilation.gmk file | annotate | diff | comparison | revisions
make/common/support/ListPathsSafely-post-compress.incl file | annotate | diff | comparison | revisions
make/common/support/ListPathsSafely-pre-compress.incl file | annotate | diff | comparison | revisions
make/common/support/ListPathsSafely-uncompress.sed file | annotate | diff | comparison | revisions
make/common/support/unicode2x.sed file | annotate | diff | comparison | revisions
make/corba-rules.gmk file | annotate | diff | comparison | revisions
make/deploy-rules.gmk file | annotate | diff | comparison | revisions
make/devkit/Makefile file | annotate | diff | comparison | revisions
make/devkit/Tools.gmk file | annotate | diff | comparison | revisions
make/hotspot-rules.gmk file | annotate | diff | comparison | revisions
make/install-rules.gmk file | annotate | diff | comparison | revisions
make/jaxp-rules.gmk file | annotate | diff | comparison | revisions
make/jaxws-rules.gmk file | annotate | diff | comparison | revisions
make/jdk-rules.gmk file | annotate | diff | comparison | revisions
make/jprt.gmk file | annotate | diff | comparison | revisions
make/langtools-rules.gmk file | annotate | diff | comparison | revisions
make/nashorn-rules.gmk file | annotate | diff | comparison | revisions
make/sanity-rules.gmk file | annotate | diff | comparison | revisions
make/scripts/fixpath.pl file | annotate | diff | comparison | revisions
make/scripts/vsvars.sh file | annotate | diff | comparison | revisions
make/sponsors-rules.gmk file | annotate | diff | comparison | revisions
     1.1 --- a/Makefile	Thu Nov 07 08:16:05 2013 -0800
     1.2 +++ b/Makefile	Thu Nov 14 10:53:23 2013 +0100
     1.3 @@ -1,5 +1,5 @@
     1.4  #
     1.5 -# Copyright (c) 1995, 2012, Oracle and/or its affiliates. All rights reserved.
     1.6 +# Copyright (c) 2012, 2013, Oracle and/or its affiliates. All rights reserved.
     1.7  # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
     1.8  #
     1.9  # This code is free software; you can redistribute it and/or modify it
    1.10 @@ -23,549 +23,112 @@
    1.11  # questions.
    1.12  #
    1.13  
    1.14 -# If NEWBUILD is defined, use the new build-infra Makefiles and configure.
    1.15 -#     See NewMakefile.gmk for more information.
    1.16 +# This must be the first rule
    1.17 +default:
    1.18  
    1.19 -# If not specified, select what the default build is
    1.20 -ifndef NEWBUILD
    1.21 -  NEWBUILD=true
    1.22 +# Inclusion of this pseudo-target will cause make to execute this file
    1.23 +# serially, regardless of -j. Recursively called makefiles will not be
    1.24 +# affected, however. This is required for correct dependency management.
    1.25 +.NOTPARALLEL:
    1.26 +
    1.27 +# The shell code below will be executed on /usr/ccs/bin/make on Solaris, but not in GNU make.
    1.28 +# /usr/ccs/bin/make lacks basically every other flow control mechanism.
    1.29 +TEST_FOR_NON_GNUMAKE:sh=echo You are not using GNU make/gmake, this is a requirement. Check your path. 1>&2 && exit 1
    1.30 +
    1.31 +# Assume we have GNU make, but check version.
    1.32 +ifeq ($(strip $(foreach v, 3.81% 3.82% 4.%, $(filter $v, $(MAKE_VERSION)))), )
    1.33 +  $(error This version of GNU Make is too low ($(MAKE_VERSION)). Check your path, or upgrade to 3.81 or newer.)
    1.34  endif
    1.35  
    1.36 -ifeq ($(NEWBUILD),true)
    1.37 +# Locate this Makefile
    1.38 +ifeq ($(filter /%,$(lastword $(MAKEFILE_LIST))),)
    1.39 +  makefile_path:=$(CURDIR)/$(lastword $(MAKEFILE_LIST))
    1.40 +else
    1.41 +  makefile_path:=$(lastword $(MAKEFILE_LIST))
    1.42 +endif
    1.43 +root_dir:=$(dir $(makefile_path))
    1.44  
    1.45 -  # The new top level Makefile
    1.46 -  include NewMakefile.gmk
    1.47 +# ... and then we can include our helper functions
    1.48 +include $(root_dir)/make/MakeHelpers.gmk
    1.49  
    1.50 -else # Original Makefile logic
    1.51 +$(eval $(call ParseLogLevel))
    1.52 +$(eval $(call ParseConfAndSpec))
    1.53  
    1.54 -BUILD_PARENT_DIRECTORY=.
    1.55 +# Now determine if we have zero, one or several configurations to build.
    1.56 +ifeq ($(SPEC),)
    1.57 +  # Since we got past ParseConfAndSpec, we must be building a global target. Do nothing.
    1.58 +else
    1.59 +  ifeq ($(words $(SPEC)),1)
    1.60 +    # We are building a single configuration. This is the normal case. Execute the Main.gmk file.
    1.61 +    include $(root_dir)/make/Main.gmk
    1.62 +  else
    1.63 +    # We are building multiple configurations.
    1.64 +    # First, find out the valid targets
    1.65 +    # Run the makefile with an arbitrary SPEC using -p -q (quiet dry-run and dump rules) to find
    1.66 +    # available PHONY targets. Use this list as valid targets to pass on to the repeated calls.
    1.67 +    all_phony_targets=$(filter-out $(global_targets) bundles-only, $(strip $(shell \
    1.68 +        $(MAKE) -p -q -f make/Main.gmk FRC SPEC=$(firstword $(SPEC)) | \
    1.69 +        grep ^.PHONY: | head -n 1 | cut -d " " -f 2-)))
    1.70  
    1.71 -# Basename of any originally supplied ALT_OUTPUTDIR directory
    1.72 -ifndef ORIG_OUTPUTDIR_BASENAME
    1.73 -  ifdef ALT_OUTPUTDIR
    1.74 -    ORIG_OUTPUTDIR_BASENAME := $(shell basename $(ALT_OUTPUTDIR))
    1.75 -  else
    1.76 -    ORIG_OUTPUTDIR_BASENAME  = $(PLATFORM)-$(ARCH)
    1.77 -  endif
    1.78 -endif
    1.79 -export ORIG_OUTPUTDIR_BASENAME
    1.80 +    $(all_phony_targets):
    1.81 +	@$(foreach spec,$(SPEC),($(MAKE) -f NewMakefile.gmk SPEC=$(spec) \
    1.82 +	    $(VERBOSE) VERBOSE=$(VERBOSE) LOG_LEVEL=$(LOG_LEVEL) $@) &&) true
    1.83  
    1.84 -# The three possible directories created for output (3 build flavors)
    1.85 -OUTPUTDIR_BASENAME-          = $(ORIG_OUTPUTDIR_BASENAME)
    1.86 -OUTPUTDIR_BASENAME-debug     = $(ORIG_OUTPUTDIR_BASENAME)-debug
    1.87 -OUTPUTDIR_BASENAME-fastdebug = $(ORIG_OUTPUTDIR_BASENAME)-fastdebug
    1.88 +    .PHONY: $(all_phony_targets)
    1.89  
    1.90 -# Relative path to a debug output area
    1.91 -REL_JDK_OUTPUTDIR = ../$(OUTPUTDIR_BASENAME-$(DEBUG_NAME))
    1.92 -
    1.93 -# The created jdk image directory
    1.94 -JDK_IMAGE_DIRNAME = j2sdk-image
    1.95 -JDK_IMAGE_DIR     = $(OUTPUTDIR)/$(JDK_IMAGE_DIRNAME)
    1.96 -ABS_JDK_IMAGE_DIR = $(ABS_OUTPUTDIR)/$(JDK_IMAGE_DIRNAME)
    1.97 -
    1.98 -# Relative path from an output directory to the image directory
    1.99 -REL_JDK_IMAGE_DIR = ../$(OUTPUTDIR_BASENAME-$(DEBUG_NAME))/$(JDK_IMAGE_DIRNAME)
   1.100 -REL_JDK_DEBUG_IMAGE_DIR = ../$(OUTPUTDIR_BASENAME-debug)/$(JDK_IMAGE_DIRNAME)
   1.101 -REL_JDK_FASTDEBUG_IMAGE_DIR = ../$(OUTPUTDIR_BASENAME-fastdebug)/$(JDK_IMAGE_DIRNAME)
   1.102 -
   1.103 -ifndef TOPDIR
   1.104 -  TOPDIR:=.
   1.105 -endif
   1.106 -
   1.107 -ifndef JDK_TOPDIR
   1.108 -  JDK_TOPDIR=$(TOPDIR)/jdk
   1.109 -endif
   1.110 -ifndef JDK_MAKE_SHARED_DIR
   1.111 -  JDK_MAKE_SHARED_DIR=$(JDK_TOPDIR)/make/common/shared
   1.112 -endif
   1.113 -
   1.114 -default: all
   1.115 -
   1.116 -include $(JDK_MAKE_SHARED_DIR)/Defs-control.gmk
   1.117 -include ./make/Defs-internal.gmk
   1.118 -include ./make/sanity-rules.gmk
   1.119 -include ./make/hotspot-rules.gmk
   1.120 -include ./make/langtools-rules.gmk
   1.121 -include ./make/corba-rules.gmk
   1.122 -include ./make/jaxp-rules.gmk
   1.123 -include ./make/jaxws-rules.gmk
   1.124 -include ./make/jdk-rules.gmk
   1.125 -include ./make/nashorn-rules.gmk
   1.126 -include ./make/install-rules.gmk
   1.127 -include ./make/sponsors-rules.gmk
   1.128 -include ./make/deploy-rules.gmk
   1.129 -
   1.130 -all:: sanity
   1.131 -
   1.132 -ifeq ($(SKIP_FASTDEBUG_BUILD), false)
   1.133 -  all:: fastdebug_build
   1.134 -endif
   1.135 -
   1.136 -ifeq ($(SKIP_DEBUG_BUILD), false)
   1.137 -  all:: debug_build
   1.138 -endif
   1.139 -
   1.140 -all:: all_product_build 
   1.141 -
   1.142 -all_product_build::
   1.143 -
   1.144 -# Everything for a full product build
   1.145 -ifeq ($(SKIP_PRODUCT_BUILD), false)
   1.146 -
   1.147 -  all_product_build:: product_build
   1.148 -
   1.149 -  ifeq ($(BUILD_INSTALL), true)
   1.150 -    all_product_build:: $(INSTALL)
   1.151 -    clobber:: install-clobber
   1.152 -  endif
   1.153 -
   1.154 -  ifeq ($(BUILD_SPONSORS), true)
   1.155 -    all_product_build:: $(SPONSORS)
   1.156 -    clobber:: sponsors-clobber
   1.157 -  endif
   1.158 -
   1.159 -  ifneq ($(SKIP_COMPARE_IMAGES), true)
   1.160 -    all_product_build:: compare-image
   1.161 -  endif
   1.162 -
   1.163 -endif
   1.164 -
   1.165 -define StartTimer
   1.166 -	$(MKDIR) -p $(BUILDTIMESDIR)
   1.167 -	$(RM) $(BUILDTIMESDIR)/build_time_*
   1.168 -	$(call RecordStartTime,TOTAL)
   1.169 -endef
   1.170 -
   1.171 -define StopTimer
   1.172 -	$(if $(REPORT_BUILD_TIMES),$(call RecordEndTime,TOTAL) && $(call ReportBuildTimes,$1),)
   1.173 -endef
   1.174 -
   1.175 -# Generic build of basic repo series
   1.176 -generic_build_repo_series:: $(SOURCE_TIPS)
   1.177 -	$(MKDIR) -p $(JDK_IMAGE_DIR)
   1.178 -	@$(call StartTimer)
   1.179 -
   1.180 -ifeq ($(BUILD_LANGTOOLS), true)
   1.181 -  generic_build_repo_series:: langtools
   1.182 -  clobber:: langtools-clobber
   1.183 -endif
   1.184 -
   1.185 -ifeq ($(BUILD_CORBA), true)
   1.186 -  generic_build_repo_series:: corba
   1.187 -  clobber:: corba-clobber
   1.188 -endif
   1.189 -
   1.190 -ifeq ($(BUILD_JAXP), true)
   1.191 -  generic_build_repo_series:: jaxp
   1.192 -  clobber:: jaxp-clobber
   1.193 -endif
   1.194 -
   1.195 -ifeq ($(BUILD_JAXWS), true)
   1.196 -  generic_build_repo_series:: jaxws
   1.197 -  clobber:: jaxws-clobber
   1.198 -endif
   1.199 -
   1.200 -ifeq ($(BUILD_HOTSPOT), true)
   1.201 -  generic_build_repo_series:: $(HOTSPOT) 
   1.202 -  clobber:: hotspot-clobber
   1.203 -endif
   1.204 -
   1.205 -ifeq ($(BUILD_JDK), true)
   1.206 -  generic_build_repo_series:: $(JDK_JAVA_EXE)
   1.207 -  clobber:: jdk-clobber
   1.208 -endif
   1.209 -
   1.210 -ifeq ($(BUILD_NASHORN), true)
   1.211 -  generic_build_repo_series:: $(NASHORN)
   1.212 -  clobber:: nashorn-clobber
   1.213 -endif
   1.214 -
   1.215 -ifeq ($(BUILD_DEPLOY), true)
   1.216 -  generic_build_repo_series:: $(DEPLOY)
   1.217 -  clobber:: deploy-clobber
   1.218 -endif
   1.219 -
   1.220 -generic_build_repo_series::
   1.221 -	@$(call StopTimer,$(if $(DEBUG_NAME),$(DEBUG_NAME)_build,all_product_build))
   1.222 -
   1.223 -# The debug build, fastdebug or debug. Needs special handling.
   1.224 -#  Note that debug builds do NOT do INSTALL steps, but must be done
   1.225 -#  after the product build and before the INSTALL step of the product build.
   1.226 -#
   1.227 -#   DEBUG_NAME is fastdebug or debug
   1.228 -#   ALT_OUTPUTDIR is changed to have -debug or -fastdebug suffix
   1.229 -#   The resulting image directory (j2sdk-image) is used by the install makefiles
   1.230 -#     to create a debug install bundle jdk-*-debug-** bundle (tar or zip) 
   1.231 -#     which will install in the debug or fastdebug subdirectory of the
   1.232 -#     normal product install area.
   1.233 -#     The install process needs to know what the DEBUG_NAME is, so
   1.234 -#     look for INSTALL_DEBUG_NAME in the install rules.
   1.235 -#
   1.236 -#   NOTE: On windows, do not use $(ABS_BOOTDIR_OUTPUTDIR)-$(DEBUG_NAME).
   1.237 -#         Due to the use of short paths in $(ABS_OUTPUTDIR), this may 
   1.238 -#         not be the same location.
   1.239 -#
   1.240 -
   1.241 -# Location of fresh bootdir output
   1.242 -ABS_BOOTDIR_OUTPUTDIR=$(ABS_OUTPUTDIR)/bootjdk
   1.243 -FRESH_BOOTDIR=$(ABS_BOOTDIR_OUTPUTDIR)/$(JDK_IMAGE_DIRNAME)
   1.244 -FRESH_DEBUG_BOOTDIR=$(ABS_BOOTDIR_OUTPUTDIR)/$(REL_JDK_IMAGE_DIR)
   1.245 -  
   1.246 -create_fresh_product_bootdir: FRC
   1.247 -	$(MAKE) ALT_OUTPUTDIR=$(ABS_BOOTDIR_OUTPUTDIR) \
   1.248 -		GENERATE_DOCS=false \
   1.249 -		BOOT_CYCLE_SETTINGS= \
   1.250 -		build_product_image
   1.251 -
   1.252 -create_fresh_debug_bootdir: FRC
   1.253 -	$(MAKE) ALT_OUTPUTDIR=$(ABS_BOOTDIR_OUTPUTDIR) \
   1.254 -		GENERATE_DOCS=false \
   1.255 -		BOOT_CYCLE_DEBUG_SETTINGS= \
   1.256 -		build_debug_image
   1.257 -
   1.258 -create_fresh_fastdebug_bootdir: FRC
   1.259 -	$(MAKE) ALT_OUTPUTDIR=$(ABS_BOOTDIR_OUTPUTDIR) \
   1.260 -		GENERATE_DOCS=false \
   1.261 -		BOOT_CYCLE_DEBUG_SETTINGS= \
   1.262 -		build_fastdebug_image
   1.263 -
   1.264 -# Create boot image?
   1.265 -ifeq ($(SKIP_BOOT_CYCLE),false)
   1.266 -  ifneq ($(PLATFORM)$(ARCH_DATA_MODEL),solaris64)
   1.267 -    DO_BOOT_CYCLE=true
   1.268    endif
   1.269  endif
   1.270  
   1.271 +# Include this after a potential spec file has been included so that the bundles target
   1.272 +# has access to the spec variables.
   1.273 +include $(root_dir)/make/Jprt.gmk
   1.274  
   1.275 +# Here are "global" targets, i.e. targets that can be executed without specifying a single configuration.
   1.276 +# If you addd more global targets, please update the variable global_targets in MakeHelpers.
   1.277  
   1.278 -ifeq ($(DO_BOOT_CYCLE),true)
   1.279 -  
   1.280 -  # Create the bootdir to use in the build
   1.281 -  product_build:: create_fresh_product_bootdir
   1.282 -  debug_build:: create_fresh_debug_bootdir
   1.283 -  fastdebug_build:: create_fresh_fastdebug_bootdir
   1.284 +help:
   1.285 +	$(info )
   1.286 +	$(info OpenJDK Makefile help)
   1.287 +	$(info =====================)
   1.288 +	$(info )
   1.289 +	$(info Common make targets)
   1.290 +	$(info .  make [default]         # Compile all product in langtools, hotspot, jaxp, jaxws,)
   1.291 +	$(info .                         # corba and jdk)
   1.292 +	$(info .  make all               # Compile everything, all repos and images)
   1.293 +	$(info .  make images            # Create complete j2sdk and j2re images)
   1.294 +	$(info .  make docs              # Create javadocs)
   1.295 +	$(info .  make overlay-images    # Create limited images for sparc 64 bit platforms)
   1.296 +	$(info .  make profiles          # Create complete j2re compact profile images)
   1.297 +	$(info .  make bootcycle-images  # Build images twice, second time with newly build JDK)
   1.298 +	$(info .  make install           # Install the generated images locally)
   1.299 +	$(info .  make clean             # Remove all files generated by make, but not those)
   1.300 +	$(info .                         # generated by configure)
   1.301 +	$(info .  make dist-clean        # Remove all files, including configuration)
   1.302 +	$(info .  make help              # Give some help on using make)
   1.303 +	$(info .  make test              # Run tests, default is all tests (see TEST below))
   1.304 +	$(info )
   1.305 +	$(info Targets for specific components)
   1.306 +	$(info (Component is any of langtools, corba, jaxp, jaxws, hotspot, jdk, nashorn, images, overlay-images, docs or test))
   1.307 +	$(info .  make <component>       # Build <component> and everything it depends on. )
   1.308 +	$(info .  make <component>-only  # Build <component> only, without dependencies. This)
   1.309 +	$(info .                         # is faster but can result in incorrect build results!)
   1.310 +	$(info .  make clean-<component> # Remove files generated by make for <component>)
   1.311 +	$(info )
   1.312 +	$(info Useful make variables)
   1.313 +	$(info .  make CONF=             # Build all configurations (note, assignment is empty))
   1.314 +	$(info .  make CONF=<substring>  # Build the configuration(s) with a name matching)
   1.315 +	$(info .                         # <substring>)
   1.316 +	$(info )
   1.317 +	$(info .  make LOG=<loglevel>    # Change the log level from warn to <loglevel>)
   1.318 +	$(info .                         # Available log levels are:)
   1.319 +	$(info .                         # 'warn' (default), 'info', 'debug' and 'trace')
   1.320 +	$(info .                         # To see executed command lines, use LOG=debug)
   1.321 +	$(info )
   1.322 +	$(info .  make JOBS=<n>          # Run <n> parallel make jobs)
   1.323 +	$(info .                         # Note that -jN does not work as expected!)
   1.324 +	$(info )
   1.325 +	$(info .  make test TEST=<test>  # Only run the given test or tests, e.g.)
   1.326 +	$(info .                         # make test TEST="jdk_lang jdk_net")
   1.327 +	$(info )
   1.328  
   1.329 -  # Define variables to be used now for the boot jdk
   1.330 -  BOOT_CYCLE_SETTINGS= \
   1.331 -     ALT_BOOTDIR=$(FRESH_BOOTDIR) \
   1.332 -     ALT_JDK_IMPORT_PATH=$(FRESH_BOOTDIR)
   1.333 -  BOOT_CYCLE_DEBUG_SETTINGS= \
   1.334 -     ALT_BOOTDIR=$(FRESH_DEBUG_BOOTDIR) \
   1.335 -     ALT_JDK_IMPORT_PATH=$(FRESH_DEBUG_BOOTDIR)
   1.336 -
   1.337 -else
   1.338 -
   1.339 -  # Use the supplied ALT_BOOTDIR as the boot
   1.340 -  BOOT_CYCLE_SETTINGS=
   1.341 -  BOOT_CYCLE_DEBUG_SETTINGS=
   1.342 -
   1.343 -endif
   1.344 -
   1.345 -build_product_image:
   1.346 -	$(MAKE) \
   1.347 -	        SKIP_FASTDEBUG_BUILD=true \
   1.348 -	        SKIP_DEBUG_BUILD=true \
   1.349 -	        $(BOOT_CYCLE_SETTINGS) \
   1.350 -	        generic_build_repo_series
   1.351 -
   1.352 -#   NOTE: On windows, do not use $(ABS_OUTPUTDIR)-$(DEBUG_NAME).
   1.353 -#         Due to the use of short paths in $(ABS_OUTPUTDIR), this may 
   1.354 -#         not be the same location.
   1.355 -
   1.356 -generic_debug_build:
   1.357 -	$(MAKE) \
   1.358 -		ALT_OUTPUTDIR=$(ABS_OUTPUTDIR)/$(REL_JDK_OUTPUTDIR) \
   1.359 -	        DEBUG_NAME=$(DEBUG_NAME) \
   1.360 -		GENERATE_DOCS=false \
   1.361 -	        $(BOOT_CYCLE_DEBUG_SETTINGS) \
   1.362 -		generic_build_repo_series
   1.363 -
   1.364 -build_debug_image:
   1.365 -	$(MAKE) DEBUG_NAME=debug generic_debug_build
   1.366 -
   1.367 -build_fastdebug_image:
   1.368 -	$(MAKE) DEBUG_NAME=fastdebug generic_debug_build
   1.369 -
   1.370 -# Build final image
   1.371 -product_build:: build_product_image
   1.372 -debug_build:: build_debug_image
   1.373 -fastdebug_build:: build_fastdebug_image
   1.374 -
   1.375 -# The source tips are stored with the relative path to the repo.
   1.376 -#   This file will be used when constructing the jdk image.
   1.377 -source_tips: $(SOURCE_TIPS)
   1.378 -	$(CAT) $<
   1.379 -$(SOURCE_TIPS): FRC
   1.380 -	@$(prep-target)
   1.381 -	@$(call GetSourceTips)
   1.382 -
   1.383 -clobber:: REPORT_BUILD_TIMES=
   1.384 -clobber:: 
   1.385 -	$(RM) -r $(OUTPUTDIR)/*
   1.386 -	-($(RMDIR) -p $(OUTPUTDIR) > $(DEV_NULL) 2>&1; $(TRUE))
   1.387 -
   1.388 -clean: clobber
   1.389 -
   1.390 -#
   1.391 -# Dev builds
   1.392 -#
   1.393 -
   1.394 -dev : dev-build
   1.395 -
   1.396 -dev-build:
   1.397 -	$(MAKE) DEV_ONLY=true all
   1.398 -dev-sanity:
   1.399 -	$(MAKE) DEV_ONLY=true sanity
   1.400 -dev-clobber:
   1.401 -	$(MAKE) DEV_ONLY=true clobber
   1.402 -
   1.403 -#
   1.404 -# Quick jdk verification build
   1.405 -#
   1.406 -jdk_only:
   1.407 -	$(MAKE) SKIP_FASTDEBUG_BUILD=true BUILD_HOTSPOT=false all
   1.408 -
   1.409 -
   1.410 -#
   1.411 -# Quick jdk verification fastdebug build
   1.412 -#
   1.413 -jdk_fastdebug_only:
   1.414 -	$(MAKE) DEBUG_NAME=fastdebug BUILD_HOTSPOT=false BUILD_DEPLOY=false \
   1.415 -	    BUILD_INSTALL=false BUILD_SPONSORS=false generic_debug_build
   1.416 -
   1.417 -#
   1.418 -# Quick deploy verification fastdebug build
   1.419 -#
   1.420 -deploy_fastdebug_only:
   1.421 -	$(MAKE) \
   1.422 -	    DEBUG_NAME=fastdebug \
   1.423 -	    BUILD_HOTSPOT=false \
   1.424 -	    BUILD_JDK=false \
   1.425 -	    BUILD_LANGTOOLS=false \
   1.426 -	    BUILD_NASHORN=false \
   1.427 -	    BUILD_CORBA=false \
   1.428 -	    BUILD_JAXP=false \
   1.429 -	    BUILD_JAXWS=false \
   1.430 -	    BUILD_INSTALL=false \
   1.431 -	    BUILD_SPONSORS=false \
   1.432 -	    generic_debug_build
   1.433 -
   1.434 -#
   1.435 -# Product build (skip debug builds)
   1.436 -#
   1.437 -product_only:
   1.438 -	$(MAKE) SKIP_FASTDEBUG_BUILD=true all
   1.439 -
   1.440 -#
   1.441 -# Check target
   1.442 -#
   1.443 -
   1.444 -check: variable_check
   1.445 -
   1.446 -#
   1.447 -# Help target
   1.448 -#
   1.449 -help: intro_help target_help variable_help notes_help examples_help
   1.450 -
   1.451 -# Intro help message
   1.452 -intro_help:
   1.453 -	@$(ECHO) "\
   1.454 -Makefile for the JDK builds (all the JDK). \n\
   1.455 -"
   1.456 -
   1.457 -# Target help
   1.458 -target_help:
   1.459 -	@$(ECHO) "\
   1.460 ---- Common Targets ---  \n\
   1.461 -all               -- build the core JDK (default target) \n\
   1.462 -help              -- Print out help information \n\
   1.463 -check             -- Check make variable values for correctness \n\
   1.464 -sanity            -- Perform detailed sanity checks on system and settings \n\
   1.465 -fastdebug_build   -- build the core JDK in 'fastdebug' mode (-g -O) \n\
   1.466 -debug_build       -- build the core JDK in 'debug' mode (-g) \n\
   1.467 -clean             -- remove all built and imported files \n\
   1.468 -clobber           -- same as clean \n\
   1.469 -"
   1.470 -
   1.471 -# Variable help (only common ones used by this Makefile)
   1.472 -variable_help: variable_help_intro variable_list variable_help_end
   1.473 -variable_help_intro:
   1.474 -	@$(ECHO) "--- Common Variables ---"
   1.475 -variable_help_end:
   1.476 -	@$(ECHO) " "
   1.477 -
   1.478 -# One line descriptions for the variables
   1.479 -OUTPUTDIR.desc             = Output directory
   1.480 -PARALLEL_COMPILE_JOBS.desc = Solaris/Linux parallel compile run count
   1.481 -SLASH_JAVA.desc            = Root of all build tools, e.g. /java or J:
   1.482 -BOOTDIR.desc               = JDK used to boot the build
   1.483 -JDK_IMPORT_PATH.desc       = JDK used to import components of the build
   1.484 -COMPILER_PATH.desc         = Compiler install directory
   1.485 -CACERTS_FILE.desc          = Location of certificates file
   1.486 -DEVTOOLS_PATH.desc         = Directory containing zip and gnumake
   1.487 -CUPS_HEADERS_PATH.desc     = Include directory location for CUPS header files
   1.488 -
   1.489 -# Make variables to print out (description and value)
   1.490 -VARIABLE_PRINTVAL_LIST +=       \
   1.491 -    OUTPUTDIR                   \
   1.492 -    PARALLEL_COMPILE_JOBS       \
   1.493 -    SLASH_JAVA                  \
   1.494 -    BOOTDIR                     \
   1.495 -    JDK_IMPORT_PATH             \
   1.496 -    COMPILER_PATH               \
   1.497 -    CACERTS_FILE                \
   1.498 -    DEVTOOLS_PATH
   1.499 -
   1.500 -# Make variables that should refer to directories that exist
   1.501 -VARIABLE_CHECKDIR_LIST +=       \
   1.502 -    SLASH_JAVA                  \
   1.503 -    BOOTDIR                     \
   1.504 -    JDK_IMPORT_PATH             \
   1.505 -    COMPILER_PATH               \
   1.506 -    DEVTOOLS_PATH 
   1.507 -
   1.508 -# Make variables that should refer to files that exist
   1.509 -VARIABLE_CHECKFIL_LIST +=       \
   1.510 -    CACERTS_FILE
   1.511 -
   1.512 -# For pattern rules below, so all are treated the same
   1.513 -DO_PRINTVAL_LIST=$(VARIABLE_PRINTVAL_LIST:%=%.printval)
   1.514 -DO_CHECKDIR_LIST=$(VARIABLE_CHECKDIR_LIST:%=%.checkdir)
   1.515 -DO_CHECKFIL_LIST=$(VARIABLE_CHECKFIL_LIST:%=%.checkfil)
   1.516 -
   1.517 -# Complete variable check
   1.518 -variable_check: $(DO_CHECKDIR_LIST) $(DO_CHECKFIL_LIST)
   1.519 -variable_list: $(DO_PRINTVAL_LIST) variable_check
   1.520 -
   1.521 -# Pattern rule for printing out a variable
   1.522 -%.printval:
   1.523 -	@$(ECHO) "  ALT_$* - $($*.desc)"
   1.524 -	@$(ECHO) "  \t $*=$($*)"
   1.525 -
   1.526 -# Pattern rule for checking to see if a variable with a directory exists
   1.527 -%.checkdir:
   1.528 -	@if [ ! -d $($*) ] ; then \
   1.529 -	    $(ECHO) "WARNING: $* does not exist, try $(MAKE) sanity"; \
   1.530 -	fi
   1.531 -
   1.532 -# Pattern rule for checking to see if a variable with a file exists
   1.533 -%.checkfil:
   1.534 -	@if [ ! -f $($*) ] ; then \
   1.535 -	    $(ECHO) "WARNING: $* does not exist, try $(MAKE) sanity"; \
   1.536 -	fi
   1.537 -
   1.538 -# Misc notes on help
   1.539 -notes_help:
   1.540 -	@$(ECHO) "\
   1.541 ---- Notes --- \n\
   1.542 -- All builds use same output directory unless overridden with \n\
   1.543 - \t ALT_OUTPUTDIR=<dir>, changing from product to fastdebug you may want \n\
   1.544 - \t to use the clean target first. \n\
   1.545 -- JDK_IMPORT_PATH must refer to a compatible build, not all past promoted \n\
   1.546 - \t builds or previous release JDK builds will work. \n\
   1.547 -- The fastest builds have been when the sources and the BOOTDIR are on \n\
   1.548 - \t local disk. \n\
   1.549 -"
   1.550 -
   1.551 -examples_help:
   1.552 -	@$(ECHO) "\
   1.553 ---- Examples --- \n\
   1.554 -  $(MAKE) fastdebug_build \n\
   1.555 -  $(MAKE) ALT_OUTPUTDIR=/tmp/foobar all \n\
   1.556 -  $(MAKE) ALT_OUTPUTDIR=/tmp/foobar fastdebug_build \n\
   1.557 -  $(MAKE) ALT_OUTPUTDIR=/tmp/foobar all \n\
   1.558 -  $(MAKE) ALT_BOOTDIR=/opt/java/jdk1.5.0 \n\
   1.559 -  $(MAKE) ALT_JDK_IMPORT_PATH=/opt/java/jdk1.6.0 \n\
   1.560 -"
   1.561 -
   1.562 -################################################################
   1.563 -# Source bundling
   1.564 -################################################################
   1.565 -ifeq ($(BUNDLE_RULES_AVAILABLE), true)
   1.566 -  include $(BUNDLE_RULES)
   1.567 -endif
   1.568 -
   1.569 -################################################################
   1.570 -# rule to test
   1.571 -################################################################
   1.572 -
   1.573 -.NOTPARALLEL: test_run
   1.574 -
   1.575 -test:
   1.576 -	$(MAKE) test_run
   1.577 -
   1.578 -test_run: test_clean test_start test_summary
   1.579 -
   1.580 -test_start:
   1.581 -	@$(ECHO) "Tests started at `$(DATE)`"
   1.582 -
   1.583 -test_clean:
   1.584 -	$(RM) $(OUTPUTDIR)/test_failures.txt $(OUTPUTDIR)/test_log.txt
   1.585 -
   1.586 -test_summary: $(OUTPUTDIR)/test_failures.txt
   1.587 -	@$(ECHO) "#################################################"
   1.588 -	@$(ECHO) "Tests completed at `$(DATE)`"
   1.589 -	@( $(EGREP) '^TEST STATS:' $(OUTPUTDIR)/test_log.txt \
   1.590 -          || $(ECHO) "No TEST STATS seen in log" )
   1.591 -	@$(ECHO) "For complete details see: $(OUTPUTDIR)/test_log.txt"
   1.592 -	@$(ECHO) "#################################################"
   1.593 -	@if [ -s $< ] ; then                                           \
   1.594 -          $(ECHO) "ERROR: Test failure count: `$(CAT) $< | $(WC) -l`"; \
   1.595 -          $(CAT) $<;                                                   \
   1.596 -          exit 1;                                                      \
   1.597 -        else                                                           \
   1.598 -          $(ECHO) "Success! No failures detected";                     \
   1.599 -        fi
   1.600 -
   1.601 -# Get failure list from log
   1.602 -$(OUTPUTDIR)/test_failures.txt: $(OUTPUTDIR)/test_log.txt
   1.603 -	@$(RM) $@
   1.604 -	@( $(EGREP) '^FAILED:' $< || $(ECHO) "" ) | $(NAWK) 'length>0' > $@
   1.605 -
   1.606 -# Get log file of all tests run
   1.607 -JDK_TO_TEST := $(shell 							\
   1.608 -  if [ -d "$(ABS_JDK_IMAGE_DIR)" ] ; then 				\
   1.609 -    $(ECHO) "$(ABS_JDK_IMAGE_DIR)"; 					\
   1.610 -  elif [ -d "$(ABS_OUTPUTDIR)/bin" ] ; then 				\
   1.611 -    $(ECHO) "$(ABS_OUTPUTDIR)"; 					\
   1.612 -  elif [ "$(PRODUCT_HOME)" != "" -a -d "$(PRODUCT_HOME)/bin" ] ; then 	\
   1.613 -    $(ECHO) "$(PRODUCT_HOME)"; 						\
   1.614 -  fi 									\
   1.615 -)
   1.616 -TEST_TARGETS=all
   1.617 -$(OUTPUTDIR)/test_log.txt:
   1.618 -	$(RM) $@
   1.619 -	( $(CD) test &&                                                     \
   1.620 -          $(MAKE) NO_STOPPING=- PRODUCT_HOME=$(JDK_TO_TEST) $(TEST_TARGETS) \
   1.621 -        ) | tee $@
   1.622 -
   1.623 -################################################################
   1.624 -# JPRT rule to build
   1.625 -################################################################
   1.626 -
   1.627 -include ./make/jprt.gmk
   1.628 -
   1.629 -################################################################
   1.630 -#  PHONY
   1.631 -################################################################
   1.632 -
   1.633 -.PHONY: all  test test_run test_start test_summary test_clean \
   1.634 -	generic_build_repo_series \
   1.635 -	what clobber insane \
   1.636 -        dev dev-build dev-sanity dev-clobber \
   1.637 -        product_build \
   1.638 -        fastdebug_build \
   1.639 -        debug_build  \
   1.640 -        build_product_image  \
   1.641 -        build_debug_image  \
   1.642 -        build_fastdebug_image \
   1.643 -        create_fresh_product_bootdir \
   1.644 -        create_fresh_debug_bootdir \
   1.645 -        create_fresh_fastdebug_bootdir \
   1.646 -        generic_debug_build
   1.647 -
   1.648 -# Force target
   1.649 -FRC:
   1.650 -
   1.651 -endif # Original Makefile logic
   1.652 -
   1.653 +.PHONY: help
     2.1 --- a/NewMakefile.gmk	Thu Nov 07 08:16:05 2013 -0800
     2.2 +++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
     2.3 @@ -1,134 +0,0 @@
     2.4 -#
     2.5 -# Copyright (c) 2012, 2013, Oracle and/or its affiliates. All rights reserved.
     2.6 -# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
     2.7 -#
     2.8 -# This code is free software; you can redistribute it and/or modify it
     2.9 -# under the terms of the GNU General Public License version 2 only, as
    2.10 -# published by the Free Software Foundation.  Oracle designates this
    2.11 -# particular file as subject to the "Classpath" exception as provided
    2.12 -# by Oracle in the LICENSE file that accompanied this code.
    2.13 -#
    2.14 -# This code is distributed in the hope that it will be useful, but WITHOUT
    2.15 -# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
    2.16 -# FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
    2.17 -# version 2 for more details (a copy is included in the LICENSE file that
    2.18 -# accompanied this code).
    2.19 -#
    2.20 -# You should have received a copy of the GNU General Public License version
    2.21 -# 2 along with this work; if not, write to the Free Software Foundation,
    2.22 -# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
    2.23 -#
    2.24 -# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
    2.25 -# or visit www.oracle.com if you need additional information or have any
    2.26 -# questions.
    2.27 -#
    2.28 -
    2.29 -# This must be the first rule
    2.30 -default:
    2.31 -
    2.32 -# Inclusion of this pseudo-target will cause make to execute this file
    2.33 -# serially, regardless of -j. Recursively called makefiles will not be
    2.34 -# affected, however. This is required for correct dependency management.
    2.35 -.NOTPARALLEL:
    2.36 -
    2.37 -# The shell code below will be executed on /usr/ccs/bin/make on Solaris, but not in GNU make.
    2.38 -# /usr/ccs/bin/make lacks basically every other flow control mechanism.
    2.39 -TEST_FOR_NON_GNUMAKE:sh=echo You are not using GNU make/gmake, this is a requirement. Check your path. 1>&2 && exit 1
    2.40 -
    2.41 -# Assume we have GNU make, but check version.
    2.42 -ifeq ($(strip $(foreach v, 3.81% 3.82% 4.%, $(filter $v, $(MAKE_VERSION)))), )
    2.43 -  $(error This version of GNU Make is too low ($(MAKE_VERSION)). Check your path, or upgrade to 3.81 or newer.)
    2.44 -endif
    2.45 -
    2.46 -# Locate this Makefile
    2.47 -ifeq ($(filter /%,$(lastword $(MAKEFILE_LIST))),)
    2.48 -  makefile_path:=$(CURDIR)/$(lastword $(MAKEFILE_LIST))
    2.49 -else
    2.50 -  makefile_path:=$(lastword $(MAKEFILE_LIST))
    2.51 -endif
    2.52 -root_dir:=$(dir $(makefile_path))
    2.53 -
    2.54 -# ... and then we can include our helper functions
    2.55 -include $(root_dir)/common/makefiles/MakeHelpers.gmk
    2.56 -
    2.57 -$(eval $(call ParseLogLevel))
    2.58 -$(eval $(call ParseConfAndSpec))
    2.59 -
    2.60 -# Now determine if we have zero, one or several configurations to build.
    2.61 -ifeq ($(SPEC),)
    2.62 -  # Since we got past ParseConfAndSpec, we must be building a global target. Do nothing.
    2.63 -else
    2.64 -  ifeq ($(words $(SPEC)),1)
    2.65 -    # We are building a single configuration. This is the normal case. Execute the Main.gmk file.
    2.66 -    include $(root_dir)/common/makefiles/Main.gmk
    2.67 -  else
    2.68 -    # We are building multiple configurations.
    2.69 -    # First, find out the valid targets
    2.70 -    # Run the makefile with an arbitrary SPEC using -p -q (quiet dry-run and dump rules) to find
    2.71 -    # available PHONY targets. Use this list as valid targets to pass on to the repeated calls.
    2.72 -    all_phony_targets=$(filter-out $(global_targets) bundles-only, $(strip $(shell \
    2.73 -        $(MAKE) -p -q -f common/makefiles/Main.gmk FRC SPEC=$(firstword $(SPEC)) | \
    2.74 -        grep ^.PHONY: | head -n 1 | cut -d " " -f 2-)))
    2.75 -
    2.76 -    $(all_phony_targets):
    2.77 -	@$(foreach spec,$(SPEC),($(MAKE) -f NewMakefile.gmk SPEC=$(spec) \
    2.78 -	    $(VERBOSE) VERBOSE=$(VERBOSE) LOG_LEVEL=$(LOG_LEVEL) $@) &&) true
    2.79 -
    2.80 -    .PHONY: $(all_phony_targets)
    2.81 -
    2.82 -  endif
    2.83 -endif
    2.84 -
    2.85 -# Include this after a potential spec file has been included so that the bundles target
    2.86 -# has access to the spec variables.
    2.87 -include $(root_dir)/common/makefiles/Jprt.gmk
    2.88 -
    2.89 -# Here are "global" targets, i.e. targets that can be executed without specifying a single configuration.
    2.90 -# If you addd more global targets, please update the variable global_targets in MakeHelpers.
    2.91 -
    2.92 -help:
    2.93 -	$(info )
    2.94 -	$(info OpenJDK Makefile help)
    2.95 -	$(info =====================)
    2.96 -	$(info )
    2.97 -	$(info Common make targets)
    2.98 -	$(info .  make [default]         # Compile all product in langtools, hotspot, jaxp, jaxws,)
    2.99 -	$(info .                         # corba and jdk)
   2.100 -	$(info .  make all               # Compile everything, all repos and images)
   2.101 -	$(info .  make images            # Create complete j2sdk and j2re images)
   2.102 -	$(info .  make docs              # Create javadocs)
   2.103 -	$(info .  make overlay-images    # Create limited images for sparc 64 bit platforms)
   2.104 -	$(info .  make profiles          # Create complete j2re compact profile images)
   2.105 -	$(info .  make bootcycle-images  # Build images twice, second time with newly build JDK)
   2.106 -	$(info .  make install           # Install the generated images locally)
   2.107 -	$(info .  make clean             # Remove all files generated by make, but not those)
   2.108 -	$(info .                         # generated by configure)
   2.109 -	$(info .  make dist-clean        # Remove all files, including configuration)
   2.110 -	$(info .  make help              # Give some help on using make)
   2.111 -	$(info .  make test              # Run tests, default is all tests (see TEST below))
   2.112 -	$(info )
   2.113 -	$(info Targets for specific components)
   2.114 -	$(info (Component is any of langtools, corba, jaxp, jaxws, hotspot, jdk, nashorn, images, overlay-images, docs or test))
   2.115 -	$(info .  make <component>       # Build <component> and everything it depends on. )
   2.116 -	$(info .  make <component>-only  # Build <component> only, without dependencies. This)
   2.117 -	$(info .                         # is faster but can result in incorrect build results!)
   2.118 -	$(info .  make clean-<component> # Remove files generated by make for <component>)
   2.119 -	$(info )
   2.120 -	$(info Useful make variables)
   2.121 -	$(info .  make CONF=             # Build all configurations (note, assignment is empty))
   2.122 -	$(info .  make CONF=<substring>  # Build the configuration(s) with a name matching)
   2.123 -	$(info .                         # <substring>)
   2.124 -	$(info )
   2.125 -	$(info .  make LOG=<loglevel>    # Change the log level from warn to <loglevel>)
   2.126 -	$(info .                         # Available log levels are:)
   2.127 -	$(info .                         # 'warn' (default), 'info', 'debug' and 'trace')
   2.128 -	$(info .                         # To see executed command lines, use LOG=debug)
   2.129 -	$(info )
   2.130 -	$(info .  make JOBS=<n>          # Run <n> parallel make jobs)
   2.131 -	$(info .                         # Note that -jN does not work as expected!)
   2.132 -	$(info )
   2.133 -	$(info .  make test TEST=<test>  # Only run the given test or tests, e.g.)
   2.134 -	$(info .                         # make test TEST="jdk_lang jdk_net")
   2.135 -	$(info )
   2.136 -
   2.137 -.PHONY: help
     3.1 --- a/common/autoconf/Makefile.in	Thu Nov 07 08:16:05 2013 -0800
     3.2 +++ b/common/autoconf/Makefile.in	Thu Nov 14 10:53:23 2013 +0100
     3.3 @@ -24,4 +24,4 @@
     3.4  # This Makefile was generated by configure @DATE_WHEN_CONFIGURED@
     3.5  # GENERATED FILE, DO NOT EDIT
     3.6  SPEC:=@OUTPUT_ROOT@/spec.gmk
     3.7 -include @SRC_ROOT@/NewMakefile.gmk
     3.8 +include @SRC_ROOT@/Makefile
     4.1 --- a/common/autoconf/basics.m4	Thu Nov 07 08:16:05 2013 -0800
     4.2 +++ b/common/autoconf/basics.m4	Thu Nov 14 10:53:23 2013 +0100
     4.3 @@ -412,7 +412,7 @@
     4.4    # Test from where we are running configure, in or outside of src root.
     4.5    if test "x$CURDIR" = "x$SRC_ROOT" || test "x$CURDIR" = "x$SRC_ROOT/common" \
     4.6        || test "x$CURDIR" = "x$SRC_ROOT/common/autoconf" \
     4.7 -      || test "x$CURDIR" = "x$SRC_ROOT/common/makefiles" ; then
     4.8 +      || test "x$CURDIR" = "x$SRC_ROOT/make" ; then
     4.9      # We are running configure from the src root.
    4.10      # Create a default ./build/target-variant-debuglevel output root.
    4.11      if test "x${CONF_NAME}" = x; then
     5.1 --- a/common/autoconf/generated-configure.sh	Thu Nov 07 08:16:05 2013 -0800
     5.2 +++ b/common/autoconf/generated-configure.sh	Thu Nov 14 10:53:23 2013 +0100
     5.3 @@ -3865,7 +3865,7 @@
     5.4  #CUSTOM_AUTOCONF_INCLUDE
     5.5  
     5.6  # Do not change or remove the following line, it is needed for consistency checks:
     5.7 -DATE_WHEN_GENERATED=1383151988
     5.8 +DATE_WHEN_GENERATED=1384422786
     5.9  
    5.10  ###############################################################################
    5.11  #
    5.12 @@ -8042,7 +8042,7 @@
    5.13    # Test from where we are running configure, in or outside of src root.
    5.14    if test "x$CURDIR" = "x$SRC_ROOT" || test "x$CURDIR" = "x$SRC_ROOT/common" \
    5.15        || test "x$CURDIR" = "x$SRC_ROOT/common/autoconf" \
    5.16 -      || test "x$CURDIR" = "x$SRC_ROOT/common/makefiles" ; then
    5.17 +      || test "x$CURDIR" = "x$SRC_ROOT/make" ; then
    5.18      # We are running configure from the src root.
    5.19      # Create a default ./build/target-variant-debuglevel output root.
    5.20      if test "x${CONF_NAME}" = x; then
    5.21 @@ -16201,32 +16201,25 @@
    5.22      cd "$CURDIR"
    5.23      # Verify that the addon source root does not have any root makefiles.
    5.24      # If it does, then it is usually an error, prevent this.
    5.25 -    if test -f $with_add_source_root/langtools/makefiles/Makefile || \
    5.26 -      test -f $with_add_source_root/langtools/make/Makefile; then
    5.27 +    if test -f $with_add_source_root/langtools/make/Makefile; then
    5.28        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
    5.29      fi
    5.30 -    if test -f $with_add_source_root/corba/makefiles/Makefile || \
    5.31 -      test -f $with_add_source_root/corba/make/Makefile; then
    5.32 +    if test -f $with_add_source_root/corba/make/Makefile; then
    5.33        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
    5.34      fi
    5.35 -    if test -f $with_add_source_root/jaxp/makefiles/Makefile || \
    5.36 -      test -f $with_add_source_root/jaxp/make/Makefile; then
    5.37 +    if test -f $with_add_source_root/jaxp/make/Makefile; then
    5.38        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
    5.39      fi
    5.40 -    if test -f $with_add_source_root/jaxws/makefiles/Makefile || \
    5.41 -      test -f $with_add_source_root/jaxws/make/Makefile; then
    5.42 +    if test -f $with_add_source_root/jaxws/make/Makefile; then
    5.43        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
    5.44      fi
    5.45 -    if test -f $with_add_source_root/hotspot/makefiles/Makefile || \
    5.46 -      test -f $with_add_source_root/hotspot/make/Makefile; then
    5.47 +    if test -f $with_add_source_root/hotspot/make/Makefile; then
    5.48        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
    5.49      fi
    5.50 -    if test -f $with_add_source_root/nashorn/makefiles/Makefile || \
    5.51 -      test -f $with_add_source_root/nashorn/make/Makefile; then
    5.52 +    if test -f $with_add_source_root/nashorn/make/Makefile; then
    5.53        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
    5.54      fi
    5.55 -    if test -f $with_add_source_root/jdk/makefiles/Makefile || \
    5.56 -      test -f $with_add_source_root/jdk/make/Makefile; then
    5.57 +    if test -f $with_add_source_root/jdk/make/Makefile; then
    5.58        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
    5.59      fi
    5.60    fi
    5.61 @@ -16240,32 +16233,25 @@
    5.62      cd "$with_override_source_root"
    5.63      OVERRIDE_SRC_ROOT="`pwd`"
    5.64      cd "$CURDIR"
    5.65 -    if test -f $with_override_source_root/langtools/makefiles/Makefile || \
    5.66 -      test -f $with_override_source_root/langtools/make/Makefile; then
    5.67 +    if test -f $with_override_source_root/langtools/make/Makefile; then
    5.68        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
    5.69      fi
    5.70 -    if test -f $with_override_source_root/corba/makefiles/Makefile || \
    5.71 -      test -f $with_override_source_root/corba/make/Makefile; then
    5.72 +    if test -f $with_override_source_root/corba/make/Makefile; then
    5.73        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
    5.74      fi
    5.75 -    if test -f $with_override_source_root/jaxp/makefiles/Makefile || \
    5.76 -      test -f $with_override_source_root/jaxp/make/Makefile; then
    5.77 +    if test -f $with_override_source_root/jaxp/make/Makefile; then
    5.78        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
    5.79      fi
    5.80 -    if test -f $with_override_source_root/jaxws/makefiles/Makefile || \
    5.81 -      test -f $with_override_source_root/jaxws/make/Makefile; then
    5.82 +    if test -f $with_override_source_root/jaxws/make/Makefile; then
    5.83        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
    5.84      fi
    5.85 -    if test -f $with_override_source_root/hotspot/makefiles/Makefile || \
    5.86 -      test -f $with_override_source_root/hotspot/make/Makefile; then
    5.87 +    if test -f $with_override_source_root/hotspot/make/Makefile; then
    5.88        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
    5.89      fi
    5.90 -    if test -f $with_override_source_root/nashorn/makefiles/Makefile || \
    5.91 -      test -f $with_override_source_root/nashorn/make/Makefile; then
    5.92 +    if test -f $with_override_source_root/nashorn/make/Makefile; then
    5.93        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
    5.94      fi
    5.95 -    if test -f $with_override_source_root/jdk/makefiles/Makefile || \
    5.96 -      test -f $with_override_source_root/jdk/make/Makefile; then
    5.97 +    if test -f $with_override_source_root/jdk/make/Makefile; then
    5.98        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
    5.99      fi
   5.100    fi
   5.101 @@ -16344,7 +16330,7 @@
   5.102      cd "$with_override_langtools"
   5.103      LANGTOOLS_TOPDIR="`pwd`"
   5.104      cd "$CURDIR"
   5.105 -    if ! test -f $LANGTOOLS_TOPDIR/makefiles/Makefile; then
   5.106 +    if ! test -f $LANGTOOLS_TOPDIR/make/Makefile; then
   5.107        as_fn_error $? "You have to override langtools with a full langtools repo!" "$LINENO" 5
   5.108      fi
   5.109      { $as_echo "$as_me:${as_lineno-$LINENO}: checking if langtools should be overridden" >&5
   5.110 @@ -16357,7 +16343,7 @@
   5.111      cd "$with_override_corba"
   5.112      CORBA_TOPDIR="`pwd`"
   5.113      cd "$CURDIR"
   5.114 -    if ! test -f $CORBA_TOPDIR/makefiles/Makefile; then
   5.115 +    if ! test -f $CORBA_TOPDIR/make/Makefile; then
   5.116        as_fn_error $? "You have to override corba with a full corba repo!" "$LINENO" 5
   5.117      fi
   5.118      { $as_echo "$as_me:${as_lineno-$LINENO}: checking if corba should be overridden" >&5
   5.119 @@ -16370,7 +16356,7 @@
   5.120      cd "$with_override_jaxp"
   5.121      JAXP_TOPDIR="`pwd`"
   5.122      cd "$CURDIR"
   5.123 -    if ! test -f $JAXP_TOPDIR/makefiles/Makefile; then
   5.124 +    if ! test -f $JAXP_TOPDIR/make/Makefile; then
   5.125        as_fn_error $? "You have to override jaxp with a full jaxp repo!" "$LINENO" 5
   5.126      fi
   5.127      { $as_echo "$as_me:${as_lineno-$LINENO}: checking if jaxp should be overridden" >&5
   5.128 @@ -16383,7 +16369,7 @@
   5.129      cd "$with_override_jaxws"
   5.130      JAXWS_TOPDIR="`pwd`"
   5.131      cd "$CURDIR"
   5.132 -    if ! test -f $JAXWS_TOPDIR/makefiles/Makefile; then
   5.133 +    if ! test -f $JAXWS_TOPDIR/make/Makefile; then
   5.134        as_fn_error $? "You have to override jaxws with a full jaxws repo!" "$LINENO" 5
   5.135      fi
   5.136      { $as_echo "$as_me:${as_lineno-$LINENO}: checking if jaxws should be overridden" >&5
   5.137 @@ -16396,8 +16382,7 @@
   5.138      cd "$with_override_hotspot"
   5.139      HOTSPOT_TOPDIR="`pwd`"
   5.140      cd "$CURDIR"
   5.141 -    if ! test -f $HOTSPOT_TOPDIR/make/Makefile && \
   5.142 -        ! test -f $HOTSPOT_TOPDIR/makefiles/Makefile; then
   5.143 +    if ! test -f $HOTSPOT_TOPDIR/make/Makefile; then
   5.144        as_fn_error $? "You have to override hotspot with a full hotspot repo!" "$LINENO" 5
   5.145      fi
   5.146      { $as_echo "$as_me:${as_lineno-$LINENO}: checking if hotspot should be overridden" >&5
   5.147 @@ -16410,7 +16395,7 @@
   5.148      cd "$with_override_nashorn"
   5.149      NASHORN_TOPDIR="`pwd`"
   5.150      cd "$CURDIR"
   5.151 -    if ! test -f $NASHORN_TOPDIR/makefiles/Makefile; then
   5.152 +    if ! test -f $NASHORN_TOPDIR/make/Makefile; then
   5.153        as_fn_error $? "You have to override nashorn with a full nashorn repo!" "$LINENO" 5
   5.154      fi
   5.155      { $as_echo "$as_me:${as_lineno-$LINENO}: checking if nashorn should be overridden" >&5
   5.156 @@ -16423,7 +16408,7 @@
   5.157      cd "$with_override_jdk"
   5.158      JDK_TOPDIR="`pwd`"
   5.159      cd "$CURDIR"
   5.160 -    if ! test -f $JDK_TOPDIR/makefiles/Makefile; then
   5.161 +    if ! test -f $JDK_TOPDIR/make/Makefile; then
   5.162        as_fn_error $? "You have to override JDK with a full JDK repo!" "$LINENO" 5
   5.163      fi
   5.164      { $as_echo "$as_me:${as_lineno-$LINENO}: checking if JDK should be overridden" >&5
     6.1 --- a/common/autoconf/hotspot-spec.gmk.in	Thu Nov 07 08:16:05 2013 -0800
     6.2 +++ b/common/autoconf/hotspot-spec.gmk.in	Thu Nov 14 10:53:23 2013 +0100
     6.3 @@ -129,4 +129,4 @@
     6.4  
     6.5  # Sneak this in via the spec.gmk file, since we don't want to mess around too much with the Hotspot make files.
     6.6  # This is needed to get the LOG setting to work properly.
     6.7 -include $(SRC_ROOT)/common/makefiles/MakeBase.gmk
     6.8 +include $(SRC_ROOT)/make/common/MakeBase.gmk
     7.1 --- a/common/autoconf/source-dirs.m4	Thu Nov 07 08:16:05 2013 -0800
     7.2 +++ b/common/autoconf/source-dirs.m4	Thu Nov 14 10:53:23 2013 +0100
     7.3 @@ -80,32 +80,25 @@
     7.4      cd "$CURDIR"
     7.5      # Verify that the addon source root does not have any root makefiles.
     7.6      # If it does, then it is usually an error, prevent this.
     7.7 -    if test -f $with_add_source_root/langtools/makefiles/Makefile || \
     7.8 -      test -f $with_add_source_root/langtools/make/Makefile; then
     7.9 +    if test -f $with_add_source_root/langtools/make/Makefile; then
    7.10        AC_MSG_ERROR([Your add source root seems to contain a full langtools repo! An add source root should only contain additional sources.])
    7.11      fi
    7.12 -    if test -f $with_add_source_root/corba/makefiles/Makefile || \
    7.13 -      test -f $with_add_source_root/corba/make/Makefile; then
    7.14 +    if test -f $with_add_source_root/corba/make/Makefile; then
    7.15        AC_MSG_ERROR([Your add source root seems to contain a full corba repo! An add source root should only contain additional sources.])
    7.16      fi
    7.17 -    if test -f $with_add_source_root/jaxp/makefiles/Makefile || \
    7.18 -      test -f $with_add_source_root/jaxp/make/Makefile; then
    7.19 +    if test -f $with_add_source_root/jaxp/make/Makefile; then
    7.20        AC_MSG_ERROR([Your add source root seems to contain a full jaxp repo! An add source root should only contain additional sources.])
    7.21      fi
    7.22 -    if test -f $with_add_source_root/jaxws/makefiles/Makefile || \
    7.23 -      test -f $with_add_source_root/jaxws/make/Makefile; then
    7.24 +    if test -f $with_add_source_root/jaxws/make/Makefile; then
    7.25        AC_MSG_ERROR([Your add source root seems to contain a full jaxws repo! An add source root should only contain additional sources.])
    7.26      fi
    7.27 -    if test -f $with_add_source_root/hotspot/makefiles/Makefile || \
    7.28 -      test -f $with_add_source_root/hotspot/make/Makefile; then
    7.29 +    if test -f $with_add_source_root/hotspot/make/Makefile; then
    7.30        AC_MSG_ERROR([Your add source root seems to contain a full hotspot repo! An add source root should only contain additional sources.])
    7.31      fi
    7.32 -    if test -f $with_add_source_root/nashorn/makefiles/Makefile || \
    7.33 -      test -f $with_add_source_root/nashorn/make/Makefile; then
    7.34 +    if test -f $with_add_source_root/nashorn/make/Makefile; then
    7.35        AC_MSG_ERROR([Your add source root seems to contain a full nashorn repo! An add source root should only contain additional sources.])
    7.36      fi
    7.37 -    if test -f $with_add_source_root/jdk/makefiles/Makefile || \
    7.38 -      test -f $with_add_source_root/jdk/make/Makefile; then
    7.39 +    if test -f $with_add_source_root/jdk/make/Makefile; then
    7.40        AC_MSG_ERROR([Your add source root seems to contain a full JDK repo! An add source root should only contain additional sources.])
    7.41      fi
    7.42    fi
    7.43 @@ -119,32 +112,25 @@
    7.44      cd "$with_override_source_root"
    7.45      OVERRIDE_SRC_ROOT="`pwd`"
    7.46      cd "$CURDIR"
    7.47 -    if test -f $with_override_source_root/langtools/makefiles/Makefile || \
    7.48 -      test -f $with_override_source_root/langtools/make/Makefile; then
    7.49 +    if test -f $with_override_source_root/langtools/make/Makefile; then
    7.50        AC_MSG_ERROR([Your override source root seems to contain a full langtools repo! An override source root should only contain sources that override.])
    7.51      fi
    7.52 -    if test -f $with_override_source_root/corba/makefiles/Makefile || \
    7.53 -      test -f $with_override_source_root/corba/make/Makefile; then
    7.54 +    if test -f $with_override_source_root/corba/make/Makefile; then
    7.55        AC_MSG_ERROR([Your override source root seems to contain a full corba repo! An override source root should only contain sources that override.])
    7.56      fi
    7.57 -    if test -f $with_override_source_root/jaxp/makefiles/Makefile || \
    7.58 -      test -f $with_override_source_root/jaxp/make/Makefile; then
    7.59 +    if test -f $with_override_source_root/jaxp/make/Makefile; then
    7.60        AC_MSG_ERROR([Your override source root seems to contain a full jaxp repo! An override source root should only contain sources that override.])
    7.61      fi
    7.62 -    if test -f $with_override_source_root/jaxws/makefiles/Makefile || \
    7.63 -      test -f $with_override_source_root/jaxws/make/Makefile; then
    7.64 +    if test -f $with_override_source_root/jaxws/make/Makefile; then
    7.65        AC_MSG_ERROR([Your override source root seems to contain a full jaxws repo! An override source root should only contain sources that override.])
    7.66      fi
    7.67 -    if test -f $with_override_source_root/hotspot/makefiles/Makefile || \
    7.68 -      test -f $with_override_source_root/hotspot/make/Makefile; then
    7.69 +    if test -f $with_override_source_root/hotspot/make/Makefile; then
    7.70        AC_MSG_ERROR([Your override source root seems to contain a full hotspot repo! An override source root should only contain sources that override.])
    7.71      fi
    7.72 -    if test -f $with_override_source_root/nashorn/makefiles/Makefile || \
    7.73 -      test -f $with_override_source_root/nashorn/make/Makefile; then
    7.74 +    if test -f $with_override_source_root/nashorn/make/Makefile; then
    7.75        AC_MSG_ERROR([Your override source root seems to contain a full nashorn repo! An override source root should only contain sources that override.])
    7.76      fi
    7.77 -    if test -f $with_override_source_root/jdk/makefiles/Makefile || \
    7.78 -      test -f $with_override_source_root/jdk/make/Makefile; then
    7.79 +    if test -f $with_override_source_root/jdk/make/Makefile; then
    7.80        AC_MSG_ERROR([Your override source root seems to contain a full JDK repo! An override source root should only contain sources that override.])
    7.81      fi
    7.82    fi
    7.83 @@ -195,7 +181,7 @@
    7.84      cd "$with_override_langtools"
    7.85      LANGTOOLS_TOPDIR="`pwd`"
    7.86      cd "$CURDIR"
    7.87 -    if ! test -f $LANGTOOLS_TOPDIR/makefiles/Makefile; then
    7.88 +    if ! test -f $LANGTOOLS_TOPDIR/make/Makefile; then
    7.89        AC_MSG_ERROR([You have to override langtools with a full langtools repo!])
    7.90      fi
    7.91      AC_MSG_CHECKING([if langtools should be overridden])
    7.92 @@ -206,7 +192,7 @@
    7.93      cd "$with_override_corba"
    7.94      CORBA_TOPDIR="`pwd`"
    7.95      cd "$CURDIR"
    7.96 -    if ! test -f $CORBA_TOPDIR/makefiles/Makefile; then
    7.97 +    if ! test -f $CORBA_TOPDIR/make/Makefile; then
    7.98        AC_MSG_ERROR([You have to override corba with a full corba repo!])
    7.99      fi
   7.100      AC_MSG_CHECKING([if corba should be overridden])
   7.101 @@ -217,7 +203,7 @@
   7.102      cd "$with_override_jaxp"
   7.103      JAXP_TOPDIR="`pwd`"
   7.104      cd "$CURDIR"
   7.105 -    if ! test -f $JAXP_TOPDIR/makefiles/Makefile; then
   7.106 +    if ! test -f $JAXP_TOPDIR/make/Makefile; then
   7.107        AC_MSG_ERROR([You have to override jaxp with a full jaxp repo!])
   7.108      fi
   7.109      AC_MSG_CHECKING([if jaxp should be overridden])
   7.110 @@ -228,7 +214,7 @@
   7.111      cd "$with_override_jaxws"
   7.112      JAXWS_TOPDIR="`pwd`"
   7.113      cd "$CURDIR"
   7.114 -    if ! test -f $JAXWS_TOPDIR/makefiles/Makefile; then
   7.115 +    if ! test -f $JAXWS_TOPDIR/make/Makefile; then
   7.116        AC_MSG_ERROR([You have to override jaxws with a full jaxws repo!])
   7.117      fi
   7.118      AC_MSG_CHECKING([if jaxws should be overridden])
   7.119 @@ -239,8 +225,7 @@
   7.120      cd "$with_override_hotspot"
   7.121      HOTSPOT_TOPDIR="`pwd`"
   7.122      cd "$CURDIR"
   7.123 -    if ! test -f $HOTSPOT_TOPDIR/make/Makefile && \
   7.124 -        ! test -f $HOTSPOT_TOPDIR/makefiles/Makefile; then
   7.125 +    if ! test -f $HOTSPOT_TOPDIR/make/Makefile; then
   7.126        AC_MSG_ERROR([You have to override hotspot with a full hotspot repo!])
   7.127      fi
   7.128      AC_MSG_CHECKING([if hotspot should be overridden])
   7.129 @@ -251,7 +236,7 @@
   7.130      cd "$with_override_nashorn"
   7.131      NASHORN_TOPDIR="`pwd`"
   7.132      cd "$CURDIR"
   7.133 -    if ! test -f $NASHORN_TOPDIR/makefiles/Makefile; then
   7.134 +    if ! test -f $NASHORN_TOPDIR/make/Makefile; then
   7.135        AC_MSG_ERROR([You have to override nashorn with a full nashorn repo!])
   7.136      fi
   7.137      AC_MSG_CHECKING([if nashorn should be overridden])
   7.138 @@ -262,7 +247,7 @@
   7.139      cd "$with_override_jdk"
   7.140      JDK_TOPDIR="`pwd`"
   7.141      cd "$CURDIR"
   7.142 -    if ! test -f $JDK_TOPDIR/makefiles/Makefile; then
   7.143 +    if ! test -f $JDK_TOPDIR/make/Makefile; then
   7.144        AC_MSG_ERROR([You have to override JDK with a full JDK repo!])
   7.145      fi
   7.146      AC_MSG_CHECKING([if JDK should be overridden])
     8.1 --- a/common/autoconf/spec.gmk.in	Thu Nov 07 08:16:05 2013 -0800
     8.2 +++ b/common/autoconf/spec.gmk.in	Thu Nov 14 10:53:23 2013 +0100
     8.3 @@ -65,8 +65,8 @@
     8.4  endif
     8.5  
     8.6  # Specify where the common include directory for makefiles is.
     8.7 -ifeq (,$(findstring -I @SRC_ROOT@/common/makefiles,$(MAKE)))
     8.8 -  MAKE:=$(MAKE) -I @SRC_ROOT@/common/makefiles
     8.9 +ifeq (,$(findstring -I @SRC_ROOT@/make/common,$(MAKE)))
    8.10 +  MAKE:=$(MAKE) -I @SRC_ROOT@/make/common
    8.11  endif
    8.12  
    8.13  # The "human readable" name of this configuration
     9.1 --- a/common/bin/compare.sh	Thu Nov 07 08:16:05 2013 -0800
     9.2 +++ b/common/bin/compare.sh	Thu Nov 14 10:53:23 2013 +0100
     9.3 @@ -1113,14 +1113,15 @@
     9.4  if [ -d "$THIS/install/j2sdk-image" ]; then
     9.5      THIS_J2SDK="$THIS/install/j2sdk-image"
     9.6      THIS_J2RE="$THIS/install/j2re-image"
     9.7 -    echo "Comparing install images"
     9.8 +    echo "Selecting install images in this build"
     9.9  elif [ -d "$THIS/deploy/j2sdk-image" ]; then
    9.10      THIS_J2SDK="$THIS/deploy/j2sdk-image"
    9.11      THIS_J2RE="$THIS/deploy/j2re-image"
    9.12 -    echo "Comparing deploy images"
    9.13 +    echo "Selecting deploy images in this build"
    9.14  elif [ -d "$THIS/images/j2sdk-image" ]; then
    9.15      THIS_J2SDK="$THIS/images/j2sdk-image"
    9.16      THIS_J2RE="$THIS/images/j2re-image"
    9.17 +    echo "Selecting jdk images in this build"
    9.18  fi
    9.19  
    9.20  if [ -d "$THIS/images/j2sdk-overlay-image" ]; then
    9.21 @@ -1128,15 +1129,18 @@
    9.22          # If there is an install image, prefer that, it's also overlay
    9.23          THIS_J2SDK_OVERLAY="$THIS/install/j2sdk-image"
    9.24          THIS_J2RE_OVERLAY="$THIS/install/j2re-image"
    9.25 +        echo "Selecting install overlay images in this build"
    9.26      else
    9.27          THIS_J2SDK_OVERLAY="$THIS/images/j2sdk-overlay-image"
    9.28          THIS_J2RE_OVERLAY="$THIS/images/j2re-overlay-image"
    9.29 +        echo "Selecting jdk overlay images in this build"
    9.30      fi
    9.31  fi
    9.32  
    9.33  if [ -d "$THIS/images/j2sdk-bundle" ]; then
    9.34      THIS_J2SDK_BUNDLE="$THIS/images/j2sdk-bundle"
    9.35      THIS_J2RE_BUNDLE="$THIS/images/j2re-bundle"
    9.36 +    echo "Selecting bundles in this build"
    9.37  fi
    9.38  
    9.39  # Figure out the layout of the other build (old or new, normal or overlay image)
    9.40 @@ -1144,21 +1148,34 @@
    9.41      if [ -f "$OTHER/j2sdk-image/LICENSE" ]; then
    9.42          OTHER_J2SDK="$OTHER/j2sdk-image"
    9.43          OTHER_J2RE="$OTHER/j2re-image"
    9.44 +        echo "Selecting old-style images in other build"
    9.45      else
    9.46          OTHER_J2SDK_OVERLAY="$OTHER/j2sdk-image"
    9.47          OTHER_J2RE_OVERLAY="$OTHER/j2re-image"
    9.48 +        echo "Selecting overlay images in other build"
    9.49      fi
    9.50 +elif [ -d "$OTHER/install/j2sdk-image" ]; then
    9.51 +    OTHER_J2SDK="$OTHER/install/j2sdk-image"
    9.52 +    OTHER_J2RE="$OTHER/install/j2re-image"
    9.53 +    echo "Selecting install images in other build"
    9.54 +elif [ -d "$OTHER/deploy/j2sdk-image" ]; then
    9.55 +    OTHER_J2SDK="$OTHER/deploy/j2sdk-image"
    9.56 +    OTHER_J2RE="$OTHER/deploy/j2re-image"
    9.57 +    echo "Selecting deploy images in other build"
    9.58  elif [ -d "$OTHER/images/j2sdk-image" ]; then
    9.59      OTHER_J2SDK="$OTHER/images/j2sdk-image"
    9.60      OTHER_J2RE="$OTHER/images/j2re-image"
    9.61 +    echo "Selecting jdk images in other build"
    9.62  fi
    9.63  
    9.64  if [ -d "$OTHER/j2sdk-bundle" ]; then
    9.65      OTHER_J2SDK_BUNDLE="$OTHER/j2sdk-bundle"
    9.66      OTHER_J2RE_BUNDLE="$OTHER/j2re-bundle"
    9.67 +    echo "Selecting bundles in other build"
    9.68  elif [ -d "$OTHER/images/j2sdk-bundle" ]; then
    9.69      OTHER_J2SDK_BUNDLE="$OTHER/images/j2sdk-bundle"
    9.70      OTHER_J2RE_BUNDLE="$OTHER/images/j2re-bundle"
    9.71 +    echo "Selecting jdk bundles in other build"
    9.72  fi
    9.73  
    9.74  if [ -z "$THIS_J2SDK" ] || [ -z "$THIS_J2RE" ]; then
    10.1 --- a/common/makefiles/HotspotWrapper.gmk	Thu Nov 07 08:16:05 2013 -0800
    10.2 +++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
    10.3 @@ -1,52 +0,0 @@
    10.4 -#
    10.5 -# Copyright (c) 2011, 2012, Oracle and/or its affiliates. All rights reserved.
    10.6 -# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
    10.7 -#
    10.8 -# This code is free software; you can redistribute it and/or modify it
    10.9 -# under the terms of the GNU General Public License version 2 only, as
   10.10 -# published by the Free Software Foundation.  Oracle designates this
   10.11 -# particular file as subject to the "Classpath" exception as provided
   10.12 -# by Oracle in the LICENSE file that accompanied this code.
   10.13 -#
   10.14 -# This code is distributed in the hope that it will be useful, but WITHOUT
   10.15 -# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
   10.16 -# FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
   10.17 -# version 2 for more details (a copy is included in the LICENSE file that
   10.18 -# accompanied this code).
   10.19 -#
   10.20 -# You should have received a copy of the GNU General Public License version
   10.21 -# 2 along with this work; if not, write to the Free Software Foundation,
   10.22 -# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
   10.23 -#
   10.24 -# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
   10.25 -# or visit www.oracle.com if you need additional information or have any
   10.26 -# questions.
   10.27 -#
   10.28 -
   10.29 -# Include the legacy hotspot-spec.gmk (which in turns includes spec.gmk)
   10.30 -BASE_SPEC:=$(SPEC)
   10.31 -include $(dir $(SPEC))hotspot-spec.gmk
   10.32 -include MakeBase.gmk
   10.33 -
   10.34 -# Inclusion of this pseudo-target will cause make to execute this file
   10.35 -# serially, regardless of -j. Recursively called makefiles will not be
   10.36 -# affected, however. This is required for correct dependency management.
   10.37 -.NOTPARALLEL:
   10.38 -
   10.39 -default: all
   10.40 -
   10.41 -# Get all files except .hg in the hotspot directory.
   10.42 -HOTSPOT_FILES := $(shell $(FIND) -L $(HOTSPOT_TOPDIR) -name ".hg" -prune -o -print)
   10.43 -
   10.44 -# The old build creates hotspot output dir before calling hotspot and
   10.45 -# not doing it breaks builds on msys.
   10.46 -$(HOTSPOT_OUTPUTDIR)/_hotspot.timestamp: $(HOTSPOT_FILES)
   10.47 -	@$(MKDIR) -p $(HOTSPOT_OUTPUTDIR)
   10.48 -	@($(CD) $(HOTSPOT_TOPDIR)/make && $(MAKE) -j1 $(HOTSPOT_MAKE_ARGS) SPEC=$(HOTSPOT_SPEC) BASE_SPEC=$(BASE_SPEC))
   10.49 -	$(TOUCH) $@
   10.50 -
   10.51 -hotspot: $(HOTSPOT_OUTPUTDIR)/_hotspot.timestamp
   10.52 -
   10.53 -all: hotspot
   10.54 -
   10.55 -.PHONY: default all hotspot
    11.1 --- a/common/makefiles/IdlCompilation.gmk	Thu Nov 07 08:16:05 2013 -0800
    11.2 +++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
    11.3 @@ -1,106 +0,0 @@
    11.4 -#
    11.5 -# Copyright (c) 2011, 2012, Oracle and/or its affiliates. All rights reserved.
    11.6 -# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
    11.7 -#
    11.8 -# This code is free software; you can redistribute it and/or modify it
    11.9 -# under the terms of the GNU General Public License version 2 only, as
   11.10 -# published by the Free Software Foundation.  Oracle designates this
   11.11 -# particular file as subject to the "Classpath" exception as provided
   11.12 -# by Oracle in the LICENSE file that accompanied this code.
   11.13 -#
   11.14 -# This code is distributed in the hope that it will be useful, but WITHOUT
   11.15 -# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
   11.16 -# FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
   11.17 -# version 2 for more details (a copy is included in the LICENSE file that
   11.18 -# accompanied this code).
   11.19 -#
   11.20 -# You should have received a copy of the GNU General Public License version
   11.21 -# 2 along with this work; if not, write to the Free Software Foundation,
   11.22 -# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
   11.23 -#
   11.24 -# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
   11.25 -# or visit www.oracle.com if you need additional information or have any
   11.26 -# questions.
   11.27 -#
   11.28 -
   11.29 -PREFIXES=-pkgPrefix CORBA org.omg \
   11.30 -    -pkgPrefix CosNaming org.omg \
   11.31 -    -pkgPrefix CosTransactions org.omg \
   11.32 -    -pkgPrefix CosTSInteroperation org.omg \
   11.33 -    -pkgPrefix DynamicAny org.omg \
   11.34 -    -pkgPrefix Dynamic org.omg \
   11.35 -    -pkgPrefix IOP org.omg \
   11.36 -    -pkgPrefix Messaging org.omg \
   11.37 -    -pkgPrefix PortableInterceptor org.omg \
   11.38 -    -pkgPrefix PortableServer org.omg \
   11.39 -    -pkgPrefix activation com.sun.corba.se.spi \
   11.40 -    -pkgPrefix GIOP com.sun.corba.se \
   11.41 -    -pkgPrefix PortableActivationIDL com.sun.corba.se \
   11.42 -    -pkgPrefix messages com.sun.corba.se
   11.43 -
   11.44 -define add_idl_package
   11.45 -  # param 1 = MYPACKAGE
   11.46 -  # param 2 = src root
   11.47 -  # param 3 = gensrc root
   11.48 -  # param 4 = source idl to compile
   11.49 -  # param 5 = target idl package
   11.50 -  # param 6 = delete these files that were output from the idlj
   11.51 -  # param 7 = idls that match these patterns should be compiled with -oldImplBase
   11.52 -  # param 8 = the idlj command
   11.53 -  # Save the generated java files to a temporary directory so
   11.54 -  # that we can find them and create proper dependencies.
   11.55 -  # After that, we move them to the real gensrc target dir.
   11.56 -  $4_TMPDIR:=tmp___$(subst /,_,$(patsubst $2/%,%,$4))___
   11.57 -  ifneq ($$(filter $7,$4),)
   11.58 -    $4_OLDIMPLBASE:=-oldImplBase
   11.59 -    $4_OLDIMPLBASE_MSG:=with -oldImplBase
   11.60 -  endif
   11.61 -  $5 : $4
   11.62 -	$(MKDIR) -p $3/$$($4_TMPDIR)
   11.63 -	$(RM) -rf $3/$$($4_TMPDIR)
   11.64 -	$(MKDIR) -p $(dir $5)
   11.65 -	$(ECHO) $(LOG_INFO) Compiling IDL $(patsubst $2/%,%,$4)
   11.66 -	$8 -td $3/$$($4_TMPDIR) \
   11.67 -	    -i $2/org/omg/CORBA \
   11.68 -	    -i $2/org/omg/PortableInterceptor \
   11.69 -	    -i $2/org/omg/PortableServer \
   11.70 -	    -D CORBA3 -corba 3.0 \
   11.71 -	    -fall \
   11.72 -	    $$($4_OLDIMPLBASE) \
   11.73 -	    $(PREFIXES) \
   11.74 -	    $4
   11.75 -	$(RM) -f $$(addprefix $3/$$($4_TMPDIR)/,$6)
   11.76 -	$(CP) -r $3/$$($4_TMPDIR)/* $3
   11.77 -	($(CD) $3/$$($4_TMPDIR) && $(FIND) . -type f | $(SED) 's!\./!$3/!g' | $(NAWK) '{ print $$$$1 ": $4" }' > $5)
   11.78 -	$(RM) -rf $3/$$($4_TMPDIR)
   11.79 -endef
   11.80 -
   11.81 -define SetupIdlCompilation
   11.82 -  # param 1 is for example BUILD_IDLS
   11.83 -  # param 2,3,4,5,6,7,8 are named args.
   11.84 -  #   IDLJ,SRC,BIN,INCLUDES,EXCLUDES,OLDIMPLBASES,DELETES
   11.85 -  $(foreach i,2 3 4 5 6 7 8 9 10 11 12 13 14 15, $(if $($i),$1_$(strip $($i)))$(NEWLINE))
   11.86 -  $(call LogSetupMacroEntry,SetupIdlCompilation($1),$2,$3,$4,$5,$6,$7,$8,$9,$(10),$(11),$(12),$(13),$(14),$(15))
   11.87 -  $(if $(16),$(error Internal makefile error: Too many arguments to SetupIdlCompilation, please update IdlCompilation.gmk))
   11.88 -
   11.89 -  # Find all existing java files and existing class files.
   11.90 -  $$(eval $$(call MakeDir,$$($1_BIN)))
   11.91 -  $1_SRCS := $$(shell find $$($1_SRC) -name "*.idl")
   11.92 -  $1_BINS := $$(shell find $$($1_BIN) -name "*.java")
   11.93 -  # Prepend the source/bin path to the filter expressions.
   11.94 -  $1_SRC_INCLUDES := $$(addprefix $$($1_SRC)/,$$($1_INCLUDES))
   11.95 -  $1_SRC_EXCLUDES := $$(addprefix $$($1_SRC)/,$$($1_EXCLUDES))
   11.96 -  $1_BIN_INCLUDES := $$(addprefix $$($1_BIN)/,$$($1_INCLUDES))
   11.97 -  $1_BIN_EXCLUDES := $$(addprefix $$($1_BIN)/,$$($1_EXCLUDES))
   11.98 -  $1_OLDIMPLBASES := $$(addprefix $$($1_SRC)/,$$($1_OLDIMPLBASES))
   11.99 -  # Now remove unwanted java/class files.
  11.100 -  $1_SRCS := $$(filter $$($1_SRC_INCLUDES),$$($1_SRCS))
  11.101 -  $1_SRCS := $$(filter-out $$($1_SRC_EXCLUDES),$$($1_SRCS))
  11.102 -  $1_BINS := $$(filter $$($1_BIN_INCLUDES),$$($1_BINS))
  11.103 -  $1_BINS := $$(filter-out $$($1_BIN_EXCLUDES),$$($1_BINS))
  11.104 -  $1 := $$(sort $$(patsubst $$($1_SRC)/%.idl,$$($1_BIN)/%.idl.d,$$($1_SRCS)))
  11.105 -  # Now create the dependencies for each idl target.
  11.106 -  $$(foreach p,$$($1),$$(eval $$(call add_idl_package,$1,$$($1_SRC),$$($1_BIN),$$(patsubst $$($1_BIN)/%.idl.d,$$($1_SRC)/%.idl,$$p),$$p,$$($1_DELETES),$$($1_OLDIMPLBASES),$$($1_IDLJ))))
  11.107 -endef
  11.108 -
  11.109 -.SUFFIXES: .java .class .package
    12.1 --- a/common/makefiles/JavaCompilation.gmk	Thu Nov 07 08:16:05 2013 -0800
    12.2 +++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
    12.3 @@ -1,592 +0,0 @@
    12.4 -#
    12.5 -# Copyright (c) 2011, 2013, Oracle and/or its affiliates. All rights reserved.
    12.6 -# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
    12.7 -#
    12.8 -# This code is free software; you can redistribute it and/or modify it
    12.9 -# under the terms of the GNU General Public License version 2 only, as
   12.10 -# published by the Free Software Foundation.  Oracle designates this
   12.11 -# particular file as subject to the "Classpath" exception as provided
   12.12 -# by Oracle in the LICENSE file that accompanied this code.
   12.13 -#
   12.14 -# This code is distributed in the hope that it will be useful, but WITHOUT
   12.15 -# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
   12.16 -# FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
   12.17 -# version 2 for more details (a copy is included in the LICENSE file that
   12.18 -# accompanied this code).
   12.19 -#
   12.20 -# You should have received a copy of the GNU General Public License version
   12.21 -# 2 along with this work; if not, write to the Free Software Foundation,
   12.22 -# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
   12.23 -#
   12.24 -# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
   12.25 -# or visit www.oracle.com if you need additional information or have any
   12.26 -# questions.
   12.27 -#
   12.28 -
   12.29 -# This makefile is much simpler now that it can use the smart javac wrapper
   12.30 -# for dependency tracking between java packages and incremental compiles.
   12.31 -# It could be even more simple if we added support for incremental jar updates
   12.32 -# directly from the smart javac wrapper.
   12.33 -
   12.34 -# Cleaning/copying properties here is not a good solution. The properties
   12.35 -# should be cleaned/copied by a annotation processor in sjavac.
   12.36 -
   12.37 -# When you read this source. Remember that $(sort ...) has the side effect
   12.38 -# of removing duplicates. It is actually this side effect that is
   12.39 -# desired whenever sort is used below!
   12.40 -
   12.41 -ifeq (,$(_MAKEBASE_GMK))
   12.42 -  $(error You must include MakeBase.gmk prior to including JavaCompilation.gmk)
   12.43 -endif
   12.44 -
   12.45 -FALSE_FIND_PATTERN:=-name FILE_NAME_THAT_DOESNT_EXIST
   12.46 -
   12.47 -define SetupJavaCompiler
   12.48 -  # param 1 is for example GENERATE_OLD_BYTECODE or GENERATE_NEW_JDKBYTECODE
   12.49 -  # This is the name of the compiler setup.
   12.50 -  # param 2-9 are named args.
   12.51 -  #   JVM:=The jvm used to run the javac/javah command
   12.52 -  #   JAVAC:=The javac jar and bootstrap classpath changes, or just bin/javac if JVM is left out
   12.53 -  #   FLAGS:=Flags to be supplied to javac
   12.54 -  #   SERVER_DIR:=Use a javac server (-XDserver) and store the server related files here
   12.55 -  #   SERVER_JVM:=Use this JVM for the server. Defaults to the JVM above.
   12.56 -  $(foreach i,2 3 4 5 6 7 8 9 10 11 12 13 14 15, $(if $($i),$1_$(strip $($i)))$(NEWLINE))
   12.57 -  $(call LogSetupMacroEntry,SetupJavaCompiler($1),$2,$3,$4,$5,$6,$7,$8,$9,$(10),$(11),$(12),$(13),$(14),$(15))
   12.58 -  $(if $(16),$(error Internal makefile error: Too many arguments to SetupJavaCompiler, please update JavaCompilation.gmk))
   12.59 -
   12.60 -  # The port file contains the tcp/ip on which the server listens
   12.61 -  # and the cookie necessary to talk to the server.
   12.62 -  $1_SJAVAC_PORTFILE:=$$($1_SERVER_DIR)/server.port
   12.63 -  # You can use a different JVM to run the background javac server.
   12.64 -  ifeq ($$($1_SERVER_JVM),)
   12.65 -    # It defaults to the same JVM that is used to start the javac command.
   12.66 -    $1_SERVER_JVM:=$$($1_JVM)
   12.67 -  endif
   12.68 -endef
   12.69 -
   12.70 -define SetupArchive
   12.71 -  # param 1 is for example ARCHIVE_MYPACKAGE
   12.72 -  # param 2 are the dependecies
   12.73 -  # param 3,4,5,6,7,8,9 are named args.
   12.74 -  #   SRCS:=List of directories in where to find files to add to archive
   12.75 -  #   SUFFIXES:=File suffixes to include in jar
   12.76 -  #   INCLUDES:=List of directories/packages in SRCS that should be included
   12.77 -  #   EXCLUDES:=List of directories/packages in SRCS that should be excluded
   12.78 -  #   EXCLUDE_FILES:=List of files in SRCS that should be excluded
   12.79 -  #   EXTRA_FILES:=List of files in SRCS that should be included regardless of suffix match.
   12.80 -  #   JAR:=Jar file to create
   12.81 -  #   MANIFEST:=Optional manifest file template.
   12.82 -  #   JARMAIN:=Optional main class to add to manifest
   12.83 -  #   JARINDEX:=true means generate the index in the jar file.
   12.84 -  #   SKIP_METAINF:=Set to prevent contents of an META-INF directory to be automatically
   12.85 -  #       added to the archive.
   12.86 -  #   EXTRA_MANIFEST_ATTR:=Extra attribute to add to manifest.
   12.87 -  #   CHECK_COMPRESS_JAR Check the COMPRESS_JAR variable
   12.88 -
   12.89 -  # NOTE: $2 is dependencies, not a named argument!
   12.90 -  $(foreach i,3 4 5 6 7 8 9 10 11 12 13 14 15, $(if $($i),$1_$(strip $($i)))$(NEWLINE))
   12.91 -  $(call LogSetupMacroEntry,SetupArchive($1),<dependencies>,$3,$4,$5,$6,$7,$8,$9,$(10),$(11),$(12),$(13),$(14),$(15))
   12.92 -  $(if $(findstring $(LOG_LEVEL),trace), $(info *[2] <dependencies> = $(strip $2)))
   12.93 -  $(if $(16),$(error Internal makefile error: Too many arguments to SetupArchive, please update JavaCompilation.gmk))
   12.94 -
   12.95 -  $1_JARMAIN:=$(strip $$($1_JARMAIN))
   12.96 -  $1_JARNAME:=$$(notdir $$($1_JAR))
   12.97 -  $1_MANIFEST_FILE:=$$(dir $$($1_JAR))_the.$$($1_JARNAME)_manifest
   12.98 -  $1_DELETESS_FILE:=$$(dir $$($1_JAR))_the.$$($1_JARNAME)_deletess
   12.99 -  $1_DELETES_FILE:=$$(dir $$($1_JAR))_the.$$($1_JARNAME)_deletes
  12.100 -  $1_BIN:=$$(dir $$($1_JAR))
  12.101 -
  12.102 -  ifeq (,$$($1_SUFFIXES))
  12.103 -    # No suffix was set, default to classes.
  12.104 -    $1_SUFFIXES:=.class
  12.105 -  endif
  12.106 -  # Convert suffixes to a find expression
  12.107 -  $1_FIND_PATTERNS:=$(FALSE_FIND_PATTERN) $$(patsubst %,$(SPACE)-o$(SPACE)-name$(SPACE)$(DQUOTE)*%$(DQUOTE),$$($1_SUFFIXES))
  12.108 -  # On windows, a lot of includes/excludes risk making the command line too long, so
  12.109 -  # writing the grep patterns to files.
  12.110 -  ifneq (,$$($1_INCLUDES))
  12.111 -    $1_GREP_INCLUDE_PATTERNS:=$$(foreach src,$$($1_SRCS), \
  12.112 -        $$(addprefix $$(src)/,$$($1_INCLUDES)))
  12.113 -    # If there are a lot of include patterns, output to file to shorten command lines
  12.114 -    ifeq ($$(word 20,$$($1_GREP_INCLUDE_PATTERNS)),)
  12.115 -      $1_GREP_INCLUDES:=| $(GREP) $$(patsubst %,$(SPACE)-e$(SPACE)$(DQUOTE)%$(DQUOTE),$$($1_GREP_INCLUDE_PATTERNS))
  12.116 -    else
  12.117 -      $1_GREP_INCLUDE_OUTPUT:=$(RM) $$($1_BIN)/_the.$$($1_JARNAME)_include $$(NEWLINE) \
  12.118 -          $$(call ListPathsSafely,$1_GREP_INCLUDE_PATTERNS,\n, \
  12.119 -          >> $$($1_BIN)/_the.$$($1_JARNAME)_include)
  12.120 -      $1_GREP_INCLUDES:=| $(GREP) -f $$($1_BIN)/_the.$$($1_JARNAME)_include
  12.121 -    endif
  12.122 -  endif
  12.123 -  ifneq (,$$($1_EXCLUDES)$$($1_EXCLUDE_FILES))
  12.124 -    $1_GREP_EXCLUDE_PATTERNS:=$$(foreach src,$$($1_SRCS),$$(addprefix $$(src)/, \
  12.125 -        $$($1_EXCLUDES) $$($1_EXCLUDE_FILES)))
  12.126 -    # If there are a lot of include patterns, output to file to shorten command lines
  12.127 -    ifeq ($$(word 20,$$($1_GREP_EXCLUDE_PATTERNS)),)
  12.128 -      $1_GREP_EXCLUDES:=| $(GREP) -v $$(patsubst %,$(SPACE)-e$(SPACE)$(DQUOTE)%$(DQUOTE),$$($1_GREP_EXCLUDE_PATTERNS))
  12.129 -    else
  12.130 -      $1_GREP_EXCLUDE_OUTPUT=$(RM) $$($1_BIN)/_the.$$($1_JARNAME)_exclude $$(NEWLINE) \
  12.131 -          $$(call ListPathsSafely,$1_GREP_EXCLUDE_PATTERNS,\n, \
  12.132 -          >> $$($1_BIN)/_the.$$($1_JARNAME)_exclude)
  12.133 -      $1_GREP_EXCLUDES:=| $(GREP) -v -f $$($1_BIN)/_the.$$($1_JARNAME)_exclude
  12.134 -    endif
  12.135 -  endif
  12.136 -
  12.137 -  # Check if this jar needs to have its index generated.
  12.138 -  ifneq (,$$($1_JARINDEX))
  12.139 -    $1_JARINDEX = (cd $$(dir $$@) && $(JAR) -i $$(notdir $$@))
  12.140 -  else
  12.141 -    $1_JARINDEX = true
  12.142 -  endif
  12.143 -  # When this macro is run in the same makefile as the java compilation, dependencies are
  12.144 -  # transfered in make variables. When the macro is run in a different makefile than the
  12.145 -  # java compilation, the dependencies need to be found in the filesystem.
  12.146 -  ifneq (,$2)
  12.147 -    $1_DEPS:=$2
  12.148 -  else
  12.149 -    $1_DEPS:=$$(filter $$(addprefix %,$$($1_SUFFIXES)), \
  12.150 -        $$(call CacheFind,$$($1_SRCS)))
  12.151 -    ifneq (,$$($1_GREP_INCLUDE_PATTERNS))
  12.152 -      $1_DEPS:=$$(filter $$(addsuffix %,$$($1_GREP_INCLUDE_PATTERNS)),$$($1_DEPS))
  12.153 -    endif
  12.154 -    ifneq (,$$($1_GREP_EXCLUDE_PATTERNS))
  12.155 -      $1_DEPS:=$$(filter-out $$(addsuffix %,$$($1_GREP_EXCLUDE_PATTERNS)),$$($1_DEPS))
  12.156 -    endif
  12.157 -    # The subst of \ is needed because $ has to be escaped with \ in EXTRA_FILES for the command
  12.158 -    # lines, but not here for use in make dependencies.
  12.159 -    $1_DEPS+=$$(subst \,,$$(foreach src,$$($1_SRCS),$$(addprefix $$(src)/,$$($1_EXTRA_FILES))))
  12.160 -    ifeq (,$$($1_SKIP_METAINF))
  12.161 -      $1_DEPS+=$$(call CacheFind,$$(wildcard $$(addsuffix /META-INF,$$($1_SRCS))))
  12.162 -    endif
  12.163 -  endif
  12.164 -
  12.165 -  # Utility macros, to make the shell script receipt somewhat easier to decipher.
  12.166 -
  12.167 -  # The capture contents macro finds all files (matching the patterns, typically
  12.168 -  # .class and .prp) that are newer than the jar-file, ie the new content to be put into the jar.
  12.169 -  $1_CAPTURE_CONTENTS=$$(foreach src,$$($1_SRCS), \
  12.170 -      (($(FIND) $$(src) -type f -a \( $$($1_FIND_PATTERNS) \) -a -newer $$@ $$($1_GREP_INCLUDES) \
  12.171 -          $$($1_GREP_EXCLUDES) | $(SED) 's|$$(src)/||g' && \
  12.172 -      $(ECHO) $$(subst $$(src)/,,$$($1_EXTRA_FILES))) > \
  12.173 -      $$(src)/_the.$$($1_JARNAME)_contents) $$(NEWLINE))
  12.174 -  # The capture metainf macro finds all files below the META-INF directory that are newer than the jar-file.
  12.175 -  ifeq (,$$($1_SKIP_METAINF))
  12.176 -    $1_CAPTURE_METAINF =$$(foreach src,$$($1_SRCS),($(FIND) $$(src)/META-INF -type f -a -newer $$@ 2> /dev/null | $(SED) 's|$$(src)/||g' >> $$(src)/_the.$$($1_JARNAME)_contents ) $$(NEWLINE))
  12.177 -  endif
  12.178 -  # The capture deletes macro finds all deleted files and concatenates them. The resulting file
  12.179 -  # tells us what to remove from the jar-file.
  12.180 -  $1_CAPTURE_DELETES=$$(foreach src,$$($1_SRCS),($(FIND) $$(src) -name _the.package.deleted -newer $$@ -exec $(SED) 's|$$(src)||g' \{\} >> $$($1_DELETES_FILE) \;) $$(NEWLINE))
  12.181 -  # The update contents macro updates the jar file with the previously capture contents.
  12.182 -  # xargs is used to trim the whitespace from the contents file, to see if it is empty.
  12.183 -  $1_UPDATE_CONTENTS=$$(foreach src,$$($1_SRCS), \
  12.184 -      (cd $$(src) && \
  12.185 -       if [ -n "`$(CAT) _the.$$($1_JARNAME)_contents | $(XARGS)`" ]; then \
  12.186 -         $(ECHO) "  updating" `$(WC) -l _the.$$($1_JARNAME)_contents | $(AWK) '{ print $$$$1 }'` files && \
  12.187 -         $(JAR) $$($1_JAR_UPDATE_OPTIONS) $$@ @_the.$$($1_JARNAME)_contents; \
  12.188 -       fi) $$(NEWLINE))
  12.189 -  # The s-variants of the above macros are used when the jar is created from scratch.
  12.190 -  $1_SCAPTURE_CONTENTS=$$(foreach src,$$($1_SRCS), \
  12.191 -      (($(FIND) $$(src) -type f -a \( $$($1_FIND_PATTERNS) \) $$($1_GREP_INCLUDES) \
  12.192 -          $$($1_GREP_EXCLUDES) | $(SED) 's|$$(src)/||g' && \
  12.193 -      $$(subst $$(src)/,,$(ECHO) $$($1_EXTRA_FILES))) > \
  12.194 -      $$(src)/_the.$$($1_JARNAME)_contents) $$(NEWLINE))
  12.195 -
  12.196 -  ifeq (,$$($1_SKIP_METAINF))
  12.197 -    $1_SCAPTURE_METAINF=$$(foreach src,$$($1_SRCS), \
  12.198 -        ($(FIND) $$(src)/META-INF -type f 2> /dev/null | $(SED) 's|$$(src)/||g' >> \
  12.199 -        $$(src)/_the.$$($1_JARNAME)_contents) $$(NEWLINE))
  12.200 -  endif
  12.201 -  $1_SUPDATE_CONTENTS=$$(foreach src,$$($1_SRCS), \
  12.202 -      (cd $$(src) && $(JAR) $$($1_JAR_UPDATE_OPTIONS) $$@ @$$(src)/_the.$$($1_JARNAME)_contents) $$(NEWLINE))
  12.203 -
  12.204 -  # Use a slightly shorter name for logging, but with enough path to identify this jar.
  12.205 -  $1_NAME:=$$(subst $$(OUTPUT_ROOT)/,,$$($1_JAR))
  12.206 -
  12.207 -  ifneq (,$$($1_CHECK_COMPRESS_JAR))
  12.208 -    $1_JAR_CREATE_OPTIONS := c0fm
  12.209 -    $1_JAR_UPDATE_OPTIONS := u0f
  12.210 -    ifeq ($(COMPRESS_JARS), true)
  12.211 -      $1_JAR_CREATE_OPTIONS := cfm
  12.212 -      $1_JAR_UPDATE_OPTIONS := uf
  12.213 -    endif
  12.214 -  else
  12.215 -    $1_JAR_CREATE_OPTIONS := cfm
  12.216 -    $1_JAR_UPDATE_OPTIONS := uf
  12.217 -  endif
  12.218 -
  12.219 -  # Here is the rule that creates/updates the jar file.
  12.220 -  $$($1_JAR) : $$($1_DEPS)
  12.221 -	$(MKDIR) -p $$($1_BIN)
  12.222 -	$$($1_GREP_INCLUDE_OUTPUT)
  12.223 -	$$($1_GREP_EXCLUDE_OUTPUT)
  12.224 -	$$(if $$($1_MANIFEST), \
  12.225 -	  $(SED) -e "s#@@RELEASE@@#$(RELEASE)#" \
  12.226 -	      -e "s#@@COMPANY_NAME@@#$(COMPANY_NAME)#" $$($1_MANIFEST) > $$($1_MANIFEST_FILE) \
  12.227 -	, \
  12.228 -	  $(RM) $$($1_MANIFEST_FILE) && $(TOUCH) $$($1_MANIFEST_FILE))
  12.229 -	$$(if $$($1_JARMAIN),$(ECHO) "Main-Class: $$(strip $$($1_JARMAIN))" >> $$($1_MANIFEST_FILE))
  12.230 -	$$(if $$($1_EXTRA_MANIFEST_ATTR),$(PRINTF) "$$($1_EXTRA_MANIFEST_ATTR)\n" >> $$($1_MANIFEST_FILE))
  12.231 -	$$(if $$(wildcard $$@), \
  12.232 -	  $(ECHO) Modifying $$($1_NAME) $$(NEWLINE) \
  12.233 -	  $$($1_CAPTURE_CONTENTS) \
  12.234 -	  $$($1_CAPTURE_METAINF) \
  12.235 -	  $(RM) $$($1_DELETES_FILE) $$(NEWLINE) \
  12.236 -	  $$($1_CAPTURE_DELETES) \
  12.237 -	  $(CAT) $$($1_DELETES_FILE) > $$($1_DELETESS_FILE) $$(NEWLINE) \
  12.238 -	  if [ -s $$($1_DELETESS_FILE) ]; then \
  12.239 -	    $(ECHO) "  deleting" `$(WC) -l $$($1_DELETESS_FILE) | $(AWK) '{ print $$$$1 }'` files && \
  12.240 -	    $(ZIP) -q -d $$@ `$(CAT) $$($1_DELETESS_FILE)` ; \
  12.241 -	  fi $$(NEWLINE) \
  12.242 -	  $$($1_UPDATE_CONTENTS) true $$(NEWLINE) \
  12.243 -	  $$($1_JARINDEX) && true \
  12.244 -	, \
  12.245 -	  $(ECHO) Creating $$($1_NAME) && $(JAR) $$($1_JAR_CREATE_OPTIONS) $$@ $$($1_MANIFEST_FILE) $$(NEWLINE) \
  12.246 -	  $$($1_SCAPTURE_CONTENTS) \
  12.247 -	  $$($1_SCAPTURE_METAINF) \
  12.248 -	  $$($1_SUPDATE_CONTENTS) \
  12.249 -	  $$($1_JARINDEX) && true )
  12.250 -
  12.251 -endef
  12.252 -
  12.253 -define SetupZipArchive
  12.254 -  # param 1 is for example ZIP_MYSOURCE
  12.255 -  # param 2,3,4,5,6,7,8,9 are named args.
  12.256 -  #   SRC,ZIP,INCLUDES,INCLUDE_FILES,EXCLUDES,EXCLUDE_FILES,SUFFIXES,EXTRA_DEPS
  12.257 -  $(foreach i,2 3 4 5 6 7 8 9 10 11 12 13 14 15, $(if $($i),$1_$(strip $($i)))$(NEWLINE))
  12.258 -  $(call LogSetupMacroEntry,SetupZipArchive($1),$2,$3,$4,$5,$6,$7,$8,$9,$(10),$(11),$(12),$(13),$(14),$(15))
  12.259 -  $(if $(16),$(error Internal makefile error: Too many arguments to SetupZipArchive, please update JavaCompilation.gmk))
  12.260 -
  12.261 -  # To avoid running find over too large sets of files, which causes make to crash
  12.262 -  # on some configurations (cygwin), use INCLUDES and INCLUDE_FILES to build a set
  12.263 -  # of directories to run find in, if available.
  12.264 -  ifneq ($$($1_INCLUDES)$$($1_INCLUDE_FILES),)
  12.265 -    $1_FIND_LIST := $$(wildcard $$(foreach i,$$($1_SRC), \
  12.266 -        $$(addprefix $$i/,$$($1_INCLUDES) $$($1_INCLUDE_FILES))))
  12.267 -  else
  12.268 -    $1_FIND_LIST := $$($1_SRC)
  12.269 -  endif
  12.270 -
  12.271 -  # Find all files in the source tree.
  12.272 -  $1_ALL_SRCS := $$(call not-containing,_the.,$$(call CacheFind,$$($1_FIND_LIST)))
  12.273 -
  12.274 -  # Filter on suffixes if set
  12.275 -  ifneq ($$($1_SUFFIXES),)
  12.276 -    $1_ALL_SRCS := $$(filter $$(addprefix %, $$($1_SUFFIXES)), $$($1_ALL_SRCS))
  12.277 -  endif
  12.278 -
  12.279 -  ifneq ($$($1_INCLUDES),)
  12.280 -    ifneq ($$($1_SUFFIXES),)
  12.281 -      $1_ZIP_INCLUDES := $$(foreach s,$$($1_SUFFIXES), \
  12.282 -          $$(addprefix -i$(SPACE)$(DQUOTE),$$(addsuffix /*$$s$(DQUOTE),$$($1_INCLUDES))))
  12.283 -    else
  12.284 -      $1_ZIP_INCLUDES := $$(addprefix -i$(SPACE)$(DQUOTE),$$(addsuffix /*$(DQUOTE),$$($1_INCLUDES)))
  12.285 -    endif
  12.286 -  endif
  12.287 -  ifneq ($$($1_INCLUDE_FILES),)
  12.288 -    $1_ZIP_INCLUDES += $$(addprefix -i$(SPACE),$$($1_INCLUDE_FILES))
  12.289 -  endif
  12.290 -  ifneq ($$($1_EXCLUDES),)
  12.291 -    $1_SRC_EXCLUDES := $$(foreach i,$$($1_SRC),$$(addprefix $$i/,$$(addsuffix /%,$$($1_EXCLUDES))))
  12.292 -    $1_ZIP_EXCLUDES := $$(addprefix -x$(SPACE)$(DQUOTE),$$(addsuffix /*$(DQUOTE),$$($1_EXCLUDES)))
  12.293 -    $1_ALL_SRCS := $$(filter-out $$($1_SRC_EXCLUDES),$$($1_ALL_SRCS))
  12.294 -  endif
  12.295 -
  12.296 -  # Use a slightly shorter name for logging, but with enough path to identify this zip.
  12.297 -  $1_NAME:=$$(subst $$(OUTPUT_ROOT)/,,$$($1_ZIP))
  12.298 -
  12.299 -  # Now $1_ALL_SRCS should contain all sources that are going to be put into the zip.
  12.300 -  # I.e. the zip -i and -x options should match the filtering done in the makefile.
  12.301 -  # Explicitly excluded files can be given with absolute path. The patsubst solution
  12.302 -  # isn't perfect but the likelyhood of an absolute path to match something in a src
  12.303 -  # dir is very small.
  12.304 -  # If zip has nothing to do, it returns 12 and would fail the build. Check for 12
  12.305 -  # and only fail if it's not.
  12.306 -  $$($1_ZIP) : $$($1_ALL_SRCS) $$($1_EXTRA_DEPS)
  12.307 -	$(MKDIR) -p $$(@D)
  12.308 -	$(ECHO) Updating $$($1_NAME)
  12.309 -	$$(foreach i,$$($1_SRC),(cd $$i && $(ZIP) -qru $$@ . $$($1_ZIP_INCLUDES) $$($1_ZIP_EXCLUDES) -x \*_the.\* $$(addprefix -x$(SPACE),$$(patsubst $$i/%,%,$$($1_EXCLUDE_FILES))) || test "$$$$?" = "12" )$$(NEWLINE)) true
  12.310 -	$(TOUCH) $$@
  12.311 -endef
  12.312 -
  12.313 -define add_file_to_copy
  12.314 -  # param 1 = BUILD_MYPACKAGE
  12.315 -  # parma 2 = The source file to copy.
  12.316 -  $2_TARGET:=$2
  12.317 -  # Remove the source prefix.
  12.318 -  $$(foreach i,$$($1_SRC),$$(eval $$(call remove_string,$$i,$2_TARGET)))
  12.319 -  # Now we can setup the depency that will trigger the copying.
  12.320 -  $$($1_BIN)$$($2_TARGET) : $2
  12.321 -	$(MKDIR) -p $$(@D)
  12.322 -	$(CP) $$< $$@
  12.323 -	$(CHMOD) -f ug+w $$@
  12.324 -
  12.325 -  # And do not forget this target
  12.326 -  $1_ALL_COPY_TARGETS += $$($1_BIN)$$($2_TARGET)
  12.327 -endef
  12.328 -
  12.329 -
  12.330 -# This macro is used only for properties files that are to be
  12.331 -# copied over to the classes directory in cleaned form:
  12.332 -# Previously this was inconsistently done in different repositories.
  12.333 -# This is the new clean standard. Though it is to be superseded by
  12.334 -# a standard annotation processor from with sjavac.
  12.335 -define add_file_to_copy_and_clean
  12.336 -  # param 1 = BUILD_MYPACKAGE
  12.337 -  # parma 2 = The source file to copy and clean.
  12.338 -  $2_TARGET:=$2
  12.339 -  # Remove the source prefix.
  12.340 -  $$(foreach i,$$($1_SRC),$$(eval $$(call remove_string,$$i,$2_TARGET)))
  12.341 -  # Now we can setup the depency that will trigger the copying.
  12.342 -  $$($1_BIN)$$($2_TARGET) : $2
  12.343 -	$(MKDIR) -p $$(@D)
  12.344 -	$(CAT) $$< | $(SED) -e 's/\([^\\]\):/\1\\:/g' -e 's/\([^\\]\)=/\1\\=/g' -e 's/#.*/#/g' \
  12.345 -	    | $(SED) -f "$(SRC_ROOT)/common/makefiles/support/unicode2x.sed" \
  12.346 -	    | $(SED) -e '/^#/d' -e '/^$$$$/d' \
  12.347 -	        -e :a -e '/\\$$$$/N; s/\\\n//; ta' \
  12.348 -	        -e 's/^[ \t]*//;s/[ \t]*$$$$//' \
  12.349 -	        -e 's/\\=/=/' | LANG=C $(SORT) > $$@
  12.350 -	$(CHMOD) -f ug+w $$@
  12.351 -
  12.352 -  # And do not forget this target
  12.353 -  $1_ALL_COPY_CLEAN_TARGETS += $$($1_BIN)$$($2_TARGET)
  12.354 -endef
  12.355 -
  12.356 -define remove_string
  12.357 -  $2 := $$(subst $1,,$$($2))
  12.358 -endef
  12.359 -
  12.360 -define replace_space_with_pathsep
  12.361 -  $1:=$(subst $(SPACE),$(PATH_SEP),$(strip $(patsubst %,%,$2)))
  12.362 -endef
  12.363 -
  12.364 -define SetupJavaCompilation
  12.365 -  # param 1 is for example BUILD_MYPACKAGE
  12.366 -  # param 2,3,4,5,6,7,8 are named args.
  12.367 -  #   SETUP:=must point to a previously setup java compiler, for example: SETUP:=BOOTJAVAC
  12.368 -  #   JVM:=path to ..bin/java
  12.369 -  #   ADD_JAVAC_FLAGS:=javac flags to append to the default ones.
  12.370 -  #   SRC:=one or more directories to search for sources
  12.371 -  #   BIN:=store classes here
  12.372 -  #   INCLUDES:=myapp.foo means will only compile java files in myapp.foo or any of its sub-packages.
  12.373 -  #   EXCLUDES:=myapp.foo means will do not compile java files in myapp.foo or any of its sub-packages.
  12.374 -  #   COPY:=.prp means copy all prp files to the corresponding package in BIN.
  12.375 -  #   CLEAN:=.properties means copy and clean all properties file to the corresponding package in BIN.
  12.376 -  #   COPY_FILES:=myapp/foo/setting.txt means copy this file over to the package myapp/foo
  12.377 -  #   SRCZIP:=Create a src.zip based on the found sources and copied files.
  12.378 -  #   INCLUDE_FILES:="com/sun/SolarisFoobar.java" means only compile this file!
  12.379 -  #   EXCLUDE_FILES:="com/sun/SolarisFoobar.java" means do not compile this particular file!
  12.380 -  #       "SolarisFoobar.java" means do not compile SolarisFoobar, wherever it is found.
  12.381 -  #   JAVAC_SOURCE_PATH_OVERRIDE:=This forces an explicit -sourcepath to javac instead of the complete
  12.382 -  #       source roots from SRC. This is sometimes needed when compiling specific subsets of the source.
  12.383 -  #   HEADERS:=path to directory where all generated c-headers are written.
  12.384 -  #   DEPENDS:=Extra dependecy
  12.385 -  $(foreach i,2 3 4 5 6 7 8 9 10 11 12 13 14 15, $(if $($i),$1_$(strip $($i)))$(NEWLINE))
  12.386 -  $(call LogSetupMacroEntry,SetupJavaCompilation($1),$2,$3,$4,$5,$6,$7,$8,$9,$(10),$(11),$(12),$(13),$(14),$(15))
  12.387 -  $(if $(16),$(error Internal makefile error: Too many arguments to SetupJavaCompilation, please update JavaCompilation.gmk))
  12.388 -
  12.389 -  # Extract the info from the java compiler setup.
  12.390 -  $1_JVM := $$($$($1_SETUP)_JVM)
  12.391 -  $1_JAVAC := $$($$($1_SETUP)_JAVAC)
  12.392 -  $1_FLAGS := $$($$($1_SETUP)_FLAGS) $(JAVAC_FLAGS) $$($1_ADD_JAVAC_FLAGS)
  12.393 -  ifeq ($$($1_JAVAC),)
  12.394 -    $$(error The Java compilation $1 refers to a non-existant java compiler setup $$($1_SETUP))
  12.395 -  endif
  12.396 -  $1_SJAVAC_PORTFILE := $$($$($1_SETUP)_SJAVAC_PORTFILE)
  12.397 -  $1_SERVER_JVM := $$($$($1_SETUP)_SERVER_JVM)
  12.398 -
  12.399 -  # Handle addons and overrides.
  12.400 -  $1_SRC:=$$(call ADD_SRCS,$$($1_SRC))
  12.401 -  # Make sure the dirs exist.
  12.402 -  $$(foreach d,$$($1_SRC), $$(if $$(wildcard $$d),,$$(error SRC specified to SetupJavaCompilation $1 contains missing directory $$d)))
  12.403 -  $$(eval $$(call MakeDir,$$($1_BIN)))
  12.404 -  # Find all files in the source trees.
  12.405 -  $1_ALL_SRCS += $$(filter-out $(OVR_SRCS),$$(call CacheFind,$$($1_SRC)))
  12.406 -  # Extract the java files.
  12.407 -  ifneq ($$($1_EXCLUDE_FILES),)
  12.408 -    $1_EXCLUDE_FILES_PATTERN:=$$(addprefix %,$$($1_EXCLUDE_FILES))
  12.409 -  endif
  12.410 -  $1_SRCS := $$(filter-out $$($1_EXCLUDE_FILES_PATTERN),$$(filter %.java,$$($1_ALL_SRCS)))
  12.411 -  ifneq ($$($1_INCLUDE_FILES),)
  12.412 -    $1_INCLUDE_FILES:=$$(foreach i,$$($1_SRC),$$(addprefix $$i/,$$($1_INCLUDE_FILES)))
  12.413 -    $1_SRCS := $$(filter $$($1_INCLUDE_FILES), $$($1_SRCS))
  12.414 -  endif
  12.415 -
  12.416 -  # Now we have a list of all java files to compile: $$($1_SRCS)
  12.417 -
  12.418 -  # Create the corresponding smart javac wrapper command line.
  12.419 -  $1_SJAVAC_ARGS:=$$(addprefix -x ,$$(addsuffix .*,$$(subst /,.,$$($1_EXCLUDES)))) \
  12.420 -      $$(addprefix -i ,$$(addsuffix .*,$$(subst /,.,$$($1_INCLUDES)))) \
  12.421 -      $$(addprefix -xf *,$$(strip $$($1_EXCLUDE_FILES))) \
  12.422 -      $$(addprefix -if *,$$(strip $$($1_INCLUDE_FILES))) \
  12.423 -      -src "$$(subst $$(SPACE),$$(PATH_SEP),$$(strip $$($1_SRC)))"
  12.424 -
  12.425 -  # Prepend the source/bin path to the filter expressions.
  12.426 -  ifneq ($$($1_INCLUDES),)
  12.427 -    $1_SRC_INCLUDES := $$(foreach i,$$($1_SRC),$$(addprefix $$i/,$$(addsuffix /%,$$($1_INCLUDES))))
  12.428 -    $1_SRCS := $$(filter $$($1_SRC_INCLUDES),$$($1_SRCS))
  12.429 -  endif
  12.430 -  ifneq ($$($1_EXCLUDES),)
  12.431 -    $1_SRC_EXCLUDES := $$(foreach i,$$($1_SRC),$$(addprefix $$i/,$$(addsuffix /%,$$($1_EXCLUDES))))
  12.432 -    $1_SRCS := $$(filter-out $$($1_SRC_EXCLUDES),$$($1_SRCS))
  12.433 -  endif
  12.434 -
  12.435 -  # Find all files to be copied from source to bin.
  12.436 -  ifneq (,$$($1_COPY))
  12.437 -    # Search for all files to be copied.
  12.438 -    $1_ALL_COPIES := $$(filter $$(addprefix %,$$($1_COPY)),$$($1_ALL_SRCS))
  12.439 -    # Copy these explicitly
  12.440 -    $1_ALL_COPIES += $$($1_COPY_FILES)
  12.441 -    # Copy must also respect filters.
  12.442 -    ifneq (,$$($1_INCLUDES))
  12.443 -      $1_ALL_COPIES := $$(filter $$($1_SRC_INCLUDES),$$($1_ALL_COPIES))
  12.444 -    endif
  12.445 -    ifneq (,$$($1_EXCLUDES))
  12.446 -      $1_ALL_COPIES := $$(filter-out $$($1_SRC_EXCLUDES),$$($1_ALL_COPIES))
  12.447 -    endif
  12.448 -    ifneq (,$$($1_EXCLUDE_FILES))
  12.449 -      $1_ALL_COPIES := $$(filter-out $$($1_EXCLUDE_FILES_PATTERN),$$($1_ALL_COPIES))
  12.450 -    endif
  12.451 -    # All files below META-INF are always copied.
  12.452 -    $1_ALL_COPIES += $$(filter $$(addsuffix /META-INF%,$$($1_SRC)),$$($1_ALL_SRCS))
  12.453 -    ifneq (,$$($1_ALL_COPIES))
  12.454 -      # Yep, there are files to be copied!
  12.455 -      $1_ALL_COPY_TARGETS:=
  12.456 -          $$(foreach i,$$($1_ALL_COPIES),$$(eval $$(call add_file_to_copy,$1,$$i)))
  12.457 -      # Now we can depend on $$($1_ALL_COPY_TARGETS) to copy all files!
  12.458 -    endif
  12.459 -  endif
  12.460 -
  12.461 -  # Find all property files to be copied and cleaned from source to bin.
  12.462 -  ifneq (,$$($1_CLEAN))
  12.463 -    # Search for all files to be copied.
  12.464 -    $1_ALL_CLEANS := $$(filter $$(addprefix %,$$($1_CLEAN)),$$($1_ALL_SRCS))
  12.465 -    # Copy and clean must also respect filters.
  12.466 -    ifneq (,$$($1_INCLUDES))
  12.467 -      $1_ALL_CLEANS := $$(filter $$($1_SRC_INCLUDES),$$($1_ALL_CLEANS))
  12.468 -    endif
  12.469 -    ifneq (,$$($1_EXCLUDES))
  12.470 -      $1_ALL_CLEANS := $$(filter-out $$($1_SRC_EXCLUDES),$$($1_ALL_CLEANS))
  12.471 -    endif
  12.472 -    ifneq (,$$($1_EXCLUDE_FILES))
  12.473 -      $1_ALL_CLEANS := $$(filter-out $$($1_EXCLUDE_FILES_PATTERN),$$($1_ALL_CLEANS))
  12.474 -    endif
  12.475 -    ifneq (,$$($1_ALL_CLEANS))
  12.476 -      # Yep, there are files to be copied and cleaned!
  12.477 -      $1_ALL_COPY_CLEAN_TARGETS:=
  12.478 -          $$(foreach i,$$($1_ALL_CLEANS),$$(eval $$(call add_file_to_copy_and_clean,$1,$$i)))
  12.479 -      # Now we can depend on $$($1_ALL_COPY_CLEAN_TARGETS) to copy all files!
  12.480 -    endif
  12.481 -  endif
  12.482 -
  12.483 -  # Prep the source paths.
  12.484 -  ifneq ($$($1_JAVAC_SOURCE_PATH_OVERRIDE),)
  12.485 -    $$(eval $$(call replace_space_with_pathsep,$1_SRCROOTSC,$$($1_JAVAC_SOURCE_PATH_OVERRIDE)))
  12.486 -  else
  12.487 -    $$(eval $$(call replace_space_with_pathsep,$1_SRCROOTSC,$$($1_SRC)))
  12.488 -  endif
  12.489 -
  12.490 -  # Create a sed expression to remove the source roots and to replace / with .
  12.491 -  # and remove .java at the end.
  12.492 -  $1_REWRITE_INTO_CLASSES:=$$(foreach i,$$($1_SRC),-e 's|$$i/||g') -e 's|/|.|g' -e 's|.java$$$$||g'
  12.493 -
  12.494 -  ifeq ($$($1_DISABLE_SJAVAC)x$$(ENABLE_SJAVAC),xyes)
  12.495 -    ifneq (,$$($1_HEADERS))
  12.496 -      $1_HEADERS_ARG := -h $$($1_HEADERS)
  12.497 -    endif
  12.498 -
  12.499 -    # Using sjavac to compile.
  12.500 -    $1 := $$($1_ALL_COPY_TARGETS) $$($1_ALL_COPY_CLEAN_TARGETS) $$($1_BIN)/javac_state
  12.501 -
  12.502 -    # Create SJAVAC variable form JAVAC variable. Expects $1_JAVAC to be
  12.503 -    # "bootclasspathprepend -cp .../javac.jar com.sun.tools.javac.Main"
  12.504 -    # and javac is simply replaced with sjavac.
  12.505 -    $1_SJAVAC:=$$(subst com.sun.tools.javac.Main,com.sun.tools.sjavac.Main,$$($1_JAVAC))
  12.506 -
  12.507 -    # Set the $1_REMOTE to spawn a background javac server.
  12.508 -    $1_REMOTE:=--server:portfile=$$($1_SJAVAC_PORTFILE),id=$1,sjavac=$$(subst $$(SPACE),%20,$$(subst $$(COMMA),%2C,$$(strip $$($1_SERVER_JVM) $$($1_SJAVAC))))
  12.509 -
  12.510 -    $$($1_BIN)/javac_state: $$($1_SRCS) $$($1_DEPENDS)
  12.511 -	$(MKDIR) -p $$(@D)
  12.512 -	$$(call ListPathsSafely,$1_SRCS,\n, >> $$($1_BIN)/_the.$1_batch.tmp)
  12.513 -	$(ECHO) Compiling $1
  12.514 -	($$($1_JVM) $$($1_SJAVAC) \
  12.515 -	    $$($1_REMOTE) \
  12.516 -	    -j $(JOBS) \
  12.517 -	    --permit-unidentified-artifacts \
  12.518 -	    --permit-sources-without-package \
  12.519 -	    --compare-found-sources $$($1_BIN)/_the.$1_batch.tmp \
  12.520 -	    --log=$(LOG_LEVEL) \
  12.521 -	    $$($1_SJAVAC_ARGS) \
  12.522 -	    $$($1_FLAGS) \
  12.523 -	    $$($1_HEADERS_ARG) \
  12.524 -	    -d $$($1_BIN) && \
  12.525 -	$(MV) $$($1_BIN)/_the.$1_batch.tmp $$($1_BIN)/_the.$1_batch)
  12.526 -  else
  12.527 -    # Using plain javac to batch compile everything.
  12.528 -    $1 := $$($1_ALL_COPY_TARGETS) $$($1_ALL_COPY_CLEAN_TARGETS) $$($1_BIN)/_the.$1_batch
  12.529 -
  12.530 -    # When building in batch, put headers in a temp dir to filter out those that actually
  12.531 -    # changed before copying them to the real header dir.
  12.532 -    ifneq (,$$($1_HEADERS))
  12.533 -      $1_HEADERS_ARG := -h $$($1_HEADERS).tmp
  12.534 -
  12.535 -      $$($1_HEADERS)/_the.$1_headers: $$($1_BIN)/_the.$1_batch
  12.536 -		$(MKDIR) -p $$(@D)
  12.537 -		for f in `ls $$($1_HEADERS).tmp`; do \
  12.538 -		  if [ ! -f "$$($1_HEADERS)/$$$$f" ] || [ "`$(DIFF) $$($1_HEADERS)/$$$$f $$($1_HEADERS).tmp/$$$$f`" != "" ]; then \
  12.539 -		    $(CP) -f $$($1_HEADERS).tmp/$$$$f $$($1_HEADERS)/$$$$f; \
  12.540 -		  fi; \
  12.541 -		done
  12.542 -		$(RM) -r $$($1_HEADERS).tmp
  12.543 -		$(TOUCH) $$@
  12.544 -
  12.545 -      $1 += $$($1_HEADERS)/_the.$1_headers
  12.546 -    endif
  12.547 -
  12.548 -    # When not using sjavac, pass along all sources to javac using an @file.
  12.549 -    $$($1_BIN)/_the.$1_batch: $$($1_SRCS) $$($1_DEPENDS)
  12.550 -	$(MKDIR) -p $$(@D)
  12.551 -	$(RM) $$($1_BIN)/_the.$1_batch $$($1_BIN)/_the.$1_batch.tmp
  12.552 -	$$(call ListPathsSafely,$1_SRCS,\n, >> $$($1_BIN)/_the.$1_batch.tmp)
  12.553 -	$(ECHO) Compiling `$(WC) $$($1_BIN)/_the.$1_batch.tmp | $(TR) -s ' ' | $(CUT) -f 2 -d ' '` files for $1
  12.554 -	($$($1_JVM) $$($1_JAVAC) $$($1_FLAGS) \
  12.555 -	    -implicit:none -sourcepath "$$($1_SRCROOTSC)" \
  12.556 -	    -d $$($1_BIN) $$($1_HEADERS_ARG) @$$($1_BIN)/_the.$1_batch.tmp && \
  12.557 -	$(MV) $$($1_BIN)/_the.$1_batch.tmp $$($1_BIN)/_the.$1_batch)
  12.558 -
  12.559 -  endif
  12.560 -
  12.561 -  # Check if a jar file was specified, then setup the rules for the jar.
  12.562 -  ifneq (,$$($1_JAR))
  12.563 -    # If no suffixes was explicitly set for this jar file.
  12.564 -    # Use class and the cleaned/copied properties file suffixes as the default
  12.565 -    # for the types of files to be put into the jar.
  12.566 -    ifeq (,$$($1_SUFFIXES))
  12.567 -      $1_SUFFIXES:=.class $$($1_CLEAN) $$($1_COPY)
  12.568 -    endif
  12.569 -
  12.570 -    $$(eval $$(call SetupArchive,ARCHIVE_$1,$$($1), \
  12.571 -        SRCS:=$$($1_BIN), \
  12.572 -        SUFFIXES:=$$($1_SUFFIXES), \
  12.573 -        EXCLUDE:=$$($1_EXCLUDES), \
  12.574 -        INCLUDES:=$$($1_INCLUDES), \
  12.575 -        EXTRA_FILES:=$$($1_ALL_COPY_TARGETS) $$($1_ALL_COPY_CLEAN_TARGETS), \
  12.576 -        JAR:=$$($1_JAR), \
  12.577 -        JARMAIN:=$$($1_JARMAIN), \
  12.578 -        MANIFEST:=$$($1_MANIFEST), \
  12.579 -        EXTRA_MANIFEST_ATTR:=$$($1_EXTRA_MANIFEST_ATTR), \
  12.580 -        JARINDEX:=$$($1_JARINDEX), \
  12.581 -        HEADERS:=$$($1_HEADERS), \
  12.582 -        SETUP:=$$($1_SETUP)))
  12.583 -  endif
  12.584 -
  12.585 -  # Check if a srczip was specified, then setup the rules for the srczip.
  12.586 -  ifneq (,$$($1_SRCZIP))
  12.587 -    $$(eval $$(call SetupZipArchive,ARCHIVE_$1, \
  12.588 -        SRC:=$$($1_SRC), \
  12.589 -        ZIP:=$$($1_SRCZIP), \
  12.590 -        INCLUDES:=$$($1_INCLUDES), \
  12.591 -        EXCLUDES:=$$($1_EXCLUDES), \
  12.592 -        EXCLUDE_FILES:=$$($1_EXCLUDE_FILES)))
  12.593 -  endif
  12.594 -
  12.595 -endef
    13.1 --- a/common/makefiles/Jprt.gmk	Thu Nov 07 08:16:05 2013 -0800
    13.2 +++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
    13.3 @@ -1,248 +0,0 @@
    13.4 -#
    13.5 -# Copyright (c) 2012, 2013, Oracle and/or its affiliates. All rights reserved.
    13.6 -# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
    13.7 -#
    13.8 -# This code is free software; you can redistribute it and/or modify it
    13.9 -# under the terms of the GNU General Public License version 2 only, as
   13.10 -# published by the Free Software Foundation.  Oracle designates this
   13.11 -# particular file as subject to the "Classpath" exception as provided
   13.12 -# by Oracle in the LICENSE file that accompanied this code.
   13.13 -#
   13.14 -# This code is distributed in the hope that it will be useful, but WITHOUT
   13.15 -# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
   13.16 -# FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
   13.17 -# version 2 for more details (a copy is included in the LICENSE file that
   13.18 -# accompanied this code).
   13.19 -#
   13.20 -# You should have received a copy of the GNU General Public License version
   13.21 -# 2 along with this work; if not, write to the Free Software Foundation,
   13.22 -# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
   13.23 -#
   13.24 -# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
   13.25 -# or visit www.oracle.com if you need additional information or have any
   13.26 -# questions.
   13.27 -#
   13.28 -
   13.29 -# This file is included by the root NewerMakefile and contains targets
   13.30 -# and utilities needed by JPRT.
   13.31 -
   13.32 -# Utilities used in this Makefile. Most of this makefile executes without
   13.33 -# the context of a spec file from configure.
   13.34 -CAT=cat
   13.35 -CMP=cmp
   13.36 -CP=cp
   13.37 -ECHO=echo
   13.38 -MKDIR=mkdir
   13.39 -PRINTF=printf
   13.40 -PWD=pwd
   13.41 -# Insure we have a path that looks like it came from pwd
   13.42 -# (This is mostly for Windows sake and drive letters)
   13.43 -define UnixPath # path
   13.44 -$(shell (cd "$1" && $(PWD)))
   13.45 -endef
   13.46 -
   13.47 -BUILD_DIR_ROOT:=$(root_dir)/build
   13.48 -
   13.49 -ifdef OPENJDK
   13.50 -  OPEN_BUILD=true
   13.51 -else
   13.52 -  OPEN_BUILD := $(if $(or $(wildcard $(root_dir)/jdk/src/closed), \
   13.53 -      $(wildcard $(root_dir)/jdk/make/closed), \
   13.54 -      $(wildcard $(root_dir)/jdk/test/closed), \
   13.55 -      $(wildcard $(root_dir)/hotspot/src/closed), \
   13.56 -      $(wildcard $(root_dir)/hotspot/make/closed), \
   13.57 -      $(wildcard $(root_dir)/hotspot/test/closed)), \
   13.58 -      false,true)
   13.59 -endif
   13.60 -
   13.61 -HOTSPOT_AVAILABLE := $(if $(wildcard $(root_dir)/hotspot),true,false)
   13.62 -
   13.63 -###########################################################################
   13.64 -# To help in adoption of the new configure&&make build process, a bridge
   13.65 -# build will use the old settings to run configure and do the build.
   13.66 -
   13.67 -# Build with the configure bridge. After running configure, restart make
   13.68 -# to parse the new spec file.
   13.69 -BRIDGE_TARGETS := all
   13.70 -# Add bootcycle-images target if legacy variable is set.
   13.71 -ifeq ($(SKIP_BOOT_CYCLE),false)
   13.72 -  BRIDGE_TARGETS += bootcycle-images
   13.73 -endif
   13.74 -bridgeBuild: bridge2configure
   13.75 -	@cd $(root_dir) && $(MAKE) -f NewMakefile.gmk $(BRIDGE_TARGETS)
   13.76 -
   13.77 -# Bridge from old Makefile ALT settings to configure options
   13.78 -bridge2configure: $(BUILD_DIR_ROOT)/.bridge2configureOpts
   13.79 -	bash ./configure $(strip $(shell $(CAT) $<))
   13.80 -
   13.81 -# Create a file with configure options created from old Makefile mechanisms.
   13.82 -$(BUILD_DIR_ROOT)/.bridge2configureOpts: $(BUILD_DIR_ROOT)/.bridge2configureOptsLatest
   13.83 -	$(RM) $@
   13.84 -	$(CP) $< $@
   13.85 -
   13.86 -# Use this file to only change when obvious things have changed
   13.87 -$(BUILD_DIR_ROOT)/.bridge2configureOptsLatest: FRC
   13.88 -	$(RM) $@.tmp
   13.89 -	$(MKDIR) -p $(BUILD_DIR_ROOT)
   13.90 -	@$(ECHO) " --with-debug-level=$(if $(DEBUG_LEVEL),$(DEBUG_LEVEL),release) " >> $@.tmp
   13.91 -        ifdef ARCH_DATA_MODEL
   13.92 -	  @$(ECHO) " --with-target-bits=$(ARCH_DATA_MODEL) " >> $@.tmp
   13.93 -        endif
   13.94 -        ifeq ($(ARCH_DATA_MODEL),32)
   13.95 -	  @$(ECHO) " --with-jvm-variants=client,server " >> $@.tmp
   13.96 -        endif
   13.97 -        ifdef ALT_PARALLEL_COMPILE_JOBS
   13.98 -	  @$(ECHO) " --with-num-cores=$(ALT_PARALLEL_COMPILE_JOBS) " >> $@.tmp
   13.99 -        endif
  13.100 -        ifdef ALT_BOOTDIR
  13.101 -	  @$(ECHO) " --with-boot-jdk=$(call UnixPath,$(ALT_BOOTDIR)) " >> $@.tmp
  13.102 -        endif
  13.103 -        ifdef ALT_CUPS_HEADERS_PATH
  13.104 -	  @$(ECHO) " --with-cups-include=$(call UnixPath,$(ALT_CUPS_HEADERS_PATH)) " >> $@.tmp
  13.105 -        endif
  13.106 -        ifdef ALT_FREETYPE_HEADERS_PATH
  13.107 -	  @$(ECHO) " --with-freetype=$(call UnixPath,$(ALT_FREETYPE_HEADERS_PATH)/..) " >> $@.tmp
  13.108 -        endif
  13.109 -        ifdef ENABLE_SJAVAC
  13.110 -	  @$(ECHO) " --enable-sjavac" >> $@.tmp
  13.111 -        endif
  13.112 -        ifeq ($(HOTSPOT_AVAILABLE),false)
  13.113 -          ifdef ALT_JDK_IMPORT_PATH
  13.114 -	    @$(ECHO) " --with-import-hotspot=$(call UnixPath,$(ALT_JDK_IMPORT_PATH)) " >> $@.tmp
  13.115 -          endif
  13.116 -        endif
  13.117 -        ifeq ($(OPEN_BUILD),true)
  13.118 -	  @$(ECHO) " --enable-openjdk-only " >> $@.tmp
  13.119 -        else
  13.120 -#         Todo: move to closed?
  13.121 -          ifdef ALT_MOZILLA_HEADERS_PATH
  13.122 -	    @$(ECHO) " --with-mozilla-headers=$(call UnixPath,$(ALT_MOZILLA_HEADERS_PATH)) " >> $@.tmp
  13.123 -          endif
  13.124 -          ifdef ALT_JUNIT_DIR
  13.125 -	    @$(ECHO) " --with-junit-dir=$(call UnixPath,$(ALT_JUNIT_DIR)) " >> $@.tmp
  13.126 -          endif
  13.127 -          ifdef ANT_HOME
  13.128 -	    @$(ECHO) " --with-ant-home=$(call UnixPath,$(ANT_HOME)) " >> $@.tmp
  13.129 -          endif
  13.130 -          ifdef ALT_JAVAFX_ZIP_DIR
  13.131 -	    @$(ECHO) " --with-javafx-zip-dir=$(call UnixPath,$(ALT_JAVAFX_ZIP_DIR)) " >> $@.tmp
  13.132 -          endif
  13.133 -          ifdef ALT_JMC_ZIP_DIR
  13.134 -	    @$(ECHO) " --with-jmc-zip-dir=$(call UnixPath,$(ALT_JMC_ZIP_DIR)) " >> $@.tmp
  13.135 -          endif
  13.136 -          ifdef ALT_WIXDIR
  13.137 -	    @$(ECHO) " --with-wix=$(call UnixPath,$(ALT_WIXDIR)) " >> $@.tmp
  13.138 -          endif
  13.139 -          ifdef ALT_INSTALL_LZMA_PATH
  13.140 -	    @$(ECHO) " --with-lzma-path=$(call UnixPath,$(ALT_INSTALL_LZMA_PATH)) " >> $@.tmp
  13.141 -          endif
  13.142 -          ifdef ALT_INSTALL_UPX_PATH
  13.143 -	    @$(ECHO) " --with-upx-path=$(call UnixPath,$(ALT_INSTALL_UPX_PATH)) " >> $@.tmp
  13.144 -          endif
  13.145 -          ifdef ALT_INSTALL_UPX_FILENAME
  13.146 -	    @$(ECHO) " --with-upx-filename=$(call UnixPath,$(ALT_INSTALL_UPX_FILENAME)) " >> $@.tmp
  13.147 -          endif
  13.148 -          ifdef ALT_CCSS_SIGNING_DIR
  13.149 -	    @$(ECHO) " --with-ccss-signing=$(call UnixPath,$(ALT_CCSS_SIGNING_DIR)) " >> $@.tmp
  13.150 -          endif
  13.151 -          ifdef ALT_SLASH_JAVA
  13.152 -	    @$(ECHO) " --with-java-devtools=$(call UnixPath,$(ALT_SLASH_JAVA)/devtools) " >> $@.tmp
  13.153 -          endif
  13.154 -          ifdef ALT_SPARKLE_FRAMEWORK_DIR
  13.155 -	    @$(ECHO) " --with-sparkle-framework=$(call UnixPath,$(ALT_SPARKLE_FRAMEWORK_DIR)) " >> $@.tmp
  13.156 -          endif
  13.157 -        endif
  13.158 -	@if [ -f $@ ] ; then \
  13.159 -	  if ! $(CMP) $@ $@.tmp > /dev/null ; then \
  13.160 -	    $(CP) $@.tmp $@ ; \
  13.161 -	  fi ; \
  13.162 -	else \
  13.163 -	  $(CP) $@.tmp $@ ; \
  13.164 -	fi
  13.165 -	$(RM) $@.tmp
  13.166 -
  13.167 -PHONY_LIST += bridge2configure bridgeBuild
  13.168 -
  13.169 -###########################################################################
  13.170 -# JPRT targets
  13.171 -
  13.172 -ifndef JPRT_ARCHIVE_BUNDLE
  13.173 -  JPRT_ARCHIVE_BUNDLE=/tmp/jprt_bundles/j2sdk-image.zip
  13.174 -endif
  13.175 -ifndef JPRT_ARCHIVE_INSTALL_BUNDLE
  13.176 -  JPRT_ARCHIVE_INSTALL_BUNDLE=/tmp/jprt_bundles/product-install.zip
  13.177 -endif
  13.178 -
  13.179 -# These targets execute in a SPEC free context, before calling bridgeBuild
  13.180 -# to generate the SPEC.
  13.181 -jprt_build_product: DEBUG_LEVEL=release
  13.182 -jprt_build_product: BUILD_DIRNAME=*-release
  13.183 -jprt_build_product: jprt_build_generic
  13.184 -
  13.185 -jprt_build_fastdebug: DEBUG_LEVEL=fastdebug
  13.186 -jprt_build_fastdebug: BUILD_DIRNAME=*-fastdebug
  13.187 -jprt_build_fastdebug: jprt_build_generic
  13.188 -
  13.189 -jprt_build_debug: DEBUG_LEVEL=slowdebug
  13.190 -jprt_build_debug: BUILD_DIRNAME=*-debug
  13.191 -jprt_build_debug: jprt_build_generic
  13.192 -
  13.193 -jprt_build_generic: BRIDGE_TARGETS+=jprt_bundle
  13.194 -jprt_build_generic: bridgeBuild
  13.195 -
  13.196 -# This target must be called in the context of a SPEC file
  13.197 -jprt_bundle: $(JPRT_ARCHIVE_BUNDLE)
  13.198 -	@$(call CheckIfMakeAtEnd)
  13.199 -
  13.200 -# This target must be called in the context of a SPEC file
  13.201 -$(JPRT_ARCHIVE_BUNDLE): bundles
  13.202 -	$(MKDIR) -p $(@D)
  13.203 -	$(RM) $@
  13.204 -	$(CP) $(BUILD_OUTPUT)/bundles/$(JDK_IMAGE_SUBDIR).zip $@
  13.205 -
  13.206 -SRC_JDK_IMAGE_DIR := $(JDK_IMAGE_DIR)
  13.207 -SRC_JRE_IMAGE_DIR := $(JRE_IMAGE_DIR)
  13.208 -SRC_JDK_BUNDLE_DIR := $(JDK_BUNDLE_DIR)
  13.209 -SRC_JRE_BUNDLE_DIR := $(JRE_BUNDLE_DIR)
  13.210 -
  13.211 -# Bundle up the images
  13.212 -bundles: all bundles-only
  13.213 -bundles-only: start-make
  13.214 -	@$(call TargetEnter)
  13.215 -	$(MKDIR) -p $(BUILD_OUTPUT)/bundles
  13.216 -	$(CD) $(SRC_JDK_IMAGE_DIR) && $(ZIP) -y -q -r $(BUILD_OUTPUT)/bundles/$(JDK_IMAGE_SUBDIR).zip .
  13.217 -	$(CD) $(SRC_JRE_IMAGE_DIR) && $(ZIP) -y -q -r $(BUILD_OUTPUT)/bundles/$(JRE_IMAGE_SUBDIR).zip .
  13.218 -	if [ -d $(BUILD_OUTPUT)/install/bundles ] ; then \
  13.219 -	  $(CD) $(BUILD_OUTPUT)/install/bundles && $(ZIP) -y -q -r $(JPRT_ARCHIVE_INSTALL_BUNDLE) . ; \
  13.220 -	fi
  13.221 -	@$(call TargetExit)
  13.222 -
  13.223 -# Copy images to one unified location regardless of platform etc.
  13.224 -final-images: all final-images-only
  13.225 -final-images-only: start-make
  13.226 -	@$(call TargetEnter)
  13.227 -	$(RM) -r $(BUILD_OUTPUT)/final-images
  13.228 -	$(MKDIR) -p $(BUILD_OUTPUT)/final-images/$(JDK_IMAGE_SUBDIR)
  13.229 -	$(MKDIR) -p $(BUILD_OUTPUT)/final-images/$(JRE_IMAGE_SUBDIR)
  13.230 -	$(CP) -R -P $(SRC_JDK_IMAGE_DIR)/* $(BUILD_OUTPUT)/final-images/$(JDK_IMAGE_SUBDIR)/
  13.231 -	$(CP) -R -P $(SRC_JRE_IMAGE_DIR)/* $(BUILD_OUTPUT)/final-images/$(JRE_IMAGE_SUBDIR)/
  13.232 -        ifeq ($(OPENJDK_TARGET_OS),macosx)
  13.233 -	  $(MKDIR) -p $(BUILD_OUTPUT)/final-images/$(JDK_BUNDLE_SUBDIR)
  13.234 -	  $(MKDIR) -p $(BUILD_OUTPUT)/final-images/$(JRE_BUNDLE_SUBDIR)
  13.235 -	  $(CP) -R -P $(SRC_JDK_BUNDLE_DIR)/* $(BUILD_OUTPUT)/final-images/$(JDK_BUNDLE_SUBDIR)/
  13.236 -	  $(CP) -R -P $(SRC_JRE_BUNDLE_DIR)/* $(BUILD_OUTPUT)/final-images/$(JRE_BUNDLE_SUBDIR)/
  13.237 -        endif
  13.238 -	@$(call TargetExit)
  13.239 -
  13.240 -
  13.241 -# Keep track of phony targets
  13.242 -PHONY_LIST += jprt_build_product jprt_build_fastdebug jprt_build_debug \
  13.243 -    jprt_build_generic bundles jprt_bundle \
  13.244 -    final-images final-images-only
  13.245 -
  13.246 -###########################################################################
  13.247 -# Phony targets
  13.248 -.PHONY: $(PHONY_LIST)
  13.249 -
  13.250 -# Force target
  13.251 -FRC:
    14.1 --- a/common/makefiles/Main.gmk	Thu Nov 07 08:16:05 2013 -0800
    14.2 +++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
    14.3 @@ -1,245 +0,0 @@
    14.4 -#
    14.5 -# Copyright (c) 2011, 2013, Oracle and/or its affiliates. All rights reserved.
    14.6 -# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
    14.7 -#
    14.8 -# This code is free software; you can redistribute it and/or modify it
    14.9 -# under the terms of the GNU General Public License version 2 only, as
   14.10 -# published by the Free Software Foundation.  Oracle designates this
   14.11 -# particular file as subject to the "Classpath" exception as provided
   14.12 -# by Oracle in the LICENSE file that accompanied this code.
   14.13 -#
   14.14 -# This code is distributed in the hope that it will be useful, but WITHOUT
   14.15 -# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
   14.16 -# FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
   14.17 -# version 2 for more details (a copy is included in the LICENSE file that
   14.18 -# accompanied this code).
   14.19 -#
   14.20 -# You should have received a copy of the GNU General Public License version
   14.21 -# 2 along with this work; if not, write to the Free Software Foundation,
   14.22 -# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
   14.23 -#
   14.24 -# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
   14.25 -# or visit www.oracle.com if you need additional information or have any
   14.26 -# questions.
   14.27 -#
   14.28 -
   14.29 -### This is the main part of the Makefile, for the normal case with SPEC specifying a single existing spec.gmk file.
   14.30 -
   14.31 -# Now load the spec
   14.32 -include $(SPEC)
   14.33 -
   14.34 -# Load the vital tools for all the makefiles.
   14.35 -include $(SRC_ROOT)/common/makefiles/MakeBase.gmk
   14.36 -
   14.37 -# Include the corresponding custom file, if present.
   14.38 --include $(CUSTOM_MAKE_DIR)/Main.gmk
   14.39 -
   14.40 -### Clean up from previous run
   14.41 -
   14.42 -# Remove any build.log from a previous run, if they exist
   14.43 -ifneq (,$(BUILD_LOG))
   14.44 -  ifneq (,$(BUILD_LOG_PREVIOUS))
   14.45 -    # Rotate old log
   14.46 -    $(shell $(RM) $(BUILD_LOG_PREVIOUS) 2> /dev/null)
   14.47 -    $(shell $(MV) $(BUILD_LOG) $(BUILD_LOG_PREVIOUS) 2> /dev/null)
   14.48 -  else
   14.49 -    $(shell $(RM) $(BUILD_LOG) 2> /dev/null)
   14.50 -  endif
   14.51 -  $(shell $(RM) $(OUTPUT_ROOT)/build-trace-time.log 2> /dev/null)
   14.52 -endif
   14.53 -# Remove any javac server logs and port files. This
   14.54 -# prevents a new make run to reuse the previous servers.
   14.55 -ifneq (,$(SJAVAC_SERVER_DIR))
   14.56 -  $(shell $(MKDIR) -p $(SJAVAC_SERVER_DIR) && $(RM) -rf $(SJAVAC_SERVER_DIR)/*)
   14.57 -endif
   14.58 -
   14.59 -# Reset the build timers.
   14.60 -$(eval $(call ResetAllTimers))
   14.61 -
   14.62 -# Setup number of jobs to use. -jN is unfortunately not available for us to parse from the command line,
   14.63 -# hence this workaround.
   14.64 -MAKE_ARGS:=$(MAKE_ARGS) -j$(JOBS)
   14.65 -
   14.66 -### Main targets
   14.67 -
   14.68 -default: jdk
   14.69 -	@$(call CheckIfMakeAtEnd)
   14.70 -
   14.71 -all: images docs
   14.72 -	@$(call CheckIfMakeAtEnd)
   14.73 -
   14.74 -# Setup a rule for SPEC file that fails if executed. This check makes sure the configuration
   14.75 -# is up to date after changes to configure
   14.76 -$(SPEC): $(wildcard $(SRC_ROOT)/common/autoconf/*)
   14.77 -	@$(ECHO) ERROR: $(SPEC) is not up to date
   14.78 -	@$(ECHO) Please rerun configure!
   14.79 -	@if test "x$(IGNORE_OLD_CONFIG)" != "xtrue"; then exit 1; fi
   14.80 -
   14.81 -start-make: $(SPEC)
   14.82 -	@$(call AtMakeStart)
   14.83 -
   14.84 -langtools: langtools-only
   14.85 -langtools-only: start-make
   14.86 -	@$(call TargetEnter)
   14.87 -	@($(CD) $(LANGTOOLS_TOPDIR)/makefiles && $(BUILD_LOG_WRAPPER) $(MAKE) $(MAKE_ARGS) -f BuildLangtools.gmk)
   14.88 -	@$(call TargetExit)
   14.89 -
   14.90 -corba: langtools corba-only
   14.91 -corba-only: start-make
   14.92 -	@$(call TargetEnter)
   14.93 -	@($(CD) $(CORBA_TOPDIR)/makefiles && $(BUILD_LOG_WRAPPER) $(MAKE) $(MAKE_ARGS) -f BuildCorba.gmk)
   14.94 -	@$(call TargetExit)
   14.95 -
   14.96 -jaxp: langtools jaxp-only
   14.97 -jaxp-only: start-make
   14.98 -	@$(call TargetEnter)
   14.99 -	@($(CD) $(JAXP_TOPDIR)/makefiles && $(BUILD_LOG_WRAPPER) $(MAKE) $(MAKE_ARGS) -f BuildJaxp.gmk)
  14.100 -	@$(call TargetExit)
  14.101 -
  14.102 -jaxws: langtools jaxp jaxws-only
  14.103 -jaxws-only: start-make
  14.104 -	@$(call TargetEnter)
  14.105 -	@($(CD) $(JAXWS_TOPDIR)/makefiles && $(BUILD_LOG_WRAPPER) $(MAKE) $(MAKE_ARGS) -f BuildJaxws.gmk)
  14.106 -	@$(call TargetExit)
  14.107 -
  14.108 -ifeq ($(BUILD_HOTSPOT),true)
  14.109 -  hotspot: hotspot-only
  14.110 -  hotspot-only: start-make
  14.111 -	@$(call TargetEnter)
  14.112 -	@($(CD) $(SRC_ROOT)/common/makefiles && $(BUILD_LOG_WRAPPER) $(MAKE) $(MAKE_ARGS) -f HotspotWrapper.gmk)
  14.113 -	@$(call TargetExit)
  14.114 -endif
  14.115 -
  14.116 -jdk: langtools hotspot corba jaxp jaxws jdk-only
  14.117 -jdk-only: start-make
  14.118 -	@$(call TargetEnter)
  14.119 -	@($(CD) $(JDK_TOPDIR)/makefiles && $(BUILD_LOG_WRAPPER) $(MAKE) $(MAKE_ARGS) -f BuildJdk.gmk $(JDK_TARGET))
  14.120 -	@$(call TargetExit)
  14.121 -
  14.122 -nashorn: jdk nashorn-only
  14.123 -nashorn-only: start-make
  14.124 -	@$(call TargetEnter)
  14.125 -	@($(CD) $(NASHORN_TOPDIR)/makefiles && $(BUILD_LOG_WRAPPER) $(MAKE) $(MAKE_ARGS) -f BuildNashorn.gmk)
  14.126 -	@$(call TargetExit)
  14.127 -
  14.128 -demos: jdk demos-only
  14.129 -demos-only: start-make
  14.130 -	@$(call TargetEnter)
  14.131 -	@($(CD) $(JDK_TOPDIR)/makefiles && $(BUILD_LOG_WRAPPER) $(MAKE) $(MAKE_ARGS) -f BuildJdk.gmk demos)
  14.132 -	@$(call TargetExit)
  14.133 -
  14.134 -# Note: This double-colon rule is intentional, to support
  14.135 -# custom make file integration.
  14.136 -images:: source-tips demos nashorn images-only
  14.137 -images-only: start-make
  14.138 -	@$(call TargetEnter)
  14.139 -	@($(CD) $(JDK_TOPDIR)/makefiles && $(BUILD_LOG_WRAPPER) $(MAKE) $(MAKE_ARGS) -f BuildJdk.gmk images)
  14.140 -	@$(call TargetExit)
  14.141 -
  14.142 -overlay-images: source-tips demos overlay-images-only
  14.143 -overlay-images-only: start-make
  14.144 -	@$(call TargetEnter)
  14.145 -	@($(CD) $(JDK_TOPDIR)/makefiles && $(BUILD_LOG_WRAPPER) $(MAKE) $(MAKE_ARGS) -f BuildJdk.gmk overlay-images)
  14.146 -	@$(call TargetExit)
  14.147 -
  14.148 -profiles: profiles-oscheck source-tips jdk hotspot profiles-only
  14.149 -profiles-only: start-make
  14.150 -	@$(call TargetEnter)
  14.151 -	@($(CD) $(JDK_TOPDIR)/makefiles && $(BUILD_LOG_WRAPPER) $(MAKE) $(MAKE_ARGS) -f BuildJdk.gmk profiles)
  14.152 -	@$(call TargetExit)
  14.153 -
  14.154 -profiles-oscheck:
  14.155 -        ifneq ($(OPENJDK_TARGET_OS), linux)
  14.156 -	  @echo "Error: The Java SE 8 Compact Profiles are only implemented for Linux at this time" && exit 1
  14.157 -        endif
  14.158 -
  14.159 -install: images install-only
  14.160 -install-only: start-make
  14.161 -	@$(call TargetEnter)
  14.162 -	@($(CD) $(JDK_TOPDIR)/makefiles && $(BUILD_LOG_WRAPPER) $(MAKE) $(MAKE_ARGS) -f BuildJdk.gmk install)
  14.163 -	@$(call TargetExit)
  14.164 -
  14.165 -docs: jdk docs-only
  14.166 -docs-only: start-make
  14.167 -	@$(call TargetEnter)
  14.168 -	@($(CD) $(SRC_ROOT)/common/makefiles/javadoc && $(BUILD_LOG_WRAPPER) $(MAKE) $(MAKE_ARGS) -f Javadoc.gmk docs)
  14.169 -	@$(call TargetExit)
  14.170 -
  14.171 -sign-jars: jdk sign-jars-only
  14.172 -sign-jars-only: start-make
  14.173 -	@$(call TargetEnter)
  14.174 -	@($(CD) $(JDK_TOPDIR)/makefiles && $(BUILD_LOG_WRAPPER) $(MAKE) $(MAKE_ARGS) -f BuildJdk.gmk sign-jars)
  14.175 -	@$(call TargetExit)
  14.176 -
  14.177 -bootcycle-images: images bootcycle-images-only
  14.178 -bootcycle-images-only: start-make
  14.179 -	@$(ECHO) Boot cycle build step 2: Building a new JDK image using previously built image
  14.180 -	@($(CD) $(SRC_ROOT)/common/makefiles && $(BUILD_LOG_WRAPPER) $(MAKE) SPEC=$(dir $(SPEC))bootcycle-spec.gmk images)
  14.181 -
  14.182 -test: images test-only
  14.183 -test-only: start-make
  14.184 -	@$(call TargetEnter)
  14.185 -	@($(CD) $(SRC_ROOT)/test && $(BUILD_LOG_WRAPPER) $(MAKE) -j1 -k MAKEFLAGS= JT_HOME=$(JT_HOME) PRODUCT_HOME=$(JDK_IMAGE_DIR) ALT_OUTPUTDIR=$(OUTPUT_ROOT) CONCURRENCY=$(JOBS) $(TEST)) || true
  14.186 -	@$(call TargetExit)
  14.187 -
  14.188 -# Stores the tips for each repository. This file is be used when constructing the jdk image and can be
  14.189 -# used to track the exact sources used to build that image.
  14.190 -source-tips: $(OUTPUT_ROOT)/source_tips
  14.191 -$(OUTPUT_ROOT)/source_tips: FRC
  14.192 -	@$(MKDIR) -p $(@D)
  14.193 -	@$(RM) $@
  14.194 -	@$(call GetSourceTips)
  14.195 -
  14.196 -
  14.197 -# Remove everything, except the output from configure.
  14.198 -clean: clean-langtools clean-corba clean-jaxp clean-jaxws clean-hotspot clean-jdk clean-nashorn clean-images clean-overlay-images clean-bootcycle-build clean-docs clean-test
  14.199 -	@($(CD) $(OUTPUT_ROOT) && $(RM) -r tmp source_tips build.log* build-trace*.log*)
  14.200 -	@$(ECHO) Cleaned all build artifacts.
  14.201 -
  14.202 -# Remove everything, including configure configuration.
  14.203 -# If the output directory was created by configure and now becomes empty, remove it as well.
  14.204 -# FIXME: tmp should not be here, fix ResetTimers instead. And remove spec.sh!
  14.205 -dist-clean: clean
  14.206 -	@($(CD) $(OUTPUT_ROOT) && $(RM) -r *spec.gmk config.* configure-arguments Makefile compare.sh spec.sh tmp javacservers)
  14.207 -	@$(if $(filter $(CONF_NAME),$(notdir $(OUTPUT_ROOT))), \
  14.208 -	  if test "x`$(LS) $(OUTPUT_ROOT)`" != x; then \
  14.209 -	    $(ECHO) "Warning: Not removing non-empty configuration directory for '$(CONF_NAME)'" ; \
  14.210 -	  else \
  14.211 -	    ($(CD) $(SRC_ROOT) && $(ECHO) "Removing configuration directory for '$(CONF_NAME)'" && $(RM) -r $(OUTPUT_ROOT)) \
  14.212 -	  fi \
  14.213 -	)
  14.214 -	@$(ECHO) Cleaned everything, you will have to re-run configure.
  14.215 -
  14.216 -clean-langtools:
  14.217 -	$(call CleanComponent,langtools)
  14.218 -clean-corba:
  14.219 -	$(call CleanComponent,corba)
  14.220 -clean-jaxp:
  14.221 -	$(call CleanComponent,jaxp)
  14.222 -clean-jaxws:
  14.223 -	$(call CleanComponent,jaxws)
  14.224 -clean-hotspot:
  14.225 -	$(call CleanComponent,hotspot)
  14.226 -clean-jdk:
  14.227 -	$(call CleanComponent,jdk)
  14.228 -clean-nashorn:
  14.229 -	$(call CleanComponent,nashorn)
  14.230 -clean-images:
  14.231 -	$(call CleanComponent,images)
  14.232 -clean-overlay-images:
  14.233 -	$(call CleanComponent,overlay-images)
  14.234 -clean-bootcycle-build:
  14.235 -	$(call CleanComponent,bootcycle-build)
  14.236 -clean-docs:
  14.237 -	$(call CleanComponent,docs)
  14.238 -	$(call CleanComponent,docstemp)
  14.239 -clean-test:
  14.240 -	$(call CleanComponent,testoutput)
  14.241 -
  14.242 -.PHONY: langtools corba jaxp jaxws hotspot jdk nashorn images overlay-images install test docs
  14.243 -.PHONY: langtools-only corba-only jaxp-only jaxws-only hotspot-only jdk-only nashorn-only images-only overlay-images-only install-only test-only docs-only
  14.244 -.PHONY: default all clean dist-clean bootcycle-images start-make
  14.245 -.PHONY: clean-langtools clean-corba clean-jaxp clean-jaxws clean-hotspot clean-jdk clean-nashorn clean-images clean-docs clean-test clean-overlay-images clean-bootcycle-build
  14.246 -.PHONY: profiles profiles-only profiles-oscheck
  14.247 -
  14.248 -FRC: # Force target
    15.1 --- a/common/makefiles/MakeBase.gmk	Thu Nov 07 08:16:05 2013 -0800
    15.2 +++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
    15.3 @@ -1,449 +0,0 @@
    15.4 -#
    15.5 -# Copyright (c) 2011, 2012, Oracle and/or its affiliates. All rights reserved.
    15.6 -# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
    15.7 -#
    15.8 -# This code is free software; you can redistribute it and/or modify it
    15.9 -# under the terms of the GNU General Public License version 2 only, as
   15.10 -# published by the Free Software Foundation.  Oracle designates this
   15.11 -# particular file as subject to the "Classpath" exception as provided
   15.12 -# by Oracle in the LICENSE file that accompanied this code.
   15.13 -#
   15.14 -# This code is distributed in the hope that it will be useful, but WITHOUT
   15.15 -# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
   15.16 -# FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
   15.17 -# version 2 for more details (a copy is included in the LICENSE file that
   15.18 -# accompanied this code).
   15.19 -#
   15.20 -# You should have received a copy of the GNU General Public License version
   15.21 -# 2 along with this work; if not, write to the Free Software Foundation,
   15.22 -# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
   15.23 -#
   15.24 -# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
   15.25 -# or visit www.oracle.com if you need additional information or have any
   15.26 -# questions.
   15.27 -#
   15.28 -
   15.29 -################################################################
   15.30 -#
   15.31 -# Check that GNU make and cygwin are recent enough.
   15.32 -# Setup common utility functions.
   15.33 -#
   15.34 -################################################################
   15.35 -
   15.36 -ifndef _MAKEBASE_GMK
   15.37 -_MAKEBASE_GMK := 1
   15.38 -
   15.39 -# If the variable that you want to send to stdout for piping into a file or otherwise,
   15.40 -# is potentially long, for example the a list of file paths, eg a list of all package directories.
   15.41 -# Then you need to use ListPathsSafely, which optimistically splits the output into several shell
   15.42 -# calls as well as use compression on recurrent file paths segments, to get around the potential
   15.43 -# command line length problem that exists in cygwin and other shells.
   15.44 -compress_pre:=$(strip $(shell $(CAT) $(SRC_ROOT)/common/makefiles/support/ListPathsSafely-pre-compress.incl))
   15.45 -compress_post:=$(strip $(shell $(CAT) $(SRC_ROOT)/common/makefiles/support/ListPathsSafely-post-compress.incl))
   15.46 -compress_paths=$(compress_pre)\
   15.47 -$(subst $(SRC_ROOT),X97,\
   15.48 -$(subst $(OUTPUT_ROOT),X98,\
   15.49 -$(subst X,X00,\
   15.50 -$(subst $(SPACE),\n,$(strip $1)))))\
   15.51 -$(compress_post)
   15.52 -
   15.53 -decompress_paths=$(SED) -f $(SRC_ROOT)/common/makefiles/support/ListPathsSafely-uncompress.sed -e 's|X99|\\n|g' \
   15.54 -    -e 's|X98|$(OUTPUT_ROOT)|g' -e 's|X97|$(SRC_ROOT)|g' \
   15.55 -    -e 's|X00|X|g' | tr '\n' '$2'
   15.56 -
   15.57 -define ListPathsSafely_If
   15.58 -	$(if $(word $3,$($1)),$(eval $1_LPS$3:=$(call compress_paths,$(wordlist $3,$4,$($1)))))
   15.59 -endef
   15.60 -
   15.61 -define ListPathsSafely_Printf
   15.62 -	$(if $(strip $($1_LPS$4)),$(if $(findstring $(LOG_LEVEL),trace),,@)printf \
   15.63 -	    -- "$(strip $($1_LPS$4))\n" | $(decompress_paths) $3)
   15.64 -endef
   15.65 -
   15.66 -# Receipt example:
   15.67 -#   rm -f thepaths
   15.68 -#   $(call ListPathsSafely,THEPATHS,\n, >> thepaths)
   15.69 -# The \n argument means translate spaces into \n
   15.70 -# if instead , , (a space) is supplied, then spaces remain spaces.
   15.71 -define ListPathsSafely
   15.72 -	$(if $(word 16001,$($1)),$(error Cannot list safely more than 16000 paths. $1 has $(words $($1)) paths!))
   15.73 -	$(ECHO) $(LOG_DEBUG) Writing $(words $($1)) paths to '$3'
   15.74 -	$(call ListPathsSafely_If,$1,$2,1,250)
   15.75 -	$(call ListPathsSafely_If,$1,$2,251,500)
   15.76 -	$(call ListPathsSafely_If,$1,$2,501,750)
   15.77 -	$(call ListPathsSafely_If,$1,$2,751,1000)
   15.78 -
   15.79 -	$(call ListPathsSafely_If,$1,$2,1001,1250)
   15.80 -	$(call ListPathsSafely_If,$1,$2,1251,1500)
   15.81 -	$(call ListPathsSafely_If,$1,$2,1501,1750)
   15.82 -	$(call ListPathsSafely_If,$1,$2,1751,2000)
   15.83 -
   15.84 -	$(call ListPathsSafely_If,$1,$2,2001,2250)
   15.85 -	$(call ListPathsSafely_If,$1,$2,2251,2500)
   15.86 -	$(call ListPathsSafely_If,$1,$2,2501,2750)
   15.87 -	$(call ListPathsSafely_If,$1,$2,2751,3000)
   15.88 -
   15.89 -	$(call ListPathsSafely_If,$1,$2,3001,3250)
   15.90 -	$(call ListPathsSafely_If,$1,$2,3251,3500)
   15.91 -	$(call ListPathsSafely_If,$1,$2,3501,3750)
   15.92 -	$(call ListPathsSafely_If,$1,$2,3751,4000)
   15.93 -
   15.94 -	$(call ListPathsSafely_If,$1,$2,4001,4250)
   15.95 -	$(call ListPathsSafely_If,$1,$2,4251,4500)
   15.96 -	$(call ListPathsSafely_If,$1,$2,4501,4750)
   15.97 -	$(call ListPathsSafely_If,$1,$2,4751,5000)
   15.98 -
   15.99 -	$(call ListPathsSafely_If,$1,$2,5001,5250)
  15.100 -	$(call ListPathsSafely_If,$1,$2,5251,5500)
  15.101 -	$(call ListPathsSafely_If,$1,$2,5501,5750)
  15.102 -	$(call ListPathsSafely_If,$1,$2,5751,6000)
  15.103 -
  15.104 -	$(call ListPathsSafely_If,$1,$2,6001,6250)
  15.105 -	$(call ListPathsSafely_If,$1,$2,6251,6500)
  15.106 -	$(call ListPathsSafely_If,$1,$2,6501,6750)
  15.107 -	$(call ListPathsSafely_If,$1,$2,6751,7000)
  15.108 -
  15.109 -	$(call ListPathsSafely_If,$1,$2,7001,7250)
  15.110 -	$(call ListPathsSafely_If,$1,$2,7251,7500)
  15.111 -	$(call ListPathsSafely_If,$1,$2,7501,7750)
  15.112 -	$(call ListPathsSafely_If,$1,$2,7751,8000)
  15.113 -
  15.114 -	$(call ListPathsSafely_If,$1,$2,8001,8250)
  15.115 -	$(call ListPathsSafely_If,$1,$2,8251,8500)
  15.116 -	$(call ListPathsSafely_If,$1,$2,8501,8750)
  15.117 -	$(call ListPathsSafely_If,$1,$2,8751,9000)
  15.118 -
  15.119 -	$(call ListPathsSafely_If,$1,$2,9001,9250)
  15.120 -	$(call ListPathsSafely_If,$1,$2,9251,9500)
  15.121 -	$(call ListPathsSafely_If,$1,$2,9501,9750)
  15.122 -	$(call ListPathsSafely_If,$1,$2,9751,10000)
  15.123 -
  15.124 -	$(call ListPathsSafely_If,$1,$2,10001,10250)
  15.125 -	$(call ListPathsSafely_If,$1,$2,10251,10500)
  15.126 -	$(call ListPathsSafely_If,$1,$2,10501,10750)
  15.127 -	$(call ListPathsSafely_If,$1,$2,10751,11000)
  15.128 -
  15.129 -	$(call ListPathsSafely_If,$1,$2,11001,11250)
  15.130 -	$(call ListPathsSafely_If,$1,$2,11251,11500)
  15.131 -	$(call ListPathsSafely_If,$1,$2,11501,11750)
  15.132 -	$(call ListPathsSafely_If,$1,$2,11751,12000)
  15.133 -
  15.134 -	$(call ListPathsSafely_If,$1,$2,12001,12250)
  15.135 -	$(call ListPathsSafely_If,$1,$2,12251,12500)
  15.136 -	$(call ListPathsSafely_If,$1,$2,12501,12750)
  15.137 -	$(call ListPathsSafely_If,$1,$2,12751,13000)
  15.138 -
  15.139 -	$(call ListPathsSafely_If,$1,$2,13001,13250)
  15.140 -	$(call ListPathsSafely_If,$1,$2,13251,13500)
  15.141 -	$(call ListPathsSafely_If,$1,$2,13501,13750)
  15.142 -	$(call ListPathsSafely_If,$1,$2,13751,14000)
  15.143 -
  15.144 -	$(call ListPathsSafely_If,$1,$2,14001,14250)
  15.145 -	$(call ListPathsSafely_If,$1,$2,14251,14500)
  15.146 -	$(call ListPathsSafely_If,$1,$2,14501,14750)
  15.147 -	$(call ListPathsSafely_If,$1,$2,14751,15000)
  15.148 -
  15.149 -	$(call ListPathsSafely_If,$1,$2,15001,15250)
  15.150 -	$(call ListPathsSafely_If,$1,$2,15251,15500)
  15.151 -	$(call ListPathsSafely_If,$1,$2,15501,15750)
  15.152 -	$(call ListPathsSafely_If,$1,$2,15751,16000)
  15.153 -
  15.154 -	$(call ListPathsSafely_Printf,$1,$2,$3,1)
  15.155 -	$(call ListPathsSafely_Printf,$1,$2,$3,251)
  15.156 -	$(call ListPathsSafely_Printf,$1,$2,$3,501)
  15.157 -	$(call ListPathsSafely_Printf,$1,$2,$3,751)
  15.158 -
  15.159 -	$(call ListPathsSafely_Printf,$1,$2,$3,1001)
  15.160 -	$(call ListPathsSafely_Printf,$1,$2,$3,1251)
  15.161 -	$(call ListPathsSafely_Printf,$1,$2,$3,1501)
  15.162 -	$(call ListPathsSafely_Printf,$1,$2,$3,1751)
  15.163 -
  15.164 -	$(call ListPathsSafely_Printf,$1,$2,$3,2001)
  15.165 -	$(call ListPathsSafely_Printf,$1,$2,$3,2251)
  15.166 -	$(call ListPathsSafely_Printf,$1,$2,$3,2501)
  15.167 -	$(call ListPathsSafely_Printf,$1,$2,$3,2751)
  15.168 -
  15.169 -	$(call ListPathsSafely_Printf,$1,$2,$3,3001)
  15.170 -	$(call ListPathsSafely_Printf,$1,$2,$3,3251)
  15.171 -	$(call ListPathsSafely_Printf,$1,$2,$3,3501)
  15.172 -	$(call ListPathsSafely_Printf,$1,$2,$3,3751)
  15.173 -
  15.174 -	$(call ListPathsSafely_Printf,$1,$2,$3,4001)
  15.175 -	$(call ListPathsSafely_Printf,$1,$2,$3,4251)
  15.176 -	$(call ListPathsSafely_Printf,$1,$2,$3,4501)
  15.177 -	$(call ListPathsSafely_Printf,$1,$2,$3,4751)
  15.178 -
  15.179 -	$(call ListPathsSafely_Printf,$1,$2,$3,5001)
  15.180 -	$(call ListPathsSafely_Printf,$1,$2,$3,5251)
  15.181 -	$(call ListPathsSafely_Printf,$1,$2,$3,5501)
  15.182 -	$(call ListPathsSafely_Printf,$1,$2,$3,5751)
  15.183 -
  15.184 -	$(call ListPathsSafely_Printf,$1,$2,$3,6001)
  15.185 -	$(call ListPathsSafely_Printf,$1,$2,$3,6251)
  15.186 -	$(call ListPathsSafely_Printf,$1,$2,$3,6501)
  15.187 -	$(call ListPathsSafely_Printf,$1,$2,$3,6751)
  15.188 -
  15.189 -	$(call ListPathsSafely_Printf,$1,$2,$3,7001)
  15.190 -	$(call ListPathsSafely_Printf,$1,$2,$3,7251)
  15.191 -	$(call ListPathsSafely_Printf,$1,$2,$3,7501)
  15.192 -	$(call ListPathsSafely_Printf,$1,$2,$3,7751)
  15.193 -
  15.194 -	$(call ListPathsSafely_Printf,$1,$2,$3,8001)
  15.195 -	$(call ListPathsSafely_Printf,$1,$2,$3,8251)
  15.196 -	$(call ListPathsSafely_Printf,$1,$2,$3,8501)
  15.197 -	$(call ListPathsSafely_Printf,$1,$2,$3,8751)
  15.198 -
  15.199 -	$(call ListPathsSafely_Printf,$1,$2,$3,9001)
  15.200 -	$(call ListPathsSafely_Printf,$1,$2,$3,9251)
  15.201 -	$(call ListPathsSafely_Printf,$1,$2,$3,9501)
  15.202 -	$(call ListPathsSafely_Printf,$1,$2,$3,9751)
  15.203 -
  15.204 -	$(call ListPathsSafely_Printf,$1,$2,$3,10001)
  15.205 -	$(call ListPathsSafely_Printf,$1,$2,$3,10251)
  15.206 -	$(call ListPathsSafely_Printf,$1,$2,$3,10501)
  15.207 -	$(call ListPathsSafely_Printf,$1,$2,$3,10751)
  15.208 -
  15.209 -	$(call ListPathsSafely_Printf,$1,$2,$3,11001)
  15.210 -	$(call ListPathsSafely_Printf,$1,$2,$3,11251)
  15.211 -	$(call ListPathsSafely_Printf,$1,$2,$3,11501)
  15.212 -	$(call ListPathsSafely_Printf,$1,$2,$3,11751)
  15.213 -
  15.214 -	$(call ListPathsSafely_Printf,$1,$2,$3,12001)
  15.215 -	$(call ListPathsSafely_Printf,$1,$2,$3,12251)
  15.216 -	$(call ListPathsSafely_Printf,$1,$2,$3,12501)
  15.217 -	$(call ListPathsSafely_Printf,$1,$2,$3,12751)
  15.218 -
  15.219 -	$(call ListPathsSafely_Printf,$1,$2,$3,13001)
  15.220 -	$(call ListPathsSafely_Printf,$1,$2,$3,13251)
  15.221 -	$(call ListPathsSafely_Printf,$1,$2,$3,13501)
  15.222 -	$(call ListPathsSafely_Printf,$1,$2,$3,13751)
  15.223 -
  15.224 -	$(call ListPathsSafely_Printf,$1,$2,$3,14001)
  15.225 -	$(call ListPathsSafely_Printf,$1,$2,$3,14251)
  15.226 -	$(call ListPathsSafely_Printf,$1,$2,$3,14501)
  15.227 -	$(call ListPathsSafely_Printf,$1,$2,$3,14751)
  15.228 -
  15.229 -	$(call ListPathsSafely_Printf,$1,$2,$3,15001)
  15.230 -	$(call ListPathsSafely_Printf,$1,$2,$3,15251)
  15.231 -	$(call ListPathsSafely_Printf,$1,$2,$3,15501)
  15.232 -	$(call ListPathsSafely_Printf,$1,$2,$3,15751)
  15.233 -endef
  15.234 -
  15.235 -define ListPathsSafelyNow_IfPrintf
  15.236 -  ifneq (,$$(word $4,$$($1)))
  15.237 -    $$(eval $1_LPS$4:=$$(call compress_paths,$$(wordlist $4,$5,$$($1))))
  15.238 -    $$(shell printf -- "$$(strip $$($1_LPS$4))\n" | $(decompress_paths) $3)
  15.239 -  endif
  15.240 -endef
  15.241 -
  15.242 -# And an non-receipt version:
  15.243 -define ListPathsSafelyNow
  15.244 -  ifneq (,$$(word 10001,$$($1)))
  15.245 -    $$(error Cannot list safely more than 10000 paths. $1 has $$(words $$($1)) paths!)
  15.246 -  endif
  15.247 -  $(call ListPathsSafelyNow_IfPrintf,$1,$2,$3,1,250)
  15.248 -  $(call ListPathsSafelyNow_IfPrintf,$1,$2,$3,251,500)
  15.249 -  $(call ListPathsSafelyNow_IfPrintf,$1,$2,$3,501,750)
  15.250 -  $(call ListPathsSafelyNow_IfPrintf,$1,$2,$3,751,1000)
  15.251 -
  15.252 -  $(call ListPathsSafelyNow_IfPrintf,$1,$2,$3,1001,1250)
  15.253 -  $(call ListPathsSafelyNow_IfPrintf,$1,$2,$3,1251,1500)
  15.254 -  $(call ListPathsSafelyNow_IfPrintf,$1,$2,$3,1501,1750)
  15.255 -  $(call ListPathsSafelyNow_IfPrintf,$1,$2,$3,1751,2000)
  15.256 -
  15.257 -  $(call ListPathsSafelyNow_IfPrintf,$1,$2,$3,2001,2250)
  15.258 -  $(call ListPathsSafelyNow_IfPrintf,$1,$2,$3,2251,2500)
  15.259 -  $(call ListPathsSafelyNow_IfPrintf,$1,$2,$3,2501,2750)
  15.260 -  $(call ListPathsSafelyNow_IfPrintf,$1,$2,$3,2751,3000)
  15.261 -
  15.262 -  $(call ListPathsSafelyNow_IfPrintf,$1,$2,$3,3001,3250)
  15.263 -  $(call ListPathsSafelyNow_IfPrintf,$1,$2,$3,3251,3500)
  15.264 -  $(call ListPathsSafelyNow_IfPrintf,$1,$2,$3,3501,3750)
  15.265 -  $(call ListPathsSafelyNow_IfPrintf,$1,$2,$3,3751,4000)
  15.266 -
  15.267 -  $(call ListPathsSafelyNow_IfPrintf,$1,$2,$3,4001,4250)
  15.268 -  $(call ListPathsSafelyNow_IfPrintf,$1,$2,$3,4251,4500)
  15.269 -  $(call ListPathsSafelyNow_IfPrintf,$1,$2,$3,4501,4750)
  15.270 -  $(call ListPathsSafelyNow_IfPrintf,$1,$2,$3,4751,5000)
  15.271 -
  15.272 -  $(call ListPathsSafelyNow_IfPrintf,$1,$2,$3,5001,5250)
  15.273 -  $(call ListPathsSafelyNow_IfPrintf,$1,$2,$3,5251,5500)
  15.274 -  $(call ListPathsSafelyNow_IfPrintf,$1,$2,$3,5501,5750)
  15.275 -  $(call ListPathsSafelyNow_IfPrintf,$1,$2,$3,5751,6000)
  15.276 -
  15.277 -  $(call ListPathsSafelyNow_IfPrintf,$1,$2,$3,6001,6250)
  15.278 -  $(call ListPathsSafelyNow_IfPrintf,$1,$2,$3,6251,6500)
  15.279 -  $(call ListPathsSafelyNow_IfPrintf,$1,$2,$3,6501,6750)
  15.280 -  $(call ListPathsSafelyNow_IfPrintf,$1,$2,$3,6751,7000)
  15.281 -
  15.282 -  $(call ListPathsSafelyNow_IfPrintf,$1,$2,$3,7001,7250)
  15.283 -  $(call ListPathsSafelyNow_IfPrintf,$1,$2,$3,7251,7500)
  15.284 -  $(call ListPathsSafelyNow_IfPrintf,$1,$2,$3,7501,7750)
  15.285 -  $(call ListPathsSafelyNow_IfPrintf,$1,$2,$3,7751,8000)
  15.286 -
  15.287 -  $(call ListPathsSafelyNow_IfPrintf,$1,$2,$3,8001,8250)
  15.288 -  $(call ListPathsSafelyNow_IfPrintf,$1,$2,$3,8251,8500)
  15.289 -  $(call ListPathsSafelyNow_IfPrintf,$1,$2,$3,8501,8750)
  15.290 -  $(call ListPathsSafelyNow_IfPrintf,$1,$2,$3,8751,9000)
  15.291 -
  15.292 -  $(call ListPathsSafelyNow_IfPrintf,$1,$2,$3,9001,9250)
  15.293 -  $(call ListPathsSafelyNow_IfPrintf,$1,$2,$3,9251,9500)
  15.294 -  $(call ListPathsSafelyNow_IfPrintf,$1,$2,$3,9501,9750)
  15.295 -  $(call ListPathsSafelyNow_IfPrintf,$1,$2,$3,9751,10000)
  15.296 -
  15.297 -endef
  15.298 -
  15.299 -# The source tips can come from the Mercurial repository, or in the files
  15.300 -# $(HGTIP_FILENAME) which contains the tip but is also positioned in the same
  15.301 -# directory as the original $(HGDIR) directory.
  15.302 -# These should not be := assignments, only used from the root Makefile.
  15.303 -HG_VERSION = $(shell $(HG) version 2> /dev/null)
  15.304 -HG_DIRECTORY=.hg
  15.305 -HGTIP_FILENAME=.hgtip
  15.306 -HG_SEARCH = ./REPO ./*/REPO ./*/*/REPO ./*/*/*/REPO
  15.307 -REPO_LIST = $(patsubst ./%,%,$(patsubst %/,%,$(sort $(dir \
  15.308 -    $(shell $(CD) $(SRC_ROOT) ; ( $(LS) -d $(HG_SEARCH:%/REPO=%/$(HG_DIRECTORY)) ; \
  15.309 -        $(LS) $(HG_SEARCH:%/REPO=%/$(HGTIP_FILENAME)) ) \
  15.310 -        2> /dev/null)))))
  15.311 -
  15.312 -# Emit the repo:tip pairs to $@
  15.313 -define GetSourceTips
  15.314 -	$(CD) $(SRC_ROOT) ; \
  15.315 -	for i in $(REPO_LIST) IGNORE ; do \
  15.316 -	  if [ "$${i}" = "IGNORE" ] ; then \
  15.317 -	    continue; \
  15.318 -	  elif [ -d $${i}/$(HG_DIRECTORY) -a "$(HG_VERSION)" != "" ] ; then \
  15.319 -	    $(PRINTF) " %s:%s" \
  15.320 -	        "$${i}" `$(HG) tip --repository $${i} --template '{node|short}\n'` ; \
  15.321 -	  elif [ -f $${i}/$(HGTIP_FILENAME) ] ; then \
  15.322 -	    $(PRINTF) " %s:%s" \
  15.323 -	        "$${i}" `$(CAT) $${i}/$(HGTIP_FILENAME)` ; \
  15.324 -	  fi; \
  15.325 -	done >> $@
  15.326 -	$(PRINTF) "\n" >> $@
  15.327 -endef
  15.328 -
  15.329 -# Create the HGTIP_FILENAME file. Called from jdk/make/closed/bundles.gmk
  15.330 -define CreateHgTip
  15.331 -	$(HG) tip --repository $1 --template '{node|short}\n' > $1/$(HGTIP_FILENAME); \
  15.332 -	$(ECHO) $1/$(HGTIP_FILENAME)
  15.333 -endef
  15.334 -
  15.335 -define SetupLogging
  15.336 -  ifeq ($$(LOG_LEVEL),trace)
  15.337 -    # Shell redefinition trick inspired by http://www.cmcrossroads.com/ask-mr-make/6535-tracing-rule-execution-in-gnu-make
  15.338 -    # For each target executed, will print
  15.339 -    # Building <TARGET> (from <FIRST PREREQUISITE>) (<ALL NEWER PREREQUISITES> newer)
  15.340 -    # but with a limit of 20 on <ALL NEWER PREREQUISITES>, to avoid cluttering logs too much
  15.341 -    # (and causing a crash on Cygwin).
  15.342 -    # Default shell seems to always be /bin/sh. Must override with bash to get this to work on Solaris.
  15.343 -    # Only use time if it's GNU time which supports format and output file.
  15.344 -    WRAPPER_SHELL:=/bin/bash $$(SRC_ROOT)/common/bin/shell-tracer.sh $$(if $$(findstring yes,$$(IS_GNU_TIME)),$$(TIME),-) $$(OUTPUT_ROOT)/build-trace-time.log /bin/bash
  15.345 -    SHELL=$$(warning $$(if $$@,Building $$@,Running shell command) $$(if $$<, (from $$<))$$(if $$?, ($$(wordlist 1, 20, $$?) $$(if $$(wordlist 21, 22, $$?), ... [in total $$(words $$?) files]) newer)))$$(WRAPPER_SHELL)
  15.346 -  endif
  15.347 -  # Never remove warning messages; this is just for completeness
  15.348 -  LOG_WARN=
  15.349 -  ifneq ($$(findstring $$(LOG_LEVEL),info debug trace),)
  15.350 -    LOG_INFO=
  15.351 -  else
  15.352 -    LOG_INFO=> /dev/null
  15.353 -  endif
  15.354 -  ifneq ($$(findstring $$(LOG_LEVEL),debug trace),)
  15.355 -    LOG_DEBUG=
  15.356 -  else
  15.357 -    LOG_DEBUG=> /dev/null
  15.358 -  endif
  15.359 -  ifneq ($$(findstring $$(LOG_LEVEL),trace),)
  15.360 -    LOG_TRACE=
  15.361 -  else
  15.362 -    LOG_TRACE=> /dev/null
  15.363 -  endif
  15.364 -endef
  15.365 -
  15.366 -# Make sure logging is setup for everyone that includes MakeBase.gmk.
  15.367 -$(eval $(call SetupLogging))
  15.368 -
  15.369 -# This is to be called by all SetupFoo macros
  15.370 -define LogSetupMacroEntry
  15.371 -  $(if $(27),$(error Internal makefile error: Too many arguments to LogSetupMacroEntry, please update MakeBase.gmk))
  15.372 -  $(if $(findstring $(LOG_LEVEL),debug trace), $(info $1 $(foreach i,2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26,$(if $($i),$(NEWLINE) $(strip [$i] $($i))))))
  15.373 -endef
  15.374 -
  15.375 -# Make directory without forking mkdir if not needed
  15.376 -define MakeDir
  15.377 -  ifneq ($$(wildcard $1 $2 $3 $4 $5 $6 $7 $8 $9),$$(strip $1 $2 $3 $4 $5 $6 $7 $8 $9))
  15.378 -    $$(shell $(MKDIR) -p $1 $2 $3 $4 $5 $6 $7 $8 $9)
  15.379 -  endif
  15.380 -endef
  15.381 -
  15.382 -ifeq ($(OPENJDK_TARGET_OS),solaris)
  15.383 -  # On Solaris, if the target is a symlink and exists, cp won't overwrite.
  15.384 -  # Cp has to operate in recursive mode to allow for -P flag, to preserve soft links. If the
  15.385 -  # name of the target file differs from the source file, rename after copy.
  15.386 -  define install-file
  15.387 -	$(MKDIR) -p $(@D)
  15.388 -	$(RM) '$@'
  15.389 -	$(CP) -f -r -P '$<' '$(@D)'
  15.390 -	if [ "$(@F)" != "$(<F)" ]; then $(MV) '$(@D)/$(<F)' '$@'; fi
  15.391 -  endef
  15.392 -else ifeq ($(OPENJDK_TARGET_OS),macosx)
  15.393 -  # On mac, extended attributes sometimes creep into the source files, which may later
  15.394 -  # cause the creation of ._* files which confuses testing. Clear these with xattr if
  15.395 -  # set. Some files get their write permissions removed after being copied to the
  15.396 -  # output dir. When these are copied again to images, xattr would fail. By only clearing
  15.397 -  # attributes when they are present, failing on this is avoided.
  15.398 -  define install-file
  15.399 -	$(MKDIR) -p $(@D)
  15.400 -	$(CP) -fRP '$<' '$@'
  15.401 -	if [ -n "`$(XATTR) -l '$@'`" ]; then $(XATTR) -c '$@'; fi
  15.402 -  endef
  15.403 -else
  15.404 -  define install-file
  15.405 -	$(MKDIR) -p $(@D)
  15.406 -	$(CP) -fP '$<' '$@'
  15.407 -  endef
  15.408 -endif
  15.409 -
  15.410 -# Convenience functions for working around make's limitations with $(filter ).
  15.411 -containing = $(foreach v,$2,$(if $(findstring $1,$v),$v))
  15.412 -not-containing = $(foreach v,$2,$(if $(findstring $1,$v),,$v))
  15.413 -
  15.414 -################################################################################
  15.415 -# In Cygwin, finds are very costly, both because of expensive forks and because
  15.416 -# of bad file system caching. Find is used extensively in $(shell) commands to
  15.417 -# find source files. This makes rerunning make with no or few changes rather
  15.418 -# expensive. To speed this up, these two macros are used to cache the results
  15.419 -# of simple find commands for reuse.
  15.420 -#
  15.421 -# Runs a find and stores both the directories where it was run and the results.
  15.422 -# This macro can be called multiple times to add to the cache. Only finds files
  15.423 -# with no filters.
  15.424 -#
  15.425 -# Needs to be called with $(eval )
  15.426 -#
  15.427 -# Param 1 - Dir to find in
  15.428 -ifeq ($(OPENJDK_BUILD_OS),windows)
  15.429 -  define FillCacheFind
  15.430 -    FIND_CACHE_DIR += $1
  15.431 -    FIND_CACHE := $$(sort $$(FIND_CACHE) $$(shell $(FIND) $1 -type f -o -type l))
  15.432 -  endef
  15.433 -else
  15.434 -  define FillCacheFind
  15.435 -  endef
  15.436 -endif
  15.437 -
  15.438 -# Mimics find by looking in the cache if all of the directories have been cached.
  15.439 -# Otherwise reverts to shell find. This is safe to call on all platforms, even if
  15.440 -# cache is deactivated.
  15.441 -#
  15.442 -# The extra - is needed when FIND_CACHE_DIR is empty but should be harmless.
  15.443 -# Param 1 - Dirs to find in
  15.444 -define CacheFind
  15.445 -  $(if $(filter-out $(addsuffix %,- $(FIND_CACHE_DIR)),$1), \
  15.446 -    $(shell $(FIND) $1 -type f -o -type l), \
  15.447 -    $(filter $(addsuffix %,$1),$(FIND_CACHE)))
  15.448 -endef
  15.449 -
  15.450 -################################################################################
  15.451 -
  15.452 -endif # _MAKEBASE_GMK
    16.1 --- a/common/makefiles/MakeHelpers.gmk	Thu Nov 07 08:16:05 2013 -0800
    16.2 +++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
    16.3 @@ -1,306 +0,0 @@
    16.4 -#
    16.5 -# Copyright (c) 2011, 2012, Oracle and/or its affiliates. All rights reserved.
    16.6 -# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
    16.7 -#
    16.8 -# This code is free software; you can redistribute it and/or modify it
    16.9 -# under the terms of the GNU General Public License version 2 only, as
   16.10 -# published by the Free Software Foundation.  Oracle designates this
   16.11 -# particular file as subject to the "Classpath" exception as provided
   16.12 -# by Oracle in the LICENSE file that accompanied this code.
   16.13 -#
   16.14 -# This code is distributed in the hope that it will be useful, but WITHOUT
   16.15 -# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
   16.16 -# FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
   16.17 -# version 2 for more details (a copy is included in the LICENSE file that
   16.18 -# accompanied this code).
   16.19 -#
   16.20 -# You should have received a copy of the GNU General Public License version
   16.21 -# 2 along with this work; if not, write to the Free Software Foundation,
   16.22 -# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
   16.23 -#
   16.24 -# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
   16.25 -# or visit www.oracle.com if you need additional information or have any
   16.26 -# questions.
   16.27 -#
   16.28 -
   16.29 -################################################################
   16.30 -#
   16.31 -# This file contains helper functions for the top-level Makefile that does
   16.32 -# not depend on the spec.gmk file having been read. (The purpose of this
   16.33 -# file is ju to avoid cluttering the top-level Makefile.)
   16.34 -#
   16.35 -################################################################
   16.36 -
   16.37 -ifndef _MAKEHELPERS_GMK
   16.38 -_MAKEHELPERS_GMK := 1
   16.39 -
   16.40 -##############################
   16.41 -# Stuff to run at include time
   16.42 -##############################
   16.43 -
   16.44 -# Find out which variables were passed explicitely on the make command line. These
   16.45 -# will be passed on to sub-makes, overriding spec.gmk settings.
   16.46 -MAKE_ARGS=$(foreach var,$(subst =command,,$(filter %=command,$(foreach var,$(.VARIABLES),$(var)=$(firstword $(origin $(var)))))),$(var)=$($(var)))
   16.47 -
   16.48 -list_alt_overrides_with_origins=$(filter ALT_%=environment ALT_%=command,$(foreach var,$(.VARIABLES),$(var)=$(firstword $(origin $(var)))))
   16.49 -list_alt_overrides=$(subst =command,,$(subst =environment,,$(list_alt_overrides_with_origins)))
   16.50 -
   16.51 -# Store the build times in this directory.
   16.52 -BUILDTIMESDIR=$(OUTPUT_ROOT)/tmp/buildtimes
   16.53 -
   16.54 -# Global targets are possible to run either with or without a SPEC. The prototypical
   16.55 -# global target is "help".
   16.56 -global_targets=help jprt% bridgeBuild
   16.57 -
   16.58 -##############################
   16.59 -# Functions
   16.60 -##############################
   16.61 -
   16.62 -define CheckEnvironment
   16.63 -        # Find all environment or command line variables that begin with ALT.
   16.64 -	$(if $(list_alt_overrides),
   16.65 -	  @$(PRINTF) "\nWARNING: You have the following ALT_ variables set:\n"
   16.66 -	  @$(PRINTF) "$(foreach var,$(list_alt_overrides),$(var)=$$$(var))\n"
   16.67 -	  @$(PRINTF) "ALT_ variables are deprecated and will be ignored. Please clean your environment.\n\n"
   16.68 -	)
   16.69 -endef
   16.70 -
   16.71 -### Functions for timers
   16.72 -
   16.73 -# Record starting time for build of a sub repository.
   16.74 -define RecordStartTime
   16.75 -	$(MKDIR) -p $(BUILDTIMESDIR)
   16.76 -	$(DATE) '+%Y %m %d %H %M %S' | $(NAWK) '{ print $$1,$$2,$$3,$$4,$$5,$$6,($$4*3600+$$5*60+$$6) }' > $(BUILDTIMESDIR)/build_time_start_$1
   16.77 -	$(DATE) '+%Y-%m-%d %H:%M:%S' > $(BUILDTIMESDIR)/build_time_start_$1_human_readable
   16.78 -endef
   16.79 -
   16.80 -# Record ending time and calculate the difference and store it in a
   16.81 -# easy to read format. Handles builds that cross midnight. Expects
   16.82 -# that a build will never take 24 hours or more.
   16.83 -define RecordEndTime
   16.84 -	$(DATE) '+%Y %m %d %H %M %S' | $(NAWK) '{ print $$1,$$2,$$3,$$4,$$5,$$6,($$4*3600+$$5*60+$$6) }' > $(BUILDTIMESDIR)/build_time_end_$1
   16.85 -	$(DATE) '+%Y-%m-%d %H:%M:%S' > $(BUILDTIMESDIR)/build_time_end_$1_human_readable
   16.86 -	$(ECHO) `$(CAT) $(BUILDTIMESDIR)/build_time_start_$1` `$(CAT) $(BUILDTIMESDIR)/build_time_end_$1` $1 | \
   16.87 -	    $(NAWK) '{ F=$$7; T=$$14; if (F > T) { T+=3600*24 }; D=T-F; H=int(D/3600); \
   16.88 -	    M=int((D-H*3600)/60); S=D-H*3600-M*60; printf("%02d:%02d:%02d %s\n",H,M,S,$$15); }' \
   16.89 -	    > $(BUILDTIMESDIR)/build_time_diff_$1
   16.90 -endef
   16.91 -
   16.92 -# Find all build_time_* files and print their contents in a list sorted
   16.93 -# on the name of the sub repository.
   16.94 -define ReportBuildTimes
   16.95 -	$(BUILD_LOG_WRAPPER) $(PRINTF) -- "----- Build times -------\nStart %s\nEnd   %s\n%s\n%s\n-------------------------\n" \
   16.96 -	    "`$(CAT) $(BUILDTIMESDIR)/build_time_start_TOTAL_human_readable`" \
   16.97 -	    "`$(CAT) $(BUILDTIMESDIR)/build_time_end_TOTAL_human_readable`" \
   16.98 -	    "`$(LS) $(BUILDTIMESDIR)/build_time_diff_* | $(GREP) -v _TOTAL | $(XARGS) $(CAT) | $(SORT) -k 2`" \
   16.99 -	    "`$(CAT) $(BUILDTIMESDIR)/build_time_diff_TOTAL`"
  16.100 -endef
  16.101 -
  16.102 -define ResetAllTimers
  16.103 -  $$(shell $(MKDIR) -p $(BUILDTIMESDIR) && $(RM) $(BUILDTIMESDIR)/build_time_*)
  16.104 -endef
  16.105 -
  16.106 -define StartGlobalTimer
  16.107 -	$(call RecordStartTime,TOTAL)
  16.108 -endef
  16.109 -
  16.110 -define StopGlobalTimer
  16.111 -	$(call RecordEndTime,TOTAL)
  16.112 -endef
  16.113 -
  16.114 -### Functions for managing makefile structure (start/end of makefile and individual targets)
  16.115 -
  16.116 -# Do not indent this function, this will add whitespace at the start which the caller won't handle
  16.117 -define GetRealTarget
  16.118 -$(strip $(if $(MAKECMDGOALS),$(MAKECMDGOALS),default))
  16.119 -endef
  16.120 -
  16.121 -# Do not indent this function, this will add whitespace at the start which the caller won't handle
  16.122 -define LastGoal
  16.123 -$(strip $(lastword $(call GetRealTarget)))
  16.124 -endef
  16.125 -
  16.126 -# Check if the current target is the final target, as specified by
  16.127 -# the user on the command line. If so, call AtRootMakeEnd.
  16.128 -define CheckIfMakeAtEnd
  16.129 -        # Check if the current target is the last goal
  16.130 -	$(if $(filter $@,$(call LastGoal)),$(call AtMakeEnd))
  16.131 -        # If the target is 'foo-only', check if our goal was stated as 'foo'
  16.132 -	$(if $(filter $@,$(call LastGoal)-only),$(call AtMakeEnd))
  16.133 -endef
  16.134 -
  16.135 -# Hook to be called when starting to execute a top-level target
  16.136 -define TargetEnter
  16.137 -	$(BUILD_LOG_WRAPPER) $(PRINTF) "## Starting $(patsubst %-only,%,$@)\n"
  16.138 -	$(call RecordStartTime,$(patsubst %-only,%,$@))
  16.139 -endef
  16.140 -
  16.141 -# Hook to be called when finish executing a top-level target
  16.142 -define TargetExit
  16.143 -	$(call RecordEndTime,$(patsubst %-only,%,$@))
  16.144 -	$(BUILD_LOG_WRAPPER) $(PRINTF) "## Finished $(patsubst %-only,%,$@) (build time %s)\n\n" \
  16.145 -	    "`$(CAT) $(BUILDTIMESDIR)/build_time_diff_$(patsubst %-only,%,$@) | $(CUT) -f 1 -d ' '`"
  16.146 -	$(call CheckIfMakeAtEnd)
  16.147 -endef
  16.148 -
  16.149 -# Hook to be called as the very first thing when running a normal build
  16.150 -define AtMakeStart
  16.151 -	$(if $(findstring --jobserver,$(MAKEFLAGS)),$(error make -j is not supported, use make JOBS=n))
  16.152 -	$(call CheckEnvironment)
  16.153 -	@$(PRINTF) $(LOG_INFO) "Running make as '$(MAKE) $(MFLAGS) $(MAKE_ARGS)'\n"
  16.154 -	@$(PRINTF) "Building $(PRODUCT_NAME) for target '$(call GetRealTarget)' in configuration '$(CONF_NAME)'\n\n"
  16.155 -	$(call StartGlobalTimer)
  16.156 -endef
  16.157 -
  16.158 -# Hook to be called as the very last thing for targets that are "top level" targets
  16.159 -define AtMakeEnd
  16.160 -	[ -f $(SJAVAC_SERVER_DIR)/server.port ] && echo Stopping sjavac server && $(TOUCH) $(SJAVAC_SERVER_DIR)/server.port.stop; true
  16.161 -	$(call StopGlobalTimer)
  16.162 -	$(call ReportBuildTimes)
  16.163 -	@$(PRINTF) "Finished building $(PRODUCT_NAME) for target '$(call GetRealTarget)'\n"
  16.164 -	$(call CheckEnvironment)
  16.165 -endef
  16.166 -
  16.167 -### Functions for parsing and setting up make options from command-line
  16.168 -
  16.169 -define FatalError
  16.170 -  # If the user specificed a "global" target (e.g. 'help'), do not exit but continue running
  16.171 -  $$(if $$(filter-out $(global_targets),$$(call GetRealTarget)),$$(error Cannot continue))
  16.172 -endef
  16.173 -
  16.174 -define ParseLogLevel
  16.175 -  ifeq ($$(origin VERBOSE),undefined)
  16.176 -    # Setup logging according to LOG (but only if VERBOSE is not given)
  16.177 -
  16.178 -    # If the "nofile" argument is given, act on it and strip it away
  16.179 -    ifneq ($$(findstring nofile,$$(LOG)),)
  16.180 -      # Reset the build log wrapper, regardless of other values
  16.181 -      override BUILD_LOG_WRAPPER=
  16.182 -      # COMMA is defined in spec.gmk, but that is not included yet
  16.183 -      COMMA=,
  16.184 -      # First try to remove ",nofile" if it exists
  16.185 -      LOG_STRIPPED1=$$(subst $$(COMMA)nofile,,$$(LOG))
  16.186 -      # Otherwise just remove "nofile"
  16.187 -      LOG_STRIPPED2=$$(subst nofile,,$$(LOG_STRIPPED1))
  16.188 -      # We might have ended up with a leading comma. Remove it
  16.189 -      LOG_STRIPPED3=$$(strip $$(patsubst $$(COMMA)%,%,$$(LOG_STRIPPED2)))
  16.190 -      LOG_LEVEL:=$$(LOG_STRIPPED3)
  16.191 -    else
  16.192 -      LOG_LEVEL:=$$(LOG)
  16.193 -    endif
  16.194 -
  16.195 -    ifeq ($$(LOG_LEVEL),)
  16.196 -      # Set LOG to "warn" as default if not set (and no VERBOSE given)
  16.197 -      override LOG_LEVEL=warn
  16.198 -    endif
  16.199 -    ifeq ($$(LOG_LEVEL),warn)
  16.200 -      VERBOSE=-s
  16.201 -    else ifeq ($$(LOG_LEVEL),info)
  16.202 -      VERBOSE=-s
  16.203 -    else ifeq ($$(LOG_LEVEL),debug)
  16.204 -      VERBOSE=
  16.205 -    else ifeq ($$(LOG_LEVEL),trace)
  16.206 -      VERBOSE=
  16.207 -    else
  16.208 -      $$(info Error: LOG must be one of: warn, info, debug or trace.)
  16.209 -      $$(eval $$(call FatalError))
  16.210 -    endif
  16.211 -  else
  16.212 -    # Provide resonable interpretations of LOG_LEVEL if VERBOSE is given.
  16.213 -    ifeq ($(VERBOSE),)
  16.214 -      LOG_LEVEL:=debug
  16.215 -    else
  16.216 -      LOG_LEVEL:=warn
  16.217 -    endif
  16.218 -    ifneq ($$(LOG),)
  16.219 -      # We have both a VERBOSE and a LOG argument. This is OK only if this is a repeated call by ourselves,
  16.220 -      # but complain if this is the top-level make call.
  16.221 -      ifeq ($$(MAKELEVEL),0)
  16.222 -        $$(info Cannot use LOG=$$(LOG) and VERBOSE=$$(VERBOSE) at the same time. Choose one.)
  16.223 -        $$(eval $$(call FatalError))
  16.224 -      endif
  16.225 -    endif
  16.226 -  endif
  16.227 -endef
  16.228 -
  16.229 -define ParseConfAndSpec
  16.230 -  ifneq ($$(filter-out $(global_targets),$$(call GetRealTarget)),)
  16.231 -    # If we only have global targets, no need to bother with SPEC or CONF
  16.232 -    ifneq ($$(origin SPEC),undefined)
  16.233 -      # We have been given a SPEC, check that it works out properly
  16.234 -      ifeq ($$(wildcard $$(SPEC)),)
  16.235 -        $$(info Cannot locate spec.gmk, given by SPEC=$$(SPEC))
  16.236 -        $$(eval $$(call FatalError))
  16.237 -      endif
  16.238 -      ifneq ($$(origin CONF),undefined)
  16.239 -        # We also have a CONF argument. This is OK only if this is a repeated call by ourselves,
  16.240 -        # but complain if this is the top-level make call.
  16.241 -        ifeq ($$(MAKELEVEL),0)
  16.242 -          $$(info Cannot use CONF=$$(CONF) and SPEC=$$(SPEC) at the same time. Choose one.)
  16.243 -          $$(eval $$(call FatalError))
  16.244 -        endif
  16.245 -      endif
  16.246 -      # ... OK, we're satisfied, we'll use this SPEC later on
  16.247 -    else
  16.248 -      # Find all spec.gmk files in the build output directory
  16.249 -      output_dir=$$(root_dir)/build
  16.250 -      all_spec_files=$$(wildcard $$(output_dir)/*/spec.gmk)
  16.251 -      ifeq ($$(all_spec_files),)
  16.252 -        $$(info No configurations found for $$(root_dir)! Please run configure to create a configuration.)
  16.253 -        $$(eval $$(call FatalError))
  16.254 -      endif
  16.255 -      # Extract the configuration names from the path
  16.256 -      all_confs=$$(patsubst %/spec.gmk,%,$$(patsubst $$(output_dir)/%,%,$$(all_spec_files)))
  16.257 -
  16.258 -      ifneq ($$(origin CONF),undefined)
  16.259 -        # User have given a CONF= argument.
  16.260 -        ifeq ($$(CONF),)
  16.261 -          # If given CONF=, match all configurations
  16.262 -          matching_confs=$$(strip $$(all_confs))
  16.263 -        else
  16.264 -          # Otherwise select those that contain the given CONF string
  16.265 -          matching_confs=$$(strip $$(foreach var,$$(all_confs),$$(if $$(findstring $$(CONF),$$(var)),$$(var))))
  16.266 -        endif
  16.267 -        ifeq ($$(matching_confs),)
  16.268 -          $$(info No configurations found matching CONF=$$(CONF))
  16.269 -          $$(info Available configurations:)
  16.270 -          $$(foreach var,$$(all_confs),$$(info * $$(var)))
  16.271 -          $$(eval $$(call FatalError))
  16.272 -        else
  16.273 -          ifeq ($$(words $$(matching_confs)),1)
  16.274 -            $$(info Building '$$(matching_confs)' (matching CONF=$$(CONF)))
  16.275 -          else
  16.276 -            $$(info Building target '$(call GetRealTarget)' in the following configurations (matching CONF=$$(CONF)):)
  16.277 -            $$(foreach var,$$(matching_confs),$$(info * $$(var)))
  16.278 -          endif
  16.279 -        endif
  16.280 -
  16.281 -        # Create a SPEC definition. This will contain the path to one or more spec.gmk files.
  16.282 -        SPEC=$$(addsuffix /spec.gmk,$$(addprefix $$(output_dir)/,$$(matching_confs)))
  16.283 -      else
  16.284 -        # No CONF or SPEC given, check the available configurations
  16.285 -        ifneq ($$(words $$(all_spec_files)),1)
  16.286 -          $$(info No CONF given, but more than one configuration found in $$(output_dir).)
  16.287 -          $$(info Available configurations:)
  16.288 -          $$(foreach var,$$(all_confs),$$(info * $$(var)))
  16.289 -          $$(info Please retry building with CONF=<config pattern> (or SPEC=<specfile>))
  16.290 -          $$(eval $$(call FatalError))
  16.291 -        endif
  16.292 -
  16.293 -        # We found exactly one configuration, use it
  16.294 -        SPEC=$$(strip $$(all_spec_files))
  16.295 -      endif
  16.296 -    endif
  16.297 -  endif
  16.298 -endef
  16.299 -
  16.300 -### Convenience functions from Main.gmk
  16.301 -
  16.302 -# Cleans the component given as $1
  16.303 -define CleanComponent
  16.304 -	@$(PRINTF) "Cleaning $1 build artifacts ..."
  16.305 -	@($(CD) $(OUTPUT_ROOT) && $(RM) -r $1)
  16.306 -	@$(PRINTF) " done\n"
  16.307 -endef
  16.308 -
  16.309 -endif # _MAKEHELPERS_GMK
    17.1 --- a/common/makefiles/Makefile	Thu Nov 07 08:16:05 2013 -0800
    17.2 +++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
    17.3 @@ -1,26 +0,0 @@
    17.4 -#
    17.5 -# Copyright (c) 2011, 2012, Oracle and/or its affiliates. All rights reserved.
    17.6 -# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
    17.7 -#
    17.8 -# This code is free software; you can redistribute it and/or modify it
    17.9 -# under the terms of the GNU General Public License version 2 only, as
   17.10 -# published by the Free Software Foundation.  Oracle designates this
   17.11 -# particular file as subject to the "Classpath" exception as provided
   17.12 -# by Oracle in the LICENSE file that accompanied this code.
   17.13 -#
   17.14 -# This code is distributed in the hope that it will be useful, but WITHOUT
   17.15 -# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
   17.16 -# FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
   17.17 -# version 2 for more details (a copy is included in the LICENSE file that
   17.18 -# accompanied this code).
   17.19 -#
   17.20 -# You should have received a copy of the GNU General Public License version
   17.21 -# 2 along with this work; if not, write to the Free Software Foundation,
   17.22 -# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
   17.23 -#
   17.24 -# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
   17.25 -# or visit www.oracle.com if you need additional information or have any
   17.26 -# questions.
   17.27 -#
   17.28 -
   17.29 -include ../../NewMakefile.gmk
    18.1 --- a/common/makefiles/NativeCompilation.gmk	Thu Nov 07 08:16:05 2013 -0800
    18.2 +++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
    18.3 @@ -1,594 +0,0 @@
    18.4 -#
    18.5 -# Copyright (c) 2011, 2013, Oracle and/or its affiliates. All rights reserved.
    18.6 -# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
    18.7 -#
    18.8 -# This code is free software; you can redistribute it and/or modify it
    18.9 -# under the terms of the GNU General Public License version 2 only, as
   18.10 -# published by the Free Software Foundation.  Oracle designates this
   18.11 -# particular file as subject to the "Classpath" exception as provided
   18.12 -# by Oracle in the LICENSE file that accompanied this code.
   18.13 -#
   18.14 -# This code is distributed in the hope that it will be useful, but WITHOUT
   18.15 -# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
   18.16 -# FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
   18.17 -# version 2 for more details (a copy is included in the LICENSE file that
   18.18 -# accompanied this code).
   18.19 -#
   18.20 -# You should have received a copy of the GNU General Public License version
   18.21 -# 2 along with this work; if not, write to the Free Software Foundation,
   18.22 -# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
   18.23 -#
   18.24 -# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
   18.25 -# or visit www.oracle.com if you need additional information or have any
   18.26 -# questions.
   18.27 -#
   18.28 -
   18.29 -# When you read this source. Remember that $(sort ...) has the side effect
   18.30 -# of removing duplicates. It is actually this side effect that is
   18.31 -# desired whenever sort is used below!
   18.32 -
   18.33 -ifeq (,$(_MAKEBASE_GMK))
   18.34 -  $(error You must include MakeBase.gmk prior to including NativeCompilation.gmk)
   18.35 -endif
   18.36 -
   18.37 -ifeq ($(COMPILER_TYPE),CC)
   18.38 -  COMPILING_MSG=echo $(LOG_INFO) "Compiling $(notdir $1) (for $(notdir $2))"
   18.39 -  LINKING_MSG=echo $(LOG_INFO) "Linking $1"
   18.40 -  LINKING_EXE_MSG=echo $(LOG_INFO) "Linking executable $1"
   18.41 -  ARCHIVING_MSG=echo $(LOG_INFO) "Archiving $1"
   18.42 -else
   18.43 -  COMPILING_MSG=
   18.44 -  LINKING_MSG=
   18.45 -  LINKING_EXE_MSG=
   18.46 -  ARCHIVING_MSG=
   18.47 -endif
   18.48 -
   18.49 -define add_native_source
   18.50 -  # param 1 = BUILD_MYPACKAGE
   18.51 -  # parma 2 = the source file name (..../alfa.c or .../beta.cpp)
   18.52 -  # param 3 = the bin dir that stores all .o (.obj) and .d files.
   18.53 -  # param 4 = the c flags to the compiler
   18.54 -  # param 5 = the c compiler
   18.55 -  # param 6 = the c++ flags to the compiler
   18.56 -  # param 7 = the c++ compiler
   18.57 -  # param 8 = the flags to the assembler
   18.58 -
   18.59 -  ifneq (,$$(filter %.c,$2))
   18.60 -    # Compile as a C file
   18.61 -    $1_$2_FLAGS=$4 $$($1_$(notdir $2)_CFLAGS) -DTHIS_FILE='"$$(<F)"' -c
   18.62 -    $1_$2_COMP=$5
   18.63 -    $1_$2_DEP_FLAG:=$(C_FLAG_DEPS)
   18.64 -  else ifneq (,$$(filter %.m,$2))
   18.65 -    # Compile as a objective-c file
   18.66 -    $1_$2_FLAGS=-x objective-c $4 $$($1_$(notdir $2)_CFLAGS) -DTHIS_FILE='"$$(<F)"' -c
   18.67 -    $1_$2_COMP=$5
   18.68 -    $1_$2_DEP_FLAG:=$(C_FLAG_DEPS)
   18.69 -  else ifneq (,$$(filter %.s,$2))
   18.70 -    # Compile as assembler file
   18.71 -    $1_$2_FLAGS=$8 -DTHIS_FILE='"$$(<F)"'
   18.72 -    $1_$2_COMP=$(AS)
   18.73 -    $1_$2_DEP_FLAG:=
   18.74 -  else
   18.75 -    # Compile as a C++ file
   18.76 -    $1_$2_FLAGS=$6 $$($1_$(notdir $2)_CXXFLAGS) -DTHIS_FILE='"$$(<F)"' -c
   18.77 -    $1_$2_COMP=$7
   18.78 -    $1_$2_DEP_FLAG:=$(CXX_FLAG_DEPS)
   18.79 -  endif
   18.80 -  # Generate the .o (.obj) file name and place it in the bin dir.
   18.81 -  $1_$2_OBJ:=$3/$$(patsubst %.cpp,%$(OBJ_SUFFIX),$$(patsubst %.c,%$(OBJ_SUFFIX),$$(patsubst %.m,%$(OBJ_SUFFIX),$$(patsubst %.s,%$(OBJ_SUFFIX),$$(notdir $2)))))
   18.82 -  # Only continue if this object file hasn't been processed already. This lets the first found
   18.83 -  # source file override any other with the same name.
   18.84 -  ifeq (,$$(findstring $$($1_$2_OBJ),$$($1_OBJS_SO_FAR)))
   18.85 -    $1_OBJS_SO_FAR+=$$($1_$2_OBJ)
   18.86 -    ifeq (,$$(filter %.s,$2))
   18.87 -      # And this is the dependency file for this obj file.
   18.88 -      $1_$2_DEP:=$$(patsubst %$(OBJ_SUFFIX),%.d,$$($1_$2_OBJ))
   18.89 -      # Include previously generated dependency information. (if it exists)
   18.90 -      -include $$($1_$2_DEP)
   18.91 -
   18.92 -      ifeq ($(COMPILER_TYPE),CL)
   18.93 -        $1_$2_DEBUG_OUT_FLAGS:=-Fd$$(patsubst %$(OBJ_SUFFIX),%.pdb,$$($1_$2_OBJ)) \
   18.94 -            -Fm$$(patsubst %$(OBJ_SUFFIX),%.map,$$($1_$2_OBJ))
   18.95 -      endif
   18.96 -    endif
   18.97 -
   18.98 -    $$($1_$2_OBJ) : $2
   18.99 -        ifeq ($(COMPILER_TYPE),CC)
  18.100 -	  $$(call COMPILING_MSG,$2,$$($1_TARGET))
  18.101 -          # The Sun studio compiler doesn't output the full path to the object file in the
  18.102 -          # generated deps files. Fixing it with sed. If compiling assembly, don't try this.
  18.103 -          ifeq ($(COMPILER_NAME)$$(filter %.s,$2),ossc)
  18.104 -	    $$($1_$2_COMP) $$($1_$2_FLAGS) $$($1_$2_DEP_FLAG) $$($1_$2_DEP).tmp $(CC_OUT_OPTION)$$($1_$2_OBJ) $2
  18.105 -	    $(SED) 's|^$$(@F):|$$@:|' $$($1_$2_DEP).tmp > $$($1_$2_DEP)
  18.106 -          else
  18.107 -	    $$($1_$2_COMP) $$($1_$2_FLAGS) $$($1_$2_DEP_FLAG) $$($1_$2_DEP) $(CC_OUT_OPTION)$$($1_$2_OBJ) $2
  18.108 -          endif
  18.109 -        endif
  18.110 -        # The Visual Studio compiler lacks a feature for generating make dependencies, but by
  18.111 -        # setting -showIncludes, all included files are printed. These are filtered out and
  18.112 -        # parsed into make dependences.
  18.113 -        ifeq ($(COMPILER_TYPE),CL)
  18.114 -	  ($$($1_$2_COMP) $$($1_$2_FLAGS) -showIncludes $$($1_$2_DEBUG_OUT_FLAGS) \
  18.115 -	      $(CC_OUT_OPTION)$$($1_$2_OBJ) $2 ; echo $$$$? > $$($1_$2_DEP).exitvalue) \
  18.116 -	      | $(TEE) $$($1_$2_DEP).raw | $(GREP) -v "^Note: including file:" \
  18.117 -	      && exit `cat $$($1_$2_DEP).exitvalue`
  18.118 -	  $(RM) $$($1_$2_DEP).exitvalue
  18.119 -	  ($(ECHO) $$@: \\ \
  18.120 -	  && $(SED) -e '/^Note: including file:/!d' \
  18.121 -	      -e 's|Note: including file: *||' \
  18.122 -	      -e 's|\\|/|g' \
  18.123 -	      -e 's|^\([a-zA-Z]\):|/cygdrive/\1|g' \
  18.124 -	      -e '/$(subst /,\/,$(TOPDIR))/!d' \
  18.125 -	      -e 's|$$$$| \\|g' \
  18.126 -	      $$($1_$2_DEP).raw) > $$($1_$2_DEP)
  18.127 -        endif
  18.128 -  endif
  18.129 -endef
  18.130 -
  18.131 -define SetupNativeCompilation
  18.132 -  # param 1 is for example BUILD_MYPACKAGE
  18.133 -  # param 2,3,4,5,6,7,8 are named args.
  18.134 -  #   SRC one or more directory roots to scan for C/C++ files.
  18.135 -  #   LANG C or C++
  18.136 -  #   CFLAGS the compiler flags to be used, used both for C and C++.
  18.137 -  #   CXXFLAGS the compiler flags to be used for c++, if set overrides CFLAGS.
  18.138 -  #   LDFLAGS the linker flags to be used, used both for C and C++.
  18.139 -  #   LDFLAGS_SUFFIX the linker flags to be added last on the commandline
  18.140 -  #       typically the libraries linked to.
  18.141 -  #   ARFLAGS the archiver flags to be used
  18.142 -  #   OBJECT_DIR the directory where we store the object files
  18.143 -  #   LIBRARY the resulting library file
  18.144 -  #   PROGRAM the resulting exec file
  18.145 -  #   INCLUDES only pick source from these directories
  18.146 -  #   EXCLUDES do not pick source from these directories
  18.147 -  #   INCLUDE_FILES only compile exactly these files!
  18.148 -  #   EXCLUDE_FILES with these names
  18.149 -  #   VERSIONINFO_RESOURCE Input file for RC. Setting this implies that RC will be run
  18.150 -  #   RC_FLAGS flags for RC.
  18.151 -  #   MAPFILE mapfile
  18.152 -  #   REORDER reorder file
  18.153 -  #   DEBUG_SYMBOLS add debug symbols (if configured on)
  18.154 -  #   CC the compiler to use, default is $(CC)
  18.155 -  #   LDEXE the linker to use for linking executables, default is $(LDEXE)
  18.156 -  #   OPTIMIZATION sets optimization level to NONE, LOW, HIGH, HIGHEST
  18.157 -  $(foreach i,2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26, $(if $($i),$1_$(strip $($i)))$(NEWLINE))
  18.158 -  $(call LogSetupMacroEntry,SetupNativeCompilation($1),$2,$3,$4,$5,$6,$7,$8,$9,$(10),$(11),$(12),$(13),$(14),$(15),$(16),$(17),$(18),$(19),$(20),$(21),$(22),$(23),$(24),$(25),$(26))
  18.159 -  $(if $(27),$(error Internal makefile error: Too many arguments to SetupNativeCompilation, please update NativeCompilation.gmk))
  18.160 -
  18.161 -  ifneq (,$$($1_BIN))
  18.162 -    $$(error BIN has been replaced with OBJECT_DIR)
  18.163 -  endif
  18.164 -
  18.165 -  ifneq (,$$($1_LIB))
  18.166 -    $$(error LIB has been replaced with LIBRARY)
  18.167 -  endif
  18.168 -
  18.169 -  ifneq (,$$($1_EXE))
  18.170 -    $$(error EXE has been replaced with PROGRAM)
  18.171 -  endif
  18.172 -
  18.173 -  ifneq (,$$($1_LIBRARY))
  18.174 -    ifeq (,$$($1_OUTPUT_DIR))
  18.175 -      $$(error LIBRARY requires OUTPUT_DIR)
  18.176 -    endif
  18.177 -
  18.178 -    ifneq ($$($1_LIBRARY),$(basename $$($1_LIBRARY)))
  18.179 -      $$(error directory of LIBRARY should be specified using OUTPUT_DIR)
  18.180 -    endif
  18.181 -
  18.182 -    ifneq (,$(findstring $(SHARED_LIBRARY_SUFFIX),$$($1_LIBRARY)))
  18.183 -      $$(error LIBRARY should be specified without SHARED_LIBRARY_SUFFIX: $(SHARED_LIBRARY_SUFFIX))
  18.184 -    endif
  18.185 -
  18.186 -    ifneq (,$(findstring $(LIBRARY_PREFIX),$$($1_LIBRARY)))
  18.187 -      $$(error LIBRARY should be specified without LIBRARY_PREFIX: $(LIBRARY_PREFIX))
  18.188 -    endif
  18.189 -
  18.190 -    $1_BASENAME:=$(LIBRARY_PREFIX)$$($1_LIBRARY)$(SHARED_LIBRARY_SUFFIX)
  18.191 -    $1_TARGET:=$$($1_OUTPUT_DIR)/$$($1_BASENAME)
  18.192 -
  18.193 -  endif
  18.194 -
  18.195 -  ifneq (,$$($1_STATIC_LIBRARY))
  18.196 -    ifeq (,$$($1_OUTPUT_DIR))
  18.197 -      $$(error STATIC_LIBRARY requires OUTPUT_DIR)
  18.198 -    endif
  18.199 -
  18.200 -    ifneq ($$($1_STATIC_LIBRARY),$(basename $$($1_STATIC_LIBRARY)))
  18.201 -      $$(error directory of STATIC_LIBRARY should be specified using OUTPUT_DIR)
  18.202 -    endif
  18.203 -
  18.204 -    ifneq (,$(findstring $(STATIC_LIBRARY_SUFFIX),$$($1_STATIC_LIBRARY)))
  18.205 -      $$(error STATIC_LIBRARY should be specified without STATIC_LIBRARY_SUFFIX: $(STATIC_LIBRARY_SUFFIX))
  18.206 -    endif
  18.207 -
  18.208 -    ifneq (,$(findstring $(LIBRARY_PREFIX),$$($1_STATIC_LIBRARY)))
  18.209 -      $$(error STATIC_LIBRARY should be specified without LIBRARY_PREFIX: $(LIBRARY_PREFIX))
  18.210 -    endif
  18.211 -
  18.212 -    $1_BASENAME:=$(LIBRARY_PREFIX)$$($1_STATIC_LIBRARY)$(STATIC_LIBRARY_SUFFIX)
  18.213 -    $1_TARGET:=$$($1_OUTPUT_DIR)/$$($1_BASENAME)
  18.214 -  endif
  18.215 -
  18.216 -  ifneq (,$$($1_PROGRAM))
  18.217 -    ifeq (,$$($1_OUTPUT_DIR))
  18.218 -      $$(error PROGRAM requires OUTPUT_DIR)
  18.219 -    endif
  18.220 -
  18.221 -    ifneq ($$($1_PROGRAM),$(basename $$($1_PROGRAM)))
  18.222 -      $$(error directory of PROGRAM should be specified using OUTPUT_DIR)
  18.223 -    endif
  18.224 -
  18.225 -    ifneq (,$(findstring $(EXE_SUFFIX),$$($1_PROGRAM)))
  18.226 -      $$(error PROGRAM should be specified without EXE_SUFFIX: $(EXE_SUFFIX))
  18.227 -    endif
  18.228 -
  18.229 -    $1_BASENAME:=$$($1_PROGRAM)$(EXE_SUFFIX)
  18.230 -    $1_TARGET:=$$($1_OUTPUT_DIR)/$$($1_BASENAME)
  18.231 -
  18.232 -  endif
  18.233 -
  18.234 -  ifeq (,$$($1_TARGET))
  18.235 -    $$(error Neither PROGRAM, LIBRARY nor STATIC_LIBRARY has been specified for SetupNativeCompilation)
  18.236 -  endif
  18.237 -
  18.238 -  ifeq (,$$($1_LANG))
  18.239 -    $$(error You have to specify LANG for native compilation $1)
  18.240 -  endif
  18.241 -  ifeq (C,$$($1_LANG))
  18.242 -    ifeq ($$($1_LDEXE),)
  18.243 -      $1_LDEXE:=$(LDEXE)
  18.244 -    endif
  18.245 -    $1_LD:=$(LD)
  18.246 -  else
  18.247 -    ifeq (C++,$$($1_LANG))
  18.248 -      $1_LD:=$(LDCXX)
  18.249 -      $1_LDEXE:=$(LDEXECXX)
  18.250 -    else
  18.251 -      $$(error Unknown native language $$($1_LANG) for $1)
  18.252 -    endif
  18.253 -  endif
  18.254 -
  18.255 -  ifeq ($$($1_CC),)
  18.256 -    $1_CC:=$(CC)
  18.257 -  endif
  18.258 -
  18.259 -  # Make sure the dirs exist.
  18.260 -  $$(eval $$(call MakeDir,$$($1_OBJECT_DIR) $$($1_OUTPUT_DIR)))
  18.261 -  $$(foreach d,$$($1_SRC), $$(if $$(wildcard $$d),,$$(error SRC specified to SetupNativeCompilation $1 contains missing directory $$d)))
  18.262 -
  18.263 -  # Find all files in the source trees. Sort to remove duplicates.
  18.264 -  $1_ALL_SRCS := $$(sort $$(call CacheFind,$$($1_SRC)))
  18.265 -  # Extract the C/C++ files.
  18.266 -  $1_EXCLUDE_FILES:=$$(foreach i,$$($1_SRC),$$(addprefix $$i/,$$($1_EXCLUDE_FILES)))
  18.267 -  $1_INCLUDE_FILES:=$$(foreach i,$$($1_SRC),$$(addprefix $$i/,$$($1_INCLUDE_FILES)))
  18.268 -  ifneq ($$($1_EXCLUDE_FILES),)
  18.269 -    $1_EXCLUDE_FILES:=$$(addprefix %,$$($1_EXCLUDE_FILES))
  18.270 -  endif
  18.271 -  $1_SRCS := $$(filter-out $$($1_EXCLUDE_FILES),$$(filter %.s %.c %.cpp %.m,$$($1_ALL_SRCS)))
  18.272 -  ifneq (,$$(strip $$($1_INCLUDE_FILES)))
  18.273 -    $1_SRCS := $$(filter $$($1_INCLUDE_FILES),$$($1_SRCS))
  18.274 -  endif
  18.275 -  ifeq (,$$($1_SRCS))
  18.276 -    $$(error No sources found for $1 when looking inside the dirs $$($1_SRC))
  18.277 -  endif
  18.278 -  # There can be only a single bin dir root, no need to foreach over the roots.
  18.279 -  $1_BINS := $$(wildcard $$($1_OBJECT_DIR)/*$(OBJ_SUFFIX))
  18.280 -  # Now we have a list of all c/c++ files to compile: $$($1_SRCS)
  18.281 -  # and we have a list of all existing object files: $$($1_BINS)
  18.282 -
  18.283 -  # Prepend the source/bin path to the filter expressions. Then do the filtering.
  18.284 -  ifneq ($$($1_INCLUDES),)
  18.285 -    $1_SRC_INCLUDES := $$(foreach i,$$($1_SRC),$$(addprefix $$i/,$$(addsuffix /%,$$($1_INCLUDES))))
  18.286 -    $1_SRCS := $$(filter $$($1_SRC_INCLUDES),$$($1_SRCS))
  18.287 -  endif
  18.288 -  ifneq ($$($1_EXCLUDES),)
  18.289 -    $1_SRC_EXCLUDES := $$(foreach i,$$($1_SRC),$$(addprefix $$i/,$$(addsuffix /%,$$($1_EXCLUDES))))
  18.290 -    $1_SRCS := $$(filter-out $$($1_SRC_EXCLUDES),$$($1_SRCS))
  18.291 -  endif
  18.292 -
  18.293 -  # Calculate the expected output from compiling the sources (sort to remove duplicates. Also provides
  18.294 -  # a reproducable order on the input files to the linker).
  18.295 -  $1_EXPECTED_OBJS:=$$(sort $$(addprefix $$($1_OBJECT_DIR)/,$$(patsubst %.cpp,%$(OBJ_SUFFIX),$$(patsubst %.c,%$(OBJ_SUFFIX),$$(patsubst %.m,%$(OBJ_SUFFIX),$$(patsubst %.s,%$(OBJ_SUFFIX),$$(notdir $$($1_SRCS))))))))
  18.296 -  # Are there too many object files on disk? Perhaps because some source file was removed?
  18.297 -  $1_SUPERFLOUS_OBJS:=$$(sort $$(filter-out $$($1_EXPECTED_OBJS),$$($1_BINS)))
  18.298 -  # Clean out the superfluous object files.
  18.299 -  ifneq ($$($1_SUPERFLUOUS_OBJS),)
  18.300 -    $$(shell $(RM) -f $$($1_SUPERFLUOUS_OBJS))
  18.301 -  endif
  18.302 -
  18.303 -  # Pickup extra OPENJDK_TARGET_OS_API and/or OPENJDK_TARGET_OS dependent variables for CFLAGS.
  18.304 -  $1_EXTRA_CFLAGS:=$$($1_CFLAGS_$(OPENJDK_TARGET_OS_API)) $$($1_CFLAGS_$(OPENJDK_TARGET_OS))
  18.305 -  ifneq ($(DEBUG_LEVEL),release)
  18.306 -    # Pickup extra debug dependent variables for CFLAGS
  18.307 -    $1_EXTRA_CFLAGS+=$$($1_CFLAGS_debug)
  18.308 -    $1_EXTRA_CFLAGS+=$$($1_CFLAGS_$(OPENJDK_TARGET_OS_API)_debug)
  18.309 -    $1_EXTRA_CFLAGS+=$$($1_CFLAGS_$(OPENJDK_TARGET_OS)_debug)
  18.310 -  else
  18.311 -    $1_EXTRA_CFLAGS+=$$($1_CFLAGS_release)
  18.312 -    $1_EXTRA_CFLAGS+=$$($1_CFLAGS_$(OPENJDK_TARGET_OS_API)_release)
  18.313 -    $1_EXTRA_CFLAGS+=$$($1_CFLAGS_$(OPENJDK_TARGET_OS)_release)
  18.314 -  endif
  18.315 -
  18.316 -  # Pickup extra OPENJDK_TARGET_OS_API and/or OPENJDK_TARGET_OS dependent variables for CXXFLAGS.
  18.317 -  $1_EXTRA_CXXFLAGS:=$$($1_CXXFLAGS_$(OPENJDK_TARGET_OS_API)) $$($1_CXXFLAGS_$(OPENJDK_TARGET_OS))
  18.318 -  ifneq ($(DEBUG_LEVEL),release)
  18.319 -    # Pickup extra debug dependent variables for CXXFLAGS
  18.320 -    $1_EXTRA_CXXFLAGS+=$$($1_CXXFLAGS_debug)
  18.321 -    $1_EXTRA_CXXFLAGS+=$$($1_CXXFLAGS_$(OPENJDK_TARGET_OS_API)_debug)
  18.322 -    $1_EXTRA_CXXFLAGS+=$$($1_CXXFLAGS_$(OPENJDK_TARGET_OS)_debug)
  18.323 -  else
  18.324 -    $1_EXTRA_CXXFLAGS+=$$($1_CXXFLAGS_release)
  18.325 -    $1_EXTRA_CXXFLAGS+=$$($1_CXXFLAGS_$(OPENJDK_TARGET_OS_API)_release)
  18.326 -    $1_EXTRA_CXXFLAGS+=$$($1_CXXFLAGS_$(OPENJDK_TARGET_OS)_release)
  18.327 -  endif
  18.328 -
  18.329 -  ifneq (,$$($1_DEBUG_SYMBOLS))
  18.330 -    ifeq ($(ENABLE_DEBUG_SYMBOLS), true)
  18.331 -      ifdef OPENJDK
  18.332 -        # Always add debug symbols
  18.333 -        $1_EXTRA_CFLAGS+=$(CFLAGS_DEBUG_SYMBOLS)
  18.334 -        $1_EXTRA_CXXFLAGS+=$(CXXFLAGS_DEBUG_SYMBOLS)
  18.335 -      else
  18.336 -        # Programs don't get the debug symbols added in the old build. It's not clear if
  18.337 -        # this is intentional.
  18.338 -        ifeq ($$($1_PROGRAM),)
  18.339 -          $1_EXTRA_CFLAGS+=$(CFLAGS_DEBUG_SYMBOLS)
  18.340 -          $1_EXTRA_CXXFLAGS+=$(CXXFLAGS_DEBUG_SYMBOLS)
  18.341 -        endif
  18.342 -      endif
  18.343 -    endif
  18.344 -  endif
  18.345 -
  18.346 -  ifeq ($$($1_CXXFLAGS),)
  18.347 -    $1_CXXFLAGS:=$$($1_CFLAGS)
  18.348 -  endif
  18.349 -  ifeq ($$(strip $$($1_EXTRA_CXXFLAGS)),)
  18.350 -    $1_EXTRA_CXXFLAGS:=$$($1_EXTRA_CFLAGS)
  18.351 -  endif
  18.352 -
  18.353 -  ifneq (,$$($1_REORDER))
  18.354 -    $1_EXTRA_CFLAGS += $$(C_FLAG_REORDER)
  18.355 -    $1_EXTRA_CXXFLAGS += $$(CXX_FLAG_REORDER)
  18.356 -  endif
  18.357 -
  18.358 -  ifeq (NONE, $$($1_OPTIMIZATION))
  18.359 -    $1_EXTRA_CFLAGS += $(C_O_FLAG_NONE)
  18.360 -    $1_EXTRA_CXXFLAGS += $(CXX_O_FLAG_NONE)
  18.361 -  else ifeq (LOW, $$($1_OPTIMIZATION))
  18.362 -    $1_EXTRA_CFLAGS += $(C_O_FLAG_NORM)
  18.363 -    $1_EXTRA_CXXFLAGS += $(CXX_O_FLAG_NORM)
  18.364 -  else ifeq (HIGH, $$($1_OPTIMIZATION))
  18.365 -    $1_EXTRA_CFLAGS += $(C_O_FLAG_HI)
  18.366 -    $1_EXTRA_CXXFLAGS += $(CXX_O_FLAG_HI)
  18.367 -  else ifeq (HIGHEST, $$($1_OPTIMIZATION))
  18.368 -    $1_EXTRA_CFLAGS += $(C_O_FLAG_HIGHEST)
  18.369 -    $1_EXTRA_CXXFLAGS += $(CXX_O_FLAG_HIGHEST)
  18.370 -  else ifneq (, $$($1_OPTIMIZATION))
  18.371 -    $$(error Unknown value for OPTIMIZATION: $$($1_OPTIMIZATION))
  18.372 -  endif
  18.373 -
  18.374 -  # Now call add_native_source for each source file we are going to compile.
  18.375 -  $$(foreach p,$$($1_SRCS), \
  18.376 -      $$(eval $$(call add_native_source,$1,$$p,$$($1_OBJECT_DIR), \
  18.377 -          $$($1_CFLAGS) $$($1_EXTRA_CFLAGS),$$($1_CC), \
  18.378 -          $$($1_CXXFLAGS) $$($1_EXTRA_CXXFLAGS),$(CXX),$$($1_ASFLAGS))))
  18.379 -
  18.380 -  # On windows we need to create a resource file
  18.381 -  ifeq ($(OPENJDK_TARGET_OS), windows)
  18.382 -    ifneq (,$$($1_VERSIONINFO_RESOURCE))
  18.383 -      $1_RES:=$$($1_OBJECT_DIR)/$$($1_BASENAME).res
  18.384 -      $$($1_RES): $$($1_VERSIONINFO_RESOURCE)
  18.385 -		$(RC) $$($1_RC_FLAGS) $(CC_OUT_OPTION)$$@ $$($1_VERSIONINFO_RESOURCE)
  18.386 -    endif
  18.387 -    ifneq (,$$($1_MANIFEST))
  18.388 -      $1_GEN_MANIFEST:=$$($1_OBJECT_DIR)/$$($1_PROGRAM).manifest
  18.389 -      IMVERSIONVALUE:=$(JDK_MINOR_VERSION).$(JDK_MICRO_VERSION).$(JDK_UPDATE_VERSION).$(COOKED_BUILD_NUMBER)
  18.390 -      $$($1_GEN_MANIFEST): $$($1_MANIFEST)
  18.391 -		$(SED) 's%IMVERSION%$$(IMVERSIONVALUE)%g;s%PROGRAM%$$($1_PROGRAM)%g' $$< > $$@
  18.392 -    endif
  18.393 -  endif
  18.394 -
  18.395 -  # mapfile doesnt seem to be implemented on macosx (yet??)
  18.396 -  ifneq ($(OPENJDK_TARGET_OS),macosx)
  18.397 -    ifneq ($(OPENJDK_TARGET_OS),windows)
  18.398 -      $1_REAL_MAPFILE:=$$($1_MAPFILE)
  18.399 -      ifneq (,$$($1_REORDER))
  18.400 -        $1_REAL_MAPFILE:=$$($1_OBJECT_DIR)/mapfile
  18.401 -
  18.402 -        $$($1_REAL_MAPFILE) : $$($1_MAPFILE) $$($1_REORDER)
  18.403 -		$$(MKDIR) -p $$(@D)
  18.404 -		$$(CP) $$($1_MAPFILE) $$@.tmp
  18.405 -		$$(SED) -e 's=OUTPUTDIR=$$($1_OBJECT_DIR)=' $$($1_REORDER) >> $$@.tmp
  18.406 -		$$(MV) $$@.tmp $$@
  18.407 -      endif
  18.408 -    endif
  18.409 -  endif
  18.410 -
  18.411 -  # Pickup extra OPENJDK_TARGET_OS_API and/or OPENJDK_TARGET_OS dependent variables
  18.412 -  # for LDFLAGS and LDFLAGS_SUFFIX
  18.413 -  $1_EXTRA_LDFLAGS:=$$($1_LDFLAGS_$(OPENJDK_TARGET_OS_API)) $$($1_LDFLAGS_$(OPENJDK_TARGET_OS))
  18.414 -  $1_EXTRA_LDFLAGS_SUFFIX:=$$($1_LDFLAGS_SUFFIX_$(OPENJDK_TARGET_OS_API)) $$($1_LDFLAGS_SUFFIX_$(OPENJDK_TARGET_OS))
  18.415 -  ifneq (,$$($1_REAL_MAPFILE))
  18.416 -    $1_EXTRA_LDFLAGS += $(call SET_SHARED_LIBRARY_MAPFILE,$$($1_REAL_MAPFILE))
  18.417 -  endif
  18.418 -
  18.419 -  $1 := $$($1_TARGET)
  18.420 -  ifneq (,$$($1_LIBRARY))
  18.421 -    # Generating a dynamic library.
  18.422 -    $1_EXTRA_LDFLAGS+=$$(call SET_SHARED_LIBRARY_NAME,$$($1_BASENAME))
  18.423 -    ifeq ($(OPENJDK_TARGET_OS), windows)
  18.424 -      $1_EXTRA_LDFLAGS+="-implib:$$($1_OBJECT_DIR)/$$($1_LIBRARY).lib"
  18.425 -    endif
  18.426 -
  18.427 -    $1_EXTRA_LDFLAGS_SUFFIX += $(GLOBAL_LDFLAGS_SUFFIX)
  18.428 -
  18.429 -    ifneq (,$$($1_DEBUG_SYMBOLS))
  18.430 -      ifeq ($(ENABLE_DEBUG_SYMBOLS), true)
  18.431 -        ifeq ($(OPENJDK_TARGET_OS), windows)
  18.432 -          $1_EXTRA_LDFLAGS+="-pdb:$$($1_OBJECT_DIR)/$$($1_LIBRARY).pdb" \
  18.433 -              "-map:$$($1_OBJECT_DIR)/$$($1_LIBRARY).map"
  18.434 -        endif
  18.435 -
  18.436 -        ifneq ($$($1_OUTPUT_DIR),$$($1_OBJECT_DIR))
  18.437 -          $$($1_OUTPUT_DIR)/% : $$($1_OBJECT_DIR)/%
  18.438 -		$(CP) $$< $$@
  18.439 -        endif
  18.440 -
  18.441 -        ifneq ($(OPENJDK_TARGET_OS), macosx)   # OBJCOPY is not used on MacOS X
  18.442 -          ifneq ($(OPENJDK_TARGET_OS), windows)  # nor on Windows
  18.443 -            ifeq ($(OPENJDK_TARGET_OS), solaris)
  18.444 -              # gobjcopy crashes on "empty" section headers with the SHF_ALLOC flag set.
  18.445 -              # Use $(FIX_EMPTY_SEC_HDR_FLAGS) to clear the SHF_ALLOC flag (if set) from
  18.446 -              # empty section headers until a fixed $(OBJCOPY) is available.
  18.447 -              # An empty section header has sh_addr == 0 and sh_size == 0.
  18.448 -              # This problem has only been seen on Solaris X64, but we call this tool
  18.449 -              # on all Solaris builds just in case.
  18.450 -              #
  18.451 -              # $(OBJCOPY) --add-gnu-debuglink=... corrupts SUNW_* sections.
  18.452 -              # Use $(ADD_GNU_DEBUGLINK) until a fixed $(OBJCOPY) is available.
  18.453 -              $$($1_OBJECT_DIR)/$$(LIBRARY_PREFIX)$$($1_LIBRARY).debuginfo : $$($1_TARGET) \
  18.454 -				$(FIX_EMPTY_SEC_HDR_FLAGS) $(ADD_GNU_DEBUGLINK)
  18.455 -		$(RM) $$@
  18.456 -		$(FIX_EMPTY_SEC_HDR_FLAGS) $(LOG_INFO) $$<
  18.457 -		$(OBJCOPY) --only-keep-debug $$< $$@
  18.458 -		$(CD) $$(@D) && $(ADD_GNU_DEBUGLINK) $(LOG_INFO) $$(@F) $$<
  18.459 -            else # not solaris
  18.460 -              $$($1_OBJECT_DIR)/$$(LIBRARY_PREFIX)$$($1_LIBRARY).debuginfo : $$($1_TARGET)
  18.461 -		$(RM) $$@
  18.462 -		$(OBJCOPY) --only-keep-debug $$< $$@
  18.463 -		$(CD) $$(@D) && $(OBJCOPY) --add-gnu-debuglink=$$(@F) $$<
  18.464 -            endif # Touch to not retrigger rule on rebuild
  18.465 -		$(TOUCH) $$@
  18.466 -          endif # !windows
  18.467 -        endif # !macosx
  18.468 -
  18.469 -        ifeq ($(ZIP_DEBUGINFO_FILES), true)
  18.470 -ifneq ($(OPENJDK_TARGET_OS), macosx) # no MacOS X support yet
  18.471 -          $1 += $$($1_OUTPUT_DIR)/$$(LIBRARY_PREFIX)$$($1_LIBRARY).diz
  18.472 -
  18.473 -          ifeq ($(OPENJDK_TARGET_OS), windows)
  18.474 -            $$($1_OBJECT_DIR)/$$(LIBRARY_PREFIX)$$($1_LIBRARY).diz : $$($1_TARGET)
  18.475 -		$(CD) $$($1_OBJECT_DIR) \
  18.476 -		&& $(ZIP) -q $$@ $$($1_LIBRARY).map $$($1_LIBRARY).pdb
  18.477 -          else
  18.478 -            $$($1_OBJECT_DIR)/$$(LIBRARY_PREFIX)$$($1_LIBRARY).diz : $$($1_TARGET) \
  18.479 -                $$($1_OBJECT_DIR)/$$(LIBRARY_PREFIX)$$($1_LIBRARY).debuginfo
  18.480 -		$(CD) $$($1_OBJECT_DIR) \
  18.481 -		&& $(ZIP) -q $$@ $$(LIBRARY_PREFIX)$$($1_LIBRARY).debuginfo
  18.482 -          endif
  18.483 -endif # no MacOS X support yet
  18.484 -        else
  18.485 -          ifeq ($(OPENJDK_TARGET_OS), windows)
  18.486 -            $1 += $$($1_OUTPUT_DIR)/$$($1_LIBRARY).map \
  18.487 -                $$($1_OUTPUT_DIR)/$$($1_LIBRARY).pdb
  18.488 -          else ifneq ($(OPENJDK_TARGET_OS), macosx) # MacOS X does not use .debuginfo files
  18.489 -            $1 += $$($1_OUTPUT_DIR)/$$(LIBRARY_PREFIX)$$($1_LIBRARY).debuginfo
  18.490 -          endif
  18.491 -        endif
  18.492 -      endif
  18.493 -    endif
  18.494 -
  18.495 -    $$($1_TARGET) : $$($1_EXPECTED_OBJS) $$($1_RES) $$($1_REAL_MAPFILE)
  18.496 -	$$(call LINKING_MSG,$$($1_BASENAME))
  18.497 -	$$($1_LD) $$($1_LDFLAGS) $$($1_EXTRA_LDFLAGS) $(LD_OUT_OPTION)$$@ \
  18.498 -	$$($1_EXPECTED_OBJS) $$($1_RES) $$($1_LDFLAGS_SUFFIX) \
  18.499 -	$$($1_EXTRA_LDFLAGS_SUFFIX)
  18.500 -
  18.501 -  endif
  18.502 -
  18.503 -  ifneq (,$$($1_STATIC_LIBRARY))
  18.504 -    # Generating a static library, ie object file archive.
  18.505 -    $$($1_TARGET) : $$($1_EXPECTED_OBJS) $$($1_RES)
  18.506 -	$$(call ARCHIVING_MSG,$$($1_LIBRARY))
  18.507 -	$(AR) $$($1_AR_FLAGS) $(AR_OUT_OPTION)$$($1_TARGET) $$($1_EXPECTED_OBJS) \
  18.508 -	    $$($1_RES) $$($1_LDFLAGS_SUFFIX) $$($1_EXTRA_LDFLAGS_SUFFIX)
  18.509 -  endif
  18.510 -
  18.511 -  ifneq (,$$($1_PROGRAM))
  18.512 -    # A executable binary has been specified, setup the target for it.
  18.513 -    ifneq (,$$($1_DEBUG_SYMBOLS))
  18.514 -      ifeq ($(ENABLE_DEBUG_SYMBOLS), true)
  18.515 -        ifeq ($(OPENJDK_TARGET_OS), windows)
  18.516 -          $1_EXTRA_LDFLAGS+="-pdb:$$($1_OBJECT_DIR)/$$($1_PROGRAM).pdb" \
  18.517 -              "-map:$$($1_OBJECT_DIR)/$$($1_PROGRAM).map"
  18.518 -        endif
  18.519 -
  18.520 -        ifneq ($$($1_OUTPUT_DIR),$$($1_OBJECT_DIR))
  18.521 -          $$($1_OUTPUT_DIR)/% : $$($1_OBJECT_DIR)/%
  18.522 -		$(CP) $$< $$@
  18.523 -        endif
  18.524 -
  18.525 -        ifneq ($(OPENJDK_TARGET_OS), macosx)   # OBJCOPY is not used on MacOS X
  18.526 -          ifneq ($(OPENJDK_TARGET_OS), windows)  # nor on Windows
  18.527 -            ifeq ($(OPENJDK_TARGET_OS), solaris)
  18.528 -              # gobjcopy crashes on "empty" section headers with the SHF_ALLOC flag set.
  18.529 -              # Use $(FIX_EMPTY_SEC_HDR_FLAGS) to clear the SHF_ALLOC flag (if set) from
  18.530 -              # empty section headers until a fixed $(OBJCOPY) is available.
  18.531 -              # An empty section header has sh_addr == 0 and sh_size == 0.
  18.532 -              # This problem has only been seen on Solaris X64, but we call this tool
  18.533 -              # on all Solaris builds just in case.
  18.534 -              #
  18.535 -              # $(OBJCOPY) --add-gnu-debuglink=... corrupts SUNW_* sections.
  18.536 -              # Use $(ADD_GNU_DEBUGLINK) until a fixed $(OBJCOPY) is available.
  18.537 -              $$($1_OBJECT_DIR)/$$($1_PROGRAM).debuginfo : $$($1_TARGET) \
  18.538 -				$(FIX_EMPTY_SEC_HDR_FLAGS) $(ADD_GNU_DEBUGLINK)
  18.539 -		$(RM) $$@
  18.540 -		$(FIX_EMPTY_SEC_HDR_FLAGS) $(LOG_INFO) $$<
  18.541 -		$(OBJCOPY) --only-keep-debug $$< $$@
  18.542 -		$(CD) $$(@D) && $(ADD_GNU_DEBUGLINK) $(LOG_INFO) $$(@F) $$<
  18.543 -            else # not solaris
  18.544 -              $$($1_OBJECT_DIR)/$$($1_PROGRAM).debuginfo : $$($1_TARGET)
  18.545 -		$(RM) $$@
  18.546 -		$(OBJCOPY) --only-keep-debug $$< $$@
  18.547 -		$(CD) $$(@D) && $(OBJCOPY) --add-gnu-debuglink=$$(@F) $$<
  18.548 -            endif
  18.549 -		$(TOUCH) $$@
  18.550 -          endif # !windows
  18.551 -        endif # !macosx
  18.552 -
  18.553 -        ifeq ($(ZIP_DEBUGINFO_FILES), true)
  18.554 -ifneq ($(OPENJDK_TARGET_OS), macosx) # no MacOS X support yet
  18.555 -          $1 += $$($1_OUTPUT_DIR)/$$($1_PROGRAM).diz
  18.556 -
  18.557 -          ifeq ($(OPENJDK_TARGET_OS), windows)
  18.558 -            $$($1_OBJECT_DIR)/$$($1_PROGRAM).diz : $$($1_TARGET)
  18.559 -		$(CD) $$($1_OBJECT_DIR) \
  18.560 -		&& $(ZIP) -q $$@ $$($1_PROGRAM).map $$($1_PROGRAM).pdb
  18.561 -          else
  18.562 -            $$($1_OBJECT_DIR)/$$(PROGRAM_PREFIX)$$($1_PROGRAM).diz : $$($1_TARGET) \
  18.563 -                $$($1_OBJECT_DIR)/$$($1_PROGRAM).debuginfo
  18.564 -		$(CD) $$($1_OBJECT_DIR) \
  18.565 -		&& $(ZIP) -q $$@ $$($1_PROGRAM).debuginfo
  18.566 -          endif
  18.567 -endif # no MacOS X support yet
  18.568 -        else
  18.569 -          ifeq ($(OPENJDK_TARGET_OS), windows)
  18.570 -            $1 += $$($1_OUTPUT_DIR)/$$($1_PROGRAM).map \
  18.571 -                $$($1_OUTPUT_DIR)/$$($1_PROGRAM).pdb
  18.572 -          else ifneq ($(OPENJDK_TARGET_OS), macosx) # MacOS X does not use .debuginfo files
  18.573 -            $1 += $$($1_OUTPUT_DIR)/$$($1_PROGRAM).debuginfo
  18.574 -          endif
  18.575 -        endif
  18.576 -      endif
  18.577 -    endif
  18.578 -
  18.579 -    $1_EXTRA_LDFLAGS_SUFFIX += $(GLOBAL_LDFLAGS_SUFFIX)
  18.580 -
  18.581 -    $$($1_TARGET) : $$($1_EXPECTED_OBJS) $$($1_RES) $$($1_GEN_MANIFEST)
  18.582 -	$$(call LINKING_EXE_MSG,$$($1_BASENAME))
  18.583 -	$$($1_LDEXE) $$($1_LDFLAGS) $$($1_EXTRA_LDFLAGS) $(EXE_OUT_OPTION)$$($1_TARGET) \
  18.584 -	$$($1_EXPECTED_OBJS) $$($1_RES) $$($1_LDFLAGS_SUFFIX) \
  18.585 -	$$($1_EXTRA_LDFLAGS_SUFFIX)
  18.586 -        ifneq (,$$($1_GEN_MANIFEST))
  18.587 -	  $(MT) -nologo -manifest $$($1_GEN_MANIFEST) -outputresource:$$@;#1
  18.588 -        endif
  18.589 -        # This only works if the openjdk_codesign identity is present on the system. Let
  18.590 -        # silently fail otherwise.
  18.591 -        ifneq (,$(CODESIGN))
  18.592 -          ifneq (,$$($1_CODESIGN))
  18.593 -	    $(CODESIGN) -s openjdk_codesign $$@
  18.594 -          endif
  18.595 -        endif
  18.596 -  endif
  18.597 -endef
    19.1 --- a/common/makefiles/RMICompilation.gmk	Thu Nov 07 08:16:05 2013 -0800
    19.2 +++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
    19.3 @@ -1,96 +0,0 @@
    19.4 -#
    19.5 -# Copyright (c) 2011, 2013, Oracle and/or its affiliates. All rights reserved.
    19.6 -# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
    19.7 -#
    19.8 -# This code is free software; you can redistribute it and/or modify it
    19.9 -# under the terms of the GNU General Public License version 2 only, as
   19.10 -# published by the Free Software Foundation.  Oracle designates this
   19.11 -# particular file as subject to the "Classpath" exception as provided
   19.12 -# by Oracle in the LICENSE file that accompanied this code.
   19.13 -#
   19.14 -# This code is distributed in the hope that it will be useful, but WITHOUT
   19.15 -# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
   19.16 -# FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
   19.17 -# version 2 for more details (a copy is included in the LICENSE file that
   19.18 -# accompanied this code).
   19.19 -#
   19.20 -# You should have received a copy of the GNU General Public License version
   19.21 -# 2 along with this work; if not, write to the Free Software Foundation,
   19.22 -# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
   19.23 -#
   19.24 -# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
   19.25 -# or visit www.oracle.com if you need additional information or have any
   19.26 -# questions.
   19.27 -#
   19.28 -
   19.29 -define SetupRMICompilation
   19.30 -  # param 1 is a name for a variable to depend on.
   19.31 -  # param 2 and up are named args.
   19.32 -  #   CLASSES:=List of classes to generate stubs for
   19.33 -  #   CLASSES_DIR:=Directory where to look for classes
   19.34 -  #   STUB_CLASSES_DIR:=Directory in where to put stub classes
   19.35 -  #   RUN_V11:=Set to run rmic with -v1.1
   19.36 -  #   RUN_V12:=Set to run rmic with -v1.2
   19.37 -  #   RUN_IIOP:=Set to run rmic with -iiop
   19.38 -  #   RUN_IIOP_STDPKG:=Set to run rmic with -iiop -standardPackage
   19.39 -  #   KEEP_GENERATED:=Set to keep generated sources around
   19.40 -  $(foreach i,2 3 4 5 6 7 8 9 10 11 12 13 14 15, $(if $($i),$1_$(strip $($i)))$(NEWLINE))
   19.41 -  $(call LogSetupMacroEntry,SetupRMICompilation($1),$2,$3,$4,$5,$6,$7,$8,$9,$(10),$(11),$(12),$(13),$(14),$(15))
   19.42 -  $(if $(16),$(error Internal makefile error: Too many arguments to SetupRMICompilation, please update RMICompilation.gmk))
   19.43 -
   19.44 -  $1_DEP_FILE := $$($1_STUB_CLASSES_DIR)/_the.$1_rmic.generated
   19.45 -
   19.46 -  $1_CLASSES_SLASH := $$(subst .,/,$$($1_CLASSES))
   19.47 -  $1_CLASS_FILES := $$(addprefix $$($1_CLASSES_DIR)/,$$(addsuffix .class,$$($1_CLASSES_SLASH)))
   19.48 -  $1_STUB_FILES := $$(addprefix $$($1_STUB_CLASSES_DIR)/,$$(addsuffix _Stub.class,$$($1_CLASSES_SLASH)))
   19.49 -  $1_TARGETS := $$($1_STUB_FILES)
   19.50 -  $1_ARGS :=
   19.51 -  ifneq (,$$($1_RUN_V11))
   19.52 -    $1_SKEL_FILES := $$(addprefix $$($1_STUB_CLASSES_DIR)/,$$(addsuffix _Skel.class,$$($1_CLASSES_SLASH)))
   19.53 -    $1_TARGETS += $$($1_SKEL_FILES)
   19.54 -    $1_ARGS += -v1.1
   19.55 -  endif
   19.56 -  ifneq (,$$($1_RUN_V12))
   19.57 -    $1_ARGS += -v1.2
   19.58 -  endif
   19.59 -
   19.60 -  $1_TIE_BASE_FILES := $$(foreach f,$$($1_CLASSES_SLASH),$$(dir $$f)_$$(notdir $$f))
   19.61 -  $1_TIE_FILES := $$(addprefix $$($1_STUB_CLASSES_DIR)/org/omg/stub/,$$(addsuffix _Tie.class,$$($1_TIE_BASE_FILES)))
   19.62 -  $1_TIE_STDPKG_FILES := $$(addprefix $$($1_STUB_CLASSES_DIR)/,$$(addsuffix _Tie.class,$$($1_TIE_BASE_FILES)))
   19.63 -
   19.64 -  ifneq (,$$($1_RUN_IIOP))
   19.65 -    $1_TARGETS += $$($1_TIE_FILES)
   19.66 -    $1_ARGS += -iiop -emitPermissionCheck
   19.67 -  endif
   19.68 -  ifneq (,$$($1_RUN_IIOP_STDPKG))
   19.69 -    $1_TARGETS += $$($1_TIE_STDPKG_FILES)
   19.70 -    $1_ARGS2 := -iiop -emitPermissionCheck -standardPackage
   19.71 -  endif
   19.72 -
   19.73 -  ifneq (,$$($1_KEEP_GENERATED))
   19.74 -    $1_ARGS += -keepgenerated
   19.75 -    $1_TARGETS += $$(subst .class,.java,$$($1_TARGETS))
   19.76 -  endif
   19.77 -
   19.78 -  $1_DOLLAR_SAFE_CLASSES := $$(subst $$$$,\$$$$,$$($1_CLASSES))
   19.79 -
   19.80 -  $$($1_TARGETS): $$($1_DEP_FILE) $$($1_CLASS_FILES)
   19.81 -
   19.82 -  $$($1_DEP_FILE): $$($1_CLASS_FILES)
   19.83 -	$(MKDIR) -p $$($1_STUB_CLASSES_DIR)
   19.84 -	if [ "x$$($1_ARGS)" != "x" ]; then \
   19.85 -	  $(ECHO) $(LOG_INFO) Running rmic $$($1_ARGS) for $$($1_DOLLAR_SAFE_CLASSES) && \
   19.86 -	  $(RMIC) $$($1_ARGS) -classpath "$$($1_CLASSES_DIR)" \
   19.87 -	      -d $$($1_STUB_CLASSES_DIR) $$($1_DOLLAR_SAFE_CLASSES); \
   19.88 -	fi;
   19.89 -	if [ "x$$($1_ARGS2)" != "x" ]; then \
   19.90 -	  $(ECHO) $(LOG_INFO) Running rmic $$($1_ARGS2) for $$($1_DOLLAR_SAFE_CLASSES) && \
   19.91 -	  $(RMIC) $$($1_ARGS2) -classpath "$$($1_CLASSES_DIR)" \
   19.92 -	      -d $$($1_STUB_CLASSES_DIR) $$($1_DOLLAR_SAFE_CLASSES); \
   19.93 -	fi;
   19.94 -	$(TOUCH) $$@
   19.95 -
   19.96 -
   19.97 -  $1 := $$($1_TARGETS) $$($1_DEP_FILE)
   19.98 -
   19.99 -endef
    20.1 --- a/common/makefiles/devkit/Makefile	Thu Nov 07 08:16:05 2013 -0800
    20.2 +++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
    20.3 @@ -1,121 +0,0 @@
    20.4 -#
    20.5 -# Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved.
    20.6 -# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
    20.7 -#
    20.8 -# This code is free software; you can redistribute it and/or modify it
    20.9 -# under the terms of the GNU General Public License version 2 only, as
   20.10 -# published by the Free Software Foundation.  Oracle designates this
   20.11 -# particular file as subject to the "Classpath" exception as provided
   20.12 -# by Oracle in the LICENSE file that accompanied this code.
   20.13 -#
   20.14 -# This code is distributed in the hope that it will be useful, but WITHOUT
   20.15 -# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
   20.16 -# FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
   20.17 -# version 2 for more details (a copy is included in the LICENSE file that
   20.18 -# accompanied this code).
   20.19 -#
   20.20 -# You should have received a copy of the GNU General Public License version
   20.21 -# 2 along with this work; if not, write to the Free Software Foundation,
   20.22 -# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
   20.23 -#
   20.24 -# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
   20.25 -# or visit www.oracle.com if you need additional information or have any
   20.26 -# questions.
   20.27 -#
   20.28 -
   20.29 -##########################################################################################
   20.30 -#
   20.31 -# This Makefile, together with Tools.gmk, can be used to compile a set of
   20.32 -# gcc based cross compilation, portable, self contained packages, capable
   20.33 -# of building OpenJDK.
   20.34 -#
   20.35 -# In addition to the makefiles, access to Oracle Linux installation
   20.36 -# media is required. This has been tested against Oracle Enterprise Linux
   20.37 -# 5.5. Set variables RPM_DIR_x86_64 and RPM_DIR_i686 respectively to point
   20.38 -# to directory containing the RPMs.
   20.39 -#
   20.40 -# By default this Makefile will build crosstools for:
   20.41 -# * i686-unknown-linux-gnu
   20.42 -# * x86_64-unknown-linux-gnu
   20.43 -# The x86_64 version of the compilers will work in multi arch mode and will
   20.44 -# be able to compile 32bit binaries with the -m32 flag. This makes the
   20.45 -# explicit cross compiler for i686 somewhat redundant and is a known issue.
   20.46 -#
   20.47 -# To build the full set of crosstools, use a command line looking like this:
   20.48 -#
   20.49 -# make tars RPM_DIR_x86_64=/tmp/oel55-x86_64/Server/ RPM_DIR_i686=/tmp/oel55-i686/Server/
   20.50 -#
   20.51 -# To create a x86_64 package without the redundant i686 cross compiler, do
   20.52 -# like this:
   20.53 -#
   20.54 -# make tars platforms=x86_64-unknown-linux-gnu RPM_DIR_x86_64=/tmp/oel55-x86_64/Server/ RPM_DIR_i686=/tmp/oel55-i686/Server/
   20.55 -
   20.56 -#
   20.57 -# Main makefile which iterates over all host and target platforms.
   20.58 -#
   20.59 -
   20.60 -os := $(shell uname -o)
   20.61 -cpu := x86_64
   20.62 -#$(shell uname -p)
   20.63 -
   20.64 -#
   20.65 -# This wrapper script can handle exactly these platforms
   20.66 -#
   20.67 -platforms := $(foreach p,x86_64 i686,$(p)-unknown-linux-gnu)
   20.68 -#platforms := $(foreach p,x86_64,$(p)-unknown-linux-gnu)
   20.69 -
   20.70 -# Figure out what platform this is building on.
   20.71 -me := $(cpu)-$(if $(findstring Linux,$(os)),unknown-linux-gnu)
   20.72 -
   20.73 -$(info Building on platform $(me))
   20.74 -
   20.75 -all compile : $(platforms)
   20.76 -
   20.77 -ifeq (,$(SKIP_ME))
   20.78 -  $(foreach p,$(filter-out $(me),$(platforms)),$(eval $(p) : $$(me)))
   20.79 -endif
   20.80 -
   20.81 -OUTPUT_ROOT = $(abspath ../../../build/devkit)
   20.82 -RESULT = $(OUTPUT_ROOT)/result
   20.83 -
   20.84 -submakevars = HOST=$@ BUILD=$(me) \
   20.85 -    RESULT=$(RESULT) PREFIX=$(RESULT)/$@ \
   20.86 -    OUTPUT_ROOT=$(OUTPUT_ROOT)
   20.87 -$(platforms) :
   20.88 -	@echo 'Building compilers for $@'
   20.89 -	@echo 'Targets: $(platforms)'
   20.90 -	for p in $@ $(filter-out $@,$(platforms)); do \
   20.91 -	  $(MAKE) -f Tools.gmk all $(submakevars) \
   20.92 -	      TARGET=$$p || exit 1 ; \
   20.93 -	done
   20.94 -	@echo 'Building ccache program for $@'
   20.95 -	$(MAKE) -f Tools.gmk ccache $(submakevars) TARGET=$@
   20.96 -	@echo 'All done"'
   20.97 -
   20.98 -$(foreach a,i686 x86_64,$(eval $(a) : $(filter $(a)%,$(platforms))))
   20.99 -
  20.100 -ia32 : i686
  20.101 -today := $(shell date +%Y%m%d)
  20.102 -
  20.103 -
  20.104 -define Mktar
  20.105 -  $(1)_tar = $$(RESULT)/sdk-$(1)-$$(today).tar.gz
  20.106 -  $$($(1)_tar) : PLATFORM = $(1)
  20.107 -  TARFILES += $$($(1)_tar)
  20.108 -  $$($(1)_tar) : $(1) $$(shell find $$(RESULT)/$(1))
  20.109 -endef
  20.110 -
  20.111 -$(foreach p,$(platforms),$(eval $(call Mktar,$(p))))
  20.112 -
  20.113 -tars : all $(TARFILES)
  20.114 -onlytars : $(TARFILES)
  20.115 -%.tar.gz :
  20.116 -	@echo 'Creating compiler package $@'
  20.117 -	cd $(RESULT)/$(PLATFORM) && tar -czf $@ *
  20.118 -	touch $@
  20.119 -
  20.120 -clean :
  20.121 -	rm -rf build result
  20.122 -
  20.123 -FORCE :
  20.124 -.PHONY : $(configs) $(platforms)
    21.1 --- a/common/makefiles/devkit/Tools.gmk	Thu Nov 07 08:16:05 2013 -0800
    21.2 +++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
    21.3 @@ -1,473 +0,0 @@
    21.4 -#
    21.5 -# Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved.
    21.6 -# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
    21.7 -#
    21.8 -# This code is free software; you can redistribute it and/or modify it
    21.9 -# under the terms of the GNU General Public License version 2 only, as
   21.10 -# published by the Free Software Foundation.  Oracle designates this
   21.11 -# particular file as subject to the "Classpath" exception as provided
   21.12 -# by Oracle in the LICENSE file that accompanied this code.
   21.13 -#
   21.14 -# This code is distributed in the hope that it will be useful, but WITHOUT
   21.15 -# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
   21.16 -# FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
   21.17 -# version 2 for more details (a copy is included in the LICENSE file that
   21.18 -# accompanied this code).
   21.19 -#
   21.20 -# You should have received a copy of the GNU General Public License version
   21.21 -# 2 along with this work; if not, write to the Free Software Foundation,
   21.22 -# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
   21.23 -#
   21.24 -# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
   21.25 -# or visit www.oracle.com if you need additional information or have any
   21.26 -# questions.
   21.27 -#
   21.28 -
   21.29 -##########################################################################################
   21.30 -#
   21.31 -# Workhorse makefile for creating ONE cross compiler
   21.32 -# Needs either to be from BUILD -> BUILD OR have
   21.33 -# BUILD -> HOST prebuilt
   21.34 -#
   21.35 -# NOTE: There is a bug here. We don't limit the
   21.36 -# PATH when building BUILD -> BUILD, which means that
   21.37 -# if you configure after you've once build the BUILD->BUILD
   21.38 -# compiler THAT one will be picked up as the compiler for itself.
   21.39 -# This is not so great, especially if you did a partial delete
   21.40 -# of the target tree.
   21.41 -#
   21.42 -# Fix this...
   21.43 -#
   21.44 -
   21.45 -$(info TARGET=$(TARGET))
   21.46 -$(info HOST=$(HOST))
   21.47 -$(info BUILD=$(BUILD))
   21.48 -
   21.49 -ARCH := $(word 1,$(subst -, ,$(TARGET)))
   21.50 -
   21.51 -##########################################################################################
   21.52 -# Define external dependencies
   21.53 -
   21.54 -# Latest that could be made to work.
   21.55 -gcc_ver := gcc-4.7.3
   21.56 -binutils_ver := binutils-2.22
   21.57 -ccache_ver := ccache-3.1.9
   21.58 -mpfr_ver := mpfr-3.0.1
   21.59 -gmp_ver := gmp-4.3.2
   21.60 -mpc_ver := mpc-1.0.1
   21.61 -
   21.62 -GCC := http://ftp.gnu.org/pub/gnu/gcc/$(gcc_ver)/$(gcc_ver).tar.bz2
   21.63 -BINUTILS := http://ftp.gnu.org/pub/gnu/binutils/$(binutils_ver).tar.bz2
   21.64 -CCACHE := http://samba.org/ftp/ccache/$(ccache_ver).tar.gz
   21.65 -MPFR := http://www.mpfr.org/${mpfr_ver}/${mpfr_ver}.tar.bz2
   21.66 -GMP := http://ftp.gnu.org/pub/gnu/gmp/${gmp_ver}.tar.bz2
   21.67 -MPC := http://www.multiprecision.org/mpc/download/${mpc_ver}.tar.gz
   21.68 -
   21.69 -# RPMs in OEL5.5
   21.70 -RPM_LIST := \
   21.71 -    kernel-headers \
   21.72 -    glibc-2 glibc-headers glibc-devel \
   21.73 -    cups-libs cups-devel \
   21.74 -    libX11 libX11-devel \
   21.75 -    xorg-x11-proto-devel \
   21.76 -    alsa-lib alsa-lib-devel \
   21.77 -    libXext libXext-devel \
   21.78 -    libXtst libXtst-devel \
   21.79 -    libXrender libXrender-devel \
   21.80 -    freetype freetype-devel \
   21.81 -    libXt libXt-devel \
   21.82 -    libSM libSM-devel \
   21.83 -    libICE libICE-devel \
   21.84 -    libXi libXi-devel \
   21.85 -    libXdmcp libXdmcp-devel \
   21.86 -    libXau libXau-devel \
   21.87 -    libgcc
   21.88 -
   21.89 -
   21.90 -ifeq ($(ARCH),x86_64)
   21.91 -  RPM_DIR ?= $(RPM_DIR_x86_64)
   21.92 -  RPM_ARCHS := x86_64
   21.93 -  ifeq ($(BUILD),$(HOST))
   21.94 -    ifeq ($(TARGET),$(HOST))
   21.95 -      # When building the native compiler for x86_64, enable mixed mode.
   21.96 -      RPM_ARCHS += i386 i686
   21.97 -    endif
   21.98 -  endif
   21.99 -else
  21.100 -  RPM_DIR ?= $(RPM_DIR_i686)
  21.101 -  RPM_ARCHS := i386 i686
  21.102 -endif
  21.103 -
  21.104 -# Sort to remove duplicates
  21.105 -RPM_FILE_LIST := $(sort $(foreach a,$(RPM_ARCHS),$(wildcard $(patsubst %,$(RPM_DIR)/%*$a.rpm,$(RPM_LIST)))))
  21.106 -
  21.107 -ifeq ($(RPM_FILE_LIST),)
  21.108 -  $(error Found no RPMs, RPM_DIR must point to list of directories to search for RPMs)
  21.109 -endif
  21.110 -
  21.111 -##########################################################################################
  21.112 -# Define common directories and files
  21.113 -
  21.114 -# Ensure we have 32-bit libs also for x64. We enable mixed-mode.
  21.115 -ifeq (x86_64,$(ARCH))
  21.116 -  LIBDIRS := lib64 lib
  21.117 -  CFLAGS_lib := -m32
  21.118 -else
  21.119 -  LIBDIRS := lib
  21.120 -endif
  21.121 -
  21.122 -# Define directories
  21.123 -RESULT := $(OUTPUT_ROOT)/result
  21.124 -BUILDDIR := $(OUTPUT_ROOT)/$(HOST)/$(TARGET)
  21.125 -PREFIX := $(RESULT)/$(HOST)
  21.126 -TARGETDIR := $(PREFIX)/$(TARGET)
  21.127 -SYSROOT := $(TARGETDIR)/sys-root
  21.128 -DOWNLOAD := $(OUTPUT_ROOT)/download
  21.129 -SRCDIR := $(OUTPUT_ROOT)/src
  21.130 -
  21.131 -# Marker file for unpacking rpms
  21.132 -rpms := $(SYSROOT)/rpms_unpacked
  21.133 -
  21.134 -# Need to patch libs that are linker scripts to use non-absolute paths
  21.135 -libs := $(SYSROOT)/libs_patched
  21.136 -
  21.137 -##########################################################################################
  21.138 -# Unpack source packages
  21.139 -
  21.140 -# Generate downloading + unpacking of sources.
  21.141 -define Download
  21.142 -  $(1)_DIR = $(abspath $(SRCDIR)/$(basename $(basename $(notdir $($(1))))))
  21.143 -  $(1)_CFG = $$($(1)_DIR)/configure
  21.144 -  $(1)_FILE = $(DOWNLOAD)/$(notdir $($(1)))
  21.145 -
  21.146 -  $$($(1)_CFG) : $$($(1)_FILE)
  21.147 -	mkdir -p $$(SRCDIR)
  21.148 -	tar -C $$(SRCDIR) -x$$(if $$(findstring .gz, $$<),z,j)f $$<
  21.149 -	$$(foreach p,$$(abspath $$(wildcard $$(notdir $$($(1)_DIR)).patch)), \
  21.150 -	  echo PATCHING $$(p) ; \
  21.151 -	  patch -d $$($(1)_DIR) -p1 -i $$(p) ; \
  21.152 -	)
  21.153 -	touch $$@
  21.154 -
  21.155 -  $$($(1)_FILE) :
  21.156 -	wget -P $(DOWNLOAD) $$($(1))
  21.157 -endef
  21.158 -
  21.159 -# Download and unpack all source packages
  21.160 -$(foreach p,GCC BINUTILS CCACHE MPFR GMP MPC,$(eval $(call Download,$(p))))
  21.161 -
  21.162 -##########################################################################################
  21.163 -# Unpack RPMS
  21.164 -
  21.165 -# Note. For building linux you should install rpm2cpio.
  21.166 -define unrpm
  21.167 -  $(SYSROOT)/$(notdir $(1)).unpacked \
  21.168 -    : $(1)
  21.169 -  $$(rpms) : $(SYSROOT)/$(notdir $(1)).unpacked
  21.170 -endef
  21.171 -
  21.172 -%.unpacked :
  21.173 -	$(info Unpacking target rpms and libraries from $<)
  21.174 -	@(mkdir -p $(@D); \
  21.175 -	cd $(@D); \
  21.176 -	rpm2cpio $< | \
  21.177 -	    cpio --extract --make-directories \
  21.178 -	        -f \
  21.179 -	        "./usr/share/doc/*" \
  21.180 -	        "./usr/share/man/*" \
  21.181 -	        "./usr/X11R6/man/*" \
  21.182 -	        "*/X11/locale/*" \
  21.183 -	    || die ; )
  21.184 -	touch $@
  21.185 -
  21.186 -$(foreach p,$(RPM_FILE_LIST),$(eval $(call unrpm,$(p))))
  21.187 -
  21.188 -##########################################################################################
  21.189 -
  21.190 -# Note: MUST create a <sys-root>/usr/lib even if not really needed.
  21.191 -# gcc will use a path relative to it to resolve lib64. (x86_64).
  21.192 -# we're creating multi-lib compiler with 32bit libc as well, so we should
  21.193 -# have it anyway, but just to make sure...
  21.194 -# Patch libc.so and libpthread.so to force linking against libraries in sysroot
  21.195 -# and not the ones installed on the build machine.
  21.196 -$(libs) : $(rpms)
  21.197 -	@echo Patching libc and pthreads
  21.198 -	@(for f in `find $(SYSROOT) -name libc.so -o -name libpthread.so`; do \
  21.199 -	  (cat $$f | sed -e 's|/usr/lib64/||g' \
  21.200 -	      -e 's|/usr/lib/||g' \
  21.201 -	      -e 's|/lib64/||g' \
  21.202 -	      -e 's|/lib/||g' ) > $$f.tmp ; \
  21.203 -	  mv $$f.tmp $$f ; \
  21.204 -	done)
  21.205 -	@mkdir -p $(SYSROOT)/usr/lib
  21.206 -	@touch $@
  21.207 -
  21.208 -##########################################################################################
  21.209 -
  21.210 -# Define marker files for each source package to be compiled
  21.211 -$(foreach t,binutils mpfr gmp mpc gcc ccache,$(eval $(t) = $(TARGETDIR)/$($(t)_ver).done))
  21.212 -
  21.213 -##########################################################################################
  21.214 -
  21.215 -# Default base config
  21.216 -CONFIG = --target=$(TARGET) \
  21.217 -    --host=$(HOST) --build=$(BUILD) \
  21.218 -    --prefix=$(PREFIX)
  21.219 -
  21.220 -PATHEXT = $(RESULT)/$(BUILD)/bin:
  21.221 -
  21.222 -PATHPRE = PATH=$(PATHEXT)$(PATH)
  21.223 -BUILDPAR = -j16
  21.224 -
  21.225 -# Default commands to when making
  21.226 -MAKECMD =
  21.227 -INSTALLCMD = install
  21.228 -
  21.229 -
  21.230 -declare_tools = CC$(1)=$(2)gcc LD$(1)=$(2)ld AR$(1)=$(2)ar AS$(1)=$(2)as RANLIB$(1)=$(2)ranlib CXX$(1)=$(2)g++ OBJDUMP$(1)=$(2)objdump
  21.231 -
  21.232 -ifeq ($(HOST),$(BUILD))
  21.233 -  ifeq ($(HOST),$(TARGET))
  21.234 -    TOOLS = $(call declare_tools,_FOR_TARGET,)
  21.235 -  endif
  21.236 -endif
  21.237 -
  21.238 -TOOLS ?= $(call declare_tools,_FOR_TARGET,$(TARGET)-)
  21.239 -
  21.240 -##########################################################################################
  21.241 -
  21.242 -# Create a TARGET bfd + libiberty only.
  21.243 -# Configure one or two times depending on mulitlib arch.
  21.244 -# If multilib, the second should be 32-bit, and we resolve
  21.245 -# CFLAG_<name> to most likely -m32.
  21.246 -define mk_bfd
  21.247 -  $$(info Libs for $(1))
  21.248 -  $$(BUILDDIR)/$$(binutils_ver)-$(subst /,-,$(1))/Makefile \
  21.249 -      : CFLAGS += $$(CFLAGS_$(1))
  21.250 -  $$(BUILDDIR)/$$(binutils_ver)-$(subst /,-,$(1))/Makefile \
  21.251 -      : LIBDIRS = --libdir=$(TARGETDIR)/$(1)
  21.252 -
  21.253 -  bfdlib += $$(TARGETDIR)/$$(binutils_ver)-$(subst /,-,$(1)).done
  21.254 -  bfdmakes += $$(BUILDDIR)/$$(binutils_ver)-$(subst /,-,$(1))/Makefile
  21.255 -endef
  21.256 -
  21.257 -# Create one set of bfds etc for each multilib arch
  21.258 -$(foreach l,$(LIBDIRS),$(eval $(call mk_bfd,$(l))))
  21.259 -
  21.260 -# Only build these two libs.
  21.261 -$(bfdlib) : MAKECMD = all-libiberty all-bfd
  21.262 -$(bfdlib) : INSTALLCMD = install-libiberty install-bfd
  21.263 -
  21.264 -# Building targets libbfd + libiberty. HOST==TARGET, i.e not
  21.265 -# for a cross env.
  21.266 -$(bfdmakes) : CONFIG = --target=$(TARGET) \
  21.267 -    --host=$(TARGET) --build=$(BUILD) \
  21.268 -    --prefix=$(TARGETDIR) \
  21.269 -    --with-sysroot=$(SYSROOT) \
  21.270 -    $(LIBDIRS)
  21.271 -
  21.272 -$(bfdmakes) : TOOLS = $(call declare_tools,_FOR_TARGET,$(TARGET)-) $(call declare_tools,,$(TARGET)-)
  21.273 -
  21.274 -##########################################################################################
  21.275 -
  21.276 -$(gcc) \
  21.277 -    $(binutils) \
  21.278 -    $(gmp) \
  21.279 -    $(mpfr) \
  21.280 -    $(mpc) \
  21.281 -    $(bfdmakes) \
  21.282 -    $(ccache) : ENVS += $(TOOLS)
  21.283 -
  21.284 -# libdir to work around hateful bfd stuff installing into wrong dirs...
  21.285 -# ensure we have 64 bit bfd support in the HOST library. I.e our
  21.286 -# compiler on i686 will know 64 bit symbols, BUT later
  21.287 -# we build just the libs again for TARGET, then with whatever the arch
  21.288 -# wants.
  21.289 -$(BUILDDIR)/$(binutils_ver)/Makefile : CONFIG += --enable-64-bit-bfd --libdir=$(PREFIX)/$(word 1,$(LIBDIRS))
  21.290 -
  21.291 -# Makefile creation. Simply run configure in build dir.
  21.292 -$(bfdmakes) \
  21.293 -$(BUILDDIR)/$(binutils_ver)/Makefile \
  21.294 -    : $(BINUTILS_CFG)
  21.295 -	$(info Configuring $@. Log in $(@D)/log.config)
  21.296 -	@mkdir -p $(@D)
  21.297 -	( \
  21.298 -	  cd $(@D) ; \
  21.299 -	  $(PATHPRE) $(ENVS) CFLAGS="$(CFLAGS)" \
  21.300 -	      $(BINUTILS_CFG) \
  21.301 -	      $(CONFIG) \
  21.302 -	      --with-sysroot=$(SYSROOT) \
  21.303 -	      --disable-nls \
  21.304 -	      --program-prefix=$(TARGET)- \
  21.305 -	      --enable-multilib \
  21.306 -	) > $(@D)/log.config 2>&1
  21.307 -	@echo 'done'
  21.308 -
  21.309 -$(BUILDDIR)/$(mpfr_ver)/Makefile \
  21.310 -    : $(MPFR_CFG)
  21.311 -	$(info Configuring $@. Log in $(@D)/log.config)
  21.312 -	@mkdir -p $(@D)
  21.313 -	( \
  21.314 -	  cd $(@D) ; \
  21.315 -	  $(PATHPRE) $(ENVS) CFLAGS="$(CFLAGS)" \
  21.316 -	      $(MPFR_CFG) \
  21.317 -	      $(CONFIG) \
  21.318 -	      --program-prefix=$(TARGET)- \
  21.319 -	      --enable-shared=no \
  21.320 -	      --with-gmp=$(PREFIX) \
  21.321 -	) > $(@D)/log.config 2>&1
  21.322 -	@echo 'done'
  21.323 -
  21.324 -$(BUILDDIR)/$(gmp_ver)/Makefile \
  21.325 -    : $(GMP_CFG)
  21.326 -	$(info Configuring $@. Log in $(@D)/log.config)
  21.327 -	@mkdir -p $(@D)
  21.328 -	( \
  21.329 -	  cd $(@D) ; \
  21.330 -	  $(PATHPRE) $(ENVS) CFLAGS="$(CFLAGS)" \
  21.331 -	      $(GMP_CFG) \
  21.332 -	      --host=$(HOST) --build=$(BUILD) \
  21.333 -	      --prefix=$(PREFIX) \
  21.334 -	      --disable-nls \
  21.335 -	      --program-prefix=$(TARGET)- \
  21.336 -	      --enable-shared=no \
  21.337 -	      --with-mpfr=$(PREFIX) \
  21.338 -	) > $(@D)/log.config 2>&1
  21.339 -	@echo 'done'
  21.340 -
  21.341 -$(BUILDDIR)/$(mpc_ver)/Makefile \
  21.342 -    : $(MPC_CFG)
  21.343 -	$(info Configuring $@. Log in $(@D)/log.config)
  21.344 -	@mkdir -p $(@D)
  21.345 -	( \
  21.346 -	  cd $(@D) ; \
  21.347 -	  $(PATHPRE) $(ENVS) CFLAGS="$(CFLAGS)" \
  21.348 -	      $(MPC_CFG) \
  21.349 -	      $(CONFIG) \
  21.350 -	      --program-prefix=$(TARGET)- \
  21.351 -	      --enable-shared=no \
  21.352 -	      --with-mpfr=$(PREFIX) \
  21.353 -	      --with-gmp=$(PREFIX) \
  21.354 -	) > $(@D)/log.config 2>&1
  21.355 -	@echo 'done'
  21.356 -
  21.357 -# Only valid if glibc target -> linux
  21.358 -# proper destructor handling for c++
  21.359 -ifneq (,$(findstring linux,$(TARGET)))
  21.360 -  $(BUILDDIR)/$(gcc_ver)/Makefile : CONFIG += --enable-__cxa_atexit
  21.361 -endif
  21.362 -
  21.363 -# Want:
  21.364 -# c,c++
  21.365 -# shared libs
  21.366 -# multilib (-m32/-m64 on x64)
  21.367 -# skip native language.
  21.368 -# and link and assemble with the binutils we created
  21.369 -# earlier, so --with-gnu*
  21.370 -$(BUILDDIR)/$(gcc_ver)/Makefile \
  21.371 -    : $(GCC_CFG)
  21.372 -	$(info Configuring $@. Log in $(@D)/log.config)
  21.373 -	mkdir -p $(@D)
  21.374 -	( \
  21.375 -	  cd $(@D) ; \
  21.376 -	  $(PATHPRE) $(ENVS) $(GCC_CFG) $(EXTRA_CFLAGS) \
  21.377 -	      $(CONFIG) \
  21.378 -	      --with-sysroot=$(SYSROOT) \
  21.379 -	      --enable-languages=c,c++ \
  21.380 -	      --enable-shared \
  21.381 -	      --enable-multilib \
  21.382 -	      --disable-nls \
  21.383 -	      --with-gnu-as \
  21.384 -	      --with-gnu-ld \
  21.385 -	      --with-mpfr=$(PREFIX) \
  21.386 -	      --with-gmp=$(PREFIX) \
  21.387 -	      --with-mpc=$(PREFIX) \
  21.388 -	) > $(@D)/log.config 2>&1
  21.389 -	@echo 'done'
  21.390 -
  21.391 -# need binutils for gcc
  21.392 -$(gcc) : $(binutils)
  21.393 -
  21.394 -# as of 4.3 or so need these for doing config
  21.395 -$(BUILDDIR)/$(gcc_ver)/Makefile : $(gmp) $(mpfr) $(mpc)
  21.396 -$(mpfr) : $(gmp)
  21.397 -$(mpc) : $(gmp) $(mpfr)
  21.398 -
  21.399 -##########################################################################################
  21.400 -# very straightforward. just build a ccache. it is only for host.
  21.401 -$(BUILDDIR)/$(ccache_ver)/Makefile \
  21.402 -    : $(CCACHE_CFG)
  21.403 -	$(info Configuring $@. Log in $(@D)/log.config)
  21.404 -	@mkdir -p $(@D)
  21.405 -	@( \
  21.406 -	  cd $(@D) ; \
  21.407 -	  $(PATHPRE) $(ENVS) $(CCACHE_CFG) \
  21.408 -	      $(CONFIG) \
  21.409 -	) > $(@D)/log.config 2>&1
  21.410 -	@echo 'done'
  21.411 -
  21.412 -gccpatch = $(TARGETDIR)/gcc-patched
  21.413 -
  21.414 -##########################################################################################
  21.415 -# For some reason cpp is not created as a target-compiler
  21.416 -ifeq ($(HOST),$(TARGET))
  21.417 -  $(gccpatch) : $(gcc) link_libs
  21.418 -	@echo -n 'Creating compiler symlinks...'
  21.419 -	@for f in cpp; do \
  21.420 -	  if [ ! -e $(PREFIX)/bin/$(TARGET)-$$f ]; \
  21.421 -	  then \
  21.422 -	    cd $(PREFIX)/bin && \
  21.423 -	    ln -s $$f $(TARGET)-$$f ; \
  21.424 -	  fi \
  21.425 -	done
  21.426 -	@touch $@
  21.427 -	@echo 'done'
  21.428 -
  21.429 -  ##########################################################################################
  21.430 -  # Ugly at best. Seems that when we compile host->host compiler, that are NOT
  21.431 -  # the BUILD compiler, the result will not try searching for libs in package root.
  21.432 -  # "Solve" this by create links from the target libdirs to where they are.
  21.433 -  link_libs:
  21.434 -	@echo -n 'Creating library symlinks...'
  21.435 -	@$(foreach l,$(LIBDIRS), \
  21.436 -	for f in `cd $(PREFIX)/$(l) && ls`; do \
  21.437 -	  if [ ! -e $(TARGETDIR)/$(l)/$$f ]; then \
  21.438 -	    mkdir -p $(TARGETDIR)/$(l) && \
  21.439 -	    cd $(TARGETDIR)/$(l)/ && \
  21.440 -	    ln -s $(if $(findstring /,$(l)),../,)../../$(l)/$$f $$f; \
  21.441 -	  fi \
  21.442 -	done;)
  21.443 -	@echo 'done'
  21.444 -else
  21.445 -  $(gccpatch) :
  21.446 -	@echo 'done'
  21.447 -endif
  21.448 -
  21.449 -##########################################################################################
  21.450 -# Build in two steps.
  21.451 -# make <default>
  21.452 -# make install.
  21.453 -# Use path to our build hosts cross tools
  21.454 -# Always need to build cross tools for build host self.
  21.455 -$(TARGETDIR)/%.done : $(BUILDDIR)/%/Makefile
  21.456 -	$(info Building $(basename $@). Log in $(<D)/log.build)
  21.457 -	$(PATHPRE) $(ENVS) $(MAKE) $(BUILDPAR) -f $< -C $(<D) $(MAKECMD) $(MAKECMD.$(notdir $@)) > $(<D)/log.build 2>&1
  21.458 -	@echo -n 'installing...'
  21.459 -	$(PATHPRE) $(MAKE) $(INSTALLPAR) -f $< -C $(<D) $(INSTALLCMD) $(MAKECMD.$(notdir $@)) > $(<D)/log.install 2>&1
  21.460 -	@touch $@
  21.461 -	@echo 'done'
  21.462 -
  21.463 -##########################################################################################
  21.464 -
  21.465 -bfdlib : $(bfdlib)
  21.466 -binutils : $(binutils)
  21.467 -rpms : $(rpms)
  21.468 -libs : $(libs)
  21.469 -sysroot : rpms libs
  21.470 -gcc : sysroot $(gcc) $(gccpatch)
  21.471 -all : binutils gcc bfdlib
  21.472 -
  21.473 -# this is only built for host. so separate.
  21.474 -ccache : $(ccache)
  21.475 -
  21.476 -.PHONY : gcc all binutils bfdlib link_libs rpms libs sysroot
    22.1 --- a/common/makefiles/javadoc/CORE_PKGS.gmk	Thu Nov 07 08:16:05 2013 -0800
    22.2 +++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
    22.3 @@ -1,300 +0,0 @@
    22.4 -#
    22.5 -# Copyright (c) 2001, 2011, Oracle and/or its affiliates. All rights reserved.
    22.6 -# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
    22.7 -#
    22.8 -# This code is free software; you can redistribute it and/or modify it
    22.9 -# under the terms of the GNU General Public License version 2 only, as
   22.10 -# published by the Free Software Foundation.  Oracle designates this
   22.11 -# particular file as subject to the "Classpath" exception as provided
   22.12 -# by Oracle in the LICENSE file that accompanied this code.
   22.13 -#
   22.14 -# This code is distributed in the hope that it will be useful, but WITHOUT
   22.15 -# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
   22.16 -# FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
   22.17 -# version 2 for more details (a copy is included in the LICENSE file that
   22.18 -# accompanied this code).
   22.19 -#
   22.20 -# You should have received a copy of the GNU General Public License version
   22.21 -# 2 along with this work; if not, write to the Free Software Foundation,
   22.22 -# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
   22.23 -#
   22.24 -# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
   22.25 -# or visit www.oracle.com if you need additional information or have any
   22.26 -# questions.
   22.27 -#
   22.28 -
   22.29 -# EXCLUDE_PKGS is the list of packages to exclude from the
   22.30 -# Java API Specification. Do not add these to CORE_PKGS.
   22.31 -# The concatenation of EXCLUDE_PKGS and CORE_PKGS
   22.32 -# should make up the list of all packages under the
   22.33 -# src/shared/classes directory of the JDK source tree.
   22.34 -#
   22.35 -EXCLUDE_PKGS = \
   22.36 -    java.awt.peer \
   22.37 -    java.awt.dnd.peer \
   22.38 -    sun.* \
   22.39 -    com.sun.* \
   22.40 -    org.apache.* \
   22.41 -    org.jcp.* \
   22.42 -    org.w3c.dom.css \
   22.43 -    org.w3c.dom.html \
   22.44 -    org.w3c.dom.stylesheets \
   22.45 -    org.w3c.dom.traversal \
   22.46 -    org.w3c.dom.ranges \
   22.47 -    org.omg.stub.javax.management.remote.rmi
   22.48 -
   22.49 -#
   22.50 -# ACTIVE_JSR_PKGS are packages that are part of an active JSR process--
   22.51 -# one that is doing its own review. These packages are not included when
   22.52 -# creating diff pages for the platform's JCP process.
   22.53 -#
   22.54 -# (see /java/pubs/apisrc/jdk/6.0/beta/make/docs/active_jsr_pkgs)
   22.55 -# Note:
   22.56 -# This is a list of regular expressions. So foo.* matches "foo" and "foo.bar".
   22.57 -#
   22.58 -ACTIVE_JSR_PKGS= \
   22.59 -    java.lang.invoke \
   22.60 -    java.sql \
   22.61 -    javax.activation \
   22.62 -    javax.annotation.* \
   22.63 -    javax.jws.* \
   22.64 -    javax.lang.* \
   22.65 -    javax.management.* \
   22.66 -    javax.script \
   22.67 -    javax.sql.* \
   22.68 -    javax.tools.* \
   22.69 -    javax.xml.* \
   22.70 -    org.w3c.* \
   22.71 -    org.xml.sax
   22.72 -
   22.73 -#
   22.74 -# CORE_PKGS is the list of packages that form the
   22.75 -# Java API Specification.
   22.76 -#
   22.77 -### ***IMPORTANT NOTE***
   22.78 -### There is also a "REGEXP" variable in the docs/makefile that
   22.79 -### determines which table the packages go in on the main page.
   22.80 -### Currently, there is only table ("Platform Packages") and
   22.81 -### everything goes in it, so REGEXP is "*". But if that policy
   22.82 -### changes, packages added will need to be reflected in that
   22.83 -### list of wildcard expressions, as well.
   22.84 -###
   22.85 -CORE_PKGS = \
   22.86 -    java.applet \
   22.87 -    java.awt \
   22.88 -    java.awt.color \
   22.89 -    java.awt.datatransfer \
   22.90 -    java.awt.dnd \
   22.91 -    java.awt.event \
   22.92 -    java.awt.font \
   22.93 -    java.awt.geom \
   22.94 -    java.awt.im \
   22.95 -    java.awt.im.spi \
   22.96 -    java.awt.image \
   22.97 -    java.awt.image.renderable \
   22.98 -    java.awt.print \
   22.99 -    java.beans \
  22.100 -    java.beans.beancontext \
  22.101 -    java.io \
  22.102 -    java.lang \
  22.103 -    java.lang.annotation \
  22.104 -    java.lang.instrument \
  22.105 -    java.lang.invoke \
  22.106 -    java.lang.management \
  22.107 -    java.lang.ref \
  22.108 -    java.lang.reflect \
  22.109 -    java.math \
  22.110 -    java.net \
  22.111 -    java.nio \
  22.112 -    java.nio.channels \
  22.113 -    java.nio.channels.spi \
  22.114 -    java.nio.charset \
  22.115 -    java.nio.charset.spi \
  22.116 -    java.nio.file \
  22.117 -    java.nio.file.attribute \
  22.118 -    java.nio.file.spi \
  22.119 -    java.rmi \
  22.120 -    java.rmi.activation \
  22.121 -    java.rmi.dgc \
  22.122 -    java.rmi.registry \
  22.123 -    java.rmi.server \
  22.124 -    java.security \
  22.125 -    java.security.acl \
  22.126 -    java.security.cert \
  22.127 -    java.security.interfaces \
  22.128 -    java.security.spec \
  22.129 -    java.sql \
  22.130 -    java.text \
  22.131 -    java.text.spi \
  22.132 -    java.time \
  22.133 -    java.time.chrono \
  22.134 -    java.time.format \
  22.135 -    java.time.temporal \
  22.136 -    java.time.zone \
  22.137 -    java.util \
  22.138 -    java.util.concurrent \
  22.139 -    java.util.concurrent.atomic \
  22.140 -    java.util.concurrent.locks \
  22.141 -    java.util.function \
  22.142 -    java.util.jar \
  22.143 -    java.util.logging \
  22.144 -    java.util.prefs \
  22.145 -    java.util.regex \
  22.146 -    java.util.spi \
  22.147 -    java.util.stream \
  22.148 -    java.util.zip \
  22.149 -    javax.accessibility \
  22.150 -    javax.activation \
  22.151 -    javax.activity \
  22.152 -    javax.annotation \
  22.153 -    javax.annotation.processing \
  22.154 -    javax.crypto \
  22.155 -    javax.crypto.interfaces \
  22.156 -    javax.crypto.spec \
  22.157 -    javax.imageio \
  22.158 -    javax.imageio.event \
  22.159 -    javax.imageio.metadata \
  22.160 -    javax.imageio.plugins.jpeg \
  22.161 -    javax.imageio.plugins.bmp \
  22.162 -    javax.imageio.spi \
  22.163 -    javax.imageio.stream \
  22.164 -    javax.jws \
  22.165 -    javax.jws.soap \
  22.166 -    javax.lang.model \
  22.167 -    javax.lang.model.element \
  22.168 -    javax.lang.model.type \
  22.169 -    javax.lang.model.util \
  22.170 -    javax.management \
  22.171 -    javax.management.loading \
  22.172 -    javax.management.monitor \
  22.173 -    javax.management.relation \
  22.174 -    javax.management.openmbean \
  22.175 -    javax.management.timer \
  22.176 -    javax.management.modelmbean \
  22.177 -    javax.management.remote \
  22.178 -    javax.management.remote.rmi \
  22.179 -    javax.naming \
  22.180 -    javax.naming.directory \
  22.181 -    javax.naming.event \
  22.182 -    javax.naming.ldap \
  22.183 -    javax.naming.spi \
  22.184 -    javax.net \
  22.185 -    javax.net.ssl \
  22.186 -    javax.print \
  22.187 -    javax.print.attribute \
  22.188 -    javax.print.attribute.standard \
  22.189 -    javax.print.event \
  22.190 -    javax.rmi \
  22.191 -    javax.rmi.CORBA \
  22.192 -    javax.rmi.ssl \
  22.193 -    javax.script \
  22.194 -    javax.security.auth \
  22.195 -    javax.security.auth.callback \
  22.196 -    javax.security.auth.kerberos \
  22.197 -    javax.security.auth.login \
  22.198 -    javax.security.auth.spi \
  22.199 -    javax.security.auth.x500 \
  22.200 -    javax.security.cert \
  22.201 -    javax.security.sasl \
  22.202 -    javax.sound.sampled \
  22.203 -    javax.sound.sampled.spi \
  22.204 -    javax.sound.midi \
  22.205 -    javax.sound.midi.spi \
  22.206 -    javax.sql \
  22.207 -    javax.sql.rowset \
  22.208 -    javax.sql.rowset.serial \
  22.209 -    javax.sql.rowset.spi \
  22.210 -    javax.swing \
  22.211 -    javax.swing.border \
  22.212 -    javax.swing.colorchooser \
  22.213 -    javax.swing.filechooser \
  22.214 -    javax.swing.event \
  22.215 -    javax.swing.table \
  22.216 -    javax.swing.text \
  22.217 -    javax.swing.text.html \
  22.218 -    javax.swing.text.html.parser \
  22.219 -    javax.swing.text.rtf \
  22.220 -    javax.swing.tree \
  22.221 -    javax.swing.undo \
  22.222 -    javax.swing.plaf \
  22.223 -    javax.swing.plaf.basic \
  22.224 -    javax.swing.plaf.metal \
  22.225 -    javax.swing.plaf.multi \
  22.226 -    javax.swing.plaf.nimbus \
  22.227 -    javax.swing.plaf.synth \
  22.228 -    javax.tools \
  22.229 -    javax.tools.annotation \
  22.230 -    javax.transaction \
  22.231 -    javax.transaction.xa \
  22.232 -    javax.xml.parsers \
  22.233 -    javax.xml.bind \
  22.234 -    javax.xml.bind.annotation \
  22.235 -    javax.xml.bind.annotation.adapters \
  22.236 -    javax.xml.bind.attachment \
  22.237 -    javax.xml.bind.helpers \
  22.238 -    javax.xml.bind.util \
  22.239 -    javax.xml.soap \
  22.240 -    javax.xml.ws \
  22.241 -    javax.xml.ws.handler \
  22.242 -    javax.xml.ws.handler.soap \
  22.243 -    javax.xml.ws.http \
  22.244 -    javax.xml.ws.soap \
  22.245 -    javax.xml.ws.spi \
  22.246 -    javax.xml.ws.spi.http \
  22.247 -    javax.xml.ws.wsaddressing \
  22.248 -    javax.xml.transform \
  22.249 -    javax.xml.transform.sax \
  22.250 -    javax.xml.transform.dom \
  22.251 -    javax.xml.transform.stax \
  22.252 -    javax.xml.transform.stream \
  22.253 -    javax.xml \
  22.254 -    javax.xml.crypto \
  22.255 -    javax.xml.crypto.dom \
  22.256 -    javax.xml.crypto.dsig \
  22.257 -    javax.xml.crypto.dsig.dom \
  22.258 -    javax.xml.crypto.dsig.keyinfo \
  22.259 -    javax.xml.crypto.dsig.spec \
  22.260 -    javax.xml.datatype \
  22.261 -    javax.xml.validation \
  22.262 -    javax.xml.namespace \
  22.263 -    javax.xml.xpath \
  22.264 -    javax.xml.stream \
  22.265 -    javax.xml.stream.events \
  22.266 -    javax.xml.stream.util \
  22.267 -    org.ietf.jgss \
  22.268 -    org.omg.CORBA \
  22.269 -    org.omg.CORBA.DynAnyPackage \
  22.270 -    org.omg.CORBA.ORBPackage \
  22.271 -    org.omg.CORBA.TypeCodePackage \
  22.272 -    org.omg.stub.java.rmi \
  22.273 -    org.omg.CORBA.portable \
  22.274 -    org.omg.CORBA_2_3 \
  22.275 -    org.omg.CORBA_2_3.portable \
  22.276 -    org.omg.CosNaming \
  22.277 -    org.omg.CosNaming.NamingContextExtPackage \
  22.278 -    org.omg.CosNaming.NamingContextPackage \
  22.279 -    org.omg.SendingContext \
  22.280 -    org.omg.PortableServer \
  22.281 -    org.omg.PortableServer.CurrentPackage \
  22.282 -    org.omg.PortableServer.POAPackage \
  22.283 -    org.omg.PortableServer.POAManagerPackage \
  22.284 -    org.omg.PortableServer.ServantLocatorPackage \
  22.285 -    org.omg.PortableServer.portable \
  22.286 -    org.omg.PortableInterceptor \
  22.287 -    org.omg.PortableInterceptor.ORBInitInfoPackage \
  22.288 -    org.omg.Messaging \
  22.289 -    org.omg.IOP \
  22.290 -    org.omg.IOP.CodecFactoryPackage \
  22.291 -    org.omg.IOP.CodecPackage \
  22.292 -    org.omg.Dynamic \
  22.293 -    org.omg.DynamicAny \
  22.294 -    org.omg.DynamicAny.DynAnyPackage \
  22.295 -    org.omg.DynamicAny.DynAnyFactoryPackage \
  22.296 -    org.w3c.dom \
  22.297 -    org.w3c.dom.events \
  22.298 -    org.w3c.dom.bootstrap \
  22.299 -    org.w3c.dom.ls \
  22.300 -    org.w3c.dom.views \
  22.301 -    org.xml.sax \
  22.302 -    org.xml.sax.ext \
  22.303 -    org.xml.sax.helpers
    23.1 --- a/common/makefiles/javadoc/Javadoc.gmk	Thu Nov 07 08:16:05 2013 -0800
    23.2 +++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
    23.3 @@ -1,1188 +0,0 @@
    23.4 -# Copyright (c) 1997, 2013, Oracle and/or its affiliates. All rights reserved.
    23.5 -# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
    23.6 -#
    23.7 -# This code is free software; you can redistribute it and/or modify it
    23.8 -# under the terms of the GNU General Public License version 2 only, as
    23.9 -# published by the Free Software Foundation.  Oracle designates this
   23.10 -# particular file as subject to the "Classpath" exception as provided
   23.11 -# by Oracle in the LICENSE file that accompanied this code.
   23.12 -#
   23.13 -# This code is distributed in the hope that it will be useful, but WITHOUT
   23.14 -# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
   23.15 -# FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
   23.16 -# version 2 for more details (a copy is included in the LICENSE file that
   23.17 -# accompanied this code).
   23.18 -#
   23.19 -# You should have received a copy of the GNU General Public License version
   23.20 -# 2 along with this work; if not, write to the Free Software Foundation,
   23.21 -# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
   23.22 -#
   23.23 -# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
   23.24 -# or visit www.oracle.com if you need additional information or have any
   23.25 -# questions.
   23.26 -#
   23.27 -
   23.28 -include $(SPEC)
   23.29 -include MakeBase.gmk
   23.30 -
   23.31 -.SUFFIXES: # Delete the default suffixes
   23.32 -.SUFFIXES: .java
   23.33 -
   23.34 -#
   23.35 -# Definitions for $(DOCSDIR), $(MKDIR), $(BINDIR), etc.
   23.36 -#
   23.37 -
   23.38 -DOCSDIR=$(OUTPUT_ROOT)/docs
   23.39 -TEMPDIR=$(OUTPUT_ROOT)/docstemp
   23.40 -
   23.41 -JDK_SHARE_SRC=$(JDK_TOPDIR)/src/share
   23.42 -JDK_SHARE_CLASSES=$(JDK_SHARE_SRC)/classes
   23.43 -
   23.44 -JDK_IMPSRC = $(JDK_OUTPUTDIR)/impsrc
   23.45 -
   23.46 -JDK_GENSRC = $(JDK_OUTPUTDIR)/gensrc
   23.47 -
   23.48 -HOTSPOT_DOCS_IMPORT_PATH=$(HOTSPOT_OUTPUTDIR)/docs
   23.49 -
   23.50 -BUILD_NUMBER=$(JDK_BUILD_NUMBER)
   23.51 -
   23.52 -JAVADOC_CMD = $(JAVA) \
   23.53 -    -Xmx1024m \
   23.54 -    -Djava.awt.headless=true \
   23.55 -    $(NEW_JAVADOC) \
   23.56 -    -bootclasspath $(JDK_OUTPUTDIR)/classes
   23.57 -
   23.58 -# Copyright year for beginning of Java and some of the apis
   23.59 -# (Needed when creating the javadocs)
   23.60 -FIRST_COPYRIGHT_YEAR = 1993
   23.61 -DOMAPI_FIRST_COPYRIGHT_YEAR = 2005
   23.62 -MIRROR_FIRST_COPYRIGHT_YEAR = 2004
   23.63 -DOCLETAPI_FIRST_COPYRIGHT_YEAR = 1993
   23.64 -TAGLETAPI_FIRST_COPYRIGHT_YEAR = 1993
   23.65 -JDI_FIRST_COPYRIGHT_YEAR = 1999
   23.66 -JAAS_FIRST_COPYRIGHT_YEAR = 1998
   23.67 -JGSS_FIRST_COPYRIGHT_YEAR = 2000
   23.68 -SMARTCARDIO_FIRST_COPYRIGHT_YEAR = 2005
   23.69 -HTTPSERVER_FIRST_COPYRIGHT_YEAR = 2005
   23.70 -MGMT_FIRST_COPYRIGHT_YEAR = 2003
   23.71 -ATTACH_FIRST_COPYRIGHT_YEAR = 2005
   23.72 -JCONSOLE_FIRST_COPYRIGHT_YEAR = 2006
   23.73 -SCTPAPI_FIRST_COPYRIGHT_YEAR = 2009
   23.74 -TRACING_FIRST_COPYRIGHT_YEAR = 2008
   23.75 -TREEAPI_FIRST_COPYRIGHT_YEAR = 2005
   23.76 -JNLP_FIRST_COPYRIGHT_YEAR = 1998
   23.77 -PLUGIN2_FIRST_COPYRIGHT_YEAR = 2007
   23.78 -
   23.79 -# Oracle name
   23.80 -FULL_COMPANY_NAME = Oracle and/or its affiliates
   23.81 -
   23.82 -# Copyright address
   23.83 -COMPANY_ADDRESS = 500 Oracle Parkway<br>Redwood Shores, CA 94065 USA.
   23.84 -
   23.85 -# The trademark symbol
   23.86 -TRADEMARK = &trade;
   23.87 -
   23.88 -# Common copyright lines used
   23.89 -# The word "Copyright" might optionally be a link to the file cpyr.html.
   23.90 -# The first year of copyright may vary or not be available.
   23.91 -# The address to the company might be optional.
   23.92 -COMMA:= ,
   23.93 -EMPTY:=
   23.94 -SPACE:=$(EMPTY) $(EMPTY)
   23.95 -COPYRIGHT_SYMBOL = &\#x00a9;
   23.96 -# Macro to construct the copyright line
   23.97 -# (The GNU make 3.78.1 "if" conditional is broken, fixed in GNU make 3.81)
   23.98 -define CopyrightLine # optionalurl optionalfirstyear optionaladdress
   23.99 -$(if $(strip $1),<a href="$(strip $1)">Copyright</a>,Copyright) \
  23.100 -$(COPYRIGHT_SYMBOL) $(if $2,$2${COMMA},) $(COPYRIGHT_YEAR),\
  23.101 -$(FULL_COMPANY_NAME). $3 All rights reserved.
  23.102 -endef
  23.103 -
  23.104 -# Url to root of documents
  23.105 -DOCSDIR_URL = {@docroot}/$(GET2DOCSDIR)
  23.106 -
  23.107 -# Url to copyright html file
  23.108 -COPYRIGHT_URL-7 = $(DOCSDIR_URL)/legal/cpyr.html
  23.109 -# This isn't added in old build yet.
  23.110 -#COPYRIGHT_URL-8 = $(DOCSDIR_URL)/legal/cpyr.html
  23.111 -COPYRIGHT_URL = $(COPYRIGHT_URL-$(JDK_MINOR_VERSION))
  23.112 -
  23.113 -# Url to bug filing site
  23.114 -BUG_SUBMIT_URL = http://bugreport.sun.com/bugreport/
  23.115 -
  23.116 -# Common line for how to submit a bug or rfe
  23.117 -BUG_SUBMIT_LINE = <a href="$(BUG_SUBMIT_URL)">Submit a bug or feature</a>
  23.118 -
  23.119 -# Url to devdocs page
  23.120 -# Was: http://java.sun.com/javase/6/webnotes/devdocs-vs-specs.html
  23.121 -DEV_DOCS_URL-7 = http://download.oracle.com/javase/7/docs/index.html
  23.122 -DEV_DOCS_URL-8 = http://download.oracle.com/javase/8/docs/index.html
  23.123 -DEV_DOCS_URL = $(DEV_DOCS_URL-$(JDK_MINOR_VERSION))
  23.124 -DOCS_BASE_URL = http://download.oracle.com/javase/7/docs
  23.125 -
  23.126 -# Common Java trademark line
  23.127 -JAVA_TRADEMARK_LINE = Java is a trademark or registered trademark of \
  23.128 -$(FULL_COMPANY_NAME) in the US and other countries.
  23.129 -
  23.130 -#################################################################
  23.131 -# Macros:
  23.132 -
  23.133 -
  23.134 -# List of all possible directories for javadoc to look for sources
  23.135 -# NOTE: Quotes are required around sourcepath argument only on Windows.
  23.136 -# Otherwise, you get "No packages or classes specified." due
  23.137 -# to $(PATH_SEP) being interpreted as an end of
  23.138 -# command (newline or shell ; character)
  23.139 -ALL_SOURCE_DIRS = $(JDK_SHARE_CLASSES) \
  23.140 -    $(JDK_IMPSRC) \
  23.141 -    $(JDK_GENSRC) \
  23.142 -    $(JDK_OUTPUTDIR)/gendocsrc_rmic \
  23.143 -    $(JDK_TOPDIR)/src/solaris/classes \
  23.144 -    $(JDK_TOPDIR)/src/windows/classes \
  23.145 -    $(JDK_SHARE_SRC)/doc/stub
  23.146 -
  23.147 -# List of directories that actually exist
  23.148 -ALL_EXISTING_SOURCE_DIRS := $(wildcard $(ALL_SOURCE_DIRS))
  23.149 -
  23.150 -# List with classpath separator between them
  23.151 -EMPTY:=
  23.152 -SPACE:= $(EMPTY) $(EMPTY)
  23.153 -RELEASEDOCS_SOURCEPATH = \
  23.154 -    $(subst $(SPACE),$(PATH_SEP),$(strip $(ALL_SOURCE_DIRS)))
  23.155 -
  23.156 -define prep-target
  23.157 -	$(MKDIR) -p $(@D)
  23.158 -	$(RM) $@
  23.159 -endef
  23.160 -
  23.161 -# Prep for javadoc creation, assumes $@ is an index.html file
  23.162 -define prep-javadoc
  23.163 -	@if [ -f "$@" -a "$?" != "" ] ; then \
  23.164 -	  $(ECHO) "# Dependencies have changed: $?"; \
  23.165 -	fi
  23.166 -	$(RM) -r $(@D)
  23.167 -	$(MKDIR) -p $(@D)
  23.168 -endef
  23.169 -
  23.170 -# A cache of the directories in ALL_SOURCE_DIRS
  23.171 -DIRECTORY_CACHE = $(DOCSTMPDIR)/directory.cache
  23.172 -
  23.173 -# Given a list of packages, return a list of files or dirs to be dependent on
  23.174 -# (Currently only returning a list of directories)
  23.175 -define PackageDependencies # packages
  23.176 -  $(shell \
  23.177 -      if [ "$1" != "" -a -f $(DIRECTORY_CACHE) ] ; then \
  23.178 -        for p in $1 ; do \
  23.179 -          pd=`$(ECHO) $${p} | $(SED) -e 's@[.]@/@g'`; \
  23.180 -          $(CAT) $(DIRECTORY_CACHE) | $(GREP) "/$${pd}/" ; \
  23.181 -        done; \
  23.182 -      fi \
  23.183 -  )
  23.184 -endef
  23.185 -
  23.186 -# Given a list of packages, add packages that exist to $@, print summary
  23.187 -define PackageFilter # packages
  23.188 -	@if [ "$1" != "" ] ; then \
  23.189 -	  for p in $1 ; do \
  23.190 -	    pd=`$(ECHO) $${p} | $(SED) -e 's@[.]@/@g'`; \
  23.191 -	    found="false"; \
  23.192 -	    for cp in $(ALL_SOURCE_DIRS) ; do \
  23.193 -	      if [ -d $${cp}/$${pd} ] ; then \
  23.194 -	        $(ECHO) "$${p}" >> $@; \
  23.195 -	        found="true"; \
  23.196 -	        break; \
  23.197 -	      fi; \
  23.198 -	    done; \
  23.199 -	    if [ "$${found}" = "false" ] ; then \
  23.200 -	      $(ECHO) "WARNING: Package not found: $${p}"; \
  23.201 -	    fi; \
  23.202 -	  done; \
  23.203 -	fi
  23.204 -endef
  23.205 -
  23.206 -# Print out a summary of the javadoc command about to be run
  23.207 -define JavadocSummary # optionsfile packagesfile
  23.208 -	@$(ECHO) "# Summary for $@"; \
  23.209 -	$(ECHO) "# Options (`$(BASENAME) $1`):"; $(SED) -e 's@^@#   @' $1; \
  23.210 -	$(ECHO) "# Packages (`$(BASENAME) $2`):";$(SED) -e 's@^@#   @' $2
  23.211 -endef
  23.212 -
  23.213 -#
  23.214 -# Temporary directory for javadoc creation
  23.215 -#
  23.216 -DOCSTMPDIR = $(TEMPDIR)/doctmp
  23.217 -
  23.218 -#
  23.219 -# Different api directories created from root directory
  23.220 -#
  23.221 -COREAPI_DOCSDIR = $(DOCSDIR)/api
  23.222 -JDK_API_DOCSDIR = $(DOCSDIR)/jdk/api
  23.223 -JRE_API_DOCSDIR = $(DOCSDIR)/jre/api
  23.224 -PLATFORM_DOCSDIR = $(DOCSDIR)/platform
  23.225 -
  23.226 -# The non-core api javadocs need to be able to access the root of the core
  23.227 -# api directory, so for jdk/api or jre/api to get to the core api/
  23.228 -# directory we would use this:
  23.229 -JDKJRE2COREAPI = ../../api
  23.230 -
  23.231 -# Common bottom argument
  23.232 -define CommonBottom # year
  23.233 -<font size="-1"><br> $(call CopyrightLine,,$1,)</font>
  23.234 -endef
  23.235 -
  23.236 -# Common trademark bottom argument (Not sure why this is used sometimes)
  23.237 -define CommonTrademarkBottom # year
  23.238 -<font size="-1">\
  23.239 -$(BUG_SUBMIT_LINE)<br>$(JAVA_TRADEMARK_LINE)<br>\
  23.240 -$(call CopyrightLine,,$1,$(COMPANY_ADDRESS))\
  23.241 -</font>
  23.242 -endef
  23.243 -
  23.244 -# Common echo of option
  23.245 -define OptionOnly # opt
  23.246 -	$(PRINTF) "%s\n" "$1"
  23.247 -endef
  23.248 -define OptionPair # opt arg
  23.249 -	$(PRINTF) "%s '%s'\n" "$1" '$2'
  23.250 -endef
  23.251 -define OptionTrip # opt arg arg
  23.252 -	$(PRINTF) "%s '%s' '%s'\n" "$1" '$2' '$3'
  23.253 -endef
  23.254 -
  23.255 -# Core api bottom argument (with special sauce)
  23.256 -COREAPI_BOTTOM = <font size="-1"> $(BUG_SUBMIT_LINE)\
  23.257 -<br>For further API reference and developer documentation, \
  23.258 -see <a href="$(DEV_DOCS_URL)" target="_blank">Java SE Documentation</a>. \
  23.259 -That documentation contains more detailed, developer-targeted descriptions, \
  23.260 -with conceptual overviews, definitions of terms, workarounds, \
  23.261 -and working code examples.<br>\
  23.262 -$(call CopyrightLine,$(COPYRIGHT_URL),$(FIRST_COPYRIGHT_YEAR),)\
  23.263 -</font>
  23.264 -
  23.265 -# Common javadoc options used by all
  23.266 -COMMON_JAVADOCFLAGS = \
  23.267 -    -XDignore.symbol.file=true \
  23.268 -    -quiet \
  23.269 -    -use \
  23.270 -    -keywords \
  23.271 -    -Xdoclint:none \
  23.272 -    -Xprofilespath $(JDK_TOPDIR)/makefiles/profile-rtjar-includes.txt \
  23.273 -    $(ADDITIONAL_JAVADOCFLAGS)
  23.274 -
  23.275 -ifdef OPENJDK
  23.276 -  ADDITIONAL_JAVADOCFLAGS = \
  23.277 -      -Xdocrootparent $(DOCS_BASE_URL)
  23.278 -else
  23.279 -  ADDITIONAL_JAVADOCFLAGS =
  23.280 -endif
  23.281 -
  23.282 -# Draft used for non-fcs documents
  23.283 -DRAFT_HEADER =
  23.284 -ifneq ($(MILESTONE), fcs)
  23.285 -  DRAFT_HEADER = <br><strong>DRAFT&nbsp;$(MILESTONE)-$(BUILD_NUMBER)</strong>
  23.286 -  DRAFT_BOTTOM = <br><strong>DRAFT&nbsp;$(MILESTONE)-$(BUILD_NUMBER)</strong>
  23.287 -  DRAFT_WINTITLE = $(BUILD_NUMBER)
  23.288 -  # Early access top text (not used in FCS releases)
  23.289 -  COREAPI_TOP_EARLYACCESS = \
  23.290 -<div style="background-color: \#EEEEEE"> \
  23.291 -<div style="padding: 6px; margin-top: 2px; margin-bottom: 6px; \
  23.292 -margin-left: 6px; margin-right: 6px; text-align: justify; \
  23.293 -font-size: 80%; font-family: Helvetica, Arial, sans-serif; \
  23.294 -font-weight: normal;"> \
  23.295 -Please note that the specifications and other information \
  23.296 -contained herein are not final and are subject to change. \
  23.297 -The information is being made available to you solely for purpose of \
  23.298 -evaluation. \
  23.299 -</div> </div>
  23.300 -
  23.301 -endif
  23.302 -
  23.303 -#################################################################
  23.304 -
  23.305 -#
  23.306 -# CORE_PKGS environment variable has been moved to the following file
  23.307 -#
  23.308 -include CORE_PKGS.gmk
  23.309 -
  23.310 -#
  23.311 -# Load environment variables for API package names that are not part of
  23.312 -# the Java SE platform
  23.313 -#
  23.314 -include NON_CORE_PKGS.gmk
  23.315 -
  23.316 -#################################################################
  23.317 -
  23.318 -#
  23.319 -# Default target is same as docs target, create core api and all others it can
  23.320 -#
  23.321 -
  23.322 -all: docs
  23.323 -docs: coredocs otherdocs
  23.324 -
  23.325 -#################################################################
  23.326 -# Production Targets -- USE THESE TARGETS WHEN:
  23.327 -# a) You're generating docs outside of release engineering's
  23.328 -#    standard control build.
  23.329 -# b) The docs will be pushed to the web and/or included in
  23.330 -#    the downloaded doc bundle.
  23.331 -#
  23.332 -# See: Notes.html#releaseTargets
  23.333 -# Note: Spaces precede ifdef/ifndef indents. Tabs precede target commands (!)
  23.334 -#
  23.335 -
  23.336 -sanitycheckcoredocs:
  23.337 -	@$(ECHO) ""
  23.338 -	@$(ECHO) "Building core api docs with these values:"
  23.339 -	@$(ECHO) "    BUILD_NUMBER = $(BUILD_NUMBER)"
  23.340 -	@$(ECHO) "    MILESTONE = $(MILESTONE)"
  23.341 -	@$(ECHO) ""
  23.342 -        ifeq ($(BUILD_NUMBER), b00)
  23.343 -	  @$(ECHO) "ERROR: Build number must be defined"
  23.344 -	  @$(ECHO) "MILESTONE is set to $(MILESTONE)"
  23.345 -	  @$(ECHO) ""
  23.346 -	  exit 1
  23.347 -        endif
  23.348 -
  23.349 -#############################################################
  23.350 -#
  23.351 -# coredocs
  23.352 -#
  23.353 -COREAPI_DOCTITLE = Java$(TRADEMARK) Platform, Standard Edition \
  23.354 -$(JDK_MINOR_VERSION)<br>API Specification
  23.355 -COREAPI_WINDOWTITLE = Java Platform SE $(JDK_MINOR_VERSION)
  23.356 -COREAPI_HEADER = \
  23.357 -<strong>Java$(TRADEMARK)&nbsp;Platform<br>Standard&nbsp;Ed.&nbsp;$(JDK_MINOR_VERSION)</strong>
  23.358 -
  23.359 -# Java language specification cite
  23.360 -TAG_JLS = jls:a:See <cite> \
  23.361 -The Java&trade; Language Specification</cite>:
  23.362 -
  23.363 -# Overview file for core apis
  23.364 -COREAPI_OVERVIEW = $(JDK_SHARE_CLASSES)/overview-core.html
  23.365 -
  23.366 -# The index.html, options, and packages files
  23.367 -COREAPI_INDEX_FILE = $(COREAPI_DOCSDIR)/index.html
  23.368 -COREAPI_OPTIONS_FILE = $(DOCSTMPDIR)/coredocs.options
  23.369 -COREAPI_PACKAGES_FILE = $(DOCSTMPDIR)/coredocs.packages
  23.370 -
  23.371 -coredocs: $(COREAPI_INDEX_FILE)
  23.372 -
  23.373 -# Set relative location to core api document root
  23.374 -$(COREAPI_INDEX_FILE): GET2DOCSDIR=..
  23.375 -
  23.376 -# Run javadoc if the index file is out of date or missing
  23.377 -$(COREAPI_INDEX_FILE): $(COREAPI_OPTIONS_FILE) $(COREAPI_PACKAGES_FILE)
  23.378 -	$(prep-javadoc)
  23.379 -	$(call JavadocSummary,$(COREAPI_OPTIONS_FILE),$(COREAPI_PACKAGES_FILE))
  23.380 -	$(JAVADOC_CMD) -d $(@D) \
  23.381 -	    @$(COREAPI_OPTIONS_FILE) @$(COREAPI_PACKAGES_FILE)
  23.382 -
  23.383 -# Create file with javadoc options in it
  23.384 -$(COREAPI_OPTIONS_FILE): $(COREAPI_OVERVIEW)
  23.385 -	$(prep-target)
  23.386 -	@($(call OptionOnly,$(COMMON_JAVADOCFLAGS)) ; \
  23.387 -	  $(call OptionPair,-sourcepath,$(RELEASEDOCS_SOURCEPATH)) ; \
  23.388 -	  $(call OptionPair,-encoding,ISO-8859-1) ; \
  23.389 -	  $(call OptionPair,-tag,beaninfo:X) ; \
  23.390 -	  $(call OptionPair,-tag,revised:X) ; \
  23.391 -	  $(call OptionPair,-tag,since.unbundled:X) ; \
  23.392 -	  $(call OptionPair,-tag,spec:X) ; \
  23.393 -	  $(call OptionPair,-tag,specdefault:X) ; \
  23.394 -	  $(call OptionPair,-tag,Note:X) ; \
  23.395 -	  $(call OptionPair,-tag,ToDo:X) ; \
  23.396 -	  $(call OptionPair,-tag,apiNote:a:API Note:) ; \
  23.397 -	  $(call OptionPair,-tag,implSpec:a:Implementation Requirements:) ; \
  23.398 -	  $(call OptionPair,-tag,implNote:a:Implementation Note:) ; \
  23.399 -	  $(call OptionPair,-tag,param) ; \
  23.400 -	  $(call OptionPair,-tag,return) ; \
  23.401 -	  $(call OptionPair,-tag,throws) ; \
  23.402 -	  $(call OptionPair,-tag,since) ; \
  23.403 -	  $(call OptionPair,-tag,version) ; \
  23.404 -	  $(call OptionPair,-tag,serialData) ; \
  23.405 -	  $(call OptionPair,-tag,factory) ; \
  23.406 -	  $(call OptionPair,-tag,see) ; \
  23.407 -	  $(call OptionPair,-tag,$(TAG_JLS)) ; \
  23.408 -	  $(call OptionOnly,-splitIndex) ; \
  23.409 -	  $(call OptionPair,-overview,$(COREAPI_OVERVIEW)) ; \
  23.410 -	  $(call OptionPair,-doctitle,$(COREAPI_DOCTITLE)) ; \
  23.411 -	  $(call OptionPair,-windowtitle,$(COREAPI_WINDOWTITLE) $(DRAFT_WINTITLE)) ; \
  23.412 -	  $(call OptionPair,-header,$(COREAPI_HEADER)$(DRAFT_HEADER)) ; \
  23.413 -	  $(call OptionPair,-bottom,$(COREAPI_BOTTOM)$(DRAFT_BOTTOM)) ; \
  23.414 -	) >> $@
  23.415 -        ifdef COREAPI_TOP_EARLYACCESS
  23.416 -	  @$(call OptionPair,-top,$(COREAPI_TOP_EARLYACCESS)) >> $@
  23.417 -        endif
  23.418 -
  23.419 -# Create a file with the package names in it
  23.420 -$(COREAPI_PACKAGES_FILE): $(DIRECTORY_CACHE) $(call PackageDependencies,$(CORE_PKGS))
  23.421 -	$(prep-target)
  23.422 -	$(call PackageFilter,$(CORE_PKGS))
  23.423 -
  23.424 -#############################################################
  23.425 -#
  23.426 -# docletapidocs
  23.427 -#
  23.428 -
  23.429 -ALL_OTHER_TARGETS += docletapidocs
  23.430 -
  23.431 -DOCLETAPI_DOCDIR := $(JDK_API_DOCSDIR)/javadoc/doclet
  23.432 -DOCLETAPI2COREAPI := ../../$(JDKJRE2COREAPI)
  23.433 -DOCLETAPI_DOCTITLE := Doclet API
  23.434 -DOCLETAPI_WINDOWTITLE := Doclet API
  23.435 -DOCLETAPI_HEADER := <strong>Doclet API</strong>
  23.436 -DOCLETAPI_BOTTOM := $(call CommonTrademarkBottom,$(DOCLETAPI_FIRST_COPYRIGHT_YEAR))
  23.437 -DOCLETAPI_GROUPNAME := Packages
  23.438 -DOCLETAPI_REGEXP := com.sun.javadoc
  23.439 -# DOCLETAPI_PKGS is located in NON_CORE_PKGS.gmk
  23.440 -
  23.441 -# The index.html, options, and packages files
  23.442 -DOCLETAPI_INDEX_FILE = $(DOCLETAPI_DOCDIR)/index.html
  23.443 -DOCLETAPI_OPTIONS_FILE = $(DOCSTMPDIR)/docletapi.options
  23.444 -DOCLETAPI_PACKAGES_FILE = $(DOCSTMPDIR)/docletapi.packages
  23.445 -
  23.446 -docletapidocs: $(DOCLETAPI_INDEX_FILE)
  23.447 -
  23.448 -# Set relative location to core api document root
  23.449 -$(DOCLETAPI_INDEX_FILE): GET2DOCSDIR=$(DOCLETAPI2COREAPI)/..
  23.450 -
  23.451 -# Run javadoc if the index file is out of date or missing
  23.452 -$(DOCLETAPI_INDEX_FILE): $(DOCLETAPI_OPTIONS_FILE) $(DOCLETAPI_PACKAGES_FILE) coredocs
  23.453 -	$(prep-javadoc)
  23.454 -	$(call JavadocSummary,$(DOCLETAPI_OPTIONS_FILE),$(DOCLETAPI_PACKAGES_FILE))
  23.455 -	$(JAVADOC_CMD) -d $(@D) \
  23.456 -	    @$(DOCLETAPI_OPTIONS_FILE) @$(DOCLETAPI_PACKAGES_FILE)
  23.457 -
  23.458 -# Create file with javadoc options in it
  23.459 -$(DOCLETAPI_OPTIONS_FILE):
  23.460 -	$(prep-target)
  23.461 -	@($(call OptionOnly,$(COMMON_JAVADOCFLAGS)) ; \
  23.462 -	  $(call OptionPair,-sourcepath,$(RELEASEDOCS_SOURCEPATH)) ; \
  23.463 -	  $(call OptionPair,-encoding,ascii) ; \
  23.464 -	  $(call OptionOnly,-breakiterator) ; \
  23.465 -	  $(call OptionPair,-doctitle,$(DOCLETAPI_DOCTITLE)) ; \
  23.466 -	  $(call OptionPair,-windowtitle,$(DOCLETAPI_WINDOWTITLE) $(DRAFT_WINTITLE)); \
  23.467 -	  $(call OptionPair,-header,$(DOCLETAPI_HEADER)$(DRAFT_HEADER)) ; \
  23.468 -	  $(call OptionPair,-bottom,$(DOCLETAPI_BOTTOM)$(DRAFT_BOTTOM)) ; \
  23.469 -	  $(call OptionTrip,-group,$(DOCLETAPI_GROUPNAME),$(DOCLETAPI_REGEXP)); \
  23.470 -	  $(call OptionTrip,-linkoffline,$(DOCLETAPI2COREAPI),$(COREAPI_DOCSDIR)/); \
  23.471 -	) >> $@
  23.472 -
  23.473 -# Create a file with the package names in it
  23.474 -$(DOCLETAPI_PACKAGES_FILE): $(DIRECTORY_CACHE) $(call PackageDependencies,$(DOCLETAPI_PKGS))
  23.475 -	$(prep-target)
  23.476 -	$(call PackageFilter,$(DOCLETAPI_PKGS))
  23.477 -
  23.478 -#############################################################
  23.479 -#
  23.480 -# tagletapidocs
  23.481 -#
  23.482 -
  23.483 -ALL_OTHER_TARGETS += tagletapidocs
  23.484 -TAGLETAPI_DOCDIR := $(JDK_API_DOCSDIR)/javadoc/taglet
  23.485 -TAGLETAPI2COREAPI := ../../$(JDKJRE2COREAPI)
  23.486 -TAGLETAPI_BOTTOM := $(call CommonTrademarkBottom,$(TAGLETAPI_FIRST_COPYRIGHT_YEAR))
  23.487 -# TAGLETAPI_FILE is located in NON_CORE_PKGS.gmk
  23.488 -
  23.489 -# Temporary directory (special generation rules)
  23.490 -TAGLETAPI_TEMPDIR = $(DOCSTMPDIR)/taglets_temp
  23.491 -
  23.492 -# The index.html, options, and packages files
  23.493 -TAGLETAPI_INDEX_FILE = $(TAGLETAPI_DOCDIR)/index.html
  23.494 -TAGLETAPI_OPTIONS_FILE = $(DOCSTMPDIR)/tagletapi.options
  23.495 -TAGLETAPI_PACKAGES_FILE = $(DOCSTMPDIR)/tagletapi.packages
  23.496 -
  23.497 -tagletapidocs: $(TAGLETAPI_INDEX_FILE)
  23.498 -
  23.499 -# Set relative location to core api document root
  23.500 -$(TAGLETAPI_INDEX_FILE): GET2DOCSDIR=$(TAGLETAPI2COREAPI)/..
  23.501 -
  23.502 -# Run javadoc if the index file is out of date or missing
  23.503 -$(TAGLETAPI_INDEX_FILE): $(TAGLETAPI_OPTIONS_FILE) $(TAGLETAPI_PACKAGES_FILE) coredocs
  23.504 -	$(prep-javadoc)
  23.505 -	$(RM) -r $(TAGLETAPI_TEMPDIR)
  23.506 -	$(MKDIR) -p $(TAGLETAPI_TEMPDIR)
  23.507 -	$(call JavadocSummary,$(TAGLETAPI_OPTIONS_FILE),$(TAGLETAPI_PACKAGES_FILE))
  23.508 -	$(JAVADOC_CMD) -d $(TAGLETAPI_TEMPDIR) \
  23.509 -	    @$(TAGLETAPI_OPTIONS_FILE) @$(TAGLETAPI_PACKAGES_FILE)
  23.510 -	cp -r $(TAGLETAPI_TEMPDIR)/com $(@D)
  23.511 -	cp $(TAGLETAPI_TEMPDIR)/stylesheet.css $(@D)
  23.512 -	$(RM) -r $(TAGLETAPI_TEMPDIR)
  23.513 -
  23.514 -# Create file with javadoc options in it
  23.515 -$(TAGLETAPI_OPTIONS_FILE):
  23.516 -	$(prep-target)
  23.517 -	@($(call OptionOnly,$(COMMON_JAVADOCFLAGS)) ; \
  23.518 -	  $(call OptionPair,-sourcepath,$(RELEASEDOCS_SOURCEPATH)) ; \
  23.519 -	  $(call OptionPair,-encoding,ascii) ; \
  23.520 -	  $(call OptionOnly,-nonavbar) ; \
  23.521 -	  $(call OptionOnly,-noindex) ; \
  23.522 -	  $(call OptionPair,-bottom,$(TAGLETAPI_BOTTOM)$(DRAFT_BOTTOM)) ; \
  23.523 -	  $(call OptionTrip,-linkoffline,$(TAGLETAPI2COREAPI),$(COREAPI_DOCSDIR)/); \
  23.524 -	) >> $@
  23.525 -
  23.526 -# Create a file with the package names in it
  23.527 -$(TAGLETAPI_PACKAGES_FILE): $(DIRECTORY_CACHE) $(call PackageDependencies,$(TAGLETAPI_PKGS))
  23.528 -	$(prep-target)
  23.529 -	@($(ECHO) "$(JDK_IMPSRC)/$(TAGLETAPI_FILE)" ) > $@
  23.530 -
  23.531 -#############################################################
  23.532 -#
  23.533 -# domapidocs
  23.534 -#
  23.535 -
  23.536 -ALL_OTHER_TARGETS += domapidocs
  23.537 -
  23.538 -DOMAPI_DOCDIR := $(JRE_API_DOCSDIR)/plugin/dom
  23.539 -DOMAPI2COREAPI := ../../$(JDKJRE2COREAPI)
  23.540 -DOMAPI_DOCTITLE := Common DOM API
  23.541 -DOMAPI_WINDOWTITLE := Common DOM API
  23.542 -DOMAPI_HEADER := <strong>Common DOM API</strong>
  23.543 -DOMAPI_BOTTOM := $(call CommonTrademarkBottom,$(DOMAPI_FIRST_COPYRIGHT_YEAR))
  23.544 -DOMAPI_GROUPNAME := Packages
  23.545 -DOMAPI_REGEXP := com.sun.java.browser.dom:org.w3c.dom*
  23.546 -# DOMAPI_PKGS is located in NON_CORE_PKGS.gmk
  23.547 -
  23.548 -# The index.html, options, and packages files
  23.549 -DOMAPI_INDEX_FILE = $(DOMAPI_DOCDIR)/index.html
  23.550 -DOMAPI_OPTIONS_FILE = $(DOCSTMPDIR)/domapi.options
  23.551 -DOMAPI_PACKAGES_FILE = $(DOCSTMPDIR)/domapi.packages
  23.552 -
  23.553 -domapidocs: $(DOMAPI_INDEX_FILE)
  23.554 -
  23.555 -# Set relative location to core api document root
  23.556 -$(DOMAPI_INDEX_FILE): GET2DOCSDIR=$(DOMAPI2COREAPI)/..
  23.557 -
  23.558 -# Run javadoc if the index file is out of date or missing
  23.559 -$(DOMAPI_INDEX_FILE): $(DOMAPI_OPTIONS_FILE) $(DOMAPI_PACKAGES_FILE) coredocs
  23.560 -	$(prep-javadoc)
  23.561 -	$(call JavadocSummary,$(DOMAPI_OPTIONS_FILE),$(DOMAPI_PACKAGES_FILE))
  23.562 -	$(JAVADOC_CMD) -d $(@D) \
  23.563 -	    @$(DOMAPI_OPTIONS_FILE) @$(DOMAPI_PACKAGES_FILE)
  23.564 -
  23.565 -# Create file with javadoc options in it
  23.566 -$(DOMAPI_OPTIONS_FILE):
  23.567 -	$(prep-target)
  23.568 -	@($(call OptionOnly,$(COMMON_JAVADOCFLAGS)) ; \
  23.569 -	  $(call OptionPair,-sourcepath,$(RELEASEDOCS_SOURCEPATH)) ; \
  23.570 -	  $(call OptionPair,-encoding,ascii) ; \
  23.571 -	  $(call OptionOnly,-splitIndex) ; \
  23.572 -	  $(call OptionPair,-doctitle,$(DOMAPI_DOCTITLE)) ; \
  23.573 -	  $(call OptionPair,-windowtitle,$(DOMAPI_WINDOWTITLE) $(DRAFT_WINTITLE)); \
  23.574 -	  $(call OptionPair,-header,$(DOMAPI_HEADER)$(DRAFT_HEADER)) ; \
  23.575 -	  $(call OptionPair,-bottom,$(DOMAPI_BOTTOM)$(DRAFT_BOTTOM)) ; \
  23.576 -	  $(call OptionTrip,-group,$(DOMAPI_GROUPNAME),$(DOMAPI_REGEXP)); \
  23.577 -	  $(call OptionTrip,-linkoffline,$(DOMAPI2COREAPI),$(COREAPI_DOCSDIR)/); \
  23.578 -	) >> $@
  23.579 -
  23.580 -# Create a file with the package names in it
  23.581 -$(DOMAPI_PACKAGES_FILE): $(DIRECTORY_CACHE) $(call PackageDependencies,$(DOMAPI_PKGS))
  23.582 -	$(prep-target)
  23.583 -	$(call PackageFilter,$(DOMAPI_PKGS))
  23.584 -
  23.585 -#############################################################
  23.586 -#
  23.587 -# jpdadocs
  23.588 -#
  23.589 -
  23.590 -ALL_OTHER_TARGETS += jpdadocs
  23.591 -
  23.592 -jpdadocs: jdidocs jdwpdocs jvmtidocs
  23.593 -
  23.594 -#############################################################
  23.595 -#
  23.596 -# jdidocs
  23.597 -#
  23.598 -
  23.599 -ALL_OTHER_TARGETS += jdidocs
  23.600 -
  23.601 -JDI_DOCDIR := $(JDK_API_DOCSDIR)/jpda/jdi
  23.602 -JDI2COREAPI := ../../$(JDKJRE2COREAPI)
  23.603 -JDI_DOCTITLE := Java$(TRADEMARK) Debug Interface
  23.604 -JDI_WINDOWTITLE := Java Debug Interface
  23.605 -JDI_HEADER := <strong>Java Debug Interface</strong>
  23.606 -JDI_BOTTOM := $(call CommonBottom,$(JDI_FIRST_COPYRIGHT_YEAR))
  23.607 -JDI_OVERVIEW := $(JDK_SHARE_CLASSES)/jdi-overview.html
  23.608 -# JDI_PKGS is located in NON_CORE_PKGS.gmk
  23.609 -
  23.610 -# The index.html, options, and packages files
  23.611 -JDI_INDEX_FILE = $(JDI_DOCDIR)/index.html
  23.612 -JDI_OPTIONS_FILE = $(DOCSTMPDIR)/jdi.options
  23.613 -JDI_PACKAGES_FILE = $(DOCSTMPDIR)/jdi.packages
  23.614 -
  23.615 -jdidocs: $(JDI_INDEX_FILE)
  23.616 -
  23.617 -# Set relative location to core api document root
  23.618 -$(JDI_INDEX_FILE): GET2DOCSDIR=$(JDI2COREAPI)/..
  23.619 -
  23.620 -# Run javadoc if the index file is out of date or missing
  23.621 -$(JDI_INDEX_FILE): $(JDI_OPTIONS_FILE) $(JDI_PACKAGES_FILE) coredocs
  23.622 -	$(prep-javadoc)
  23.623 -	$(call JavadocSummary,$(JDI_OPTIONS_FILE),$(JDI_PACKAGES_FILE))
  23.624 -	$(JAVADOC_CMD) -d $(@D) \
  23.625 -	    @$(JDI_OPTIONS_FILE) @$(JDI_PACKAGES_FILE)
  23.626 -
  23.627 -# Create file with javadoc options in it
  23.628 -$(JDI_OPTIONS_FILE): $(JDI_OVERVIEW)
  23.629 -	$(prep-target)
  23.630 -	@($(call OptionOnly,$(COMMON_JAVADOCFLAGS)) ; \
  23.631 -	  $(call OptionPair,-sourcepath,$(RELEASEDOCS_SOURCEPATH)) ; \
  23.632 -	  $(call OptionPair,-encoding,ascii) ; \
  23.633 -	  $(call OptionPair,-overview,$(JDI_OVERVIEW)) ; \
  23.634 -	  $(call OptionPair,-doctitle,$(JDI_DOCTITLE)) ; \
  23.635 -	  $(call OptionPair,-windowtitle,$(JDI_WINDOWTITLE) $(DRAFT_WINTITLE)); \
  23.636 -	  $(call OptionPair,-header,$(JDI_HEADER)$(DRAFT_HEADER)) ; \
  23.637 -	  $(call OptionPair,-bottom,$(JDI_BOTTOM)$(DRAFT_BOTTOM)) ; \
  23.638 -	  $(call OptionTrip,-linkoffline,$(JDI2COREAPI),$(COREAPI_DOCSDIR)/); \
  23.639 -	) >> $@
  23.640 -
  23.641 -# Create a file with the package names in it
  23.642 -$(JDI_PACKAGES_FILE): $(DIRECTORY_CACHE) $(call PackageDependencies,$(JDI_PKGS))
  23.643 -	$(prep-target)
  23.644 -	$(call PackageFilter,$(JDI_PKGS))
  23.645 -
  23.646 -#############################################################
  23.647 -#
  23.648 -# jdwpdocs
  23.649 -#
  23.650 -
  23.651 -ALL_OTHER_TARGETS += jdwpdocs
  23.652 -
  23.653 -JDWP_DOCDIR = $(PLATFORM_DOCSDIR)/jpda/jdwp
  23.654 -
  23.655 -jdwpdocs: $(JDWP_DOCDIR)/jdwp-protocol.html
  23.656 -$(JDWP_DOCDIR)/jdwp-protocol.html : $(JDK_OUTPUTDIR)/gensrc_jdwp_doc/jdwp-protocol.html
  23.657 -	$(MKDIR) -p $(@D)
  23.658 -	$(RM) $@
  23.659 -	$(CP) $< $@
  23.660 -
  23.661 -#############################################################
  23.662 -#
  23.663 -# jvmtidocs
  23.664 -#
  23.665 -
  23.666 -ALL_OTHER_TARGETS += jvmtidocs
  23.667 -
  23.668 -JVMTI_DOCDIR = $(PLATFORM_DOCSDIR)/jvmti
  23.669 -JVMTI_HTML = $(HOTSPOT_DIST)/docs/platform/jvmti/jvmti.html
  23.670 -
  23.671 -jvmtidocs: $(JVMTI_DOCDIR)/jvmti.html
  23.672 -$(JVMTI_DOCDIR)/jvmti.html:
  23.673 -	@$(prep-javadoc)
  23.674 -	@if [ -f $(JVMTI_HTML) ] ; then \
  23.675 -	  $(ECHO) "$(CP) $(JVMTI_HTML) $@"; \
  23.676 -	  $(CP) $(JVMTI_HTML) $@; \
  23.677 -	else \
  23.678 -	  $(ECHO) "WARNING: Generated file does not exist: $(JVMTI_HTML)"; \
  23.679 -	fi
  23.680 -
  23.681 -#############################################################
  23.682 -#
  23.683 -# jaasdocs
  23.684 -#
  23.685 -
  23.686 -ALL_OTHER_TARGETS += jaasdocs
  23.687 -
  23.688 -JAAS_DOCDIR := $(JRE_API_DOCSDIR)/security/jaas/spec
  23.689 -JAAS2COREAPI := ../../../$(JDKJRE2COREAPI)
  23.690 -JAAS_DOCTITLE := Java$(TRADEMARK) Authentication and Authorization Service
  23.691 -JAAS_WINDOWTITLE := Java Authentication and Authorization Service
  23.692 -JAAS_HEADER := <strong>Java Authentication and Authorization Service</strong>
  23.693 -JAAS_BOTTOM := $(call CommonBottom,$(JAAS_FIRST_COPYRIGHT_YEAR))
  23.694 -# JAAS_PKGS is located in NON_CORE_PKGS.gmk
  23.695 -JAAS_OVERVIEW := $(JDK_SHARE_CLASSES)/com/sun/security/auth/jaas-overview.html
  23.696 -
  23.697 -# The index.html, options, and packages files
  23.698 -JAAS_INDEX_FILE = $(JAAS_DOCDIR)/index.html
  23.699 -JAAS_OPTIONS_FILE = $(DOCSTMPDIR)/jaas.options
  23.700 -JAAS_PACKAGES_FILE = $(DOCSTMPDIR)/jaas.packages
  23.701 -
  23.702 -jaasdocs: $(JAAS_INDEX_FILE)
  23.703 -
  23.704 -# Set relative location to core api document root
  23.705 -$(JAAS_INDEX_FILE): GET2DOCSDIR=$(JAAS2COREAPI)/..
  23.706 -
  23.707 -# Run javadoc if the index file is out of date or missing
  23.708 -$(JAAS_INDEX_FILE): $(JAAS_OPTIONS_FILE) $(JAAS_PACKAGES_FILE) coredocs
  23.709 -	$(prep-javadoc)
  23.710 -	$(call JavadocSummary,$(JAAS_OPTIONS_FILE),$(JAAS_PACKAGES_FILE))
  23.711 -	$(JAVADOC_CMD) -d $(@D) \
  23.712 -	    @$(JAAS_OPTIONS_FILE) @$(JAAS_PACKAGES_FILE)
  23.713 -
  23.714 -# Create file with javadoc options in it
  23.715 -$(JAAS_OPTIONS_FILE): $(JAAS_OVERVIEW)
  23.716 -	$(prep-target)
  23.717 -	@($(call OptionOnly,$(COMMON_JAVADOCFLAGS)) ; \
  23.718 -	  $(call OptionPair,-sourcepath,$(RELEASEDOCS_SOURCEPATH)) ; \
  23.719 -	  $(call OptionPair,-encoding,ascii) ; \
  23.720 -	  $(call OptionPair,-overview,$(JAAS_OVERVIEW)) ; \
  23.721 -	  $(call OptionPair,-doctitle,$(JAAS_DOCTITLE)) ; \
  23.722 -	  $(call OptionPair,-windowtitle,$(JAAS_WINDOWTITLE) $(DRAFT_WINTITLE)); \
  23.723 -	  $(call OptionPair,-header,$(JAAS_HEADER)$(DRAFT_HEADER)) ; \
  23.724 -	  $(call OptionPair,-bottom,$(JAAS_BOTTOM)$(DRAFT_BOTTOM)) ; \
  23.725 -	  $(call OptionTrip,-linkoffline,$(JAAS2COREAPI),$(COREAPI_DOCSDIR)/); \
  23.726 -	) >> $@
  23.727 -
  23.728 -# Create a file with the package names in it
  23.729 -$(JAAS_PACKAGES_FILE): $(DIRECTORY_CACHE) $(call PackageDependencies,$(JAAS_PKGS))
  23.730 -	$(prep-target)
  23.731 -	$(call PackageFilter,$(JAAS_PKGS))
  23.732 -
  23.733 -#############################################################
  23.734 -#
  23.735 -# jgssdocs
  23.736 -#
  23.737 -
  23.738 -ALL_OTHER_TARGETS += jgssdocs
  23.739 -
  23.740 -JGSS_DOCDIR := $(JRE_API_DOCSDIR)/security/jgss/spec
  23.741 -JGSS2COREAPI := ../../../$(JDKJRE2COREAPI)
  23.742 -JGSS_DOCTITLE := Java$(TRADEMARK) GSS-API Utilities
  23.743 -JGSS_WINDOWTITLE := Java GSS-API Utilities
  23.744 -JGSS_HEADER := <strong>Java GSS-API Utilities</strong>
  23.745 -JGSS_BOTTOM := $(call CommonBottom,$(JGSS_FIRST_COPYRIGHT_YEAR))
  23.746 -JGSS_OVERVIEW := $(JDK_SHARE_CLASSES)/com/sun/security/jgss/jgss-overview.html
  23.747 -# JGSS_PKGS is located in NON_CORE_PKGS.gmk
  23.748 -
  23.749 -# The index.html, options, and packages files
  23.750 -JGSS_INDEX_FILE = $(JGSS_DOCDIR)/index.html
  23.751 -JGSS_OPTIONS_FILE = $(DOCSTMPDIR)/jgss.options
  23.752 -JGSS_PACKAGES_FILE = $(DOCSTMPDIR)/jgss.packages
  23.753 -
  23.754 -jgssdocs: $(JGSS_INDEX_FILE)
  23.755 -
  23.756 -# Set relative location to core api document root
  23.757 -$(JGSS_INDEX_FILE): GET2DOCSDIR=$(JGSS2COREAPI)/..
  23.758 -
  23.759 -# Run javadoc if the index file is out of date or missing
  23.760 -$(JGSS_INDEX_FILE): $(JGSS_OPTIONS_FILE) $(JGSS_PACKAGES_FILE) coredocs
  23.761 -	$(prep-javadoc)
  23.762 -	$(call JavadocSummary,$(JGSS_OPTIONS_FILE),$(JGSS_PACKAGES_FILE))
  23.763 -	$(JAVADOC_CMD) -d $(@D) \
  23.764 -	    @$(JGSS_OPTIONS_FILE) @$(JGSS_PACKAGES_FILE)
  23.765 -
  23.766 -# Create file with javadoc options in it
  23.767 -$(JGSS_OPTIONS_FILE): $(JGSS_OVERVIEW)
  23.768 -	$(prep-target)
  23.769 -	@($(call OptionOnly,$(COMMON_JAVADOCFLAGS)) ; \
  23.770 -	  $(call OptionPair,-sourcepath,$(RELEASEDOCS_SOURCEPATH)) ; \
  23.771 -	  $(call OptionPair,-encoding,ascii) ; \
  23.772 -	  $(call OptionOnly,-nodeprecatedlist) ; \
  23.773 -	  $(call OptionPair,-overview,$(JGSS_OVERVIEW)) ; \
  23.774 -	  $(call OptionPair,-doctitle,$(JGSS_DOCTITLE)) ; \
  23.775 -	  $(call OptionPair,-windowtitle,$(JGSS_WINDOWTITLE) $(DRAFT_WINTITLE)); \
  23.776 -	  $(call OptionPair,-header,$(JGSS_HEADER)$(DRAFT_HEADER)) ; \
  23.777 -	  $(call OptionPair,-bottom,$(JGSS_BOTTOM)$(DRAFT_BOTTOM)) ; \
  23.778 -	  $(call OptionTrip,-linkoffline,$(JGSS2COREAPI),$(COREAPI_DOCSDIR)/); \
  23.779 -	) >> $@
  23.780 -
  23.781 -# Create a file with the package names in it
  23.782 -$(JGSS_PACKAGES_FILE): $(DIRECTORY_CACHE) $(call PackageDependencies,$(JGSS_PKGS))
  23.783 -	$(prep-target)
  23.784 -	$(call PackageFilter,$(JGSS_PKGS))
  23.785 -
  23.786 -#############################################################
  23.787 -#
  23.788 -# smartcardiodocs
  23.789 -#
  23.790 -
  23.791 -ALL_OTHER_TARGETS += smartcardiodocs
  23.792 -
  23.793 -SMARTCARDIO_DOCDIR := $(JRE_API_DOCSDIR)/security/smartcardio/spec
  23.794 -SMARTCARDIO2COREAPI := ../../../$(JDKJRE2COREAPI)
  23.795 -SMARTCARDIO_DOCTITLE := Java$(TRADEMARK) Smart Card I/O
  23.796 -SMARTCARDIO_WINDOWTITLE := Java Smart Card I/O
  23.797 -SMARTCARDIO_HEADER := <strong>Java Smart Card I/O</strong>
  23.798 -SMARTCARDIO_BOTTOM := $(call CommonBottom,$(SMARTCARDIO_FIRST_COPYRIGHT_YEAR))
  23.799 -# SMARTCARDIO_PKGS is located in NON_CORE_PKGS.gmk
  23.800 -
  23.801 -# The index.html, options, and packages files
  23.802 -SMARTCARDIO_INDEX_FILE = $(SMARTCARDIO_DOCDIR)/index.html
  23.803 -SMARTCARDIO_OPTIONS_FILE = $(DOCSTMPDIR)/smartcardio.options
  23.804 -SMARTCARDIO_PACKAGES_FILE = $(DOCSTMPDIR)/smartcardio.packages
  23.805 -
  23.806 -smartcardiodocs: $(SMARTCARDIO_INDEX_FILE)
  23.807 -
  23.808 -# Set relative location to core api document root
  23.809 -$(SMARTCARDIO_INDEX_FILE): GET2DOCSDIR=$(SMARTCARDIO2COREAPI)/..
  23.810 -
  23.811 -# Run javadoc if the index file is out of date or missing
  23.812 -$(SMARTCARDIO_INDEX_FILE): $(SMARTCARDIO_OPTIONS_FILE) $(SMARTCARDIO_PACKAGES_FILE) coredocs
  23.813 -	$(prep-javadoc)
  23.814 -	$(call JavadocSummary,$(SMARTCARDIO_OPTIONS_FILE),$(SMARTCARDIO_PACKAGES_FILE))
  23.815 -	$(JAVADOC_CMD) -d $(@D) \
  23.816 -	    @$(SMARTCARDIO_OPTIONS_FILE) @$(SMARTCARDIO_PACKAGES_FILE)
  23.817 -
  23.818 -# Create file with javadoc options in it
  23.819 -$(SMARTCARDIO_OPTIONS_FILE):
  23.820 -	$(prep-target)
  23.821 -	@($(call OptionOnly,$(COMMON_JAVADOCFLAGS)) ; \
  23.822 -	  $(call OptionPair,-sourcepath,$(RELEASEDOCS_SOURCEPATH)) ; \
  23.823 -	  $(call OptionPair,-encoding,ascii) ; \
  23.824 -	  $(call OptionOnly,-nodeprecatedlist) ; \
  23.825 -	  $(call OptionPair,-doctitle,$(SMARTCARDIO_DOCTITLE)) ; \
  23.826 -	  $(call OptionPair,-windowtitle,$(SMARTCARDIO_WINDOWTITLE) $(DRAFT_WINTITLE)); \
  23.827 -	  $(call OptionPair,-header,$(SMARTCARDIO_HEADER)$(DRAFT_HEADER)); \
  23.828 -	  $(call OptionPair,-bottom,$(SMARTCARDIO_BOTTOM)$(DRAFT_BOTTOM)); \
  23.829 -	  $(call OptionTrip,-linkoffline,$(SMARTCARDIO2COREAPI),$(COREAPI_DOCSDIR)/); \
  23.830 -	) >> $@
  23.831 -
  23.832 -# Create a file with the package names in it
  23.833 -$(SMARTCARDIO_PACKAGES_FILE): $(DIRECTORY_CACHE) $(call PackageDependencies,$(SMARTCARDIO_PKGS))
  23.834 -	$(prep-target)
  23.835 -	$(call PackageFilter,$(SMARTCARDIO_PKGS))
  23.836 -
  23.837 -#############################################################
  23.838 -#
  23.839 -# httpserverdocs
  23.840 -#
  23.841 -
  23.842 -ALL_OTHER_TARGETS += httpserverdocs
  23.843 -
  23.844 -HTTPSERVER_DOCDIR := $(JRE_API_DOCSDIR)/net/httpserver/spec
  23.845 -HTTPSERVER2COREAPI := ../../../$(JDKJRE2COREAPI)
  23.846 -HTTPSERVER_DOCTITLE := Java$(TRADEMARK) HTTP Server
  23.847 -HTTPSERVER_WINDOWTITLE := Java HTTP Server
  23.848 -HTTPSERVER_HEADER := <strong>Java HTTP Server</strong>
  23.849 -HTTPSERVER_BOTTOM := $(call CommonBottom,$(HTTPSERVER_FIRST_COPYRIGHT_YEAR))
  23.850 -# HTTPSERVER_PKGS is located in NON_CORE_PKGS.gmk
  23.851 -
  23.852 -HTTPSERVER_INDEX_HTML = $(HTTPSERVER_DOCDIR)/index.html
  23.853 -HTTPSERVER_OPTIONS_FILE = $(DOCSTMPDIR)/httpserver.options
  23.854 -HTTPSERVER_PACKAGES_FILE = $(DOCSTMPDIR)/httpserver.packages
  23.855 -
  23.856 -httpserverdocs: $(HTTPSERVER_INDEX_HTML)
  23.857 -
  23.858 -# Set relative location to core api document root
  23.859 -$(HTTPSERVER_INDEX_HTML): GET2DOCSDIR=$(HTTPSERVER2COREAPI)/..
  23.860 -
  23.861 -# Run javadoc if the index file is out of date or missing
  23.862 -$(HTTPSERVER_INDEX_HTML): $(HTTPSERVER_OPTIONS_FILE) $(HTTPSERVER_PACKAGES_FILE) coredocs
  23.863 -	$(prep-javadoc)
  23.864 -	$(call JavadocSummary,$(HTTPSERVER_OPTIONS_FILE),$(HTTPSERVER_PACKAGES_FILE))
  23.865 -	$(JAVADOC_CMD) -d $(@D) \
  23.866 -	    @$(HTTPSERVER_OPTIONS_FILE) @$(HTTPSERVER_PACKAGES_FILE)
  23.867 -
  23.868 -# Create file with javadoc options in it
  23.869 -$(HTTPSERVER_OPTIONS_FILE):
  23.870 -	$(prep-target)
  23.871 -	@($(call OptionOnly,$(COMMON_JAVADOCFLAGS)) ; \
  23.872 -	  $(call OptionPair,-sourcepath,$(RELEASEDOCS_SOURCEPATH)) ; \
  23.873 -	  $(call OptionPair,-encoding,ascii) ; \
  23.874 -	  $(call OptionOnly,-nodeprecatedlist) ; \
  23.875 -	  $(call OptionPair,-doctitle,$(HTTPSERVER_DOCTITLE)) ; \
  23.876 -	  $(call OptionPair,-windowtitle,$(HTTPSERVER_WINDOWTITLE) $(DRAFT_WINTITLE)); \
  23.877 -	  $(call OptionPair,-header,$(HTTPSERVER_HEADER)$(DRAFT_HEADER)); \
  23.878 -	  $(call OptionPair,-bottom,$(HTTPSERVER_BOTTOM)$(DRAFT_BOTTOM)); \
  23.879 -	  $(call OptionTrip,-linkoffline,$(HTTPSERVER2COREAPI),$(COREAPI_DOCSDIR)/); \
  23.880 -	) >> $@
  23.881 -
  23.882 -# Create a file with the package names in it
  23.883 -$(HTTPSERVER_PACKAGES_FILE): $(DIRECTORY_CACHE) $(call PackageDependencies,$(HTTPSERVER_PKGS))
  23.884 -	$(prep-target)
  23.885 -	$(call PackageFilter,$(HTTPSERVER_PKGS))
  23.886 -
  23.887 -#############################################################
  23.888 -#
  23.889 -# mgmtdocs
  23.890 -#
  23.891 -
  23.892 -ALL_OTHER_TARGETS += mgmtdocs
  23.893 -
  23.894 -MGMT_DOCDIR := $(JRE_API_DOCSDIR)/management/extension
  23.895 -MGMT2COREAPI := ../../$(JDKJRE2COREAPI)
  23.896 -JVM_MIB_NAME := JVM-MANAGEMENT-MIB.mib
  23.897 -JVM_MIB_SRC := $(JDK_TOPDIR)/src/closed/share/classes/sun/management/snmp/$(JVM_MIB_NAME)
  23.898 -MGMT_DOCTITLE := Monitoring and Management Interface for the Java$(TRADEMARK) Platform
  23.899 -MGMT_WINDOWTITLE := Monitoring and Management Interface for the Java Platform
  23.900 -MGMT_HEADER := <strong>Monitoring and Management Interface for the Java Platform</strong>
  23.901 -MGMT_BOTTOM := $(call CommonBottom,$(MGMT_FIRST_COPYRIGHT_YEAR))
  23.902 -MGMT_OVERVIEW := $(JDK_SHARE_CLASSES)/com/sun/management/mgmt-overview.html
  23.903 -# MGMT_PKGS is located in NON_CORE_PKGS.gmk
  23.904 -
  23.905 -# The index.html, options, and packages files
  23.906 -MGMT_INDEX_FILE = $(MGMT_DOCDIR)/index.html
  23.907 -MGMT_OPTIONS_FILE = $(DOCSTMPDIR)/mgmt.options
  23.908 -MGMT_PACKAGES_FILE = $(DOCSTMPDIR)/mgmt.packages
  23.909 -
  23.910 -mgmtdocs: $(MGMT_INDEX_FILE)
  23.911 -
  23.912 -# Set relative location to core api document root
  23.913 -$(MGMT_INDEX_FILE): GET2DOCSDIR=$(MGMT2COREAPI)/..
  23.914 -
  23.915 -# Run javadoc if the index file is out of date or missing
  23.916 -$(MGMT_INDEX_FILE): $(MGMT_OPTIONS_FILE) $(MGMT_PACKAGES_FILE) coredocs
  23.917 -	$(prep-javadoc)
  23.918 -	@if [ -f $(JVM_MIB_SRC) ] ; then \
  23.919 -	  $(ECHO) "$(CP) $(JVM_MIB_SRC) $(@D)/.."; \
  23.920 -	  $(CP) $(JVM_MIB_SRC) $(@D)/.. ; \
  23.921 -	else \
  23.922 -	  $(ECHO) "WARNING: File $(JVM_MIB_NAME) not available."; \
  23.923 -	fi
  23.924 -	$(call JavadocSummary,$(MGMT_OPTIONS_FILE),$(MGMT_PACKAGES_FILE))
  23.925 -	$(JAVADOC_CMD) -d $(@D) \
  23.926 -	    @$(MGMT_OPTIONS_FILE) @$(MGMT_PACKAGES_FILE)
  23.927 -
  23.928 -# Create file with javadoc options in it
  23.929 -$(MGMT_OPTIONS_FILE): $(MGMT_OVERVIEW)
  23.930 -	$(prep-target)
  23.931 -	@($(call OptionOnly,$(COMMON_JAVADOCFLAGS)) ; \
  23.932 -	  $(call OptionPair,-sourcepath,$(RELEASEDOCS_SOURCEPATH)) ; \
  23.933 -	  $(call OptionPair,-encoding,ascii) ; \
  23.934 -	  $(call OptionOnly,-nodeprecatedlist) ; \
  23.935 -	  $(call OptionPair,-overview,$(MGMT_OVERVIEW)) ; \
  23.936 -	  $(call OptionPair,-doctitle,$(MGMT_DOCTITLE)) ; \
  23.937 -	  $(call OptionPair,-windowtitle,$(MGMT_WINDOWTITLE) $(DRAFT_WINTITLE)); \
  23.938 -	  $(call OptionPair,-header,$(MGMT_HEADER)$(DRAFT_HEADER)) ; \
  23.939 -	  $(call OptionPair,-bottom,$(MGMT_BOTTOM)$(DRAFT_BOTTOM)) ; \
  23.940 -	  $(call OptionTrip,-linkoffline,$(MGMT2COREAPI),$(COREAPI_DOCSDIR)/); \
  23.941 -	) >> $@
  23.942 -
  23.943 -# Create a file with the package names in it
  23.944 -$(MGMT_PACKAGES_FILE): $(DIRECTORY_CACHE) $(call PackageDependencies,$(MGMT_PKGS))
  23.945 -	$(prep-target)
  23.946 -	$(call PackageFilter,$(MGMT_PKGS))
  23.947 -
  23.948 -#############################################################
  23.949 -#
  23.950 -# attachdocs
  23.951 -#
  23.952 -
  23.953 -ALL_OTHER_TARGETS += attachdocs
  23.954 -
  23.955 -ATTACH_DOCDIR := $(JDK_API_DOCSDIR)/attach/spec
  23.956 -ATTACH2COREAPI := ../../$(JDKJRE2COREAPI)
  23.957 -ATTACH_DOCTITLE := Attach API
  23.958 -ATTACH_WINDOWTITLE := Attach API
  23.959 -ATTACH_HEADER := <strong>Attach API</strong>
  23.960 -ATTACH_BOTTOM := $(call CommonBottom,$(ATTACH_FIRST_COPYRIGHT_YEAR))
  23.961 -# ATTACH_PKGS is located in NON_CORE_PKGS.gmk
  23.962 -
  23.963 -ATTACH_INDEX_HTML = $(ATTACH_DOCDIR)/index.html
  23.964 -ATTACH_OPTIONS_FILE = $(DOCSTMPDIR)/attach.options
  23.965 -ATTACH_PACKAGES_FILE = $(DOCSTMPDIR)/attach.packages
  23.966 -
  23.967 -attachdocs: $(ATTACH_INDEX_HTML)
  23.968 -
  23.969 -# Set relative location to core api document root
  23.970 -$(ATTACH_INDEX_HTML): GET2DOCSDIR=$(ATTACH2COREAPI)/..
  23.971 -
  23.972 -# Run javadoc if the index file is out of date or missing
  23.973 -$(ATTACH_INDEX_HTML): $(ATTACH_OPTIONS_FILE) $(ATTACH_PACKAGES_FILE) coredocs
  23.974 -	$(prep-javadoc)
  23.975 -	$(call JavadocSummary,$(ATTACH_OPTIONS_FILE),$(ATTACH_PACKAGES_FILE))
  23.976 -	$(JAVADOC_CMD) -d $(@D) \
  23.977 -	    @$(ATTACH_OPTIONS_FILE) @$(ATTACH_PACKAGES_FILE)
  23.978 -
  23.979 -# Create file with javadoc options in it
  23.980 -$(ATTACH_OPTIONS_FILE):
  23.981 -	$(prep-target)
  23.982 -	@($(call OptionOnly,$(COMMON_JAVADOCFLAGS)) ; \
  23.983 -	  $(call OptionPair,-sourcepath,$(RELEASEDOCS_SOURCEPATH)) ; \
  23.984 -	  $(call OptionPair,-encoding,ascii) ; \
  23.985 -	  $(call OptionOnly,-nodeprecatedlist) ; \
  23.986 -	  $(call OptionPair,-doctitle,$(ATTACH_DOCTITLE)) ; \
  23.987 -	  $(call OptionPair,-windowtitle,$(ATTACH_WINDOWTITLE) $(DRAFT_WINTITLE)); \
  23.988 -	  $(call OptionPair,-header,$(ATTACH_HEADER)$(DRAFT_HEADER)) ; \
  23.989 -	  $(call OptionPair,-bottom,$(ATTACH_BOTTOM)$(DRAFT_BOTTOM)) ; \
  23.990 -	  $(call OptionTrip,-linkoffline,$(ATTACH2COREAPI),$(COREAPI_DOCSDIR)/); \
  23.991 -	) >> $@
  23.992 -
  23.993 -# Create a file with the package names in it
  23.994 -$(ATTACH_PACKAGES_FILE): $(DIRECTORY_CACHE) $(call PackageDependencies,$(ATTACH_PKGS))
  23.995 -	$(prep-target)
  23.996 -	$(call PackageFilter,$(ATTACH_PKGS))
  23.997 -
  23.998 -#############################################################
  23.999 -#
 23.1000 -# jconsoledocs
 23.1001 -#
 23.1002 -
 23.1003 -ALL_OTHER_TARGETS += jconsoledocs
 23.1004 -
 23.1005 -JCONSOLE_DOCDIR := $(JDK_API_DOCSDIR)/jconsole/spec
 23.1006 -JCONSOLE2COREAPI := ../../$(JDKJRE2COREAPI)
 23.1007 -JCONSOLE_DOCTITLE := JConsole API
 23.1008 -JCONSOLE_WINDOWTITLE := JConsole API
 23.1009 -JCONSOLE_HEADER := <strong>JConsole API</strong>
 23.1010 -JCONSOLE_BOTTOM := $(call CommonBottom,$(JCONSOLE_FIRST_COPYRIGHT_YEAR))
 23.1011 -# JCONSOLE_PKGS is located in NON_CORE_PKGS.gmk
 23.1012 -
 23.1013 -JCONSOLE_INDEX_HTML = $(JCONSOLE_DOCDIR)/index.html
 23.1014 -JCONSOLE_OPTIONS_FILE = $(DOCSTMPDIR)/jconsole.options
 23.1015 -JCONSOLE_PACKAGES_FILE = $(DOCSTMPDIR)/jconsole.packages
 23.1016 -
 23.1017 -jconsoledocs: $(JCONSOLE_INDEX_HTML)
 23.1018 -
 23.1019 -# Set relative location to core api document root
 23.1020 -$(JCONSOLE_INDEX_HTML): GET2DOCSDIR=$(JCONSOLE2COREAPI)/..
 23.1021 -
 23.1022 -# Run javadoc if the index file is out of date or missing
 23.1023 -$(JCONSOLE_INDEX_HTML): $(JCONSOLE_OPTIONS_FILE) $(JCONSOLE_PACKAGES_FILE) coredocs
 23.1024 -	$(prep-javadoc)
 23.1025 -	$(call JavadocSummary,$(JCONSOLE_OPTIONS_FILE),$(JCONSOLE_PACKAGES_FILE))
 23.1026 -	$(JAVADOC_CMD) -d $(@D) \
 23.1027 -	    @$(JCONSOLE_OPTIONS_FILE) @$(JCONSOLE_PACKAGES_FILE)
 23.1028 -
 23.1029 -# Create file with javadoc options in it
 23.1030 -$(JCONSOLE_OPTIONS_FILE):
 23.1031 -	$(prep-target)
 23.1032 -	@($(call OptionOnly,$(COMMON_JAVADOCFLAGS)) ; \
 23.1033 -	  $(call OptionPair,-sourcepath,$(RELEASEDOCS_SOURCEPATH)) ; \
 23.1034 -	  $(call OptionPair,-encoding,ascii) ; \
 23.1035 -	  $(call OptionOnly,-nodeprecatedlist) ; \
 23.1036 -	  $(call OptionPair,-doctitle,$(JCONSOLE_DOCTITLE)) ; \
 23.1037 -	  $(call OptionPair,-windowtitle,$(JCONSOLE_WINDOWTITLE) $(DRAFT_WINTITLE)); \
 23.1038 -	  $(call OptionPair,-header,$(JCONSOLE_HEADER)$(DRAFT_HEADER)) ; \
 23.1039 -	  $(call OptionPair,-bottom,$(JCONSOLE_BOTTOM)$(DRAFT_BOTTOM)) ; \
 23.1040 -	  $(call OptionTrip,-linkoffline,$(JCONSOLE2COREAPI),$(COREAPI_DOCSDIR)/); \
 23.1041 -	) >> $@
 23.1042 -
 23.1043 -# Create a file with the package names in it
 23.1044 -$(JCONSOLE_PACKAGES_FILE): $(DIRECTORY_CACHE) $(call PackageDependencies,$(JCONSOLE_PKGS))
 23.1045 -	$(prep-target)
 23.1046 -	$(call PackageFilter,$(JCONSOLE_PKGS))
 23.1047 -
 23.1048 -#############################################################
 23.1049 -#
 23.1050 -# treeapidocs
 23.1051 -#
 23.1052 -
 23.1053 -ALL_OTHER_TARGETS += treeapidocs
 23.1054 -
 23.1055 -TREEAPI_DOCDIR := $(JDK_API_DOCSDIR)/javac/tree
 23.1056 -TREEAPI2COREAPI := ../../$(JDKJRE2COREAPI)
 23.1057 -TREEAPI_DOCTITLE := Compiler Tree API
 23.1058 -TREEAPI_WINDOWTITLE := Compiler Tree API
 23.1059 -TREEAPI_HEADER := <strong>Compiler Tree API</strong>
 23.1060 -TREEAPI_BOTTOM := $(call CommonBottom,$(TREEAPI_FIRST_COPYRIGHT_YEAR))
 23.1061 -TREEAPI_GROUPNAME := Packages
 23.1062 -TREEAPI_REGEXP := com.sun.source.*
 23.1063 -# TREEAPI_PKGS is located in NON_CORE_PKGS.gmk
 23.1064 -
 23.1065 -TREEAPI_INDEX_HTML = $(TREEAPI_DOCDIR)/index.html
 23.1066 -TREEAPI_OPTIONS_FILE = $(DOCSTMPDIR)/treeapi.options
 23.1067 -TREEAPI_PACKAGES_FILE = $(DOCSTMPDIR)/treeapi.packages
 23.1068 -
 23.1069 -treeapidocs: $(TREEAPI_INDEX_HTML)
 23.1070 -
 23.1071 -# Set relative location to core api document root
 23.1072 -$(TREEAPI_INDEX_HTML): GET2DOCSDIR=$(TREEAPI2COREAPI)/..
 23.1073 -
 23.1074 -# Run javadoc if the index file is out of date or missing
 23.1075 -$(TREEAPI_INDEX_HTML): $(TREEAPI_OPTIONS_FILE) $(TREEAPI_PACKAGES_FILE) coredocs
 23.1076 -	$(prep-javadoc)
 23.1077 -	$(call JavadocSummary,$(TREEAPI_OPTIONS_FILE),$(TREEAPI_PACKAGES_FILE))
 23.1078 -	$(JAVADOC_CMD) -d $(@D) \
 23.1079 -	    @$(TREEAPI_OPTIONS_FILE) @$(TREEAPI_PACKAGES_FILE)
 23.1080 -
 23.1081 -# Create file with javadoc options in it
 23.1082 -$(TREEAPI_OPTIONS_FILE):
 23.1083 -	$(prep-target)
 23.1084 -	@($(call OptionOnly,$(COMMON_JAVADOCFLAGS)) ; \
 23.1085 -	  $(call OptionPair,-sourcepath,$(RELEASEDOCS_SOURCEPATH)) ; \
 23.1086 -	  $(call OptionPair,-encoding,ascii) ; \
 23.1087 -	  $(call OptionPair,-doctitle,$(TREEAPI_DOCTITLE)) ; \
 23.1088 -	  $(call OptionPair,-windowtitle,$(TREEAPI_WINDOWTITLE) $(DRAFT_WINTITLE)); \
 23.1089 -	  $(call OptionPair,-header,$(TREEAPI_HEADER)$(DRAFT_HEADER)) ; \
 23.1090 -	  $(call OptionPair,-tag,$(TAG_JLS)) ; \
 23.1091 -	  $(call OptionPair,-bottom,$(TREEAPI_BOTTOM)$(DRAFT_BOTTOM)) ; \
 23.1092 -	  $(call OptionTrip,-group,$(TREEAPI_GROUPNAME),$(TREEAPI_REGEXP)); \
 23.1093 -	  $(call OptionTrip,-linkoffline,$(TREEAPI2COREAPI),$(COREAPI_DOCSDIR)/); \
 23.1094 -	) >> $@
 23.1095 -
 23.1096 -# Create a file with the package names in it
 23.1097 -$(TREEAPI_PACKAGES_FILE): $(DIRECTORY_CACHE) $(call PackageDependencies,$(TREEAPI_PKGS))
 23.1098 -	$(prep-target)
 23.1099 -	$(call PackageFilter,$(TREEAPI_PKGS))
 23.1100 -
 23.1101 -#############################################################
 23.1102 -#
 23.1103 -# sctpdocs
 23.1104 -#
 23.1105 -
 23.1106 -ALL_OTHER_TARGETS += sctpdocs
 23.1107 -
 23.1108 -SCTPAPI_DOCDIR := $(JRE_API_DOCSDIR)/nio/sctp/spec
 23.1109 -SCTPAPI2COREAPI := ../../../$(JDKJRE2COREAPI)
 23.1110 -SCTPAPI_DOCTITLE := SCTP API
 23.1111 -SCTPAPI_WINDOWTITLE := SCTP API
 23.1112 -SCTPAPI_HEADER := <strong>SCTP API</strong>
 23.1113 -SCTPAPI_BOTTOM := $(call CommonBottom,$(SCTPAPI_FIRST_COPYRIGHT_YEAR))
 23.1114 -# SCTPAPI_PKGS is located in NON_CORE_PKGS.gmk
 23.1115 -
 23.1116 -SCTPAPI_INDEX_HTML = $(SCTPAPI_DOCDIR)/index.html
 23.1117 -SCTPAPI_OPTIONS_FILE = $(DOCSTMPDIR)/sctp.options
 23.1118 -SCTPAPI_PACKAGES_FILE = $(DOCSTMPDIR)/sctp.packages
 23.1119 -
 23.1120 -sctpdocs: $(SCTPAPI_INDEX_HTML)
 23.1121 -
 23.1122 -# Set relative location to core api document root
 23.1123 -$(SCTPAPI_INDEX_HTML): GET2DOCSDIR=$(SCTPAPI2COREAPI)/..
 23.1124 -
 23.1125 -# Run javadoc if the index file is out of date or missing
 23.1126 -$(SCTPAPI_INDEX_HTML): $(SCTPAPI_OPTIONS_FILE) $(SCTPAPI_PACKAGES_FILE) coredocs
 23.1127 -	$(prep-javadoc)
 23.1128 -	$(call JavadocSummary,$(SCTPAPI_OPTIONS_FILE),$(SCTPAPI_PACKAGES_FILE))
 23.1129 -	$(JAVADOC_CMD) -d $(@D) \
 23.1130 -	    @$(SCTPAPI_OPTIONS_FILE) @$(SCTPAPI_PACKAGES_FILE)
 23.1131 -
 23.1132 -# Create file with javadoc options in it
 23.1133 -$(SCTPAPI_OPTIONS_FILE):
 23.1134 -	$(prep-target)
 23.1135 -	@($(call OptionOnly,$(COMMON_JAVADOCFLAGS)) ; \
 23.1136 -	  $(call OptionPair,-sourcepath,$(RELEASEDOCS_SOURCEPATH)) ; \
 23.1137 -	  $(call OptionPair,-encoding,ascii) ; \
 23.1138 -	  $(call OptionOnly,-nodeprecatedlist) ; \
 23.1139 -	  $(call OptionPair,-doctitle,$(SCTPAPI_DOCTITLE)) ; \
 23.1140 -	  $(call OptionPair,-windowtitle,$(SCTPAPI_WINDOWTITLE) $(DRAFT_WINTITLE)); \
 23.1141 -	  $(call OptionPair,-header,$(SCTPAPI_HEADER)$(DRAFT_HEADER)) ; \
 23.1142 -	  $(call OptionPair,-bottom,$(SCTPAPI_BOTTOM)$(DRAFT_BOTTOM)) ; \
 23.1143 -	  $(call OptionTrip,-linkoffline,$(SCTPAPI2COREAPI),$(COREAPI_DOCSDIR)/); \
 23.1144 -	) >> $@
 23.1145 -
 23.1146 -# Create a file with the package names in it
 23.1147 -$(SCTPAPI_PACKAGES_FILE): $(DIRECTORY_CACHE) $(call PackageDependencies,$(SCTPAPI_PKGS))
 23.1148 -	$(prep-target)
 23.1149 -	$(call PackageFilter,$(SCTPAPI_PKGS))
 23.1150 -
 23.1151 -#############################################################
 23.1152 -#
 23.1153 -# Get a cache of all the directories
 23.1154 -
 23.1155 -$(DIRECTORY_CACHE): $(ALL_EXISTING_SOURCE_DIRS)
 23.1156 -	$(prep-target)
 23.1157 -	@for cp in $(ALL_EXISTING_SOURCE_DIRS) ; do \
 23.1158 -	  $(ECHO) "$(FIND) $${cp} -type f >> $@"; \
 23.1159 -	  $(FIND) $${cp} -type f >> $@; \
 23.1160 -	done
 23.1161 -
 23.1162 -#############################################################
 23.1163 -#release version of core packages ########
 23.1164 -# Maximize performance and ensure that build number & milestone are set.
 23.1165 -
 23.1166 -rel-coredocs: sanitycheckcoredocs
 23.1167 -	$(MAKE) coredocs
 23.1168 -
 23.1169 -rel-docs: rel-coredocs $(ALL_OTHER_TARGETS)
 23.1170 -#
 23.1171 -# end of production targets
 23.1172 -
 23.1173 -otherdocs: $(ALL_OTHER_TARGETS)
 23.1174 -
 23.1175 -clean:
 23.1176 -	$(RM) -r $(DOCSDIR) $(DOCSTMPDIR)
 23.1177 -
 23.1178 -#############################################################
 23.1179 -# DEBUG TARGET
 23.1180 -# List the values defined in the makefile hierarchy, to make sure everything
 23.1181 -# is set properly, and to help identify values we can use instead of making new ones.
 23.1182 -# (Most of them come from common/shared/Defs.gmk)
 23.1183 -#
 23.1184 -# Notes:
 23.1185 -# * BUILD_NUMBER defaults to b00 if not set on command line with BUILD_NUMBER=<value>
 23.1186 -# * MILESTONE defaults to internal unless set to beta, rc, or fcs on command line
 23.1187 -#
 23.1188 -
 23.1189 -#############################################################
 23.1190 -.PHONY: all docs coredocs rel-docs otherdocs rel-coredocs \
 23.1191 -    sanitycheckcoredocs $(ALL_OTHER_TARGETS)
    24.1 --- a/common/makefiles/javadoc/NON_CORE_PKGS.gmk	Thu Nov 07 08:16:05 2013 -0800
    24.2 +++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
    24.3 @@ -1,110 +0,0 @@
    24.4 -#
    24.5 -# Copyright (c) 2002, 2012, Oracle and/or its affiliates. All rights reserved.
    24.6 -# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
    24.7 -#
    24.8 -# This code is free software; you can redistribute it and/or modify it
    24.9 -# under the terms of the GNU General Public License version 2 only, as
   24.10 -# published by the Free Software Foundation.  Oracle designates this
   24.11 -# particular file as subject to the "Classpath" exception as provided
   24.12 -# by Oracle in the LICENSE file that accompanied this code.
   24.13 -#
   24.14 -# This code is distributed in the hope that it will be useful, but WITHOUT
   24.15 -# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
   24.16 -# FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
   24.17 -# version 2 for more details (a copy is included in the LICENSE file that
   24.18 -# accompanied this code).
   24.19 -#
   24.20 -# You should have received a copy of the GNU General Public License version
   24.21 -# 2 along with this work; if not, write to the Free Software Foundation,
   24.22 -# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
   24.23 -#
   24.24 -# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
   24.25 -# or visit www.oracle.com if you need additional information or have any
   24.26 -# questions.
   24.27 -#
   24.28 -
   24.29 -#
   24.30 -# This file contains the package names of all the "non-core"
   24.31 -# API published in the Java 2 SDK documentation. "Non-core" means
   24.32 -# it includes all published API outside of the JDK API specification.
   24.33 -#
   24.34 -# These environment variables are used by javadoc in
   24.35 -# make/docs/Makefile and are referenced by the localization
   24.36 -# team when determining which APIs to extract javadoc
   24.37 -# comments from.
   24.38 -
   24.39 -DOMAPI_PKGS = com.sun.java.browser.dom \
   24.40 -    org.w3c.dom \
   24.41 -    org.w3c.dom.bootstrap \
   24.42 -    org.w3c.dom.ls \
   24.43 -    org.w3c.dom.ranges \
   24.44 -    org.w3c.dom.traversal \
   24.45 -    org.w3c.dom.html \
   24.46 -    org.w3c.dom.stylesheets \
   24.47 -    org.w3c.dom.css \
   24.48 -    org.w3c.dom.events \
   24.49 -    org.w3c.dom.views
   24.50 -
   24.51 -JDI_PKGS = com.sun.jdi \
   24.52 -    com.sun.jdi.event \
   24.53 -    com.sun.jdi.request \
   24.54 -    com.sun.jdi.connect \
   24.55 -    com.sun.jdi.connect.spi
   24.56 -
   24.57 -MGMT_PKGS = com.sun.management
   24.58 -
   24.59 -JAAS_PKGS = com.sun.security.auth \
   24.60 -    com.sun.security.auth.callback \
   24.61 -    com.sun.security.auth.login \
   24.62 -    com.sun.security.auth.module
   24.63 -
   24.64 -JGSS_PKGS = com.sun.security.jgss
   24.65 -
   24.66 -OLD_JSSE_PKGS = com.sun.net.ssl
   24.67 -
   24.68 -HTTPSERVER_PKGS = com.sun.net.httpserver \
   24.69 -    com.sun.net.httpserver.spi
   24.70 -
   24.71 -NIO_PKGS = com.sun.nio.file
   24.72 -
   24.73 -DOCLETAPI_PKGS = com.sun.javadoc
   24.74 -
   24.75 -TAGLETAPI_FILE = com/sun/tools/doclets/Taglet.java
   24.76 -
   24.77 -TAGLETAPI_PKGS = com.sun.tools.doclets
   24.78 -
   24.79 -ATTACH_PKGS = com.sun.tools.attach \
   24.80 -    com.sun.tools.attach.spi
   24.81 -
   24.82 -JCONSOLE_PKGS = com.sun.tools.jconsole
   24.83 -
   24.84 -TREEAPI_PKGS = com.sun.source.doctree \
   24.85 -    com.sun.source.tree \
   24.86 -    com.sun.source.util \
   24.87 -    jdk
   24.88 -
   24.89 -SMARTCARDIO_PKGS = javax.smartcardio
   24.90 -
   24.91 -SCTPAPI_PKGS = com.sun.nio.sctp
   24.92 -
   24.93 -ifeq ($(PLATFORM), macosx)
   24.94 -  APPLE_EXT_PKGS = com.apple.concurrent \
   24.95 -      com.apple.eawt \
   24.96 -      com.apple.eawt.event \
   24.97 -      com.apple.eio
   24.98 -endif
   24.99 -
  24.100 -JDK_PKGS = jdk
  24.101 -
  24.102 -# non-core packages in rt.jar
  24.103 -NON_CORE_PKGS = $(DOMAPI_PKGS) \
  24.104 -    $(MGMT_PKGS) \
  24.105 -    $(JAAS_PKGS) \
  24.106 -    $(JGSS_PKGS) \
  24.107 -    $(NIO_PKGS) \
  24.108 -    $(OLD_JSSE_PKGS) \
  24.109 -    $(HTTPSERVER_PKGS) \
  24.110 -    $(SMARTCARDIO_PKGS) \
  24.111 -    $(SCTPAPI_PKGS) \
  24.112 -    $(APPLE_EXT_PKGS) \
  24.113 -    $(JDK_PKGS)
    25.1 --- a/common/makefiles/javadoc/Notes.html	Thu Nov 07 08:16:05 2013 -0800
    25.2 +++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
    25.3 @@ -1,49 +0,0 @@
    25.4 -<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
    25.5 -<html>
    25.6 -<head>
    25.7 -<title>Doc Process Notes</title>
    25.8 -<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
    25.9 -</head>
   25.10 -
   25.11 -<body>
   25.12 -<h3><a name="REGEXP"></a><br>
   25.13 -REGEXP</h3>
   25.14 -<p> REGEXP is a list of wildcard patterns that determines which packages listed
   25.15 -  in CORE_PKGS.gmk go into which summary-table on the main API index page. It
   25.16 -  was motivated by the need to divide the world into &quot;core packages&quot;
   25.17 -  (java.*) and &quot;extension packages&quot; (javax.*). In time, the distinction
   25.18 -  went away. The whole table is now called &quot;Platform Packages&quot;--which
   25.19 -  eliminated the need for this list of regular expressions. But it lingered on,
   25.20 -  accreting all of the packages in the JVM, one by one. I pruned it back to &quot;*&quot;,
   25.21 -  so it now covers every package in the Java platform API docs. If some separation
   25.22 -  is needed in the future, it can grow back into a colon-separated list, starting
   25.23 -  with this, which is in all respects equivalent to &quot;*&quot; at this point
   25.24 -  in time:</p>
   25.25 -<blockquote>
   25.26 -  <pre>REGEXP = &quot;java.*:javax.*:org.ietf*:org.omg.</pre>
   25.27 -</blockquote>
   25.28 -<h3><a name="releaseTargets"></a><br>
   25.29 -  Release Targets</h3>
   25.30 -<p> (Thanks to Kelly O'Hair for this info.)</p>
   25.31 -<p> The <tt>rel-coredocs</tt> and <tt>rel-docs</tt> targets were added by Eric
   25.32 -  Armstrong. <tt>rel-coredocs</tt> assumes the kind of large, 32-bit machine used
   25.33 -  in the javapubs group's docs-release process. It specifies memory settings accordingly
   25.34 -  to maximize performance.</p>
   25.35 -<p> The performance settings, like the sanity check, are most important for the
   25.36 -  core docs--the platform APIs. Running javadoc on those APIs takes a significant
   25.37 -  amount of time and memory. Setting the initial heap size as large as possible
   25.38 -  is important to prevent thrashing as the heap grows. Setting the maximum as
   25.39 -  large as necessary is also important to keep the job from failing.</p>
   25.40 -<blockquote>
   25.41 -  <p> <tt>-J-Xmx512</tt> sets a maximum of 512, which became necessary in 6.0<br>
   25.42 -    <tt>-J-Xms256</tt> sets starting size to 256 (default is 8)</p>
   25.43 -</blockquote>
   25.44 -<p> <tt>rel-coredocs</tt> also includes a sanity check to help ensure that <tt>BUILD_NUMBER</tt>
   25.45 -  and <tt>MILESTONE</tt> are specified properly when docs are built outside of
   25.46 -  the normal release engineering process, with the intention of releasing them
   25.47 -  on the web or in a downloaded docs bundle. (When invoked in release engineering's
   25.48 -  control build, the values are always set properly. But when the targets are
   25.49 -  run by themselves, they default to b00 and &quot;internal&quot;--which silently
   25.50 -  sabotage the result of a build that can take many hours to complete.</p>
   25.51 -</body>
   25.52 -</html>
    26.1 --- a/common/makefiles/support/ListPathsSafely-post-compress.incl	Thu Nov 07 08:16:05 2013 -0800
    26.2 +++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
    26.3 @@ -1,1 +0,0 @@
    26.4 -))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))
    27.1 --- a/common/makefiles/support/ListPathsSafely-pre-compress.incl	Thu Nov 07 08:16:05 2013 -0800
    27.2 +++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
    27.3 @@ -1,1 +0,0 @@
    27.4 -$(subst com,X01,$(subst org,X02,$(subst sun,X03,$(subst java,X04,$(subst javax,X05,$(subst sun/io,X06,$(subst com/sun,X07,$(subst java/io,X08,$(subst org/omg,X09,$(subst org/w3c,X10,$(subst org/xml,X11,$(subst sun/awt,X12,$(subst sun/net,X13,$(subst sun/nio,X14,$(subst sun/rmi,X15,$(subst java/awt,X16,$(subst java/net,X17,$(subst java/nio,X18,$(subst java/rmi,X19,$(subst META-INF,X20,$(subst sun/font,X21,$(subst sun/misc,X22,$(subst sun/text,X23,$(subst sun/util,X24,$(subst java/lang,X25,$(subst java/math,X26,$(subst java/text,X27,$(subst java/util,X28,$(subst javax/jws,X29,$(subst javax/net,X30,$(subst javax/rmi,X31,$(subst javax/xml,X32,$(subst sun/corba,X33,$(subst sun/print,X34,$(subst sun/swing,X35,$(subst java/beans,X36,$(subst javax/lang,X37,$(subst sun/applet,X38,$(subst sun/java2d,X39,$(subst java/applet,X40,$(subst javax/print,X41,$(subst javax/sound,X42,$(subst javax/swing,X43,$(subst javax/tools,X44,$(subst jdk/classes,X45,$(subst org/relaxng,X46,$(subst sun/reflect,X47,$(subst javax/crypto,X48,$(subst javax/naming,X49,$(subst jaxp/classes,X50,$(subst sun/security,X51,$(subst corba/classes,X52,$(subst java/security,X53,$(subst javax/imageio,X54,$(subst jdk/btclasses,X55,$(subst javax/activity,X56,$(subst javax/security,X57,$(subst jdk/newclasses,X58,$(subst sun/instrument,X59,$(subst sun/management,X60,$(subst corba/btclasses,X61,$(subst jdk/democlasses,X62,$(subst javax/activation,X63,$(subst javax/annotation,X64,$(subst javax/management,X65,$(subst javax/transaction,X66,$(subst jaxws/jaf_classes,X67,$(subst langtools/classes,X68,$(subst META-INF/services,X69,$(subst jdk/newdemoclasses,X70,$(subst javax/accessibility,X71,$(subst jaxws/jaxws_classes,X72,
    28.1 --- a/common/makefiles/support/ListPathsSafely-uncompress.sed	Thu Nov 07 08:16:05 2013 -0800
    28.2 +++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
    28.3 @@ -1,72 +0,0 @@
    28.4 -s|X01|com|g
    28.5 -s|X02|org|g
    28.6 -s|X03|sun|g
    28.7 -s|X04|java|g
    28.8 -s|X05|javax|g
    28.9 -s|X06|sun/io|g
   28.10 -s|X07|com/sun|g
   28.11 -s|X08|java/io|g
   28.12 -s|X09|org/omg|g
   28.13 -s|X10|org/w3c|g
   28.14 -s|X11|org/xml|g
   28.15 -s|X12|sun/awt|g
   28.16 -s|X13|sun/net|g
   28.17 -s|X14|sun/nio|g
   28.18 -s|X15|sun/rmi|g
   28.19 -s|X16|java/awt|g
   28.20 -s|X17|java/net|g
   28.21 -s|X18|java/nio|g
   28.22 -s|X19|java/rmi|g
   28.23 -s|X20|META-INF|g
   28.24 -s|X21|sun/font|g
   28.25 -s|X22|sun/misc|g
   28.26 -s|X23|sun/text|g
   28.27 -s|X24|sun/util|g
   28.28 -s|X25|java/lang|g
   28.29 -s|X26|java/math|g
   28.30 -s|X27|java/text|g
   28.31 -s|X28|java/util|g
   28.32 -s|X29|javax/jws|g
   28.33 -s|X30|javax/net|g
   28.34 -s|X31|javax/rmi|g
   28.35 -s|X32|javax/xml|g
   28.36 -s|X33|sun/corba|g
   28.37 -s|X34|sun/print|g
   28.38 -s|X35|sun/swing|g
   28.39 -s|X36|java/beans|g
   28.40 -s|X37|javax/lang|g
   28.41 -s|X38|sun/applet|g
   28.42 -s|X39|sun/java2d|g
   28.43 -s|X40|java/applet|g
   28.44 -s|X41|javax/print|g
   28.45 -s|X42|javax/sound|g
   28.46 -s|X43|javax/swing|g
   28.47 -s|X44|javax/tools|g
   28.48 -s|X45|jdk/classes|g
   28.49 -s|X46|org/relaxng|g
   28.50 -s|X47|sun/reflect|g
   28.51 -s|X48|javax/crypto|g
   28.52 -s|X49|javax/naming|g
   28.53 -s|X50|jaxp/classes|g
   28.54 -s|X51|sun/security|g
   28.55 -s|X52|corba/classes|g
   28.56 -s|X53|java/security|g
   28.57 -s|X54|javax/imageio|g
   28.58 -s|X55|jdk/btclasses|g
   28.59 -s|X56|javax/activity|g
   28.60 -s|X57|javax/security|g
   28.61 -s|X58|jdk/newclasses|g
   28.62 -s|X59|sun/instrument|g
   28.63 -s|X60|sun/management|g
   28.64 -s|X61|corba/btclasses|g
   28.65 -s|X62|jdk/democlasses|g
   28.66 -s|X63|javax/activation|g
   28.67 -s|X64|javax/annotation|g
   28.68 -s|X65|javax/management|g
   28.69 -s|X66|javax/transaction|g
   28.70 -s|X67|jaxws/jaf_classes|g
   28.71 -s|X68|langtools/classes|g
   28.72 -s|X69|META-INF/services|g
   28.73 -s|X70|jdk/newdemoclasses|g
   28.74 -s|X71|javax/accessibility|g
   28.75 -s|X72|jaxws/jaxws_classes|g
    29.1 --- a/common/makefiles/support/unicode2x.sed	Thu Nov 07 08:16:05 2013 -0800
    29.2 +++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
    29.3 @@ -1,100 +0,0 @@
    29.4 -s/\\u0020/\x20/g
    29.5 -s/\\u003A/\x3A/g
    29.6 -s/\\u006B/\x6B/g
    29.7 -s/\\u0075/\x75/g
    29.8 -s/\\u00A0/\xA0/g
    29.9 -s/\\u00A3/\xA3/g
   29.10 -s/\\u00B0/\xB0/g
   29.11 -s/\\u00B7/\xB7/g
   29.12 -s/\\u00BA/\xBA/g
   29.13 -s/\\u00BF/\xBF/g
   29.14 -s/\\u00C0/\xC0/g
   29.15 -s/\\u00C1/\xC1/g
   29.16 -s/\\u00C2/\xC2/g
   29.17 -s/\\u00C4/\xC4/g
   29.18 -s/\\u00C5/\xC5/g
   29.19 -s/\\u00C8/\xC8/g
   29.20 -s/\\u00C9/\xC9/g
   29.21 -s/\\u00CA/\xCA/g
   29.22 -s/\\u00CD/\xCD/g
   29.23 -s/\\u00CE/\xCE/g
   29.24 -s/\\u00D3/\xD3/g
   29.25 -s/\\u00D4/\xD4/g
   29.26 -s/\\u00D6/\xD6/g
   29.27 -s/\\u00DA/\xDA/g
   29.28 -s/\\u00DC/\xDC/g
   29.29 -s/\\u00DD/\xDD/g
   29.30 -s/\\u00DF/\xDF/g
   29.31 -s/\\u00E0/\xE0/g
   29.32 -s/\\u00E1/\xE1/g
   29.33 -s/\\u00E2/\xE2/g
   29.34 -s/\\u00E3/\xE3/g
   29.35 -s/\\u00E4/\xE4/g
   29.36 -s/\\u00E5/\xE5/g
   29.37 -s/\\u00E6/\xE6/g
   29.38 -s/\\u00E7/\xE7/g
   29.39 -s/\\u00E8/\xE8/g
   29.40 -s/\\u00E9/\xE9/g
   29.41 -s/\\u00EA/\xEA/g
   29.42 -s/\\u00EB/\xEB/g
   29.43 -s/\\u00EC/\xEC/g
   29.44 -s/\\u00ED/\xED/g
   29.45 -s/\\u00EE/\xEE/g
   29.46 -s/\\u00EF/\xEF/g
   29.47 -s/\\u00F1/\xF1/g
   29.48 -s/\\u00F2/\xF2/g
   29.49 -s/\\u00F3/\xF3/g
   29.50 -s/\\u00F4/\xF4/g
   29.51 -s/\\u00F5/\xF5/g
   29.52 -s/\\u00F6/\xF6/g
   29.53 -s/\\u00F9/\xF9/g
   29.54 -s/\\u00FA/\xFA/g
   29.55 -s/\\u00FC/\xFC/g
   29.56 -s/\\u0020/\x20/g
   29.57 -s/\\u003f/\x3f/g
   29.58 -s/\\u006f/\x6f/g
   29.59 -s/\\u0075/\x75/g
   29.60 -s/\\u00a0/\xa0/g
   29.61 -s/\\u00a3/\xa3/g
   29.62 -s/\\u00b0/\xb0/g
   29.63 -s/\\u00ba/\xba/g
   29.64 -s/\\u00bf/\xbf/g
   29.65 -s/\\u00c1/\xc1/g
   29.66 -s/\\u00c4/\xc4/g
   29.67 -s/\\u00c5/\xc5/g
   29.68 -s/\\u00c8/\xc8/g
   29.69 -s/\\u00c9/\xc9/g
   29.70 -s/\\u00ca/\xca/g
   29.71 -s/\\u00cd/\xcd/g
   29.72 -s/\\u00d6/\xd6/g
   29.73 -s/\\u00dc/\xdc/g
   29.74 -s/\\u00dd/\xdd/g
   29.75 -s/\\u00df/\xdf/g
   29.76 -s/\\u00e0/\xe0/g
   29.77 -s/\\u00e1/\xe1/g
   29.78 -s/\\u00e2/\xe2/g
   29.79 -s/\\u00e3/\xe3/g
   29.80 -s/\\u00e4/\xe4/g
   29.81 -s/\\u00e5/\xe5/g
   29.82 -s/\\u00e7/\xe7/g
   29.83 -s/\\u00e8/\xe8/g
   29.84 -s/\\u00e9/\xe9/g
   29.85 -s/\\u00ea/\xea/g
   29.86 -s/\\u00eb/\xeb/g
   29.87 -s/\\u00ec/\xec/g
   29.88 -s/\\u00ed/\xed/g
   29.89 -s/\\u00ee/\xee/g
   29.90 -s/\\u00ef/\xef/g
   29.91 -s/\\u00f0/\xf0/g
   29.92 -s/\\u00f1/\xf1/g
   29.93 -s/\\u00f2/\xf2/g
   29.94 -s/\\u00f3/\xf3/g
   29.95 -s/\\u00f4/\xf4/g
   29.96 -s/\\u00f5/\xf5/g
   29.97 -s/\\u00f6/\xf6/g
   29.98 -s/\\u00f7/\xf7/g
   29.99 -s/\\u00f8/\xf8/g
  29.100 -s/\\u00f9/\xf9/g
  29.101 -s/\\u00fa/\xfa/g
  29.102 -s/\\u00fc/\xfc/g
  29.103 -s/\\u00ff/\xff/g
    30.1 --- a/common/nb_native/nbproject/configurations.xml	Thu Nov 07 08:16:05 2013 -0800
    30.2 +++ b/common/nb_native/nbproject/configurations.xml	Thu Nov 14 10:53:23 2013 +0100
    30.3 @@ -4987,7 +4987,7 @@
    30.4              <pElem>../../jdk/src/share/back</pElem>
    30.5              <pElem>../../jdk/src/solaris/back</pElem>
    30.6              <pElem>../../build/linux-x86_64-normal-server-release/jdk/gensrc_jdwp_headers</pElem>
    30.7 -            <pElem>../../jdk/makefiles</pElem>
    30.8 +            <pElem>../../jdk/make</pElem>
    30.9            </incDir>
   30.10            <preprocessorList>
   30.11              <Elem>ARCH="amd64"</Elem>
   30.12 @@ -5064,7 +5064,7 @@
   30.13              <pElem>../../jdk/src/solaris/native/common</pElem>
   30.14              <pElem>../../jdk/src/share/demo/jvmti/waiters</pElem>
   30.15              <pElem>../../jdk/src/share/demo/jvmti/agent_util</pElem>
   30.16 -            <pElem>../../jdk/makefiles</pElem>
   30.17 +            <pElem>../../jdk/make</pElem>
   30.18            </incDir>
   30.19          </ccTool>
   30.20        </folder>
   30.21 @@ -5074,7 +5074,7 @@
   30.22              <pElem>../../jdk/src/share/demo/jvmti/heapTracker</pElem>
   30.23              <pElem>../../jdk/src/share/demo/jvmti/agent_util</pElem>
   30.24              <pElem>../../jdk/src/share/demo/jvmti/java_crw_demo</pElem>
   30.25 -            <pElem>../../jdk/makefiles</pElem>
   30.26 +            <pElem>../../jdk/make</pElem>
   30.27            </incDir>
   30.28          </cTool>
   30.29        </folder>
   30.30 @@ -5083,7 +5083,7 @@
   30.31            <incDir>
   30.32              <pElem>../../jdk/src/share/demo/jvmti/compiledMethodLoad</pElem>
   30.33              <pElem>../../jdk/src/share/demo/jvmti/agent_util</pElem>
   30.34 -            <pElem>../../jdk/makefiles</pElem>
   30.35 +            <pElem>../../jdk/make</pElem>
   30.36            </incDir>
   30.37            <preprocessorList>
   30.38              <Elem>THIS_FILE="compiledMethodLoad.c"</Elem>
   30.39 @@ -5095,7 +5095,7 @@
   30.40            <incDir>
   30.41              <pElem>../../jdk/src/share/demo/jvmti/gctest</pElem>
   30.42              <pElem>../../jdk/src/share/demo/jvmti/agent_util</pElem>
   30.43 -            <pElem>../../jdk/makefiles</pElem>
   30.44 +            <pElem>../../jdk/make</pElem>
   30.45            </incDir>
   30.46            <preprocessorList>
   30.47              <Elem>THIS_FILE="gctest.c"</Elem>
   30.48 @@ -5108,7 +5108,7 @@
   30.49              <pElem>../../jdk/src/share/demo/jvmti/heapTracker</pElem>
   30.50              <pElem>../../jdk/src/share/demo/jvmti/agent_util</pElem>
   30.51              <pElem>../../jdk/src/share/demo/jvmti/java_crw_demo</pElem>
   30.52 -            <pElem>../../jdk/makefiles</pElem>
   30.53 +            <pElem>../../jdk/make</pElem>
   30.54            </incDir>
   30.55            <preprocessorList>
   30.56              <Elem>THIS_FILE="heapTracker.c"</Elem>
   30.57 @@ -5120,7 +5120,7 @@
   30.58            <incDir>
   30.59              <pElem>../../jdk/src/share/demo/jvmti/heapViewer</pElem>
   30.60              <pElem>../../jdk/src/share/demo/jvmti/agent_util</pElem>
   30.61 -            <pElem>../../jdk/makefiles</pElem>
   30.62 +            <pElem>../../jdk/make</pElem>
   30.63            </incDir>
   30.64            <preprocessorList>
   30.65              <Elem>THIS_FILE="heapViewer.c"</Elem>
   30.66 @@ -5135,7 +5135,7 @@
   30.67              <pElem>../../jdk/src/share/npt</pElem>
   30.68              <pElem>../../jdk/src/solaris/npt</pElem>
   30.69              <pElem>../../jdk/src/share/demo/jvmti/java_crw_demo</pElem>
   30.70 -            <pElem>../../jdk/makefiles</pElem>
   30.71 +            <pElem>../../jdk/make</pElem>
   30.72            </incDir>
   30.73            <preprocessorList>
   30.74              <Elem>THIS_FILE="debug_malloc.c"</Elem>
   30.75 @@ -5150,7 +5150,7 @@
   30.76              <pElem>../../jdk/src/share/demo/jvmti/java_crw_demo</pElem>
   30.77              <pElem>../../jdk/src/share/npt</pElem>
   30.78              <pElem>../../jdk/src/solaris/npt</pElem>
   30.79 -            <pElem>../../jdk/makefiles</pElem>
   30.80 +            <pElem>../../jdk/make</pElem>
   30.81            </incDir>
   30.82            <preprocessorList>
   30.83              <Elem>THIS_FILE="java_crw_demo.c"</Elem>
   30.84 @@ -5163,7 +5163,7 @@
   30.85              <pElem>../../jdk/src/share/demo/jvmti/minst</pElem>
   30.86              <pElem>../../jdk/src/share/demo/jvmti/agent_util</pElem>
   30.87              <pElem>../../jdk/src/share/demo/jvmti/java_crw_demo</pElem>
   30.88 -            <pElem>../../jdk/makefiles</pElem>
   30.89 +            <pElem>../../jdk/make</pElem>
   30.90            </incDir>
   30.91            <preprocessorList>
   30.92              <Elem>THIS_FILE="minst.c"</Elem>
   30.93 @@ -5176,7 +5176,7 @@
   30.94              <pElem>../../jdk/src/share/demo/jvmti/mtrace</pElem>
   30.95              <pElem>../../jdk/src/share/demo/jvmti/agent_util</pElem>
   30.96              <pElem>../../jdk/src/share/demo/jvmti/java_crw_demo</pElem>
   30.97 -            <pElem>../../jdk/makefiles</pElem>
   30.98 +            <pElem>../../jdk/make</pElem>
   30.99            </incDir>
  30.100            <preprocessorList>
  30.101              <Elem>THIS_FILE="mtrace.c"</Elem>
  30.102 @@ -5188,7 +5188,7 @@
  30.103            <incDir>
  30.104              <pElem>../../jdk/src/share/demo/jvmti/versionCheck</pElem>
  30.105              <pElem>../../jdk/src/share/demo/jvmti/agent_util</pElem>
  30.106 -            <pElem>../../jdk/makefiles</pElem>
  30.107 +            <pElem>../../jdk/make</pElem>
  30.108            </incDir>
  30.109            <preprocessorList>
  30.110              <Elem>THIS_FILE="versionCheck.c"</Elem>
  30.111 @@ -5208,7 +5208,7 @@
  30.112              <pElem>../../jdk/src/share/instrument</pElem>
  30.113              <pElem>../../jdk/src/solaris/instrument</pElem>
  30.114              <pElem>../../jdk/src/share/bin</pElem>
  30.115 -            <pElem>../../jdk/makefiles</pElem>
  30.116 +            <pElem>../../jdk/make</pElem>
  30.117            </incDir>
  30.118            <preprocessorList>
  30.119              <Elem>ARCH="amd64"</Elem>
  30.120 @@ -5250,7 +5250,7 @@
  30.121              <pElem>../../build/linux-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
  30.122              <pElem>../../jdk/src/share/native/com/sun/media/sound</pElem>
  30.123              <pElem>../../jdk/src/solaris/native/com/sun/media/sound</pElem>
  30.124 -            <pElem>../../jdk/makefiles</pElem>
  30.125 +            <pElem>../../jdk/make</pElem>
  30.126            </incDir>
  30.127            <preprocessorList>
  30.128              <Elem>ARCH="amd64"</Elem>
  30.129 @@ -5342,7 +5342,7 @@
  30.130              <pElem>../../jdk/src/solaris/native/java/util</pElem>
  30.131              <pElem>../../jdk/src/solaris/native/sun/util/locale/provider</pElem>
  30.132              <pElem>../../jdk/src/share/native/java/lang/fdlibm/include</pElem>
  30.133 -            <pElem>../../jdk/makefiles</pElem>
  30.134 +            <pElem>../../jdk/make</pElem>
  30.135            </incDir>
  30.136            <preprocessorList>
  30.137              <Elem>ARCHPROPNAME="amd64"</Elem>
  30.138 @@ -5373,7 +5373,7 @@
  30.139          <cTool>
  30.140            <incDir>
  30.141              <pElem>../../jdk/src/share/native/java/lang/fdlibm/include</pElem>
  30.142 -            <pElem>../../jdk/makefiles</pElem>
  30.143 +            <pElem>../../jdk/make</pElem>
  30.144            </incDir>
  30.145          </cTool>
  30.146        </folder>
  30.147 @@ -5395,7 +5395,7 @@
  30.148              <pElem>../../jdk/src/solaris/native/java/util</pElem>
  30.149              <pElem>../../jdk/src/solaris/native/sun/util/locale/provider</pElem>
  30.150              <pElem>../../jdk/src/share/native/java/lang/fdlibm/include</pElem>
  30.151 -            <pElem>../../jdk/makefiles</pElem>
  30.152 +            <pElem>../../jdk/make</pElem>
  30.153            </incDir>
  30.154            <preprocessorList>
  30.155              <Elem>ARCHPROPNAME="amd64"</Elem>
  30.156 @@ -5425,7 +5425,7 @@
  30.157              <pElem>../../jdk/src/solaris/native/java/util</pElem>
  30.158              <pElem>../../jdk/src/solaris/native/sun/util/locale/provider</pElem>
  30.159              <pElem>../../jdk/src/share/native/java/lang/fdlibm/include</pElem>
  30.160 -            <pElem>../../jdk/makefiles</pElem>
  30.161 +            <pElem>../../jdk/make</pElem>
  30.162            </incDir>
  30.163            <preprocessorList>
  30.164              <Elem>ARCHPROPNAME="amd64"</Elem>
  30.165 @@ -5452,7 +5452,7 @@
  30.166              <pElem>../../jdk/src/solaris/native/sun/net/dns</pElem>
  30.167              <pElem>../../jdk/src/solaris/native/sun/net/spi</pElem>
  30.168              <pElem>../../jdk/src/solaris/native/sun/net/sdp</pElem>
  30.169 -            <pElem>../../jdk/makefiles</pElem>
  30.170 +            <pElem>../../jdk/make</pElem>
  30.171            </incDir>
  30.172            <preprocessorList>
  30.173              <Elem>THIS_FILE="DatagramPacket.c"</Elem>
  30.174 @@ -5484,7 +5484,7 @@
  30.175              <pElem>../../jdk/src/solaris/native/java/util</pElem>
  30.176              <pElem>../../jdk/src/solaris/native/sun/util/locale/provider</pElem>
  30.177              <pElem>../../jdk/src/share/native/java/lang/fdlibm/include</pElem>
  30.178 -            <pElem>../../jdk/makefiles</pElem>
  30.179 +            <pElem>../../jdk/make</pElem>
  30.180            </incDir>
  30.181            <preprocessorList>
  30.182              <Elem>ARCHPROPNAME="amd64"</Elem>
  30.183 @@ -5521,7 +5521,7 @@
  30.184              <pElem>../../jdk/src/solaris/native/java/util</pElem>
  30.185              <pElem>../../jdk/src/solaris/native/sun/util/locale/provider</pElem>
  30.186              <pElem>../../jdk/src/share/native/java/lang/fdlibm/include</pElem>
  30.187 -            <pElem>../../jdk/makefiles</pElem>
  30.188 +            <pElem>../../jdk/make</pElem>
  30.189            </incDir>
  30.190            <preprocessorList>
  30.191              <Elem>ARCHPROPNAME="amd64"</Elem>
  30.192 @@ -5565,7 +5565,7 @@
  30.193              <pElem>../../jdk/src/solaris/native/java/util</pElem>
  30.194              <pElem>../../jdk/src/solaris/native/sun/util/locale/provider</pElem>
  30.195              <pElem>../../jdk/src/share/native/java/lang/fdlibm/include</pElem>
  30.196 -            <pElem>../../jdk/makefiles</pElem>
  30.197 +            <pElem>../../jdk/make</pElem>
  30.198            </incDir>
  30.199            <preprocessorList>
  30.200              <Elem>ARCHPROPNAME="amd64"</Elem>
  30.201 @@ -5601,7 +5601,7 @@
  30.202              <pElem>../../jdk/src/share/native/common</pElem>
  30.203              <pElem>../../jdk/src/solaris/native/common</pElem>
  30.204              <pElem>../../build/linux-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
  30.205 -            <pElem>../../jdk/makefiles</pElem>
  30.206 +            <pElem>../../jdk/make</pElem>
  30.207            </incDir>
  30.208            <preprocessorList>
  30.209              <Elem>PNG_NO_MMX_CODE</Elem>
  30.210 @@ -5673,7 +5673,7 @@
  30.211              <pElem>../../jdk/src/share/native/sun/awt/image</pElem>
  30.212              <pElem>../../jdk/src/share/native/sun/awt/image/cvutils</pElem>
  30.213              <pElem>../../jdk/src/solaris/native/sun/jdga</pElem>
  30.214 -            <pElem>../../jdk/makefiles</pElem>
  30.215 +            <pElem>../../jdk/make</pElem>
  30.216            </incDir>
  30.217            <preprocessorList>
  30.218              <Elem>INTERNAL_BUILD</Elem>
  30.219 @@ -5702,7 +5702,7 @@
  30.220              <pElem>../../jdk/src/share/native/common</pElem>
  30.221              <pElem>../../jdk/src/solaris/native/common</pElem>
  30.222              <pElem>../../build/linux-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
  30.223 -            <pElem>../../jdk/makefiles</pElem>
  30.224 +            <pElem>../../jdk/make</pElem>
  30.225            </incDir>
  30.226            <preprocessorList>
  30.227              <Elem>PNG_NO_MMX_CODE</Elem>
  30.228 @@ -5745,7 +5745,7 @@
  30.229              <pElem>../../jdk/src/solaris/native/sun/java2d/opengl</pElem>
  30.230              <pElem>../../jdk/src/share/native/sun/font</pElem>
  30.231              <pElem>../../jdk/src/solaris/native/sun/java2d/x11</pElem>
  30.232 -            <pElem>../../jdk/makefiles</pElem>
  30.233 +            <pElem>../../jdk/make</pElem>
  30.234            </incDir>
  30.235            <preprocessorList>
  30.236              <Elem>INTERNAL_BUILD</Elem>
  30.237 @@ -5781,7 +5781,7 @@
  30.238              <pElem>../../jdk/src/solaris/native/sun/java2d/opengl</pElem>
  30.239              <pElem>../../jdk/src/share/native/sun/font</pElem>
  30.240              <pElem>../../jdk/src/solaris/native/sun/java2d/x11</pElem>
  30.241 -            <pElem>../../jdk/makefiles</pElem>
  30.242 +            <pElem>../../jdk/make</pElem>
  30.243            </incDir>
  30.244            <preprocessorList>
  30.245              <Elem>INTERNAL_BUILD</Elem>
  30.246 @@ -5817,7 +5817,7 @@
  30.247              <pElem>../../jdk/src/share/native/common</pElem>
  30.248              <pElem>../../jdk/src/solaris/native/common</pElem>
  30.249              <pElem>../../build/linux-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
  30.250 -            <pElem>../../jdk/makefiles</pElem>
  30.251 +            <pElem>../../jdk/make</pElem>
  30.252            </incDir>
  30.253            <preprocessorList>
  30.254              <Elem>PNG_NO_MMX_CODE</Elem>
  30.255 @@ -5864,7 +5864,7 @@
  30.256              <pElem>../../jdk/src/share/native/common</pElem>
  30.257              <pElem>../../jdk/src/solaris/native/common</pElem>
  30.258              <pElem>../../build/linux-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
  30.259 -            <pElem>../../jdk/makefiles</pElem>
  30.260 +            <pElem>../../jdk/make</pElem>
  30.261            </incDir>
  30.262            <preprocessorList>
  30.263              <Elem>PNG_NO_MMX_CODE</Elem>
  30.264 @@ -5900,7 +5900,7 @@
  30.265              <pElem>../../jdk/src/share/native/sun/awt/image</pElem>
  30.266              <pElem>../../jdk/src/share/native/sun/awt/image/cvutils</pElem>
  30.267              <pElem>../../jdk/src/solaris/native/sun/jdga</pElem>
  30.268 -            <pElem>../../jdk/makefiles</pElem>
  30.269 +            <pElem>../../jdk/make</pElem>
  30.270            </incDir>
  30.271            <preprocessorList>
  30.272              <Elem>INTERNAL_BUILD</Elem>
  30.273 @@ -5949,7 +5949,7 @@
  30.274              <pElem>../../jdk/src/share/native/sun/java2d/pipe</pElem>
  30.275              <pElem>../../jdk/src/solaris/native/sun/java2d</pElem>
  30.276              <pElem>../../jdk/src/share/native/sun/java2d</pElem>
  30.277 -            <pElem>../../jdk/makefiles</pElem>
  30.278 +            <pElem>../../jdk/make</pElem>
  30.279            </incDir>
  30.280            <preprocessorList>
  30.281              <Elem>HEADLESS</Elem>
  30.282 @@ -5988,7 +5988,7 @@
  30.283            <incDir>
  30.284              <pElem>../../jdk/src/share/native/sun/java2d</pElem>
  30.285              <pElem>../../jdk/src/share/native/sun/awt/debug</pElem>
  30.286 -            <pElem>../../jdk/makefiles</pElem>
  30.287 +            <pElem>../../jdk/make</pElem>
  30.288            </incDir>
  30.289          </cTool>
  30.290        </folder>
  30.291 @@ -6011,7 +6011,7 @@
  30.292              <pElem>../../jdk/src/solaris/native/sun/java2d/opengl</pElem>
  30.293              <pElem>../../jdk/src/share/native/sun/font</pElem>
  30.294              <pElem>../../jdk/src/solaris/native/sun/java2d/x11</pElem>
  30.295 -            <pElem>../../jdk/makefiles</pElem>
  30.296 +            <pElem>../../jdk/make</pElem>
  30.297            </incDir>
  30.298            <preprocessorList>
  30.299              <Elem>INTERNAL_BUILD</Elem>
  30.300 @@ -6041,7 +6041,7 @@
  30.301              <pElem>../../jdk/src/share/native/sun/awt/image</pElem>
  30.302              <pElem>../../jdk/src/share/native/sun/awt/image/cvutils</pElem>
  30.303              <pElem>../../jdk/src/solaris/native/sun/jdga</pElem>
  30.304 -            <pElem>../../jdk/makefiles</pElem>
  30.305 +            <pElem>../../jdk/make</pElem>
  30.306            </incDir>
  30.307            <preprocessorList>
  30.308              <Elem>INTERNAL_BUILD</Elem>
  30.309 @@ -6072,7 +6072,7 @@
  30.310              <pElem>../../jdk/src/solaris/native/sun/java2d/opengl</pElem>
  30.311              <pElem>../../jdk/src/share/native/sun/font</pElem>
  30.312              <pElem>../../jdk/src/solaris/native/sun/java2d/x11</pElem>
  30.313 -            <pElem>../../jdk/makefiles</pElem>
  30.314 +            <pElem>../../jdk/make</pElem>
  30.315            </incDir>
  30.316            <preprocessorList>
  30.317              <Elem>INTERNAL_BUILD</Elem>
  30.318 @@ -6094,7 +6094,7 @@
  30.319              <pElem>../../jdk/src/solaris/native/common</pElem>
  30.320              <pElem>../../build/linux-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
  30.321              <pElem>../../jdk/src/share/native/sun/management</pElem>
  30.322 -            <pElem>../../jdk/makefiles</pElem>
  30.323 +            <pElem>../../jdk/make</pElem>
  30.324            </incDir>
  30.325            <preprocessorList>
  30.326              <Elem>ARCH="amd64"</Elem>
  30.327 @@ -6136,7 +6136,7 @@
  30.328              <pElem>../../jdk/src/solaris/native/java/util</pElem>
  30.329              <pElem>../../jdk/src/solaris/native/sun/util/locale/provider</pElem>
  30.330              <pElem>../../jdk/src/share/native/java/lang/fdlibm/include</pElem>
  30.331 -            <pElem>../../jdk/makefiles</pElem>
  30.332 +            <pElem>../../jdk/make</pElem>
  30.333            </incDir>
  30.334            <preprocessorList>
  30.335              <Elem>ARCH="amd64"</Elem>
  30.336 @@ -6161,7 +6161,7 @@
  30.337        <folder path="$SRC/jdk/src/share/native/sun/nio">
  30.338          <cTool>
  30.339            <incDir>
  30.340 -            <pElem>../../jdk/makefiles</pElem>
  30.341 +            <pElem>../../jdk/make</pElem>
  30.342            </incDir>
  30.343            <preprocessorList>
  30.344              <Elem>THIS_FILE="genSocketOptionRegistry.c"</Elem>
  30.345 @@ -6193,7 +6193,7 @@
  30.346              <pElem>../../jdk/src/solaris/native/java/util</pElem>
  30.347              <pElem>../../jdk/src/solaris/native/sun/util/locale/provider</pElem>
  30.348              <pElem>../../jdk/src/share/native/java/lang/fdlibm/include</pElem>
  30.349 -            <pElem>../../jdk/makefiles</pElem>
  30.350 +            <pElem>../../jdk/make</pElem>
  30.351            </incDir>
  30.352            <preprocessorList>
  30.353              <Elem>ARCH="amd64"</Elem>
  30.354 @@ -6244,7 +6244,7 @@
  30.355            <incDir>
  30.356              <pElem>../../jdk/src/share/native/sun/security/ec</pElem>
  30.357              <pElem>../../jdk/src/share/native/sun/security/ec/impl</pElem>
  30.358 -            <pElem>../../jdk/makefiles</pElem>
  30.359 +            <pElem>../../jdk/make</pElem>
  30.360            </incDir>
  30.361            <preprocessorList>
  30.362              <Elem>THIS_FILE="ECC_JNI.cpp"</Elem>
  30.363 @@ -6256,7 +6256,7 @@
  30.364            <incDir>
  30.365              <pElem>../../jdk/src/share/native/sun/security/ec</pElem>
  30.366              <pElem>../../jdk/src/share/native/sun/security/ec/impl</pElem>
  30.367 -            <pElem>../../jdk/makefiles</pElem>
  30.368 +            <pElem>../../jdk/make</pElem>
  30.369            </incDir>
  30.370            <preprocessorList>
  30.371              <Elem>MP_API_COMPATIBLE</Elem>
  30.372 @@ -6269,7 +6269,7 @@
  30.373            <incDir>
  30.374              <pElem>../../jdk/src/share/native/sun/security/jgss/wrapper</pElem>
  30.375              <pElem>../../jdk/src/solaris/native/sun/security/jgss/wrapper</pElem>
  30.376 -            <pElem>../../jdk/makefiles</pElem>
  30.377 +            <pElem>../../jdk/make</pElem>
  30.378            </incDir>
  30.379            <preprocessorList>
  30.380              <Elem>THIS_FILE="GSSLibStub.c"</Elem>
  30.381 @@ -6283,7 +6283,7 @@
  30.382              <pElem>../../jdk/src/solaris/native/sun/security/pkcs11</pElem>
  30.383              <pElem>../../jdk/src/share/native/sun/security/pkcs11/wrapper</pElem>
  30.384              <pElem>../../jdk/src/solaris/native/sun/security/pkcs11/wrapper</pElem>
  30.385 -            <pElem>../../jdk/makefiles</pElem>
  30.386 +            <pElem>../../jdk/make</pElem>
  30.387            </incDir>
  30.388            <preprocessorList>
  30.389              <Elem>THIS_FILE="p11_convert.c"</Elem>
  30.390 @@ -6296,7 +6296,7 @@
  30.391              <pElem>../../jdk/src/share/native/sun/security/smartcardio</pElem>
  30.392              <pElem>../../jdk/src/solaris/native/sun/security/smartcardio</pElem>
  30.393              <pElem>../../jdk/src/solaris/native/sun/security/smartcardio/MUSCLE</pElem>
  30.394 -            <pElem>../../jdk/makefiles</pElem>
  30.395 +            <pElem>../../jdk/make</pElem>
  30.396            </incDir>
  30.397            <preprocessorList>
  30.398              <Elem>THIS_FILE="pcsc.c"</Elem>
  30.399 @@ -6315,7 +6315,7 @@
  30.400              <pElem>../../jdk/src/solaris/native/common</pElem>
  30.401              <pElem>../../build/linux-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
  30.402              <pElem>../../jdk/src/share/native/sun/tracing/dtrace</pElem>
  30.403 -            <pElem>../../jdk/makefiles</pElem>
  30.404 +            <pElem>../../jdk/make</pElem>
  30.405            </incDir>
  30.406            <preprocessorList>
  30.407              <Elem>ARCH="amd64"</Elem>
  30.408 @@ -6344,7 +6344,7 @@
  30.409              <pElem>../../build/linux-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
  30.410              <pElem>../../jdk/src/share/npt</pElem>
  30.411              <pElem>../../jdk/src/solaris/npt</pElem>
  30.412 -            <pElem>../../jdk/makefiles</pElem>
  30.413 +            <pElem>../../jdk/make</pElem>
  30.414            </incDir>
  30.415            <preprocessorList>
  30.416              <Elem>ARCH="amd64"</Elem>
  30.417 @@ -6375,7 +6375,7 @@
  30.418              <pElem>../../jdk/src/solaris/transport/socket</pElem>
  30.419              <pElem>../../jdk/src/share/back/export</pElem>
  30.420              <pElem>../../jdk/src/share/back</pElem>
  30.421 -            <pElem>../../jdk/makefiles</pElem>
  30.422 +            <pElem>../../jdk/make</pElem>
  30.423            </incDir>
  30.424            <preprocessorList>
  30.425              <Elem>ARCH="amd64"</Elem>
  30.426 @@ -6427,7 +6427,7 @@
  30.427              <pElem>../../jdk/src/share/back</pElem>
  30.428              <pElem>../../jdk/src/solaris/back</pElem>
  30.429              <pElem>../../build/linux-x86_64-normal-server-release/jdk/gensrc_jdwp_headers</pElem>
  30.430 -            <pElem>../../jdk/makefiles</pElem>
  30.431 +            <pElem>../../jdk/make</pElem>
  30.432            </incDir>
  30.433            <preprocessorList>
  30.434              <Elem>JDWP_LOGGING</Elem>
  30.435 @@ -6463,7 +6463,7 @@
  30.436              <pElem>../../jdk/src/share/npt</pElem>
  30.437              <pElem>../../jdk/src/solaris/npt</pElem>
  30.438              <pElem>../../jdk/src/share/demo/jvmti/java_crw_demo</pElem>
  30.439 -            <pElem>../../jdk/makefiles</pElem>
  30.440 +            <pElem>../../jdk/make</pElem>
  30.441            </incDir>
  30.442            <preprocessorList>
  30.443              <Elem>THIS_FILE="hprof_md.c"</Elem>
  30.444 @@ -6483,7 +6483,7 @@
  30.445              <pElem>../../jdk/src/share/instrument</pElem>
  30.446              <pElem>../../jdk/src/solaris/instrument</pElem>
  30.447              <pElem>../../jdk/src/share/bin</pElem>
  30.448 -            <pElem>../../jdk/makefiles</pElem>
  30.449 +            <pElem>../../jdk/make</pElem>
  30.450            </incDir>
  30.451            <preprocessorList>
  30.452              <Elem>NO_JPLIS_LOGGING</Elem>
  30.453 @@ -6515,7 +6515,7 @@
  30.454          <cTool>
  30.455            <incDir>
  30.456              <pElem>../../jdk/src/share/native/sun/management</pElem>
  30.457 -            <pElem>../../jdk/makefiles</pElem>
  30.458 +            <pElem>../../jdk/make</pElem>
  30.459            </incDir>
  30.460          </cTool>
  30.461        </folder>
  30.462 @@ -6524,7 +6524,7 @@
  30.463            <incDir>
  30.464              <pElem>../../jdk/src/share/native/com/sun/media/sound</pElem>
  30.465              <pElem>../../jdk/src/solaris/native/com/sun/media/sound</pElem>
  30.466 -            <pElem>../../jdk/makefiles</pElem>
  30.467 +            <pElem>../../jdk/make</pElem>
  30.468            </incDir>
  30.469            <preprocessorList>
  30.470              <Elem>EXTRA_SOUND_JNI_LIBS=" jsoundalsa"</Elem>
  30.471 @@ -6541,7 +6541,7 @@
  30.472        <folder path="$SRC/jdk/src/solaris/native/com/sun/security">
  30.473          <cTool>
  30.474            <incDir>
  30.475 -            <pElem>../../jdk/makefiles</pElem>
  30.476 +            <pElem>../../jdk/make</pElem>
  30.477            </incDir>
  30.478            <preprocessorList>
  30.479              <Elem>THIS_FILE="Unix.c"</Elem>
  30.480 @@ -6573,7 +6573,7 @@
  30.481              <pElem>../../jdk/src/solaris/native/java/util</pElem>
  30.482              <pElem>../../jdk/src/solaris/native/sun/util/locale/provider</pElem>
  30.483              <pElem>../../jdk/src/share/native/java/lang/fdlibm/include</pElem>
  30.484 -            <pElem>../../jdk/makefiles</pElem>
  30.485 +            <pElem>../../jdk/make</pElem>
  30.486            </incDir>
  30.487            <preprocessorList>
  30.488              <Elem>ARCHPROPNAME="amd64"</Elem>
  30.489 @@ -6619,7 +6619,7 @@
  30.490              <pElem>../../jdk/src/solaris/native/java/util</pElem>
  30.491              <pElem>../../jdk/src/solaris/native/sun/util/locale/provider</pElem>
  30.492              <pElem>../../jdk/src/share/native/java/lang/fdlibm/include</pElem>
  30.493 -            <pElem>../../jdk/makefiles</pElem>
  30.494 +            <pElem>../../jdk/make</pElem>
  30.495            </incDir>
  30.496            <preprocessorList>
  30.497              <Elem>ARCHPROPNAME="amd64"</Elem>
  30.498 @@ -6648,7 +6648,7 @@
  30.499              <pElem>../../jdk/src/solaris/native/java/util</pElem>
  30.500              <pElem>../../jdk/src/solaris/native/sun/util/locale/provider</pElem>
  30.501              <pElem>../../jdk/src/share/native/java/lang/fdlibm/include</pElem>
  30.502 -            <pElem>../../jdk/makefiles</pElem>
  30.503 +            <pElem>../../jdk/make</pElem>
  30.504            </incDir>
  30.505            <preprocessorList>
  30.506              <Elem>ARCHPROPNAME="amd64"</Elem>
  30.507 @@ -6668,7 +6668,7 @@
  30.508              <pElem>../../jdk/src/solaris/native/sun/net/dns</pElem>
  30.509              <pElem>../../jdk/src/solaris/native/sun/net/spi</pElem>
  30.510              <pElem>../../jdk/src/solaris/native/sun/net/sdp</pElem>
  30.511 -            <pElem>../../jdk/makefiles</pElem>
  30.512 +            <pElem>../../jdk/make</pElem>
  30.513            </incDir>
  30.514            <preprocessorList>
  30.515              <Elem>THIS_FILE="Inet4AddressImpl.c"</Elem>
  30.516 @@ -6682,7 +6682,7 @@
  30.517              <pElem>../../jdk/src/share/native/java/io</pElem>
  30.518              <pElem>../../jdk/src/share/native/java/net</pElem>
  30.519              <pElem>../../jdk/src/solaris/native/java/net</pElem>
  30.520 -            <pElem>../../jdk/makefiles</pElem>
  30.521 +            <pElem>../../jdk/make</pElem>
  30.522            </incDir>
  30.523            <preprocessorList>
  30.524              <Elem>THIS_FILE="MappedByteBuffer.c"</Elem>
  30.525 @@ -6707,7 +6707,7 @@
  30.526              <pElem>../../jdk/src/solaris/native/java/util</pElem>
  30.527              <pElem>../../jdk/src/solaris/native/sun/util/locale/provider</pElem>
  30.528              <pElem>../../jdk/src/share/native/java/lang/fdlibm/include</pElem>
  30.529 -            <pElem>../../jdk/makefiles</pElem>
  30.530 +            <pElem>../../jdk/make</pElem>
  30.531            </incDir>
  30.532            <preprocessorList>
  30.533              <Elem>ARCHPROPNAME="amd64"</Elem>
  30.534 @@ -6744,7 +6744,7 @@
  30.535              <pElem>../../jdk/src/share/native/common</pElem>
  30.536              <pElem>../../jdk/src/solaris/native/common</pElem>
  30.537              <pElem>../../build/linux-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
  30.538 -            <pElem>../../jdk/makefiles</pElem>
  30.539 +            <pElem>../../jdk/make</pElem>
  30.540            </incDir>
  30.541            <preprocessorList>
  30.542              <Elem>PNG_NO_MMX_CODE</Elem>
  30.543 @@ -6773,7 +6773,7 @@
  30.544              <pElem>../../jdk/src/share/native/sun/java2d/pipe</pElem>
  30.545              <pElem>../../jdk/src/solaris/native/sun/java2d</pElem>
  30.546              <pElem>../../jdk/src/share/native/sun/java2d</pElem>
  30.547 -            <pElem>../../jdk/makefiles</pElem>
  30.548 +            <pElem>../../jdk/make</pElem>
  30.549            </incDir>
  30.550            <preprocessorList>
  30.551              <Elem>HEADLESS</Elem>
  30.552 @@ -6808,7 +6808,7 @@
  30.553              <pElem>../../jdk/src/share/native/sun/awt/image</pElem>
  30.554              <pElem>../../jdk/src/share/native/sun/awt/image/cvutils</pElem>
  30.555              <pElem>../../jdk/src/solaris/native/sun/jdga</pElem>
  30.556 -            <pElem>../../jdk/makefiles</pElem>
  30.557 +            <pElem>../../jdk/make</pElem>
  30.558            </incDir>
  30.559            <preprocessorList>
  30.560              <Elem>INTERNAL_BUILD</Elem>
  30.561 @@ -6838,7 +6838,7 @@
  30.562              <pElem>../../jdk/src/solaris/native/common</pElem>
  30.563              <pElem>../../build/linux-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
  30.564              <pElem>../../jdk/src/share/native/sun/management</pElem>
  30.565 -            <pElem>../../jdk/makefiles</pElem>
  30.566 +            <pElem>../../jdk/make</pElem>
  30.567            </incDir>
  30.568            <preprocessorList>
  30.569              <Elem>THIS_FILE="FileSystemImpl.c"</Elem>
  30.570 @@ -6860,7 +6860,7 @@
  30.571              <pElem>../../jdk/src/solaris/native/sun/net/dns</pElem>
  30.572              <pElem>../../jdk/src/solaris/native/sun/net/spi</pElem>
  30.573              <pElem>../../jdk/src/solaris/native/sun/net/sdp</pElem>
  30.574 -            <pElem>../../jdk/makefiles</pElem>
  30.575 +            <pElem>../../jdk/make</pElem>
  30.576            </incDir>
  30.577            <preprocessorList>
  30.578              <Elem>THIS_FILE="ResolverConfigurationImpl.c"</Elem>
  30.579 @@ -6909,7 +6909,7 @@
  30.580              <pElem>../../jdk/src/share/native/java/net</pElem>
  30.581              <pElem>../../jdk/src/solaris/native/sun/nio/ch</pElem>
  30.582              <pElem>../../jdk/src/solaris/native/java/net</pElem>
  30.583 -            <pElem>../../jdk/makefiles</pElem>
  30.584 +            <pElem>../../jdk/make</pElem>
  30.585            </incDir>
  30.586          </cTool>
  30.587        </folder>
  30.588 @@ -6941,7 +6941,7 @@
  30.589            <incDir>
  30.590              <pElem>../../jdk/src/share/native/sun/security/jgss/wrapper</pElem>
  30.591              <pElem>../../jdk/src/solaris/native/sun/security/jgss/wrapper</pElem>
  30.592 -            <pElem>../../jdk/makefiles</pElem>
  30.593 +            <pElem>../../jdk/make</pElem>
  30.594            </incDir>
  30.595          </cTool>
  30.596        </folder>
  30.597 @@ -6952,7 +6952,7 @@
  30.598              <pElem>../../jdk/src/solaris/native/sun/security/pkcs11</pElem>
  30.599              <pElem>../../jdk/src/share/native/sun/security/pkcs11/wrapper</pElem>
  30.600              <pElem>../../jdk/src/solaris/native/sun/security/pkcs11/wrapper</pElem>
  30.601 -            <pElem>../../jdk/makefiles</pElem>
  30.602 +            <pElem>../../jdk/make</pElem>
  30.603            </incDir>
  30.604            <preprocessorList>
  30.605              <Elem>THIS_FILE="p11_md.c"</Elem>
  30.606 @@ -6965,7 +6965,7 @@
  30.607              <pElem>../../jdk/src/share/native/sun/security/smartcardio</pElem>
  30.608              <pElem>../../jdk/src/solaris/native/sun/security/smartcardio</pElem>
  30.609              <pElem>../../jdk/src/solaris/native/sun/security/smartcardio/MUSCLE</pElem>
  30.610 -            <pElem>../../jdk/makefiles</pElem>
  30.611 +            <pElem>../../jdk/make</pElem>
  30.612            </incDir>
  30.613            <preprocessorList>
  30.614              <Elem>THIS_FILE="pcsc_md.c"</Elem>
  30.615 @@ -6983,7 +6983,7 @@
  30.616              <pElem>../../jdk/src/share/native/common</pElem>
  30.617              <pElem>../../jdk/src/solaris/native/common</pElem>
  30.618              <pElem>../../build/linux-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
  30.619 -            <pElem>../../jdk/makefiles</pElem>
  30.620 +            <pElem>../../jdk/make</pElem>
  30.621            </incDir>
  30.622            <preprocessorList>
  30.623              <Elem>THIS_FILE="LinuxVirtualMachine.c"</Elem>
  30.624 @@ -7001,7 +7001,7 @@
  30.625              <pElem>../../jdk/src/solaris/native/common</pElem>
  30.626              <pElem>../../build/linux-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
  30.627              <pElem>../../jdk/src/share/native/sun/tracing/dtrace</pElem>
  30.628 -            <pElem>../../jdk/makefiles</pElem>
  30.629 +            <pElem>../../jdk/make</pElem>
  30.630            </incDir>
  30.631            <preprocessorList>
  30.632              <Elem>THIS_FILE="jvm_symbols_md.c"</Elem>
  30.633 @@ -7033,7 +7033,7 @@
  30.634              <pElem>../../jdk/src/solaris/native/java/util</pElem>
  30.635              <pElem>../../jdk/src/solaris/native/sun/util/locale/provider</pElem>
  30.636              <pElem>../../jdk/src/share/native/java/lang/fdlibm/include</pElem>
  30.637 -            <pElem>../../jdk/makefiles</pElem>
  30.638 +            <pElem>../../jdk/make</pElem>
  30.639            </incDir>
  30.640            <preprocessorList>
  30.641              <Elem>ARCHPROPNAME="amd64"</Elem>
  30.642 @@ -7071,7 +7071,7 @@
  30.643              <pElem>../../jdk/src/share/native/sun/awt/image</pElem>
  30.644              <pElem>../../jdk/src/share/native/sun/awt/image/cvutils</pElem>
  30.645              <pElem>../../jdk/src/solaris/native/sun/jdga</pElem>
  30.646 -            <pElem>../../jdk/makefiles</pElem>
  30.647 +            <pElem>../../jdk/make</pElem>
  30.648            </incDir>
  30.649            <preprocessorList>
  30.650              <Elem>INTERNAL_BUILD</Elem>
  30.651 @@ -7095,7 +7095,7 @@
  30.652              <pElem>../../build/linux-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
  30.653              <pElem>../../jdk/src/share/npt</pElem>
  30.654              <pElem>../../jdk/src/solaris/npt</pElem>
  30.655 -            <pElem>../../jdk/makefiles</pElem>
  30.656 +            <pElem>../../jdk/make</pElem>
  30.657            </incDir>
  30.658            <preprocessorList>
  30.659              <Elem>THIS_FILE="utf_md.c"</Elem>
  30.660 @@ -7116,7 +7116,7 @@
  30.661              <pElem>../../jdk/src/solaris/transport/socket</pElem>
  30.662              <pElem>../../jdk/src/share/back/export</pElem>
  30.663              <pElem>../../jdk/src/share/back</pElem>
  30.664 -            <pElem>../../jdk/makefiles</pElem>
  30.665 +            <pElem>../../jdk/make</pElem>
  30.666            </incDir>
  30.667            <preprocessorList>
  30.668              <Elem>THIS_FILE="socket_md.c"</Elem>
  30.669 @@ -10455,7 +10455,7 @@
  30.670              <pElem>../../jdk/src/share/bin</pElem>
  30.671              <pElem>../../jdk/src/solaris/bin</pElem>
  30.672              <pElem>../../jdk/src/share/native/java/util/zip/zlib-1.2.5</pElem>
  30.673 -            <pElem>../../jdk/makefiles</pElem>
  30.674 +            <pElem>../../jdk/make</pElem>
  30.675            </incDir>
  30.676          </cTool>
  30.677        </item>
  30.678 @@ -10466,7 +10466,7 @@
  30.679              <pElem>../../jdk/src/share/bin</pElem>
  30.680              <pElem>../../jdk/src/solaris/bin</pElem>
  30.681              <pElem>../../jdk/src/share/native/java/util/zip/zlib-1.2.5</pElem>
  30.682 -            <pElem>../../jdk/makefiles</pElem>
  30.683 +            <pElem>../../jdk/make</pElem>
  30.684            </incDir>
  30.685            <preprocessorList>
  30.686              <Elem>THIS_FILE="jli_util.c"</Elem>
  30.687 @@ -10479,7 +10479,7 @@
  30.688              <pElem>../../jdk/src/share/bin</pElem>
  30.689              <pElem>../../jdk/src/solaris/bin</pElem>
  30.690              <pElem>../../jdk/src/linux/bin</pElem>
  30.691 -            <pElem>../../jdk/makefiles</pElem>
  30.692 +            <pElem>../../jdk/make</pElem>
  30.693            </incDir>
  30.694            <preprocessorList>
  30.695              <Elem>EXPAND_CLASSPATH_WILDCARDS</Elem>
  30.696 @@ -10504,7 +10504,7 @@
  30.697              <pElem>../../jdk/src/share/bin</pElem>
  30.698              <pElem>../../jdk/src/solaris/bin</pElem>
  30.699              <pElem>../../jdk/src/share/native/java/util/zip/zlib-1.2.5</pElem>
  30.700 -            <pElem>../../jdk/makefiles</pElem>
  30.701 +            <pElem>../../jdk/make</pElem>
  30.702            </incDir>
  30.703            <preprocessorList>
  30.704              <Elem>THIS_FILE="parse_manifest.c"</Elem>
  30.705 @@ -10521,7 +10521,7 @@
  30.706              <pElem>../../jdk/src/share/bin</pElem>
  30.707              <pElem>../../jdk/src/solaris/bin</pElem>
  30.708              <pElem>../../jdk/src/share/native/java/util/zip/zlib-1.2.5</pElem>
  30.709 -            <pElem>../../jdk/makefiles</pElem>
  30.710 +            <pElem>../../jdk/make</pElem>
  30.711            </incDir>
  30.712            <preprocessorList>
  30.713              <Elem>THIS_FILE="splashscreen_stubs.c"</Elem>
  30.714 @@ -10538,7 +10538,7 @@
  30.715              <pElem>../../jdk/src/share/bin</pElem>
  30.716              <pElem>../../jdk/src/solaris/bin</pElem>
  30.717              <pElem>../../jdk/src/share/native/java/util/zip/zlib-1.2.5</pElem>
  30.718 -            <pElem>../../jdk/makefiles</pElem>
  30.719 +            <pElem>../../jdk/make</pElem>
  30.720            </incDir>
  30.721            <preprocessorList>
  30.722              <Elem>THIS_FILE="version_comp.c"</Elem>
  30.723 @@ -10552,7 +10552,7 @@
  30.724              <pElem>../../jdk/src/share/bin</pElem>
  30.725              <pElem>../../jdk/src/solaris/bin</pElem>
  30.726              <pElem>../../jdk/src/share/native/java/util/zip/zlib-1.2.5</pElem>
  30.727 -            <pElem>../../jdk/makefiles</pElem>
  30.728 +            <pElem>../../jdk/make</pElem>
  30.729            </incDir>
  30.730            <preprocessorList>
  30.731              <Elem>THIS_FILE="wildcard.c"</Elem>
  30.732 @@ -10992,7 +10992,7 @@
  30.733              <pElem>../../jdk/src/share/native/common</pElem>
  30.734              <pElem>../../jdk/src/solaris/native/common</pElem>
  30.735              <pElem>../../build/linux-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
  30.736 -            <pElem>../../jdk/makefiles</pElem>
  30.737 +            <pElem>../../jdk/make</pElem>
  30.738            </incDir>
  30.739            <preprocessorList>
  30.740              <Elem>NO_ZLIB</Elem>
  30.741 @@ -11013,7 +11013,7 @@
  30.742              <pElem>../../jdk/src/share/native/common</pElem>
  30.743              <pElem>../../jdk/src/solaris/native/common</pElem>
  30.744              <pElem>../../build/linux-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
  30.745 -            <pElem>../../jdk/makefiles</pElem>
  30.746 +            <pElem>../../jdk/make</pElem>
  30.747            </incDir>
  30.748            <preprocessorList>
  30.749              <Elem>NO_ZLIB</Elem>
  30.750 @@ -11035,7 +11035,7 @@
  30.751              <pElem>../../jdk/src/share/native/common</pElem>
  30.752              <pElem>../../jdk/src/solaris/native/common</pElem>
  30.753              <pElem>../../build/linux-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
  30.754 -            <pElem>../../jdk/makefiles</pElem>
  30.755 +            <pElem>../../jdk/make</pElem>
  30.756            </incDir>
  30.757            <preprocessorList>
  30.758              <Elem>NO_ZLIB</Elem>
  30.759 @@ -11057,7 +11057,7 @@
  30.760              <pElem>../../jdk/src/share/native/common</pElem>
  30.761              <pElem>../../jdk/src/solaris/native/common</pElem>
  30.762              <pElem>../../build/linux-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
  30.763 -            <pElem>../../jdk/makefiles</pElem>
  30.764 +            <pElem>../../jdk/make</pElem>
  30.765            </incDir>
  30.766            <preprocessorList>
  30.767              <Elem>NO_ZLIB</Elem>
  30.768 @@ -11079,7 +11079,7 @@
  30.769              <pElem>../../jdk/src/solaris/javavm/export</pElem>
  30.770              <pElem>../../jdk/src/share/native/common</pElem>
  30.771              <pElem>../../jdk/src/solaris/native/common</pElem>
  30.772 -            <pElem>../../jdk/makefiles</pElem>
  30.773 +            <pElem>../../jdk/make</pElem>
  30.774            </incDir>
  30.775            <preprocessorList>
  30.776              <Elem>THIS_FILE="main.cpp"</Elem>
  30.777 @@ -11099,7 +11099,7 @@
  30.778              <pElem>../../jdk/src/share/native/common</pElem>
  30.779              <pElem>../../jdk/src/solaris/native/common</pElem>
  30.780              <pElem>../../build/linux-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
  30.781 -            <pElem>../../jdk/makefiles</pElem>
  30.782 +            <pElem>../../jdk/make</pElem>
  30.783            </incDir>
  30.784            <preprocessorList>
  30.785              <Elem>NO_ZLIB</Elem>
  30.786 @@ -11121,7 +11121,7 @@
  30.787              <pElem>../../jdk/src/share/native/common</pElem>
  30.788              <pElem>../../jdk/src/solaris/native/common</pElem>
  30.789              <pElem>../../build/linux-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
  30.790 -            <pElem>../../jdk/makefiles</pElem>
  30.791 +            <pElem>../../jdk/make</pElem>
  30.792            </incDir>
  30.793            <preprocessorList>
  30.794              <Elem>NO_ZLIB</Elem>
  30.795 @@ -11143,7 +11143,7 @@
  30.796              <pElem>../../jdk/src/share/native/common</pElem>
  30.797              <pElem>../../jdk/src/solaris/native/common</pElem>
  30.798              <pElem>../../build/linux-x86_64-normal-server-release/jdk/gensrc_headers</pElem>
  30.799 -            <pElem>../../jdk/makefiles</pElem>
  30.800 +            <pElem>../../jdk/make</pElem>
  30.801            </incDir>
  30.802            <preprocessorList>
  30.803              <Elem>NO_ZLIB</Elem>
  30.804 @@ -11307,7 +11307,7 @@
  30.805              flavor2="0">
  30.806          <cTool>
  30.807            <incDir>
  30.808 -            <pElem>../../jdk/makefiles</pElem>
  30.809 +            <pElem>../../jdk/make</pElem>
  30.810            </incDir>
  30.811          </cTool>
  30.812        </item>
  30.813 @@ -11317,7 +11317,7 @@
  30.814              flavor2="0">
  30.815          <cTool>
  30.816            <incDir>
  30.817 -            <pElem>../../jdk/makefiles</pElem>
  30.818 +            <pElem>../../jdk/make</pElem>
  30.819            </incDir>
  30.820            <preprocessorList>
  30.821              <Elem>THIS_FILE="check_format.c"</Elem>
  30.822 @@ -11345,7 +11345,7 @@
  30.823              <pElem>../../jdk/src/solaris/native/java/util</pElem>
  30.824              <pElem>../../jdk/src/solaris/native/sun/util/locale/provider</pElem>
  30.825              <pElem>../../jdk/src/share/native/java/lang/fdlibm/include</pElem>
  30.826 -            <pElem>../../jdk/makefiles</pElem>
  30.827 +            <pElem>../../jdk/make</pElem>
  30.828            </incDir>
  30.829            <preprocessorList>
  30.830              <Elem>ARCHPROPNAME="amd64"</Elem>
  30.831 @@ -11378,7 +11378,7 @@
  30.832              <pElem>../../jdk/src/solaris/native/java/util</pElem>
  30.833              <pElem>../../jdk/src/solaris/native/sun/util/locale/provider</pElem>
  30.834              <pElem>../../jdk/src/share/native/java/lang/fdlibm/include</pElem>
  30.835 -            <pElem>../../jdk/makefiles</pElem>
  30.836 +            <pElem>../../jdk/make</pElem>
  30.837            </incDir>
  30.838            <preprocessorList>
  30.839              <Elem>ARCHPROPNAME="amd64"</Elem>
  30.840 @@ -11411,7 +11411,7 @@
  30.841              <pElem>../../jdk/src/solaris/native/java/util</pElem>
  30.842              <pElem>../../jdk/src/solaris/native/sun/util/locale/provider</pElem>
  30.843              <pElem>../../jdk/src/share/native/java/lang/fdlibm/include</pElem>
  30.844 -            <pElem>../../jdk/makefiles</pElem>
  30.845 +            <pElem>../../jdk/make</pElem>
  30.846            </incDir>
  30.847            <preprocessorList>
  30.848              <Elem>ARCHPROPNAME="amd64"</Elem>
  30.849 @@ -11444,7 +11444,7 @@
  30.850              <pElem>../../jdk/src/solaris/native/java/util</pElem>
  30.851              <pElem>../../jdk/src/solaris/native/sun/util/locale/provider</pElem>
  30.852              <pElem>../../jdk/src/share/native/java/lang/fdlibm/include</pElem>
  30.853 -            <pElem>../../jdk/makefiles</pElem>
  30.854 +            <pElem>../../jdk/make</pElem>
  30.855            </incDir>
  30.856            <preprocessorList>
  30.857              <Elem>ARCHPROPNAME="amd64"</Elem>
  30.858 @@ -11477,7 +11477,7 @@
  30.859              <pElem>../../jdk/src/solaris/native/java/util</pElem>
  30.860              <pElem>../../jdk/src/solaris/native/sun/util/locale/provider</pElem>
  30.861              <pElem>../../jdk/src/share/native/java/lang/fdlibm/include</pElem>
  30.862 -            <pElem>../../jdk/makefiles</pElem>
  30.863 +            <pElem>../../jdk/make</pElem>
  30.864            </incDir>
  30.865            <preprocessorList>
  30.866              <Elem>ARCHPROPNAME="amd64"</Elem>
  30.867 @@ -11565,7 +11565,7 @@
  30.868              <pElem>../../jdk/src/solaris/native/java/util</pElem>
  30.869              <pElem>../../jdk/src/solaris/native/sun/util/locale/provider</pElem>
  30.870              <pElem>../../jdk/src/share/native/java/lang/fdlibm/include</pElem>
  30.871 -            <pElem>../../jdk/makefiles</pElem>
  30.872 +            <pElem>../../jdk/make</pElem>
  30.873            </incDir>
  30.874            <preprocessorList>
  30.875              <Elem>ARCHPROPNAME="amd64"</Elem>
  30.876 @@ -11598,7 +11598,7 @@
  30.877              <pElem>../../jdk/src/solaris/native/java/util</pElem>
  30.878              <pElem>../../jdk/src/solaris/native/sun/util/locale/provider</pElem>
  30.879              <pElem>../../jdk/src/share/native/java/lang/fdlibm/include</pElem>
  30.880 -            <pElem>../../jdk/makefiles</pElem>
  30.881 +            <pElem>../../jdk/make</pElem>
  30.882            </incDir>
  30.883            <preprocessorList>
  30.884              <Elem>ARCHPROPNAME="amd64"</Elem>
  30.885 @@ -11631,7 +11631,7 @@
  30.886              <pElem>../../jdk/src/solaris/native/java/util</pElem>
  30.887              <pElem>../../jdk/src/solaris/native/sun/util/locale/provider</pElem>
  30.888              <pElem>../../jdk/src/share/native/java/lang/fdlibm/include</pElem>
  30.889 -            <pElem>../../jdk/makefiles</pElem>
  30.890 +            <pElem>../../jdk/make</pElem>
  30.891            </incDir>
  30.892            <preprocessorList>
  30.893              <Elem>ARCHPROPNAME="amd64"</Elem>
  30.894 @@ -11664,7 +11664,7 @@
  30.895              <pElem>../../jdk/src/solaris/native/java/util</pElem>
  30.896              <pElem>../../jdk/src/solaris/native/sun/util/locale/provider</pElem>
  30.897              <pElem>../../jdk/src/share/native/java/lang/fdlibm/include</pElem>
  30.898 -            <pElem>../../jdk/makefiles</pElem>
  30.899 +            <pElem>../../jdk/make</pElem>
  30.900            </incDir>
  30.901            <preprocessorList>
  30.902              <Elem>ARCHPROPNAME="amd64"</Elem>
  30.903 @@ -11697,7 +11697,7 @@
  30.904              <pElem>../../jdk/src/solaris/native/java/util</pElem>
  30.905              <pElem>../../jdk/src/solaris/native/sun/util/locale/provider</pElem>
  30.906              <pElem>../../jdk/src/share/native/java/lang/fdlibm/include</pElem>
  30.907 -            <pElem>../../jdk/makefiles</pElem>
  30.908 +            <pElem>../../jdk/make</pElem>
  30.909            </incDir>
  30.910            <preprocessorList>
  30.911              <Elem>ARCHPROPNAME="amd64"</Elem>
  30.912 @@ -11730,7 +11730,7 @@
  30.913              <pElem>../../jdk/src/solaris/native/java/util</pElem>
  30.914              <pElem>../../jdk/src/solaris/native/sun/util/locale/provider</pElem>
  30.915              <pElem>../../jdk/src/share/native/java/lang/fdlibm/include</pElem>
  30.916 -            <pElem>../../jdk/makefiles</pElem>
  30.917 +            <pElem>../../jdk/make</pElem>
  30.918            </incDir>
  30.919            <preprocessorList>
  30.920              <Elem>ARCHPROPNAME="amd64"</Elem>
  30.921 @@ -11763,7 +11763,7 @@
  30.922              <pElem>../../jdk/src/solaris/native/java/util</pElem>
  30.923              <pElem>../../jdk/src/solaris/native/sun/util/locale/provider</pElem>
  30.924              <pElem>../../jdk/src/share/native/java/lang/fdlibm/include</pElem>
  30.925 -            <pElem>../../jdk/makefiles</pElem>
  30.926 +            <pElem>../../jdk/make</pElem>
  30.927            </incDir>
  30.928            <preprocessorList>
  30.929              <Elem>ARCHPROPNAME="amd64"</Elem>
  30.930 @@ -11796,7 +11796,7 @@
  30.931              <pElem>../../jdk/src/solaris/native/java/util</pElem>
  30.932              <pElem>../../jdk/src/solaris/native/sun/util/locale/provider</pElem>
  30.933              <pElem>../../jdk/src/share/native/java/lang/fdlibm/include</pElem>
  30.934 -            <pElem>../../jdk/makefiles</pElem>
  30.935 +            <pElem>../../jdk/make</pElem>
  30.936            </incDir>
  30.937            <preprocessorList>
  30.938              <Elem>ARCHPROPNAME="amd64"</Elem>
  30.939 @@ -11829,7 +11829,7 @@
  30.940              <pElem>../../jdk/src/solaris/native/java/util</pElem>
  30.941              <pElem>../../jdk/src/solaris/native/sun/util/locale/provider</pElem>
  30.942              <pElem>../../jdk/src/share/native/java/lang/fdlibm/include</pElem>
  30.943 -            <pElem>../../jdk/makefiles</pElem>
  30.944 +            <pElem>../../jdk/make</pElem>
  30.945            </incDir>
  30.946            <preprocessorList>
  30.947              <Elem>ARCHPROPNAME="amd64"</Elem>
  30.948 @@ -11862,7 +11862,7 @@
  30.949              <pElem>../../jdk/src/solaris/native/java/util</pElem>
  30.950              <pElem>../../jdk/src/solaris/native/sun/util/locale/provider</pElem>
  30.951              <pElem>../../jdk/src/share/native/java/lang/fdlibm/include</pElem>
  30.952 -            <pElem>../../jdk/makefiles</pElem>
  30.953 +            <pElem>../../jdk/make</pElem>
  30.954            </incDir>
  30.955            <preprocessorList>
  30.956              <Elem>ARCHPROPNAME="amd64"</Elem>
  30.957 @@ -11895,7 +11895,7 @@
  30.958              <pElem>../../jdk/src/solaris/native/java/util</pElem>
  30.959              <pElem>../../jdk/src/solaris/native/sun/util/locale/provider</pElem>
  30.960              <pElem>../../jdk/src/share/native/java/lang/fdlibm/include</pElem>
  30.961 -            <pElem>../../jdk/makefiles</pElem>
  30.962 +            <pElem>../../jdk/make</pElem>
  30.963            </incDir>
  30.964            <preprocessorList>
  30.965              <Elem>ARCHPROPNAME="amd64"</Elem>
  30.966 @@ -11928,7 +11928,7 @@
  30.967              <pElem>../../jdk/src/solaris/native/java/util</pElem>
  30.968              <pElem>../../jdk/src/solaris/native/sun/util/locale/provider</pElem>
  30.969              <pElem>../../jdk/src/share/native/java/lang/fdlibm/include</pElem>
  30.970 -            <pElem>../../jdk/makefiles</pElem>
  30.971 +            <pElem>../../jdk/make</pElem>
  30.972            </incDir>
  30.973            <preprocessorList>
  30.974              <Elem>ARCHPROPNAME="amd64"</Elem>
  30.975 @@ -11961,7 +11961,7 @@
  30.976              <pElem>../../jdk/src/solaris/native/java/util</pElem>
  30.977              <pElem>../../jdk/src/solaris/native/sun/util/locale/provider</pElem>
  30.978              <pElem>../../jdk/src/share/native/java/lang/fdlibm/include</pElem>
  30.979 -            <pElem>../../jdk/makefiles</pElem>
  30.980 +            <pElem>../../jdk/make</pElem>
  30.981            </incDir>
  30.982            <preprocessorList>
  30.983              <Elem>ARCHPROPNAME="amd64"</Elem>
  30.984 @@ -11994,7 +11994,7 @@
  30.985              <pElem>../../jdk/src/solaris/native/java/util</pElem>
  30.986              <pElem>../../jdk/src/solaris/native/sun/util/locale/provider</pElem>
  30.987              <pElem>../../jdk/src/share/native/java/lang/fdlibm/include</pElem>
  30.988 -            <pElem>../../jdk/makefiles</pElem>
  30.989 +            <pElem>../../jdk/make</pElem>
  30.990            </incDir>
  30.991            <preprocessorList>
  30.992              <Elem>ARCHPROPNAME="amd64"</Elem>
  30.993 @@ -12027,7 +12027,7 @@
  30.994              <pElem>../../jdk/src/solaris/native/java/util</pElem>
  30.995              <pElem>../../jdk/src/solaris/native/sun/util/locale/provider</pElem>
  30.996              <pElem>../../jdk/src/share/native/java/lang/fdlibm/include</pElem>
  30.997 -            <pElem>../../jdk/makefiles</pElem>
  30.998 +            <pElem>../../jdk/make</pElem>
  30.999            </incDir>
 30.1000            <preprocessorList>
 30.1001              <Elem>ARCHPROPNAME="amd64"</Elem>
 30.1002 @@ -12060,7 +12060,7 @@
 30.1003              <pElem>../../jdk/src/solaris/native/java/util</pElem>
 30.1004              <pElem>../../jdk/src/solaris/native/sun/util/locale/provider</pElem>
 30.1005              <pElem>../../jdk/src/share/native/java/lang/fdlibm/include</pElem>
 30.1006 -            <pElem>../../jdk/makefiles</pElem>
 30.1007 +            <pElem>../../jdk/make</pElem>
 30.1008            </incDir>
 30.1009            <preprocessorList>
 30.1010              <Elem>ARCHPROPNAME="amd64"</Elem>
 30.1011 @@ -12800,7 +12800,7 @@
 30.1012              <pElem>../../jdk/src/solaris/native/java/util</pElem>
 30.1013              <pElem>../../jdk/src/solaris/native/sun/util/locale/provider</pElem>
 30.1014              <pElem>../../jdk/src/share/native/java/lang/fdlibm/include</pElem>
 30.1015 -            <pElem>../../jdk/makefiles</pElem>
 30.1016 +            <pElem>../../jdk/make</pElem>
 30.1017            </incDir>
 30.1018            <preprocessorList>
 30.1019              <Elem>ARCHPROPNAME="amd64"</Elem>
 30.1020 @@ -12833,7 +12833,7 @@
 30.1021              <pElem>../../jdk/src/share/native/java/util/zip/zlib-1.2.5</pElem>
 30.1022              <pElem>../../jdk/src/share/native/java/io</pElem>
 30.1023              <pElem>../../jdk/src/solaris/native/java/io</pElem>
 30.1024 -            <pElem>../../jdk/makefiles</pElem>
 30.1025 +            <pElem>../../jdk/make</pElem>
 30.1026            </incDir>
 30.1027            <preprocessorList>
 30.1028              <Elem>THIS_FILE="Adler32.c"</Elem>
 30.1029 @@ -12860,7 +12860,7 @@
 30.1030              <pElem>../../jdk/src/share/native/java/util/zip/zlib-1.2.5</pElem>
 30.1031              <pElem>../../jdk/src/share/native/java/io</pElem>
 30.1032              <pElem>../../jdk/src/solaris/native/java/io</pElem>
 30.1033 -            <pElem>../../jdk/makefiles</pElem>
 30.1034 +            <pElem>../../jdk/make</pElem>
 30.1035            </incDir>
 30.1036            <preprocessorList>
 30.1037              <Elem>THIS_FILE="CRC32.c"</Elem>
 30.1038 @@ -12887,7 +12887,7 @@
 30.1039              <pElem>../../jdk/src/share/native/java/util/zip/zlib-1.2.5</pElem>
 30.1040              <pElem>../../jdk/src/share/native/java/io</pElem>
 30.1041              <pElem>../../jdk/src/solaris/native/java/io</pElem>
 30.1042 -            <pElem>../../jdk/makefiles</pElem>
 30.1043 +            <pElem>../../jdk/make</pElem>
 30.1044            </incDir>
 30.1045            <preprocessorList>
 30.1046              <Elem>THIS_FILE="Deflater.c"</Elem>
 30.1047 @@ -12914,7 +12914,7 @@
 30.1048              <pElem>../../jdk/src/share/native/java/util/zip/zlib-1.2.5</pElem>
 30.1049              <pElem>../../jdk/src/share/native/java/io</pElem>
 30.1050              <pElem>../../jdk/src/solaris/native/java/io</pElem>
 30.1051 -            <pElem>../../jdk/makefiles</pElem>
 30.1052 +            <pElem>../../jdk/make</pElem>
 30.1053            </incDir>
 30.1054            <preprocessorList>
 30.1055              <Elem>THIS_FILE="Inflater.c"</Elem>
 30.1056 @@ -12941,7 +12941,7 @@
 30.1057              <pElem>../../jdk/src/share/native/java/util/zip/zlib-1.2.5</pElem>
 30.1058              <pElem>../../jdk/src/share/native/java/io</pElem>
 30.1059              <pElem>../../jdk/src/solaris/native/java/io</pElem>
 30.1060 -            <pElem>../../jdk/makefiles</pElem>
 30.1061 +            <pElem>../../jdk/make</pElem>
 30.1062            </incDir>
 30.1063            <preprocessorList>
 30.1064              <Elem>THIS_FILE="ZipFile.c"</Elem>
 30.1065 @@ -12968,7 +12968,7 @@
 30.1066              <pElem>../../jdk/src/share/native/java/util/zip/zlib-1.2.5</pElem>
 30.1067              <pElem>../../jdk/src/share/native/java/io</pElem>
 30.1068              <pElem>../../jdk/src/solaris/native/java/io</pElem>
 30.1069 -            <pElem>../../jdk/makefiles</pElem>
 30.1070 +            <pElem>../../jdk/make</pElem>
 30.1071            </incDir>
 30.1072            <preprocessorList>
 30.1073              <Elem>THIS_FILE="zip_util.c"</Elem>
 30.1074 @@ -13213,7 +13213,7 @@
 30.1075              <pElem>../../jdk/src/solaris/native/sun/java2d/opengl</pElem>
 30.1076              <pElem>../../jdk/src/share/native/sun/font</pElem>
 30.1077              <pElem>../../jdk/src/solaris/native/sun/java2d/x11</pElem>
 30.1078 -            <pElem>../../jdk/makefiles</pElem>
 30.1079 +            <pElem>../../jdk/make</pElem>
 30.1080            </incDir>
 30.1081            <preprocessorList>
 30.1082              <Elem>INTERNAL_BUILD</Elem>
 30.1083 @@ -13253,7 +13253,7 @@
 30.1084              <pElem>../../jdk/src/solaris/native/sun/java2d/opengl</pElem>
 30.1085              <pElem>../../jdk/src/share/native/sun/font</pElem>
 30.1086              <pElem>../../jdk/src/solaris/native/sun/java2d/x11</pElem>
 30.1087 -            <pElem>../../jdk/makefiles</pElem>
 30.1088 +            <pElem>../../jdk/make</pElem>
 30.1089            </incDir>
 30.1090            <preprocessorList>
 30.1091              <Elem>INTERNAL_BUILD</Elem>
 30.1092 @@ -13293,7 +13293,7 @@
 30.1093              <pElem>../../jdk/src/solaris/native/sun/java2d/opengl</pElem>
 30.1094              <pElem>../../jdk/src/share/native/sun/font</pElem>
 30.1095              <pElem>../../jdk/s