Mercurial > jdk8-mips64-public / changeset
changeset
Merge
Tue, 08 Jan 2013 13:14:22 -0800
- author
- katleman
- date
- Tue, 08 Jan 2013 13:14:22 -0800
- changeset 572
- 64a9ebad39fe
- parent 550
- c1be681d80a1
- parent 571
- 7a3c6ffdf1fb
- child 573
- b284980b7d9a
Merge
| common/autoconf/closed.version.numbers | file | annotate | diff | comparison | revisions | |
| common/autoconf/version.numbers | file | annotate | diff | comparison | revisions |
1.1 --- a/Makefile Thu Jan 03 12:44:32 2013 -0800 1.2 +++ b/Makefile Tue Jan 08 13:14:22 2013 -0800 1.3 @@ -26,6 +26,11 @@ 1.4 # If NEWBUILD is defined, use the new build-infra Makefiles and configure. 1.5 # See NewMakefile.gmk for more information. 1.6 1.7 +# If not specified, select what the default build is 1.8 +ifndef NEWBUILD 1.9 + NEWBUILD=true 1.10 +endif 1.11 + 1.12 ifeq ($(NEWBUILD),true) 1.13 1.14 # The new top level Makefile
2.1 --- a/NewMakefile.gmk Thu Jan 03 12:44:32 2013 -0800 2.2 +++ b/NewMakefile.gmk Tue Jan 08 13:14:22 2013 -0800 2.3 @@ -23,273 +23,107 @@ 2.4 # questions. 2.5 # 2.6 2.7 -# Utilities used in this Makefile 2.8 -BASENAME=basename 2.9 -CAT=cat 2.10 -CD=cd 2.11 -CMP=cmp 2.12 -CP=cp 2.13 -ECHO=echo 2.14 -MKDIR=mkdir 2.15 -PRINTF=printf 2.16 -PWD=pwd 2.17 -TAR=tar 2.18 -ifeq ($(PLATFORM),windows) 2.19 - ZIP=zip 2.20 -else 2.21 - # store symbolic links as the link 2.22 - ZIP=zip -y 2.23 -endif 2.24 -# Insure we have a path that looks like it came from pwd 2.25 -# (This is mostly for Windows sake and drive letters) 2.26 -define UnixPath # path 2.27 -$(shell (cd "$1" && $(PWD))) 2.28 -endef 2.29 +# This must be the first rule 2.30 +default: 2.31 2.32 -# Current root directory 2.33 -CURRENT_DIRECTORY := $(shell $(PWD)) 2.34 +# Inclusion of this pseudo-target will cause make to execute this file 2.35 +# serially, regardless of -j. Recursively called makefiles will not be 2.36 +# affected, however. This is required for correct dependency management. 2.37 +.NOTPARALLEL: 2.38 2.39 -# Build directory root 2.40 -BUILD_DIR_ROOT = $(CURRENT_DIRECTORY)/build 2.41 +# The shell code below will be executed on /usr/ccs/bin/make on Solaris, but not in GNU make. 2.42 +# /usr/ccs/bin/make lacks basically every other flow control mechanism. 2.43 +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.44 2.45 -# All configured Makefiles to run 2.46 -ALL_MAKEFILES = $(wildcard $(BUILD_DIR_ROOT)/*-*/Makefile) 2.47 - 2.48 -# All bundles to create 2.49 -ALL_IMAGE_DIRS = $(wildcard $(BUILD_DIR_ROOT)/*-*/images/*-image) 2.50 - 2.51 -# Build all the standard 'all', 'images', and 'clean' targets 2.52 -all images clean: checks 2.53 - @if [ "$(ALL_MAKEFILES)" = "" ] ; then \ 2.54 - $(ECHO) "ERROR: No configurations to build"; exit 1; \ 2.55 - fi 2.56 - @for bdir in $(dir $(ALL_MAKEFILES)) ; do \ 2.57 - $(ECHO) "$(CD) $${bdir} && $(MAKE) $@" ; \ 2.58 - $(CD) $${bdir} && $(MAKE) $@ ; \ 2.59 - done 2.60 - 2.61 -# TBD: Deploy input 2.62 -$(BUILD_DIR_ROOT)/.deploy_input: 2.63 - @if [ "$(ALL_MAKEFILES)" = "" ] ; then \ 2.64 - $(ECHO) "ERROR: No configurations to build"; exit 1; \ 2.65 - fi 2.66 - @for bdir in $(dir $(ALL_MAKEFILES)) ; do \ 2.67 - if [ deploy/make/Makefile ] ; then \ 2.68 - echo "Attempting deploy build." ; \ 2.69 - ( \ 2.70 - $(RM) -r $${bdir}/deploy_input ; \ 2.71 - $(MKDIR) -p $${bdir}/deploy_input ; \ 2.72 - ( $(CD) $${bdir}/images && $(TAR) -cf - j2sdk-image j2re-image ) \ 2.73 - | ( $(CD) $${bdir}/deploy_input && $(TAR) -xf - ) ; \ 2.74 - ) ; \ 2.75 - fi; \ 2.76 - done 2.77 - touch $@ 2.78 - 2.79 -# TBD: Deploy images 2.80 -deploy: $(BUILD_DIR_ROOT)/.deploy_input 2.81 - @if [ "$(ALL_MAKEFILES)" = "" ] ; then \ 2.82 - $(ECHO) "ERROR: No configurations to build"; exit 1; \ 2.83 - fi 2.84 - @for bdir in $(dir $(ALL_MAKEFILES)) ; do \ 2.85 - if [ deploy/make/Makefile ] ; then \ 2.86 - echo "Attempting deploy build." ; \ 2.87 - ( \ 2.88 - $(CD) deploy/make && \ 2.89 - $(MAKE) \ 2.90 - ABS_OUTPUTDIR=$${bdir}/deploy_input \ 2.91 - OUTPUTDIR=$${bdir}/deploy_input \ 2.92 - ) ; \ 2.93 - fi; \ 2.94 - done 2.95 - 2.96 -# TBD: Install bundles 2.97 -install: 2.98 - 2.99 -# Bundle creation 2.100 -bundles: 2.101 - @if [ "$(ALL_IMAGE_DIRS)" = "" ] ; then \ 2.102 - $(ECHO) "ERROR: No images to bundle"; exit 1; \ 2.103 - fi 2.104 - @for i in $(ALL_IMAGE_DIRS) ; do \ 2.105 - $(MKDIR) -p $${i}/../../bundles && \ 2.106 - $(RM) $${i}/../../bundles/`$(BASENAME) $${i}`.zip && \ 2.107 - $(ECHO) "$(CD) $${i} && $(ZIP) -q -r ../../bundles/`$(BASENAME) $${i}`.zip ." && \ 2.108 - $(CD) $${i} && $(ZIP) -q -r ../../bundles/`$(BASENAME) $${i}`.zip . ; \ 2.109 - done 2.110 - 2.111 -# Clobber all the built files 2.112 -clobber:: 2.113 - $(RM) -r $(BUILD_DIR_ROOT) 2.114 - 2.115 -# Make various checks to insure the build will be successful 2.116 -# Possibilities: 2.117 -# * Check that if any closed repo is provided, they all must be. 2.118 -# * Check that all open repos exist, at least until we are ready for some 2.119 -# kind of partial build. 2.120 -checks: 2.121 - @$(ECHO) "No checks yet" 2.122 - 2.123 -# Keep track of user targets 2.124 -USER_TARGETS += all deploy install images clean clobber checks 2.125 - 2.126 -########################################################################### 2.127 -# To help in adoption of the new configure&&make build process, a bridge 2.128 -# build will use the old settings to run configure and do the build. 2.129 - 2.130 -# Build with the configure bridge 2.131 -bridgeBuild: bridge2configure images 2.132 - 2.133 -# Bridge from old Makefile ALT settings to configure options 2.134 -bridge2configure: $(BUILD_DIR_ROOT)/.bridge2configureOpts 2.135 - bash ./configure $(strip $(shell $(CAT) $<)) 2.136 - 2.137 -# Create a file with configure options created from old Makefile mechanisms. 2.138 -$(BUILD_DIR_ROOT)/.bridge2configureOpts: $(BUILD_DIR_ROOT)/.bridge2configureOptsLatest 2.139 - $(RM) $@ 2.140 - $(CP) $< $@ 2.141 - 2.142 -# Use this file to only change when obvious things have changed 2.143 -$(BUILD_DIR_ROOT)/.bridge2configureOptsLatest: FRC 2.144 - $(RM) $@.tmp 2.145 - $(MKDIR) -p $(BUILD_DIR_ROOT) 2.146 - @$(ECHO) " --with-debug-level=$(if $(DEBUG_LEVEL),$(DEBUG_LEVEL),release) " >> $@.tmp 2.147 -ifdef ARCH_DATA_MODEL 2.148 - @$(ECHO) " --with-target-bits=$(ARCH_DATA_MODEL) " >> $@.tmp 2.149 -endif 2.150 -ifdef ALT_PARALLEL_COMPILE_JOBS 2.151 - @$(ECHO) " --with-num-cores=$(ALT_PARALLEL_COMPILE_JOBS) " >> $@.tmp 2.152 -endif 2.153 -ifdef ALT_BOOTDIR 2.154 - @$(ECHO) " --with-boot-jdk=$(call UnixPath,$(ALT_BOOTDIR)) " >> $@.tmp 2.155 -endif 2.156 -ifdef ALT_CUPS_HEADERS_PATH 2.157 - @$(ECHO) " --with-cups-include=$(call UnixPath,$(ALT_CUPS_HEADERS_PATH)) " >> $@.tmp 2.158 -endif 2.159 -ifdef ALT_FREETYPE_HEADERS_PATH 2.160 - @$(ECHO) " --with-freetype=$(call UnixPath,$(ALT_FREETYPE_HEADERS_PATH)/..) " >> $@.tmp 2.161 -endif 2.162 - @if [ -f $@ ] ; then \ 2.163 - if ! $(CMP) $@ $@.tmp > /dev/null ; then \ 2.164 - $(CP) $@.tmp $@ ; \ 2.165 - fi ; \ 2.166 - else \ 2.167 - $(CP) $@.tmp $@ ; \ 2.168 - fi 2.169 - $(RM) $@.tmp 2.170 - 2.171 -# Clobber all the built files 2.172 -clobber:: bridge2clobber 2.173 -bridge2clobber:: 2.174 - $(RM) $(BUILD_DIR_ROOT)/.bridge2* 2.175 - $(RM) $(BUILD_DIR_ROOT)/.deploy_input 2.176 - 2.177 -# Keep track of phony targets 2.178 -PHONY_LIST += bridge2configure bridgeBuild bridge2clobber 2.179 - 2.180 -########################################################################### 2.181 -# Sanity checks (history target) 2.182 -# 2.183 - 2.184 -sanity: checks 2.185 - 2.186 -# Keep track of user targets 2.187 -USER_TARGETS += sanity 2.188 - 2.189 -########################################################################### 2.190 -# Javadocs 2.191 -# 2.192 - 2.193 -javadocs: 2.194 - cd common/makefiles && $(MAKE) -f MakefileJavadoc.gmk 2.195 - 2.196 -# Keep track of user targets 2.197 -USER_TARGETS += javadocs 2.198 - 2.199 -########################################################################### 2.200 -# JPRT targets 2.201 - 2.202 -ifndef JPRT_ARCHIVE_BUNDLE 2.203 - JPRT_ARCHIVE_BUNDLE=/tmp/jprt_bundles/j2sdk-image.zip 2.204 +# Assume we have GNU make, but check version. 2.205 +ifeq (,$(findstring 3.81,$(MAKE_VERSION))) 2.206 + ifeq (,$(findstring 3.82,$(MAKE_VERSION))) 2.207 + $(error This version of GNU Make is too low ($(MAKE_VERSION)). Check your path, or upgrade to 3.81 or newer.) 2.208 + endif 2.209 endif 2.210 2.211 -jprt_build_product: DEBUG_LEVEL=release 2.212 -jprt_build_product: BUILD_DIRNAME=*-release 2.213 -jprt_build_product: jprt_build_generic 2.214 +# Locate this Makefile 2.215 +ifeq ($(filter /%,$(lastword $(MAKEFILE_LIST))),) 2.216 + makefile_path:=$(CURDIR)/$(lastword $(MAKEFILE_LIST)) 2.217 +else 2.218 + makefile_path:=$(lastword $(MAKEFILE_LIST)) 2.219 +endif 2.220 +root_dir:=$(dir $(makefile_path)) 2.221 2.222 -jprt_build_fastdebug: DEBUG_LEVEL=fastdebug 2.223 -jprt_build_fastdebug: BUILD_DIRNAME=*-fastdebug 2.224 -jprt_build_fastdebug: jprt_build_generic 2.225 +include $(root_dir)/common/makefiles/Jprt.gmk 2.226 2.227 -jprt_build_debug: DEBUG_LEVEL=slowdebug 2.228 -jprt_build_debug: BUILD_DIRNAME=*-debug 2.229 -jprt_build_debug: jprt_build_generic 2.230 +# ... and then we can include our helper functions 2.231 +include $(root_dir)/common/makefiles/MakeHelpers.gmk 2.232 2.233 -jprt_build_generic: $(JPRT_ARCHIVE_BUNDLE) 2.234 +$(eval $(call ParseLogLevel)) 2.235 +$(eval $(call ParseConfAndSpec)) 2.236 2.237 -$(JPRT_ARCHIVE_BUNDLE): bridgeBuild bundles 2.238 - $(MKDIR) -p $(@D) 2.239 - $(RM) $@ 2.240 - $(CP) $(BUILD_DIR_ROOT)/$(BUILD_DIRNAME)/bundles/j2sdk-image.zip $@ 2.241 +# Now determine if we have zero, one or several configurations to build. 2.242 +ifeq ($(SPEC),) 2.243 + # Since we got past ParseConfAndSpec, we must be building a global target. Do nothing. 2.244 +else 2.245 + ifeq ($(words $(SPEC)),1) 2.246 + # We are building a single configuration. This is the normal case. Execute the Main.gmk file. 2.247 + include $(root_dir)/common/makefiles/Main.gmk 2.248 + else 2.249 + # We are building multiple configurations. 2.250 + # First, find out the valid targets 2.251 + # Run the makefile with an arbitraty SPEC using -p -q (quiet dry-run and dump rules) to find 2.252 + # available PHONY targets. Use this list as valid targets to pass on to the repeated calls. 2.253 + all_phony_targets=$(filter-out $(global_targets), $(strip $(shell \ 2.254 + $(MAKE) -p -q -f common/makefiles SPEC=$(firstword $(SPEC)) | \ 2.255 + grep ^.PHONY: | head -n 1 | cut -d " " -f 2-))) 2.256 2.257 -# Keep track of phony targets 2.258 -PHONY_LIST += jprt_build_product jprt_build_fastdebug jprt_build_debug \ 2.259 - jprt_build_generic 2.260 +$(all_phony_targets): 2.261 + @$(foreach spec,$(SPEC),($(MAKE) -f NewMakefile.gmk SPEC=$(spec) $(VERBOSE) VERBOSE=$(VERBOSE) $@) &&) true 2.262 2.263 -########################################################################### 2.264 -# Help target 2.265 + endif 2.266 +endif 2.267 2.268 -HELP_FORMAT=%12s%s\n 2.269 +# Here are "global" targets, i.e. targets that can be executed without specifying a single configuration. 2.270 +# If you addd more global targets, please update the variable global_targets in MakeHelpers. 2.271 2.272 help: 2.273 - @$(PRINTF) "# JDK Makefile\n" 2.274 - @$(PRINTF) "#\n" 2.275 - @$(PRINTF) "# Usage: make [Target]\n" 2.276 - @$(PRINTF) "#\n" 2.277 - @$(PRINTF) "# $(HELP_FORMAT)" "Target " "Description" 2.278 - @$(PRINTF) "# $(HELP_FORMAT)" "------ " "-----------" 2.279 - @for i in $(USER_TARGETS) ; do \ 2.280 - $(MAKE) help_$${i} ; \ 2.281 - done 2.282 - @$(PRINTF) "#\n" 2.283 + $(info ) 2.284 + $(info OpenJDK Makefile help) 2.285 + $(info =====================) 2.286 + $(info ) 2.287 + $(info Common make targets) 2.288 + $(info . make [default] # Compile all product in langtools, hotspot, jaxp, jaxws,) 2.289 + $(info . # corba and jdk) 2.290 + $(info . make all # Compile everything, all repos and images) 2.291 + $(info . make images # Create complete j2sdk and j2re images) 2.292 + $(info . make overlay-images # Create limited images for sparc 64 bit platforms) 2.293 + $(info . make bootcycle-images # Build images twice, second time with newly build JDK) 2.294 + $(info . make install # Install the generated images locally) 2.295 + $(info . make clean # Remove all files generated by make, but not those) 2.296 + $(info . # generated by configure) 2.297 + $(info . make dist-clean # Remove all files, including configuration) 2.298 + $(info . make help # Give some help on using make) 2.299 + $(info . make test # Run tests, default is all tests (see TEST below)) 2.300 + $(info ) 2.301 + $(info Targets for specific components) 2.302 + $(info (Component is any of langtools, corba, jaxp, jaxws, hotspot, jdk, images or overlay-images)) 2.303 + $(info . make <component> # Build <component> and everything it depends on. ) 2.304 + $(info . make <component>-only # Build <component> only, without dependencies. This) 2.305 + $(info . # is faster but can result in incorrect build results!) 2.306 + $(info . make clean-<component> # Remove files generated by make for <component>) 2.307 + $(info ) 2.308 + $(info Useful make variables) 2.309 + $(info . make CONF= # Build all configurations (note, assignment is empty)) 2.310 + $(info . make CONF=<substring> # Build the configuration(s) with a name matching) 2.311 + $(info . # <substring>) 2.312 + $(info ) 2.313 + $(info . make LOG=<loglevel> # Change the log level from warn to <loglevel>) 2.314 + $(info . # Available log levels are:) 2.315 + $(info . # 'warn' (default), 'info', 'debug' and 'trace') 2.316 + $(info . # To see executed command lines, use LOG=debug) 2.317 + $(info ) 2.318 + $(info . make JOBS=<n> # Run <n> parallel make jobs) 2.319 + $(info . # Note that -jN does not work as expected!) 2.320 + $(info ) 2.321 + $(info . make test TEST=<test> # Only run the given test or tests, e.g.) 2.322 + $(info . # make test TEST="jdk_lang jdk_net") 2.323 + $(info ) 2.324 2.325 -help_all: 2.326 - @$(PRINTF) "# $(HELP_FORMAT)" "$(subst help_,,$@) - " \ 2.327 - "Build the entire jdk but not the images" 2.328 -help_images: 2.329 - @$(PRINTF) "# $(HELP_FORMAT)" "$(subst help_,,$@) - " \ 2.330 - "Create the jdk images for the builds" 2.331 -help_deploy: 2.332 - @$(PRINTF) "# $(HELP_FORMAT)" "$(subst help_,,$@) - " \ 2.333 - "Create the jdk deploy images from the jdk images" 2.334 -help_install: 2.335 - @$(PRINTF) "# $(HELP_FORMAT)" "$(subst help_,,$@) - " \ 2.336 - "Create the jdk install bundles from the deploy images" 2.337 -help_clean: 2.338 - @$(PRINTF) "# $(HELP_FORMAT)" "$(subst help_,,$@) - " \ 2.339 - "Clean and prepare for a fresh build from scratch" 2.340 -help_clobber: 2.341 - @$(PRINTF) "# $(HELP_FORMAT)" "$(subst help_,,$@) - " \ 2.342 - "Clean and also purge any hidden derived data" 2.343 -help_checks: 2.344 - @$(PRINTF) "# $(HELP_FORMAT)" "$(subst help_,,$@) - " \ 2.345 - "Perform various checks to make sure we can build" 2.346 -help_sanity: 2.347 - @$(PRINTF) "# $(HELP_FORMAT)" "$(subst help_,,$@) - " \ 2.348 - "Same as 'make checks'" 2.349 -help_javadocs: 2.350 - @$(PRINTF) "# $(HELP_FORMAT)" "$(subst help_,,$@) - " \ 2.351 - "Build the javadocs" 2.352 -help_help: 2.353 - @$(PRINTF) "# $(HELP_FORMAT)" "$(subst help_,,$@) - " \ 2.354 - "Print out the help messages" 2.355 - 2.356 -# Keep track of user targets 2.357 -USER_TARGETS += help 2.358 - 2.359 -########################################################################### 2.360 -# Phony targets 2.361 -.PHONY: $(PHONY_LIST) $(USER_TARGETS) 2.362 - 2.363 -# Force target 2.364 -FRC: 2.365 +.PHONY: help
3.1 --- a/common/autoconf/Makefile.in Thu Jan 03 12:44:32 2013 -0800 3.2 +++ b/common/autoconf/Makefile.in Tue Jan 08 13:14:22 2013 -0800 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@/common/makefiles/Makefile 3.8 +include @SRC_ROOT@/NewMakefile.gmk
4.1 --- a/common/autoconf/autogen.sh Thu Jan 03 12:44:32 2013 -0800 4.2 +++ b/common/autoconf/autogen.sh Tue Jan 08 13:14:22 2013 -0800 4.3 @@ -26,9 +26,11 @@ 4.4 4.5 # Create a timestamp as seconds since epoch 4.6 if test "x`uname -s`" = "xSunOS"; then 4.7 - # date +%s is not available on Solaris, use this workaround 4.8 - # from http://solarisjedi.blogspot.co.uk/2006/06/solaris-date-command-and-epoch-time.html 4.9 - TIMESTAMP=`/usr/bin/truss /usr/bin/date 2>&1 | nawk -F= '/^time\(\)/ {gsub(/ /,"",$2);print $2}'` 4.10 + TIMESTAMP=`date +%s` 4.11 + if test "x$TIMESTAMP" = "x%s"; then 4.12 + # date +%s not available on this Solaris, use workaround from nawk(1): 4.13 + TIMESTAMP=`nawk 'BEGIN{print srand()}'` 4.14 + fi 4.15 else 4.16 TIMESTAMP=`date +%s` 4.17 fi
5.1 --- a/common/autoconf/basics.m4 Thu Jan 03 12:44:32 2013 -0800 5.2 +++ b/common/autoconf/basics.m4 Tue Jan 08 13:14:22 2013 -0800 5.3 @@ -1,5 +1,5 @@ 5.4 # 5.5 -# Copyright (c) 2011, 2012, Oracle and/or its affiliates. All rights reserved. 5.6 +# Copyright (c) 2011, 2013, Oracle and/or its affiliates. All rights reserved. 5.7 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. 5.8 # 5.9 # This code is free software; you can redistribute it and/or modify it 5.10 @@ -234,7 +234,9 @@ 5.11 BASIC_REQUIRE_PROG(CAT, cat) 5.12 BASIC_REQUIRE_PROG(CHMOD, chmod) 5.13 BASIC_REQUIRE_PROG(CMP, cmp) 5.14 +BASIC_REQUIRE_PROG(COMM, comm) 5.15 BASIC_REQUIRE_PROG(CP, cp) 5.16 +BASIC_REQUIRE_PROG(CPIO, cpio) 5.17 BASIC_REQUIRE_PROG(CUT, cut) 5.18 BASIC_REQUIRE_PROG(DATE, date) 5.19 BASIC_REQUIRE_PROG(DIFF, [gdiff diff]) 5.20 @@ -633,6 +635,18 @@ 5.21 fi 5.22 ]) 5.23 5.24 +# Check that source files have basic read permissions set. This might 5.25 +# not be the case in cygwin in certain conditions. 5.26 +AC_DEFUN_ONCE([BASIC_CHECK_SRC_PERMS], 5.27 +[ 5.28 + if test x"$OPENJDK_BUILD_OS" = xwindows; then 5.29 + file_to_test="$SRC_ROOT/LICENSE" 5.30 + if test `$STAT -c '%a' "$file_to_test"` -lt 400; then 5.31 + AC_MSG_ERROR([Bad file permissions on src files. This is usually caused by cloning the repositories with a non cygwin hg in a directory not created in cygwin.]) 5.32 + fi 5.33 + fi 5.34 +]) 5.35 + 5.36 AC_DEFUN_ONCE([BASIC_TEST_USABILITY_ISSUES], 5.37 [ 5.38 5.39 @@ -642,6 +656,8 @@ 5.40 [OUTPUT_DIR_IS_LOCAL="no"]) 5.41 AC_MSG_RESULT($OUTPUT_DIR_IS_LOCAL) 5.42 5.43 +BASIC_CHECK_SRC_PERMS 5.44 + 5.45 # Check if the user has any old-style ALT_ variables set. 5.46 FOUND_ALT_VARIABLES=`env | grep ^ALT_` 5.47
6.1 --- a/common/autoconf/closed.version.numbers Thu Jan 03 12:44:32 2013 -0800 6.2 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 6.3 @@ -1,32 +0,0 @@ 6.4 -# 6.5 -# Copyright (c) 2012, Oracle and/or its affiliates. All rights reserved. 6.6 -# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. 6.7 -# 6.8 -# This code is free software; you can redistribute it and/or modify it 6.9 -# under the terms of the GNU General Public License version 2 only, as 6.10 -# published by the Free Software Foundation. 6.11 -# 6.12 -# This code is distributed in the hope that it will be useful, but WITHOUT 6.13 -# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or 6.14 -# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License 6.15 -# version 2 for more details (a copy is included in the LICENSE file that 6.16 -# accompanied this code). 6.17 -# 6.18 -# You should have received a copy of the GNU General Public License version 6.19 -# 2 along with this work; if not, write to the Free Software Foundation, 6.20 -# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. 6.21 -# 6.22 -# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA 6.23 -# or visit www.oracle.com if you need additional information or have any 6.24 -# questions. 6.25 -# 6.26 - 6.27 -LAUNCHER_NAME=java 6.28 -PRODUCT_NAME="Java(TM)" 6.29 -PRODUCT_SUFFIX="SE Runtime Environment" 6.30 -JDK_RC_PLATFORM_NAME="Platform SE" 6.31 -COMPANY_NAME="Oracle Corporation" 6.32 - 6.33 -# Might need better names for these 6.34 -MACOSX_BUNDLE_NAME_BASE="Java SE" 6.35 -MACOSX_BUNDLE_ID_BASE="com.oracle.java"
7.1 --- a/common/autoconf/compare.sh.in Thu Jan 03 12:44:32 2013 -0800 7.2 +++ b/common/autoconf/compare.sh.in Tue Jan 08 13:14:22 2013 -0800 7.3 @@ -1,6 +1,6 @@ 7.4 #!/bin/bash 7.5 # 7.6 -# Copyright (c) 2012, Oracle and/or its affiliates. All rights reserved. 7.7 +# Copyright (c) 2012, 2013 Oracle and/or its affiliates. All rights reserved. 7.8 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. 7.9 # 7.10 # This code is free software; you can redistribute it and/or modify it 7.11 @@ -48,6 +48,7 @@ 7.12 JAVAP="@FIXPATH@ @BOOT_JDK@/bin/javap" 7.13 LDD="@LDD@" 7.14 MKDIR="@MKDIR@" 7.15 +NAWK="@NAWK@" 7.16 NM="@NM@" 7.17 OBJDUMP="@OBJDUMP@" 7.18 OTOOL="@OTOOL@"
8.1 --- a/common/autoconf/generated-configure.sh Thu Jan 03 12:44:32 2013 -0800 8.2 +++ b/common/autoconf/generated-configure.sh Tue Jan 08 13:14:22 2013 -0800 8.3 @@ -1,6 +1,6 @@ 8.4 #! /bin/sh 8.5 # Guess values for system-dependent variables and create Makefiles. 8.6 -# Generated by GNU Autoconf 2.68 for OpenJDK jdk8. 8.7 +# Generated by GNU Autoconf 2.67 for OpenJDK jdk8. 8.8 # 8.9 # Report bugs to <build-dev@openjdk.java.net>. 8.10 # 8.11 @@ -91,7 +91,6 @@ 8.12 IFS=" "" $as_nl" 8.13 8.14 # Find who we are. Look in the path if we contain no directory separator. 8.15 -as_myself= 8.16 case $0 in #(( 8.17 *[\\/]* ) as_myself=$0 ;; 8.18 *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR 8.19 @@ -217,18 +216,11 @@ 8.20 # We cannot yet assume a decent shell, so we have to provide a 8.21 # neutralization value for shells without unset; and this also 8.22 # works around shells that cannot unset nonexistent variables. 8.23 - # Preserve -v and -x to the replacement shell. 8.24 BASH_ENV=/dev/null 8.25 ENV=/dev/null 8.26 (unset BASH_ENV) >/dev/null 2>&1 && unset BASH_ENV ENV 8.27 export CONFIG_SHELL 8.28 - case $- in # (((( 8.29 - *v*x* | *x*v* ) as_opts=-vx ;; 8.30 - *v* ) as_opts=-v ;; 8.31 - *x* ) as_opts=-x ;; 8.32 - * ) as_opts= ;; 8.33 - esac 8.34 - exec "$CONFIG_SHELL" $as_opts "$as_myself" ${1+"$@"} 8.35 + exec "$CONFIG_SHELL" "$as_myself" ${1+"$@"} 8.36 fi 8.37 8.38 if test x$as_have_required = xno; then : 8.39 @@ -760,10 +752,8 @@ 8.40 JAVA_CHECK 8.41 JAVAC_CHECK 8.42 COOKED_BUILD_NUMBER 8.43 -FULL_VERSION 8.44 -RELEASE 8.45 +USER_RELEASE_SUFFIX 8.46 JDK_VERSION 8.47 -RUNTIME_NAME 8.48 COPYRIGHT_YEAR 8.49 MACOSX_BUNDLE_ID_BASE 8.50 MACOSX_BUNDLE_NAME_BASE 8.51 @@ -792,7 +782,6 @@ 8.52 OS_VERSION_MINOR 8.53 OS_VERSION_MAJOR 8.54 PKG_CONFIG 8.55 -COMM 8.56 TIME 8.57 STAT 8.58 HG 8.59 @@ -908,7 +897,9 @@ 8.60 DIFF 8.61 DATE 8.62 CUT 8.63 +CPIO 8.64 CP 8.65 +COMM 8.66 CMP 8.67 CHMOD 8.68 CAT 8.69 @@ -977,6 +968,8 @@ 8.70 enable_hotspot_test_in_build 8.71 with_cacerts_file 8.72 enable_unlimited_crypto 8.73 +with_milestone 8.74 +with_build_number 8.75 with_boot_jdk 8.76 with_boot_jdk_jvmargs 8.77 with_add_source_root 8.78 @@ -1439,7 +1432,7 @@ 8.79 $as_echo "$as_me: WARNING: you should use --build, --host, --target" >&2 8.80 expr "x$ac_option" : ".*[^-._$as_cr_alnum]" >/dev/null && 8.81 $as_echo "$as_me: WARNING: invalid host type: $ac_option" >&2 8.82 - : "${build_alias=$ac_option} ${host_alias=$ac_option} ${target_alias=$ac_option}" 8.83 + : ${build_alias=$ac_option} ${host_alias=$ac_option} ${target_alias=$ac_option} 8.84 ;; 8.85 8.86 esac 8.87 @@ -1706,6 +1699,8 @@ 8.88 --with-builddeps-group chgrp the downloaded build dependencies to this 8.89 group 8.90 --with-cacerts-file specify alternative cacerts file 8.91 + --with-milestone Set milestone value for build [internal] 8.92 + --with-build-number Set build number value for build [b00] 8.93 --with-boot-jdk path to Boot JDK (used to bootstrap build) [probed] 8.94 --with-boot-jdk-jvmargs specify JVM arguments to be passed to all 8.95 invocations of the Boot JDK, overriding the default 8.96 @@ -1859,7 +1854,7 @@ 8.97 if $ac_init_version; then 8.98 cat <<\_ACEOF 8.99 OpenJDK configure jdk8 8.100 -generated by GNU Autoconf 2.68 8.101 +generated by GNU Autoconf 2.67 8.102 8.103 Copyright (C) 2010 Free Software Foundation, Inc. 8.104 This configure script is free software; the Free Software Foundation 8.105 @@ -1905,7 +1900,7 @@ 8.106 8.107 ac_retval=1 8.108 fi 8.109 - eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno 8.110 + eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;} 8.111 as_fn_set_status $ac_retval 8.112 8.113 } # ac_fn_c_try_compile 8.114 @@ -1943,7 +1938,7 @@ 8.115 8.116 ac_retval=1 8.117 fi 8.118 - eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno 8.119 + eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;} 8.120 as_fn_set_status $ac_retval 8.121 8.122 } # ac_fn_cxx_try_compile 8.123 @@ -1981,7 +1976,7 @@ 8.124 8.125 ac_retval=1 8.126 fi 8.127 - eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno 8.128 + eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;} 8.129 as_fn_set_status $ac_retval 8.130 8.131 } # ac_fn_objc_try_compile 8.132 @@ -2018,7 +2013,7 @@ 8.133 8.134 ac_retval=1 8.135 fi 8.136 - eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno 8.137 + eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;} 8.138 as_fn_set_status $ac_retval 8.139 8.140 } # ac_fn_c_try_cpp 8.141 @@ -2055,7 +2050,7 @@ 8.142 8.143 ac_retval=1 8.144 fi 8.145 - eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno 8.146 + eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;} 8.147 as_fn_set_status $ac_retval 8.148 8.149 } # ac_fn_cxx_try_cpp 8.150 @@ -2068,10 +2063,10 @@ 8.151 ac_fn_cxx_check_header_mongrel () 8.152 { 8.153 as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack 8.154 - if eval \${$3+:} false; then : 8.155 + if eval "test \"\${$3+set}\"" = set; then : 8.156 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5 8.157 $as_echo_n "checking for $2... " >&6; } 8.158 -if eval \${$3+:} false; then : 8.159 +if eval "test \"\${$3+set}\"" = set; then : 8.160 $as_echo_n "(cached) " >&6 8.161 fi 8.162 eval ac_res=\$$3 8.163 @@ -2138,7 +2133,7 @@ 8.164 esac 8.165 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5 8.166 $as_echo_n "checking for $2... " >&6; } 8.167 -if eval \${$3+:} false; then : 8.168 +if eval "test \"\${$3+set}\"" = set; then : 8.169 $as_echo_n "(cached) " >&6 8.170 else 8.171 eval "$3=\$ac_header_compiler" 8.172 @@ -2147,7 +2142,7 @@ 8.173 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 8.174 $as_echo "$ac_res" >&6; } 8.175 fi 8.176 - eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno 8.177 + eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;} 8.178 8.179 } # ac_fn_cxx_check_header_mongrel 8.180 8.181 @@ -2188,7 +2183,7 @@ 8.182 ac_retval=$ac_status 8.183 fi 8.184 rm -rf conftest.dSYM conftest_ipa8_conftest.oo 8.185 - eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno 8.186 + eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;} 8.187 as_fn_set_status $ac_retval 8.188 8.189 } # ac_fn_cxx_try_run 8.190 @@ -2202,7 +2197,7 @@ 8.191 as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack 8.192 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5 8.193 $as_echo_n "checking for $2... " >&6; } 8.194 -if eval \${$3+:} false; then : 8.195 +if eval "test \"\${$3+set}\"" = set; then : 8.196 $as_echo_n "(cached) " >&6 8.197 else 8.198 cat confdefs.h - <<_ACEOF >conftest.$ac_ext 8.199 @@ -2220,7 +2215,7 @@ 8.200 eval ac_res=\$$3 8.201 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 8.202 $as_echo "$ac_res" >&6; } 8.203 - eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno 8.204 + eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;} 8.205 8.206 } # ac_fn_cxx_check_header_compile 8.207 8.208 @@ -2397,7 +2392,7 @@ 8.209 rm -f conftest.val 8.210 8.211 fi 8.212 - eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno 8.213 + eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;} 8.214 as_fn_set_status $ac_retval 8.215 8.216 } # ac_fn_cxx_compute_int 8.217 @@ -2443,7 +2438,7 @@ 8.218 # interfere with the next link command; also delete a directory that is 8.219 # left behind by Apple's compiler. We do this before executing the actions. 8.220 rm -rf conftest.dSYM conftest_ipa8_conftest.oo 8.221 - eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno 8.222 + eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;} 8.223 as_fn_set_status $ac_retval 8.224 8.225 } # ac_fn_cxx_try_link 8.226 @@ -2456,7 +2451,7 @@ 8.227 as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack 8.228 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5 8.229 $as_echo_n "checking for $2... " >&6; } 8.230 -if eval \${$3+:} false; then : 8.231 +if eval "test \"\${$3+set}\"" = set; then : 8.232 $as_echo_n "(cached) " >&6 8.233 else 8.234 cat confdefs.h - <<_ACEOF >conftest.$ac_ext 8.235 @@ -2511,7 +2506,7 @@ 8.236 eval ac_res=\$$3 8.237 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 8.238 $as_echo "$ac_res" >&6; } 8.239 - eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno 8.240 + eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;} 8.241 8.242 } # ac_fn_cxx_check_func 8.243 8.244 @@ -2524,7 +2519,7 @@ 8.245 as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack 8.246 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5 8.247 $as_echo_n "checking for $2... " >&6; } 8.248 -if eval \${$3+:} false; then : 8.249 +if eval "test \"\${$3+set}\"" = set; then : 8.250 $as_echo_n "(cached) " >&6 8.251 else 8.252 cat confdefs.h - <<_ACEOF >conftest.$ac_ext 8.253 @@ -2542,7 +2537,7 @@ 8.254 eval ac_res=\$$3 8.255 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 8.256 $as_echo "$ac_res" >&6; } 8.257 - eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno 8.258 + eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;} 8.259 8.260 } # ac_fn_c_check_header_compile 8.261 cat >config.log <<_ACEOF 8.262 @@ -2550,7 +2545,7 @@ 8.263 running configure, to aid debugging if configure makes a mistake. 8.264 8.265 It was created by OpenJDK $as_me jdk8, which was 8.266 -generated by GNU Autoconf 2.68. Invocation command line was 8.267 +generated by GNU Autoconf 2.67. Invocation command line was 8.268 8.269 $ $0 $@ 8.270 8.271 @@ -2808,7 +2803,7 @@ 8.272 || { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 8.273 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} 8.274 as_fn_error $? "failed to load site script $ac_site_file 8.275 -See \`config.log' for more details" "$LINENO" 5; } 8.276 +See \`config.log' for more details" "$LINENO" 5 ; } 8.277 fi 8.278 done 8.279 8.280 @@ -2991,7 +2986,7 @@ 8.281 8.282 # Include these first... 8.283 # 8.284 -# Copyright (c) 2011, 2012, Oracle and/or its affiliates. All rights reserved. 8.285 +# Copyright (c) 2011, 2013, Oracle and/or its affiliates. All rights reserved. 8.286 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. 8.287 # 8.288 # This code is free software; you can redistribute it and/or modify it 8.289 @@ -3088,6 +3083,10 @@ 8.290 # Argument 3: what to do otherwise (remote disk or failure) 8.291 8.292 8.293 +# Check that source files have basic read permissions set. This might 8.294 +# not be the case in cygwin in certain conditions. 8.295 + 8.296 + 8.297 8.298 8.299 # 8.300 @@ -3402,7 +3401,7 @@ 8.301 8.302 8.303 # 8.304 -# Copyright (c) 2011, 2012, Oracle and/or its affiliates. All rights reserved. 8.305 +# Copyright (c) 2011, 2013, Oracle and/or its affiliates. All rights reserved. 8.306 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. 8.307 # 8.308 # This code is free software; you can redistribute it and/or modify it 8.309 @@ -3434,6 +3433,10 @@ 8.310 8.311 8.312 8.313 +############################################################################### 8.314 +# 8.315 +# Setup version numbers 8.316 +# 8.317 8.318 8.319 8.320 @@ -3683,7 +3686,7 @@ 8.321 #CUSTOM_AUTOCONF_INCLUDE 8.322 8.323 # Do not change or remove the following line, it is needed for consistency checks: 8.324 -DATE_WHEN_GENERATED=1355963953 8.325 +DATE_WHEN_GENERATED=1357219413 8.326 8.327 ############################################################################### 8.328 # 8.329 @@ -3721,7 +3724,7 @@ 8.330 set dummy $ac_prog; ac_word=$2 8.331 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 8.332 $as_echo_n "checking for $ac_word... " >&6; } 8.333 -if ${ac_cv_path_BASENAME+:} false; then : 8.334 +if test "${ac_cv_path_BASENAME+set}" = set; then : 8.335 $as_echo_n "(cached) " >&6 8.336 else 8.337 case $BASENAME in 8.338 @@ -3780,7 +3783,7 @@ 8.339 set dummy $ac_prog; ac_word=$2 8.340 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 8.341 $as_echo_n "checking for $ac_word... " >&6; } 8.342 -if ${ac_cv_path_BASH+:} false; then : 8.343 +if test "${ac_cv_path_BASH+set}" = set; then : 8.344 $as_echo_n "(cached) " >&6 8.345 else 8.346 case $BASH in 8.347 @@ -3839,7 +3842,7 @@ 8.348 set dummy $ac_prog; ac_word=$2 8.349 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 8.350 $as_echo_n "checking for $ac_word... " >&6; } 8.351 -if ${ac_cv_path_CAT+:} false; then : 8.352 +if test "${ac_cv_path_CAT+set}" = set; then : 8.353 $as_echo_n "(cached) " >&6 8.354 else 8.355 case $CAT in 8.356 @@ -3898,7 +3901,7 @@ 8.357 set dummy $ac_prog; ac_word=$2 8.358 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 8.359 $as_echo_n "checking for $ac_word... " >&6; } 8.360 -if ${ac_cv_path_CHMOD+:} false; then : 8.361 +if test "${ac_cv_path_CHMOD+set}" = set; then : 8.362 $as_echo_n "(cached) " >&6 8.363 else 8.364 case $CHMOD in 8.365 @@ -3957,7 +3960,7 @@ 8.366 set dummy $ac_prog; ac_word=$2 8.367 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 8.368 $as_echo_n "checking for $ac_word... " >&6; } 8.369 -if ${ac_cv_path_CMP+:} false; then : 8.370 +if test "${ac_cv_path_CMP+set}" = set; then : 8.371 $as_echo_n "(cached) " >&6 8.372 else 8.373 case $CMP in 8.374 @@ -4010,13 +4013,72 @@ 8.375 8.376 8.377 8.378 + for ac_prog in comm 8.379 +do 8.380 + # Extract the first word of "$ac_prog", so it can be a program name with args. 8.381 +set dummy $ac_prog; ac_word=$2 8.382 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 8.383 +$as_echo_n "checking for $ac_word... " >&6; } 8.384 +if test "${ac_cv_path_COMM+set}" = set; then : 8.385 + $as_echo_n "(cached) " >&6 8.386 +else 8.387 + case $COMM in 8.388 + [\\/]* | ?:[\\/]*) 8.389 + ac_cv_path_COMM="$COMM" # Let the user override the test with a path. 8.390 + ;; 8.391 + *) 8.392 + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR 8.393 +for as_dir in $PATH 8.394 +do 8.395 + IFS=$as_save_IFS 8.396 + test -z "$as_dir" && as_dir=. 8.397 + for ac_exec_ext in '' $ac_executable_extensions; do 8.398 + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then 8.399 + ac_cv_path_COMM="$as_dir/$ac_word$ac_exec_ext" 8.400 + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 8.401 + break 2 8.402 + fi 8.403 +done 8.404 + done 8.405 +IFS=$as_save_IFS 8.406 + 8.407 + ;; 8.408 +esac 8.409 +fi 8.410 +COMM=$ac_cv_path_COMM 8.411 +if test -n "$COMM"; then 8.412 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $COMM" >&5 8.413 +$as_echo "$COMM" >&6; } 8.414 +else 8.415 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 8.416 +$as_echo "no" >&6; } 8.417 +fi 8.418 + 8.419 + 8.420 + test -n "$COMM" && break 8.421 +done 8.422 + 8.423 + 8.424 + if test "x$COMM" = x; then 8.425 + if test "xcomm" = x; then 8.426 + PROG_NAME=comm 8.427 + else 8.428 + PROG_NAME=comm 8.429 + fi 8.430 + { $as_echo "$as_me:${as_lineno-$LINENO}: Could not find $PROG_NAME!" >&5 8.431 +$as_echo "$as_me: Could not find $PROG_NAME!" >&6;} 8.432 + as_fn_error $? "Cannot continue" "$LINENO" 5 8.433 + fi 8.434 + 8.435 + 8.436 + 8.437 for ac_prog in cp 8.438 do 8.439 # Extract the first word of "$ac_prog", so it can be a program name with args. 8.440 set dummy $ac_prog; ac_word=$2 8.441 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 8.442 $as_echo_n "checking for $ac_word... " >&6; } 8.443 -if ${ac_cv_path_CP+:} false; then : 8.444 +if test "${ac_cv_path_CP+set}" = set; then : 8.445 $as_echo_n "(cached) " >&6 8.446 else 8.447 case $CP in 8.448 @@ -4069,13 +4131,72 @@ 8.449 8.450 8.451 8.452 + for ac_prog in cpio 8.453 +do 8.454 + # Extract the first word of "$ac_prog", so it can be a program name with args. 8.455 +set dummy $ac_prog; ac_word=$2 8.456 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 8.457 +$as_echo_n "checking for $ac_word... " >&6; } 8.458 +if test "${ac_cv_path_CPIO+set}" = set; then : 8.459 + $as_echo_n "(cached) " >&6 8.460 +else 8.461 + case $CPIO in 8.462 + [\\/]* | ?:[\\/]*) 8.463 + ac_cv_path_CPIO="$CPIO" # Let the user override the test with a path. 8.464 + ;; 8.465 + *) 8.466 + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR 8.467 +for as_dir in $PATH 8.468 +do 8.469 + IFS=$as_save_IFS 8.470 + test -z "$as_dir" && as_dir=. 8.471 + for ac_exec_ext in '' $ac_executable_extensions; do 8.472 + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then 8.473 + ac_cv_path_CPIO="$as_dir/$ac_word$ac_exec_ext" 8.474 + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 8.475 + break 2 8.476 + fi 8.477 +done 8.478 + done 8.479 +IFS=$as_save_IFS 8.480 + 8.481 + ;; 8.482 +esac 8.483 +fi 8.484 +CPIO=$ac_cv_path_CPIO 8.485 +if test -n "$CPIO"; then 8.486 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CPIO" >&5 8.487 +$as_echo "$CPIO" >&6; } 8.488 +else 8.489 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 8.490 +$as_echo "no" >&6; } 8.491 +fi 8.492 + 8.493 + 8.494 + test -n "$CPIO" && break 8.495 +done 8.496 + 8.497 + 8.498 + if test "x$CPIO" = x; then 8.499 + if test "xcpio" = x; then 8.500 + PROG_NAME=cpio 8.501 + else 8.502 + PROG_NAME=cpio 8.503 + fi 8.504 + { $as_echo "$as_me:${as_lineno-$LINENO}: Could not find $PROG_NAME!" >&5 8.505 +$as_echo "$as_me: Could not find $PROG_NAME!" >&6;} 8.506 + as_fn_error $? "Cannot continue" "$LINENO" 5 8.507 + fi 8.508 + 8.509 + 8.510 + 8.511 for ac_prog in cut 8.512 do 8.513 # Extract the first word of "$ac_prog", so it can be a program name with args. 8.514 set dummy $ac_prog; ac_word=$2 8.515 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 8.516 $as_echo_n "checking for $ac_word... " >&6; } 8.517 -if ${ac_cv_path_CUT+:} false; then : 8.518 +if test "${ac_cv_path_CUT+set}" = set; then : 8.519 $as_echo_n "(cached) " >&6 8.520 else 8.521 case $CUT in 8.522 @@ -4134,7 +4255,7 @@ 8.523 set dummy $ac_prog; ac_word=$2 8.524 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 8.525 $as_echo_n "checking for $ac_word... " >&6; } 8.526 -if ${ac_cv_path_DATE+:} false; then : 8.527 +if test "${ac_cv_path_DATE+set}" = set; then : 8.528 $as_echo_n "(cached) " >&6 8.529 else 8.530 case $DATE in 8.531 @@ -4193,7 +4314,7 @@ 8.532 set dummy $ac_prog; ac_word=$2 8.533 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 8.534 $as_echo_n "checking for $ac_word... " >&6; } 8.535 -if ${ac_cv_path_DIFF+:} false; then : 8.536 +if test "${ac_cv_path_DIFF+set}" = set; then : 8.537 $as_echo_n "(cached) " >&6 8.538 else 8.539 case $DIFF in 8.540 @@ -4252,7 +4373,7 @@ 8.541 set dummy $ac_prog; ac_word=$2 8.542 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 8.543 $as_echo_n "checking for $ac_word... " >&6; } 8.544 -if ${ac_cv_path_DIRNAME+:} false; then : 8.545 +if test "${ac_cv_path_DIRNAME+set}" = set; then : 8.546 $as_echo_n "(cached) " >&6 8.547 else 8.548 case $DIRNAME in 8.549 @@ -4311,7 +4432,7 @@ 8.550 set dummy $ac_prog; ac_word=$2 8.551 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 8.552 $as_echo_n "checking for $ac_word... " >&6; } 8.553 -if ${ac_cv_path_ECHO+:} false; then : 8.554 +if test "${ac_cv_path_ECHO+set}" = set; then : 8.555 $as_echo_n "(cached) " >&6 8.556 else 8.557 case $ECHO in 8.558 @@ -4370,7 +4491,7 @@ 8.559 set dummy $ac_prog; ac_word=$2 8.560 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 8.561 $as_echo_n "checking for $ac_word... " >&6; } 8.562 -if ${ac_cv_path_EXPR+:} false; then : 8.563 +if test "${ac_cv_path_EXPR+set}" = set; then : 8.564 $as_echo_n "(cached) " >&6 8.565 else 8.566 case $EXPR in 8.567 @@ -4429,7 +4550,7 @@ 8.568 set dummy $ac_prog; ac_word=$2 8.569 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 8.570 $as_echo_n "checking for $ac_word... " >&6; } 8.571 -if ${ac_cv_path_FILE+:} false; then : 8.572 +if test "${ac_cv_path_FILE+set}" = set; then : 8.573 $as_echo_n "(cached) " >&6 8.574 else 8.575 case $FILE in 8.576 @@ -4488,7 +4609,7 @@ 8.577 set dummy $ac_prog; ac_word=$2 8.578 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 8.579 $as_echo_n "checking for $ac_word... " >&6; } 8.580 -if ${ac_cv_path_FIND+:} false; then : 8.581 +if test "${ac_cv_path_FIND+set}" = set; then : 8.582 $as_echo_n "(cached) " >&6 8.583 else 8.584 case $FIND in 8.585 @@ -4547,7 +4668,7 @@ 8.586 set dummy $ac_prog; ac_word=$2 8.587 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 8.588 $as_echo_n "checking for $ac_word... " >&6; } 8.589 -if ${ac_cv_path_HEAD+:} false; then : 8.590 +if test "${ac_cv_path_HEAD+set}" = set; then : 8.591 $as_echo_n "(cached) " >&6 8.592 else 8.593 case $HEAD in 8.594 @@ -4606,7 +4727,7 @@ 8.595 set dummy $ac_prog; ac_word=$2 8.596 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 8.597 $as_echo_n "checking for $ac_word... " >&6; } 8.598 -if ${ac_cv_path_LN+:} false; then : 8.599 +if test "${ac_cv_path_LN+set}" = set; then : 8.600 $as_echo_n "(cached) " >&6 8.601 else 8.602 case $LN in 8.603 @@ -4665,7 +4786,7 @@ 8.604 set dummy $ac_prog; ac_word=$2 8.605 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 8.606 $as_echo_n "checking for $ac_word... " >&6; } 8.607 -if ${ac_cv_path_LS+:} false; then : 8.608 +if test "${ac_cv_path_LS+set}" = set; then : 8.609 $as_echo_n "(cached) " >&6 8.610 else 8.611 case $LS in 8.612 @@ -4724,7 +4845,7 @@ 8.613 set dummy $ac_prog; ac_word=$2 8.614 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 8.615 $as_echo_n "checking for $ac_word... " >&6; } 8.616 -if ${ac_cv_path_MKDIR+:} false; then : 8.617 +if test "${ac_cv_path_MKDIR+set}" = set; then : 8.618 $as_echo_n "(cached) " >&6 8.619 else 8.620 case $MKDIR in 8.621 @@ -4783,7 +4904,7 @@ 8.622 set dummy $ac_prog; ac_word=$2 8.623 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 8.624 $as_echo_n "checking for $ac_word... " >&6; } 8.625 -if ${ac_cv_path_MKTEMP+:} false; then : 8.626 +if test "${ac_cv_path_MKTEMP+set}" = set; then : 8.627 $as_echo_n "(cached) " >&6 8.628 else 8.629 case $MKTEMP in 8.630 @@ -4842,7 +4963,7 @@ 8.631 set dummy $ac_prog; ac_word=$2 8.632 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 8.633 $as_echo_n "checking for $ac_word... " >&6; } 8.634 -if ${ac_cv_path_MV+:} false; then : 8.635 +if test "${ac_cv_path_MV+set}" = set; then : 8.636 $as_echo_n "(cached) " >&6 8.637 else 8.638 case $MV in 8.639 @@ -4901,7 +5022,7 @@ 8.640 set dummy $ac_prog; ac_word=$2 8.641 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 8.642 $as_echo_n "checking for $ac_word... " >&6; } 8.643 -if ${ac_cv_path_PRINTF+:} false; then : 8.644 +if test "${ac_cv_path_PRINTF+set}" = set; then : 8.645 $as_echo_n "(cached) " >&6 8.646 else 8.647 case $PRINTF in 8.648 @@ -4960,7 +5081,7 @@ 8.649 set dummy $ac_prog; ac_word=$2 8.650 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 8.651 $as_echo_n "checking for $ac_word... " >&6; } 8.652 -if ${ac_cv_path_THEPWDCMD+:} false; then : 8.653 +if test "${ac_cv_path_THEPWDCMD+set}" = set; then : 8.654 $as_echo_n "(cached) " >&6 8.655 else 8.656 case $THEPWDCMD in 8.657 @@ -5019,7 +5140,7 @@ 8.658 set dummy $ac_prog; ac_word=$2 8.659 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 8.660 $as_echo_n "checking for $ac_word... " >&6; } 8.661 -if ${ac_cv_path_RM+:} false; then : 8.662 +if test "${ac_cv_path_RM+set}" = set; then : 8.663 $as_echo_n "(cached) " >&6 8.664 else 8.665 case $RM in 8.666 @@ -5078,7 +5199,7 @@ 8.667 set dummy $ac_prog; ac_word=$2 8.668 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 8.669 $as_echo_n "checking for $ac_word... " >&6; } 8.670 -if ${ac_cv_path_SH+:} false; then : 8.671 +if test "${ac_cv_path_SH+set}" = set; then : 8.672 $as_echo_n "(cached) " >&6 8.673 else 8.674 case $SH in 8.675 @@ -5137,7 +5258,7 @@ 8.676 set dummy $ac_prog; ac_word=$2 8.677 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 8.678 $as_echo_n "checking for $ac_word... " >&6; } 8.679 -if ${ac_cv_path_SORT+:} false; then : 8.680 +if test "${ac_cv_path_SORT+set}" = set; then : 8.681 $as_echo_n "(cached) " >&6 8.682 else 8.683 case $SORT in 8.684 @@ -5196,7 +5317,7 @@ 8.685 set dummy $ac_prog; ac_word=$2 8.686 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 8.687 $as_echo_n "checking for $ac_word... " >&6; } 8.688 -if ${ac_cv_path_TAIL+:} false; then : 8.689 +if test "${ac_cv_path_TAIL+set}" = set; then : 8.690 $as_echo_n "(cached) " >&6 8.691 else 8.692 case $TAIL in 8.693 @@ -5255,7 +5376,7 @@ 8.694 set dummy $ac_prog; ac_word=$2 8.695 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 8.696 $as_echo_n "checking for $ac_word... " >&6; } 8.697 -if ${ac_cv_path_TAR+:} false; then : 8.698 +if test "${ac_cv_path_TAR+set}" = set; then : 8.699 $as_echo_n "(cached) " >&6 8.700 else 8.701 case $TAR in 8.702 @@ -5314,7 +5435,7 @@ 8.703 set dummy $ac_prog; ac_word=$2 8.704 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 8.705 $as_echo_n "checking for $ac_word... " >&6; } 8.706 -if ${ac_cv_path_TEE+:} false; then : 8.707 +if test "${ac_cv_path_TEE+set}" = set; then : 8.708 $as_echo_n "(cached) " >&6 8.709 else 8.710 case $TEE in 8.711 @@ -5373,7 +5494,7 @@ 8.712 set dummy $ac_prog; ac_word=$2 8.713 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 8.714 $as_echo_n "checking for $ac_word... " >&6; } 8.715 -if ${ac_cv_path_TOUCH+:} false; then : 8.716 +if test "${ac_cv_path_TOUCH+set}" = set; then : 8.717 $as_echo_n "(cached) " >&6 8.718 else 8.719 case $TOUCH in 8.720 @@ -5432,7 +5553,7 @@ 8.721 set dummy $ac_prog; ac_word=$2 8.722 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 8.723 $as_echo_n "checking for $ac_word... " >&6; } 8.724 -if ${ac_cv_path_TR+:} false; then : 8.725 +if test "${ac_cv_path_TR+set}" = set; then : 8.726 $as_echo_n "(cached) " >&6 8.727 else 8.728 case $TR in 8.729 @@ -5491,7 +5612,7 @@ 8.730 set dummy $ac_prog; ac_word=$2 8.731 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 8.732 $as_echo_n "checking for $ac_word... " >&6; } 8.733 -if ${ac_cv_path_UNAME+:} false; then : 8.734 +if test "${ac_cv_path_UNAME+set}" = set; then : 8.735 $as_echo_n "(cached) " >&6 8.736 else 8.737 case $UNAME in 8.738 @@ -5550,7 +5671,7 @@ 8.739 set dummy $ac_prog; ac_word=$2 8.740 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 8.741 $as_echo_n "checking for $ac_word... " >&6; } 8.742 -if ${ac_cv_path_UNIQ+:} false; then : 8.743 +if test "${ac_cv_path_UNIQ+set}" = set; then : 8.744 $as_echo_n "(cached) " >&6 8.745 else 8.746 case $UNIQ in 8.747 @@ -5609,7 +5730,7 @@ 8.748 set dummy $ac_prog; ac_word=$2 8.749 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 8.750 $as_echo_n "checking for $ac_word... " >&6; } 8.751 -if ${ac_cv_path_WC+:} false; then : 8.752 +if test "${ac_cv_path_WC+set}" = set; then : 8.753 $as_echo_n "(cached) " >&6 8.754 else 8.755 case $WC in 8.756 @@ -5668,7 +5789,7 @@ 8.757 set dummy $ac_prog; ac_word=$2 8.758 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 8.759 $as_echo_n "checking for $ac_word... " >&6; } 8.760 -if ${ac_cv_path_WHICH+:} false; then : 8.761 +if test "${ac_cv_path_WHICH+set}" = set; then : 8.762 $as_echo_n "(cached) " >&6 8.763 else 8.764 case $WHICH in 8.765 @@ -5727,7 +5848,7 @@ 8.766 set dummy $ac_prog; ac_word=$2 8.767 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 8.768 $as_echo_n "checking for $ac_word... " >&6; } 8.769 -if ${ac_cv_path_XARGS+:} false; then : 8.770 +if test "${ac_cv_path_XARGS+set}" = set; then : 8.771 $as_echo_n "(cached) " >&6 8.772 else 8.773 case $XARGS in 8.774 @@ -5787,7 +5908,7 @@ 8.775 set dummy $ac_prog; ac_word=$2 8.776 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 8.777 $as_echo_n "checking for $ac_word... " >&6; } 8.778 -if ${ac_cv_prog_AWK+:} false; then : 8.779 +if test "${ac_cv_prog_AWK+set}" = set; then : 8.780 $as_echo_n "(cached) " >&6 8.781 else 8.782 if test -n "$AWK"; then 8.783 @@ -5837,7 +5958,7 @@ 8.784 8.785 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for grep that handles long lines and -e" >&5 8.786 $as_echo_n "checking for grep that handles long lines and -e... " >&6; } 8.787 -if ${ac_cv_path_GREP+:} false; then : 8.788 +if test "${ac_cv_path_GREP+set}" = set; then : 8.789 $as_echo_n "(cached) " >&6 8.790 else 8.791 if test -z "$GREP"; then 8.792 @@ -5912,7 +6033,7 @@ 8.793 8.794 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for egrep" >&5 8.795 $as_echo_n "checking for egrep... " >&6; } 8.796 -if ${ac_cv_path_EGREP+:} false; then : 8.797 +if test "${ac_cv_path_EGREP+set}" = set; then : 8.798 $as_echo_n "(cached) " >&6 8.799 else 8.800 if echo a | $GREP -E '(a|b)' >/dev/null 2>&1 8.801 @@ -5991,7 +6112,7 @@ 8.802 8.803 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for fgrep" >&5 8.804 $as_echo_n "checking for fgrep... " >&6; } 8.805 -if ${ac_cv_path_FGREP+:} false; then : 8.806 +if test "${ac_cv_path_FGREP+set}" = set; then : 8.807 $as_echo_n "(cached) " >&6 8.808 else 8.809 if echo 'ab*c' | $GREP -F 'ab*c' >/dev/null 2>&1 8.810 @@ -6070,7 +6191,7 @@ 8.811 8.812 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for a sed that does not truncate output" >&5 8.813 $as_echo_n "checking for a sed that does not truncate output... " >&6; } 8.814 -if ${ac_cv_path_SED+:} false; then : 8.815 +if test "${ac_cv_path_SED+set}" = set; then : 8.816 $as_echo_n "(cached) " >&6 8.817 else 8.818 ac_script=s/aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa/bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb/ 8.819 @@ -6156,7 +6277,7 @@ 8.820 set dummy $ac_prog; ac_word=$2 8.821 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 8.822 $as_echo_n "checking for $ac_word... " >&6; } 8.823 -if ${ac_cv_path_NAWK+:} false; then : 8.824 +if test "${ac_cv_path_NAWK+set}" = set; then : 8.825 $as_echo_n "(cached) " >&6 8.826 else 8.827 case $NAWK in 8.828 @@ -6216,7 +6337,7 @@ 8.829 set dummy cygpath; ac_word=$2 8.830 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 8.831 $as_echo_n "checking for $ac_word... " >&6; } 8.832 -if ${ac_cv_path_CYGPATH+:} false; then : 8.833 +if test "${ac_cv_path_CYGPATH+set}" = set; then : 8.834 $as_echo_n "(cached) " >&6 8.835 else 8.836 case $CYGPATH in 8.837 @@ -6256,7 +6377,7 @@ 8.838 set dummy readlink; ac_word=$2 8.839 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 8.840 $as_echo_n "checking for $ac_word... " >&6; } 8.841 -if ${ac_cv_path_READLINK+:} false; then : 8.842 +if test "${ac_cv_path_READLINK+set}" = set; then : 8.843 $as_echo_n "(cached) " >&6 8.844 else 8.845 case $READLINK in 8.846 @@ -6296,7 +6417,7 @@ 8.847 set dummy df; ac_word=$2 8.848 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 8.849 $as_echo_n "checking for $ac_word... " >&6; } 8.850 -if ${ac_cv_path_DF+:} false; then : 8.851 +if test "${ac_cv_path_DF+set}" = set; then : 8.852 $as_echo_n "(cached) " >&6 8.853 else 8.854 case $DF in 8.855 @@ -6336,7 +6457,7 @@ 8.856 set dummy SetFile; ac_word=$2 8.857 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 8.858 $as_echo_n "checking for $ac_word... " >&6; } 8.859 -if ${ac_cv_path_SETFILE+:} false; then : 8.860 +if test "${ac_cv_path_SETFILE+set}" = set; then : 8.861 $as_echo_n "(cached) " >&6 8.862 else 8.863 case $SETFILE in 8.864 @@ -6382,7 +6503,7 @@ 8.865 8.866 { $as_echo "$as_me:${as_lineno-$LINENO}: checking build system type" >&5 8.867 $as_echo_n "checking build system type... " >&6; } 8.868 -if ${ac_cv_build+:} false; then : 8.869 +if test "${ac_cv_build+set}" = set; then : 8.870 $as_echo_n "(cached) " >&6 8.871 else 8.872 ac_build_alias=$build_alias 8.873 @@ -6398,7 +6519,7 @@ 8.874 $as_echo "$ac_cv_build" >&6; } 8.875 case $ac_cv_build in 8.876 *-*-*) ;; 8.877 -*) as_fn_error $? "invalid value of canonical build" "$LINENO" 5;; 8.878 +*) as_fn_error $? "invalid value of canonical build" "$LINENO" 5 ;; 8.879 esac 8.880 build=$ac_cv_build 8.881 ac_save_IFS=$IFS; IFS='-' 8.882 @@ -6416,7 +6537,7 @@ 8.883 8.884 { $as_echo "$as_me:${as_lineno-$LINENO}: checking host system type" >&5 8.885 $as_echo_n "checking host system type... " >&6; } 8.886 -if ${ac_cv_host+:} false; then : 8.887 +if test "${ac_cv_host+set}" = set; then : 8.888 $as_echo_n "(cached) " >&6 8.889 else 8.890 if test "x$host_alias" = x; then 8.891 @@ -6431,7 +6552,7 @@ 8.892 $as_echo "$ac_cv_host" >&6; } 8.893 case $ac_cv_host in 8.894 *-*-*) ;; 8.895 -*) as_fn_error $? "invalid value of canonical host" "$LINENO" 5;; 8.896 +*) as_fn_error $? "invalid value of canonical host" "$LINENO" 5 ;; 8.897 esac 8.898 host=$ac_cv_host 8.899 ac_save_IFS=$IFS; IFS='-' 8.900 @@ -6449,7 +6570,7 @@ 8.901 8.902 { $as_echo "$as_me:${as_lineno-$LINENO}: checking target system type" >&5 8.903 $as_echo_n "checking target system type... " >&6; } 8.904 -if ${ac_cv_target+:} false; then : 8.905 +if test "${ac_cv_target+set}" = set; then : 8.906 $as_echo_n "(cached) " >&6 8.907 else 8.908 if test "x$target_alias" = x; then 8.909 @@ -6464,7 +6585,7 @@ 8.910 $as_echo "$ac_cv_target" >&6; } 8.911 case $ac_cv_target in 8.912 *-*-*) ;; 8.913 -*) as_fn_error $? "invalid value of canonical target" "$LINENO" 5;; 8.914 +*) as_fn_error $? "invalid value of canonical target" "$LINENO" 5 ;; 8.915 esac 8.916 target=$ac_cv_target 8.917 ac_save_IFS=$IFS; IFS='-' 8.918 @@ -7584,7 +7705,7 @@ 8.919 # from configure, but only server is valid anyway. Fix this 8.920 # when hotspot makefiles are rewritten. 8.921 if test "x$MACOSX_UNIVERSAL" = xtrue; then 8.922 - HOTSPOT_TARGET=universal_product 8.923 + HOTSPOT_TARGET=universal_${HOTSPOT_EXPORT} 8.924 fi 8.925 8.926 ##### 8.927 @@ -7883,7 +8004,7 @@ 8.928 set dummy $ac_prog; ac_word=$2 8.929 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 8.930 $as_echo_n "checking for $ac_word... " >&6; } 8.931 -if ${ac_cv_prog_PKGHANDLER+:} false; then : 8.932 +if test "${ac_cv_prog_PKGHANDLER+set}" = set; then : 8.933 $as_echo_n "(cached) " >&6 8.934 else 8.935 if test -n "$PKGHANDLER"; then 8.936 @@ -8248,7 +8369,7 @@ 8.937 set dummy $ac_prog; ac_word=$2 8.938 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 8.939 $as_echo_n "checking for $ac_word... " >&6; } 8.940 -if ${ac_cv_path_CHECK_GMAKE+:} false; then : 8.941 +if test "${ac_cv_path_CHECK_GMAKE+set}" = set; then : 8.942 $as_echo_n "(cached) " >&6 8.943 else 8.944 case $CHECK_GMAKE in 8.945 @@ -8602,7 +8723,7 @@ 8.946 set dummy $ac_prog; ac_word=$2 8.947 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 8.948 $as_echo_n "checking for $ac_word... " >&6; } 8.949 -if ${ac_cv_path_CHECK_MAKE+:} false; then : 8.950 +if test "${ac_cv_path_CHECK_MAKE+set}" = set; then : 8.951 $as_echo_n "(cached) " >&6 8.952 else 8.953 case $CHECK_MAKE in 8.954 @@ -8961,7 +9082,7 @@ 8.955 set dummy $ac_prog; ac_word=$2 8.956 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 8.957 $as_echo_n "checking for $ac_word... " >&6; } 8.958 -if ${ac_cv_path_CHECK_TOOLSDIR_GMAKE+:} false; then : 8.959 +if test "${ac_cv_path_CHECK_TOOLSDIR_GMAKE+set}" = set; then : 8.960 $as_echo_n "(cached) " >&6 8.961 else 8.962 case $CHECK_TOOLSDIR_GMAKE in 8.963 @@ -9314,7 +9435,7 @@ 8.964 set dummy $ac_prog; ac_word=$2 8.965 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 8.966 $as_echo_n "checking for $ac_word... " >&6; } 8.967 -if ${ac_cv_path_CHECK_TOOLSDIR_MAKE+:} false; then : 8.968 +if test "${ac_cv_path_CHECK_TOOLSDIR_MAKE+set}" = set; then : 8.969 $as_echo_n "(cached) " >&6 8.970 else 8.971 case $CHECK_TOOLSDIR_MAKE in 8.972 @@ -9710,7 +9831,7 @@ 8.973 set dummy $ac_prog; ac_word=$2 8.974 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 8.975 $as_echo_n "checking for $ac_word... " >&6; } 8.976 -if ${ac_cv_path_UNZIP+:} false; then : 8.977 +if test "${ac_cv_path_UNZIP+set}" = set; then : 8.978 $as_echo_n "(cached) " >&6 8.979 else 8.980 case $UNZIP in 8.981 @@ -9769,7 +9890,7 @@ 8.982 set dummy $ac_prog; ac_word=$2 8.983 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 8.984 $as_echo_n "checking for $ac_word... " >&6; } 8.985 -if ${ac_cv_path_ZIP+:} false; then : 8.986 +if test "${ac_cv_path_ZIP+set}" = set; then : 8.987 $as_echo_n "(cached) " >&6 8.988 else 8.989 case $ZIP in 8.990 @@ -9828,7 +9949,7 @@ 8.991 set dummy ldd; ac_word=$2 8.992 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 8.993 $as_echo_n "checking for $ac_word... " >&6; } 8.994 -if ${ac_cv_path_LDD+:} false; then : 8.995 +if test "${ac_cv_path_LDD+set}" = set; then : 8.996 $as_echo_n "(cached) " >&6 8.997 else 8.998 case $LDD in 8.999 @@ -9874,7 +9995,7 @@ 8.1000 set dummy otool; ac_word=$2 8.1001 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 8.1002 $as_echo_n "checking for $ac_word... " >&6; } 8.1003 -if ${ac_cv_path_OTOOL+:} false; then : 8.1004 +if test "${ac_cv_path_OTOOL+set}" = set; then : 8.1005 $as_echo_n "(cached) " >&6 8.1006 else 8.1007 case $OTOOL in 8.1008 @@ -9919,7 +10040,7 @@ 8.1009 set dummy $ac_prog; ac_word=$2 8.1010 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 8.1011 $as_echo_n "checking for $ac_word... " >&6; } 8.1012 -if ${ac_cv_path_READELF+:} false; then : 8.1013 +if test "${ac_cv_path_READELF+set}" = set; then : 8.1014 $as_echo_n "(cached) " >&6 8.1015 else 8.1016 case $READELF in 8.1017 @@ -9962,7 +10083,7 @@ 8.1018 set dummy hg; ac_word=$2 8.1019 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 8.1020 $as_echo_n "checking for $ac_word... " >&6; } 8.1021 -if ${ac_cv_path_HG+:} false; then : 8.1022 +if test "${ac_cv_path_HG+set}" = set; then : 8.1023 $as_echo_n "(cached) " >&6 8.1024 else 8.1025 case $HG in 8.1026 @@ -10002,7 +10123,7 @@ 8.1027 set dummy stat; ac_word=$2 8.1028 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 8.1029 $as_echo_n "checking for $ac_word... " >&6; } 8.1030 -if ${ac_cv_path_STAT+:} false; then : 8.1031 +if test "${ac_cv_path_STAT+set}" = set; then : 8.1032 $as_echo_n "(cached) " >&6 8.1033 else 8.1034 case $STAT in 8.1035 @@ -10042,7 +10163,7 @@ 8.1036 set dummy time; ac_word=$2 8.1037 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 8.1038 $as_echo_n "checking for $ac_word... " >&6; } 8.1039 -if ${ac_cv_path_TIME+:} false; then : 8.1040 +if test "${ac_cv_path_TIME+set}" = set; then : 8.1041 $as_echo_n "(cached) " >&6 8.1042 else 8.1043 case $TIME in 8.1044 @@ -10087,7 +10208,7 @@ 8.1045 set dummy $ac_prog; ac_word=$2 8.1046 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 8.1047 $as_echo_n "checking for $ac_word... " >&6; } 8.1048 -if ${ac_cv_path_COMM+:} false; then : 8.1049 +if test "${ac_cv_path_COMM+set}" = set; then : 8.1050 $as_echo_n "(cached) " >&6 8.1051 else 8.1052 case $COMM in 8.1053 @@ -10151,7 +10272,7 @@ 8.1054 set dummy ${ac_tool_prefix}pkg-config; ac_word=$2 8.1055 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 8.1056 $as_echo_n "checking for $ac_word... " >&6; } 8.1057 -if ${ac_cv_path_PKG_CONFIG+:} false; then : 8.1058 +if test "${ac_cv_path_PKG_CONFIG+set}" = set; then : 8.1059 $as_echo_n "(cached) " >&6 8.1060 else 8.1061 case $PKG_CONFIG in 8.1062 @@ -10194,7 +10315,7 @@ 8.1063 set dummy pkg-config; ac_word=$2 8.1064 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 8.1065 $as_echo_n "checking for $ac_word... " >&6; } 8.1066 -if ${ac_cv_path_ac_pt_PKG_CONFIG+:} false; then : 8.1067 +if test "${ac_cv_path_ac_pt_PKG_CONFIG+set}" = set; then : 8.1068 $as_echo_n "(cached) " >&6 8.1069 else 8.1070 case $ac_pt_PKG_CONFIG in 8.1071 @@ -10367,7 +10488,7 @@ 8.1072 set dummy $ac_prog; ac_word=$2 8.1073 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 8.1074 $as_echo_n "checking for $ac_word... " >&6; } 8.1075 -if ${ac_cv_prog_BDEPS_UNZIP+:} false; then : 8.1076 +if test "${ac_cv_prog_BDEPS_UNZIP+set}" = set; then : 8.1077 $as_echo_n "(cached) " >&6 8.1078 else 8.1079 if test -n "$BDEPS_UNZIP"; then 8.1080 @@ -10413,7 +10534,7 @@ 8.1081 set dummy $ac_prog; ac_word=$2 8.1082 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 8.1083 $as_echo_n "checking for $ac_word... " >&6; } 8.1084 -if ${ac_cv_prog_BDEPS_FTP+:} false; then : 8.1085 +if test "${ac_cv_prog_BDEPS_FTP+set}" = set; then : 8.1086 $as_echo_n "(cached) " >&6 8.1087 else 8.1088 if test -n "$BDEPS_FTP"; then 8.1089 @@ -10608,10 +10729,38 @@ 8.1090 8.1091 8.1092 # Source the version numbers 8.1093 -. $AUTOCONF_DIR/version.numbers 8.1094 -if test "x$OPENJDK" = "xfalse"; then 8.1095 - . $AUTOCONF_DIR/closed.version.numbers 8.1096 -fi 8.1097 +. $AUTOCONF_DIR/version-numbers 8.1098 + 8.1099 +# Get the settings from parameters 8.1100 + 8.1101 +# Check whether --with-milestone was given. 8.1102 +if test "${with_milestone+set}" = set; then : 8.1103 + withval=$with_milestone; 8.1104 +fi 8.1105 + 8.1106 +if test "x$with_milestone" = xyes; then 8.1107 + as_fn_error $? "Milestone must have a value" "$LINENO" 5 8.1108 +elif test "x$with_milestone" != x; then 8.1109 + MILESTONE="$with_milestone" 8.1110 +else 8.1111 + MILESTONE=internal 8.1112 +fi 8.1113 + 8.1114 + 8.1115 +# Check whether --with-build-number was given. 8.1116 +if test "${with_build_number+set}" = set; then : 8.1117 + withval=$with_build_number; 8.1118 +fi 8.1119 + 8.1120 +if test "x$with_build_number" = xyes; then 8.1121 + as_fn_error $? "Build number must have a value" "$LINENO" 5 8.1122 +elif test "x$with_build_number" != x; then 8.1123 + JDK_BUILD_NUMBER="$with_build_number" 8.1124 +fi 8.1125 +if test "x$JDK_BUILD_NUMBER" = x; then 8.1126 + JDK_BUILD_NUMBER=b00 8.1127 +fi 8.1128 + 8.1129 # Now set the JDK version, milestone, build number etc. 8.1130 8.1131 8.1132 @@ -10630,9 +10779,6 @@ 8.1133 COPYRIGHT_YEAR=`date +'%Y'` 8.1134 8.1135 8.1136 -RUNTIME_NAME="$PRODUCT_NAME $PRODUCT_SUFFIX" 8.1137 - 8.1138 - 8.1139 if test "x$JDK_UPDATE_VERSION" != x; then 8.1140 JDK_VERSION="${JDK_MAJOR_VERSION}.${JDK_MINOR_VERSION}.${JDK_MICRO_VERSION}_${JDK_UPDATE_VERSION}" 8.1141 else 8.1142 @@ -10640,23 +10786,11 @@ 8.1143 fi 8.1144 8.1145 8.1146 -if test "x$MILESTONE" != x; then 8.1147 - RELEASE="${JDK_VERSION}-${MILESTONE}${BUILD_VARIANT_RELEASE}" 8.1148 -else 8.1149 - RELEASE="${JDK_VERSION}${BUILD_VARIANT_RELEASE}" 8.1150 -fi 8.1151 - 8.1152 - 8.1153 -if test "x$JDK_BUILD_NUMBER" != x; then 8.1154 - FULL_VERSION="${RELEASE}-${JDK_BUILD_NUMBER}" 8.1155 -else 8.1156 - JDK_BUILD_NUMBER=b00 8.1157 - BUILD_DATE=`date '+%Y_%m_%d_%H_%M'` 8.1158 - # Avoid [:alnum:] since it depends on the locale. 8.1159 - CLEAN_USERNAME=`echo "$USER" | $TR -d -c 'abcdefghijklmnopqrstuvqxyz0123456789'` 8.1160 - USER_RELEASE_SUFFIX=`echo "${CLEAN_USERNAME}_${BUILD_DATE}" | $TR 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'` 8.1161 - FULL_VERSION="${RELEASE}-${USER_RELEASE_SUFFIX}-${JDK_BUILD_NUMBER}" 8.1162 -fi 8.1163 +BUILD_DATE=`date '+%Y_%m_%d_%H_%M'` 8.1164 +# Avoid [:alnum:] since it depends on the locale. 8.1165 +CLEAN_USERNAME=`echo "$USER" | $TR -d -c 'abcdefghijklmnopqrstuvqxyz0123456789'` 8.1166 +USER_RELEASE_SUFFIX=`echo "${CLEAN_USERNAME}_${BUILD_DATE}" | $TR 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'` 8.1167 + 8.1168 8.1169 COOKED_BUILD_NUMBER=`$ECHO $JDK_BUILD_NUMBER | $SED -e 's/^b//' -e 's/^0//'` 8.1170 8.1171 @@ -11702,7 +11836,7 @@ 8.1172 set dummy javac; ac_word=$2 8.1173 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 8.1174 $as_echo_n "checking for $ac_word... " >&6; } 8.1175 -if ${ac_cv_path_JAVAC_CHECK+:} false; then : 8.1176 +if test "${ac_cv_path_JAVAC_CHECK+set}" = set; then : 8.1177 $as_echo_n "(cached) " >&6 8.1178 else 8.1179 case $JAVAC_CHECK in 8.1180 @@ -11742,7 +11876,7 @@ 8.1181 set dummy java; ac_word=$2 8.1182 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 8.1183 $as_echo_n "checking for $ac_word... " >&6; } 8.1184 -if ${ac_cv_path_JAVA_CHECK+:} false; then : 8.1185 +if test "${ac_cv_path_JAVA_CHECK+set}" = set; then : 8.1186 $as_echo_n "(cached) " >&6 8.1187 else 8.1188 case $JAVA_CHECK in 8.1189 @@ -15801,7 +15935,7 @@ 8.1190 set dummy link; ac_word=$2 8.1191 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 8.1192 $as_echo_n "checking for $ac_word... " >&6; } 8.1193 -if ${ac_cv_path_CYGWIN_LINK+:} false; then : 8.1194 +if test "${ac_cv_path_CYGWIN_LINK+set}" = set; then : 8.1195 $as_echo_n "(cached) " >&6 8.1196 else 8.1197 case $CYGWIN_LINK in 8.1198 @@ -16790,7 +16924,7 @@ 8.1199 set dummy $ac_prog; ac_word=$2 8.1200 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 8.1201 $as_echo_n "checking for $ac_word... " >&6; } 8.1202 -if ${ac_cv_path_BUILD_CC+:} false; then : 8.1203 +if test "${ac_cv_path_BUILD_CC+set}" = set; then : 8.1204 $as_echo_n "(cached) " >&6 8.1205 else 8.1206 case $BUILD_CC in 8.1207 @@ -17101,7 +17235,7 @@ 8.1208 set dummy $ac_prog; ac_word=$2 8.1209 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 8.1210 $as_echo_n "checking for $ac_word... " >&6; } 8.1211 -if ${ac_cv_path_BUILD_CXX+:} false; then : 8.1212 +if test "${ac_cv_path_BUILD_CXX+set}" = set; then : 8.1213 $as_echo_n "(cached) " >&6 8.1214 else 8.1215 case $BUILD_CXX in 8.1216 @@ -17410,7 +17544,7 @@ 8.1217 set dummy ld; ac_word=$2 8.1218 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 8.1219 $as_echo_n "checking for $ac_word... " >&6; } 8.1220 -if ${ac_cv_path_BUILD_LD+:} false; then : 8.1221 +if test "${ac_cv_path_BUILD_LD+set}" = set; then : 8.1222 $as_echo_n "(cached) " >&6 8.1223 else 8.1224 case $BUILD_LD in 8.1225 @@ -17922,7 +18056,7 @@ 8.1226 set dummy $ac_prog; ac_word=$2 8.1227 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 8.1228 $as_echo_n "checking for $ac_word... " >&6; } 8.1229 -if ${ac_cv_path_TOOLS_DIR_CC+:} false; then : 8.1230 +if test "${ac_cv_path_TOOLS_DIR_CC+set}" = set; then : 8.1231 $as_echo_n "(cached) " >&6 8.1232 else 8.1233 case $TOOLS_DIR_CC in 8.1234 @@ -17974,7 +18108,7 @@ 8.1235 set dummy $ac_prog; ac_word=$2 8.1236 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 8.1237 $as_echo_n "checking for $ac_word... " >&6; } 8.1238 -if ${ac_cv_path_POTENTIAL_CC+:} false; then : 8.1239 +if test "${ac_cv_path_POTENTIAL_CC+set}" = set; then : 8.1240 $as_echo_n "(cached) " >&6 8.1241 else 8.1242 case $POTENTIAL_CC in 8.1243 @@ -18387,7 +18521,7 @@ 8.1244 set dummy $ac_tool_prefix$ac_prog; ac_word=$2 8.1245 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 8.1246 $as_echo_n "checking for $ac_word... " >&6; } 8.1247 -if ${ac_cv_prog_PROPER_COMPILER_CC+:} false; then : 8.1248 +if test "${ac_cv_prog_PROPER_COMPILER_CC+set}" = set; then : 8.1249 $as_echo_n "(cached) " >&6 8.1250 else 8.1251 if test -n "$PROPER_COMPILER_CC"; then 8.1252 @@ -18431,7 +18565,7 @@ 8.1253 set dummy $ac_prog; ac_word=$2 8.1254 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 8.1255 $as_echo_n "checking for $ac_word... " >&6; } 8.1256 -if ${ac_cv_prog_ac_ct_PROPER_COMPILER_CC+:} false; then : 8.1257 +if test "${ac_cv_prog_ac_ct_PROPER_COMPILER_CC+set}" = set; then : 8.1258 $as_echo_n "(cached) " >&6 8.1259 else 8.1260 if test -n "$ac_ct_PROPER_COMPILER_CC"; then 8.1261 @@ -18881,7 +19015,7 @@ 8.1262 set dummy $ac_tool_prefix$ac_prog; ac_word=$2 8.1263 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 8.1264 $as_echo_n "checking for $ac_word... " >&6; } 8.1265 -if ${ac_cv_prog_CC+:} false; then : 8.1266 +if test "${ac_cv_prog_CC+set}" = set; then : 8.1267 $as_echo_n "(cached) " >&6 8.1268 else 8.1269 if test -n "$CC"; then 8.1270 @@ -18925,7 +19059,7 @@ 8.1271 set dummy $ac_prog; ac_word=$2 8.1272 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 8.1273 $as_echo_n "checking for $ac_word... " >&6; } 8.1274 -if ${ac_cv_prog_ac_ct_CC+:} false; then : 8.1275 +if test "${ac_cv_prog_ac_ct_CC+set}" = set; then : 8.1276 $as_echo_n "(cached) " >&6 8.1277 else 8.1278 if test -n "$ac_ct_CC"; then 8.1279 @@ -18978,7 +19112,7 @@ 8.1280 test -z "$CC" && { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 8.1281 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} 8.1282 as_fn_error $? "no acceptable C compiler found in \$PATH 8.1283 -See \`config.log' for more details" "$LINENO" 5; } 8.1284 +See \`config.log' for more details" "$LINENO" 5 ; } 8.1285 8.1286 # Provide some information about the compiler. 8.1287 $as_echo "$as_me:${as_lineno-$LINENO}: checking for C compiler version" >&5 8.1288 @@ -19093,7 +19227,7 @@ 8.1289 { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 8.1290 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} 8.1291 as_fn_error 77 "C compiler cannot create executables 8.1292 -See \`config.log' for more details" "$LINENO" 5; } 8.1293 +See \`config.log' for more details" "$LINENO" 5 ; } 8.1294 else 8.1295 { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 8.1296 $as_echo "yes" >&6; } 8.1297 @@ -19136,7 +19270,7 @@ 8.1298 { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 8.1299 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} 8.1300 as_fn_error $? "cannot compute suffix of executables: cannot compile and link 8.1301 -See \`config.log' for more details" "$LINENO" 5; } 8.1302 +See \`config.log' for more details" "$LINENO" 5 ; } 8.1303 fi 8.1304 rm -f conftest conftest$ac_cv_exeext 8.1305 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_exeext" >&5 8.1306 @@ -19195,7 +19329,7 @@ 8.1307 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} 8.1308 as_fn_error $? "cannot run C compiled programs. 8.1309 If you meant to cross compile, use \`--host'. 8.1310 -See \`config.log' for more details" "$LINENO" 5; } 8.1311 +See \`config.log' for more details" "$LINENO" 5 ; } 8.1312 fi 8.1313 fi 8.1314 fi 8.1315 @@ -19206,7 +19340,7 @@ 8.1316 ac_clean_files=$ac_clean_files_save 8.1317 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for suffix of object files" >&5 8.1318 $as_echo_n "checking for suffix of object files... " >&6; } 8.1319 -if ${ac_cv_objext+:} false; then : 8.1320 +if test "${ac_cv_objext+set}" = set; then : 8.1321 $as_echo_n "(cached) " >&6 8.1322 else 8.1323 cat confdefs.h - <<_ACEOF >conftest.$ac_ext 8.1324 @@ -19247,7 +19381,7 @@ 8.1325 { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 8.1326 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} 8.1327 as_fn_error $? "cannot compute suffix of object files: cannot compile 8.1328 -See \`config.log' for more details" "$LINENO" 5; } 8.1329 +See \`config.log' for more details" "$LINENO" 5 ; } 8.1330 fi 8.1331 rm -f conftest.$ac_cv_objext conftest.$ac_ext 8.1332 fi 8.1333 @@ -19257,7 +19391,7 @@ 8.1334 ac_objext=$OBJEXT 8.1335 { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are using the GNU C compiler" >&5 8.1336 $as_echo_n "checking whether we are using the GNU C compiler... " >&6; } 8.1337 -if ${ac_cv_c_compiler_gnu+:} false; then : 8.1338 +if test "${ac_cv_c_compiler_gnu+set}" = set; then : 8.1339 $as_echo_n "(cached) " >&6 8.1340 else 8.1341 cat confdefs.h - <<_ACEOF >conftest.$ac_ext 8.1342 @@ -19294,7 +19428,7 @@ 8.1343 ac_save_CFLAGS=$CFLAGS 8.1344 { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CC accepts -g" >&5 8.1345 $as_echo_n "checking whether $CC accepts -g... " >&6; } 8.1346 -if ${ac_cv_prog_cc_g+:} false; then : 8.1347 +if test "${ac_cv_prog_cc_g+set}" = set; then : 8.1348 $as_echo_n "(cached) " >&6 8.1349 else 8.1350 ac_save_c_werror_flag=$ac_c_werror_flag 8.1351 @@ -19372,7 +19506,7 @@ 8.1352 fi 8.1353 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $CC option to accept ISO C89" >&5 8.1354 $as_echo_n "checking for $CC option to accept ISO C89... " >&6; } 8.1355 -if ${ac_cv_prog_cc_c89+:} false; then : 8.1356 +if test "${ac_cv_prog_cc_c89+set}" = set; then : 8.1357 $as_echo_n "(cached) " >&6 8.1358 else 8.1359 ac_cv_prog_cc_c89=no 8.1360 @@ -19491,7 +19625,7 @@ 8.1361 set dummy $ac_prog; ac_word=$2 8.1362 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 8.1363 $as_echo_n "checking for $ac_word... " >&6; } 8.1364 -if ${ac_cv_path_TOOLS_DIR_CXX+:} false; then : 8.1365 +if test "${ac_cv_path_TOOLS_DIR_CXX+set}" = set; then : 8.1366 $as_echo_n "(cached) " >&6 8.1367 else 8.1368 case $TOOLS_DIR_CXX in 8.1369 @@ -19543,7 +19677,7 @@ 8.1370 set dummy $ac_prog; ac_word=$2 8.1371 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 8.1372 $as_echo_n "checking for $ac_word... " >&6; } 8.1373 -if ${ac_cv_path_POTENTIAL_CXX+:} false; then : 8.1374 +if test "${ac_cv_path_POTENTIAL_CXX+set}" = set; then : 8.1375 $as_echo_n "(cached) " >&6 8.1376 else 8.1377 case $POTENTIAL_CXX in 8.1378 @@ -19956,7 +20090,7 @@ 8.1379 set dummy $ac_tool_prefix$ac_prog; ac_word=$2 8.1380 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 8.1381 $as_echo_n "checking for $ac_word... " >&6; } 8.1382 -if ${ac_cv_prog_PROPER_COMPILER_CXX+:} false; then : 8.1383 +if test "${ac_cv_prog_PROPER_COMPILER_CXX+set}" = set; then : 8.1384 $as_echo_n "(cached) " >&6 8.1385 else 8.1386 if test -n "$PROPER_COMPILER_CXX"; then 8.1387 @@ -20000,7 +20134,7 @@ 8.1388 set dummy $ac_prog; ac_word=$2 8.1389 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 8.1390 $as_echo_n "checking for $ac_word... " >&6; } 8.1391 -if ${ac_cv_prog_ac_ct_PROPER_COMPILER_CXX+:} false; then : 8.1392 +if test "${ac_cv_prog_ac_ct_PROPER_COMPILER_CXX+set}" = set; then : 8.1393 $as_echo_n "(cached) " >&6 8.1394 else 8.1395 if test -n "$ac_ct_PROPER_COMPILER_CXX"; then 8.1396 @@ -20454,7 +20588,7 @@ 8.1397 set dummy $ac_tool_prefix$ac_prog; ac_word=$2 8.1398 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 8.1399 $as_echo_n "checking for $ac_word... " >&6; } 8.1400 -if ${ac_cv_prog_CXX+:} false; then : 8.1401 +if test "${ac_cv_prog_CXX+set}" = set; then : 8.1402 $as_echo_n "(cached) " >&6 8.1403 else 8.1404 if test -n "$CXX"; then 8.1405 @@ -20498,7 +20632,7 @@ 8.1406 set dummy $ac_prog; ac_word=$2 8.1407 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 8.1408 $as_echo_n "checking for $ac_word... " >&6; } 8.1409 -if ${ac_cv_prog_ac_ct_CXX+:} false; then : 8.1410 +if test "${ac_cv_prog_ac_ct_CXX+set}" = set; then : 8.1411 $as_echo_n "(cached) " >&6 8.1412 else 8.1413 if test -n "$ac_ct_CXX"; then 8.1414 @@ -20576,7 +20710,7 @@ 8.1415 8.1416 { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are using the GNU C++ compiler" >&5 8.1417 $as_echo_n "checking whether we are using the GNU C++ compiler... " >&6; } 8.1418 -if ${ac_cv_cxx_compiler_gnu+:} false; then : 8.1419 +if test "${ac_cv_cxx_compiler_gnu+set}" = set; then : 8.1420 $as_echo_n "(cached) " >&6 8.1421 else 8.1422 cat confdefs.h - <<_ACEOF >conftest.$ac_ext 8.1423 @@ -20613,7 +20747,7 @@ 8.1424 ac_save_CXXFLAGS=$CXXFLAGS 8.1425 { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CXX accepts -g" >&5 8.1426 $as_echo_n "checking whether $CXX accepts -g... " >&6; } 8.1427 -if ${ac_cv_prog_cxx_g+:} false; then : 8.1428 +if test "${ac_cv_prog_cxx_g+set}" = set; then : 8.1429 $as_echo_n "(cached) " >&6 8.1430 else 8.1431 ac_save_cxx_werror_flag=$ac_cxx_werror_flag 8.1432 @@ -20711,7 +20845,7 @@ 8.1433 set dummy $ac_tool_prefix$ac_prog; ac_word=$2 8.1434 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 8.1435 $as_echo_n "checking for $ac_word... " >&6; } 8.1436 -if ${ac_cv_prog_OBJC+:} false; then : 8.1437 +if test "${ac_cv_prog_OBJC+set}" = set; then : 8.1438 $as_echo_n "(cached) " >&6 8.1439 else 8.1440 if test -n "$OBJC"; then 8.1441 @@ -20755,7 +20889,7 @@ 8.1442 set dummy $ac_prog; ac_word=$2 8.1443 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 8.1444 $as_echo_n "checking for $ac_word... " >&6; } 8.1445 -if ${ac_cv_prog_ac_ct_OBJC+:} false; then : 8.1446 +if test "${ac_cv_prog_ac_ct_OBJC+set}" = set; then : 8.1447 $as_echo_n "(cached) " >&6 8.1448 else 8.1449 if test -n "$ac_ct_OBJC"; then 8.1450 @@ -20831,7 +20965,7 @@ 8.1451 8.1452 { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are using the GNU Objective C compiler" >&5 8.1453 $as_echo_n "checking whether we are using the GNU Objective C compiler... " >&6; } 8.1454 -if ${ac_cv_objc_compiler_gnu+:} false; then : 8.1455 +if test "${ac_cv_objc_compiler_gnu+set}" = set; then : 8.1456 $as_echo_n "(cached) " >&6 8.1457 else 8.1458 cat confdefs.h - <<_ACEOF >conftest.$ac_ext 8.1459 @@ -20868,7 +21002,7 @@ 8.1460 ac_save_OBJCFLAGS=$OBJCFLAGS 8.1461 { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $OBJC accepts -g" >&5 8.1462 $as_echo_n "checking whether $OBJC accepts -g... " >&6; } 8.1463 -if ${ac_cv_prog_objc_g+:} false; then : 8.1464 +if test "${ac_cv_prog_objc_g+set}" = set; then : 8.1465 $as_echo_n "(cached) " >&6 8.1466 else 8.1467 ac_save_objc_werror_flag=$ac_objc_werror_flag 8.1468 @@ -21244,7 +21378,7 @@ 8.1469 set dummy ${ac_tool_prefix}ar; ac_word=$2 8.1470 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 8.1471 $as_echo_n "checking for $ac_word... " >&6; } 8.1472 -if ${ac_cv_prog_AR+:} false; then : 8.1473 +if test "${ac_cv_prog_AR+set}" = set; then : 8.1474 $as_echo_n "(cached) " >&6 8.1475 else 8.1476 if test -n "$AR"; then 8.1477 @@ -21284,7 +21418,7 @@ 8.1478 set dummy ar; ac_word=$2 8.1479 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 8.1480 $as_echo_n "checking for $ac_word... " >&6; } 8.1481 -if ${ac_cv_prog_ac_ct_AR+:} false; then : 8.1482 +if test "${ac_cv_prog_ac_ct_AR+set}" = set; then : 8.1483 $as_echo_n "(cached) " >&6 8.1484 else 8.1485 if test -n "$ac_ct_AR"; then 8.1486 @@ -21626,7 +21760,7 @@ 8.1487 set dummy link; ac_word=$2 8.1488 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 8.1489 $as_echo_n "checking for $ac_word... " >&6; } 8.1490 -if ${ac_cv_prog_WINLD+:} false; then : 8.1491 +if test "${ac_cv_prog_WINLD+set}" = set; then : 8.1492 $as_echo_n "(cached) " >&6 8.1493 else 8.1494 if test -n "$WINLD"; then 8.1495 @@ -21965,7 +22099,7 @@ 8.1496 set dummy mt; ac_word=$2 8.1497 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 8.1498 $as_echo_n "checking for $ac_word... " >&6; } 8.1499 -if ${ac_cv_prog_MT+:} false; then : 8.1500 +if test "${ac_cv_prog_MT+set}" = set; then : 8.1501 $as_echo_n "(cached) " >&6 8.1502 else 8.1503 if test -n "$MT"; then 8.1504 @@ -22286,7 +22420,7 @@ 8.1505 set dummy rc; ac_word=$2 8.1506 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 8.1507 $as_echo_n "checking for $ac_word... " >&6; } 8.1508 -if ${ac_cv_prog_RC+:} false; then : 8.1509 +if test "${ac_cv_prog_RC+set}" = set; then : 8.1510 $as_echo_n "(cached) " >&6 8.1511 else 8.1512 if test -n "$RC"; then 8.1513 @@ -22677,7 +22811,7 @@ 8.1514 set dummy lib; ac_word=$2 8.1515 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 8.1516 $as_echo_n "checking for $ac_word... " >&6; } 8.1517 -if ${ac_cv_prog_WINAR+:} false; then : 8.1518 +if test "${ac_cv_prog_WINAR+set}" = set; then : 8.1519 $as_echo_n "(cached) " >&6 8.1520 else 8.1521 if test -n "$WINAR"; then 8.1522 @@ -22983,7 +23117,7 @@ 8.1523 set dummy dumpbin; ac_word=$2 8.1524 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 8.1525 $as_echo_n "checking for $ac_word... " >&6; } 8.1526 -if ${ac_cv_prog_DUMPBIN+:} false; then : 8.1527 +if test "${ac_cv_prog_DUMPBIN+set}" = set; then : 8.1528 $as_echo_n "(cached) " >&6 8.1529 else 8.1530 if test -n "$DUMPBIN"; then 8.1531 @@ -23302,7 +23436,7 @@ 8.1532 CPP= 8.1533 fi 8.1534 if test -z "$CPP"; then 8.1535 - if ${ac_cv_prog_CPP+:} false; then : 8.1536 + if test "${ac_cv_prog_CPP+set}" = set; then : 8.1537 $as_echo_n "(cached) " >&6 8.1538 else 8.1539 # Double quotes because CPP needs to be expanded 8.1540 @@ -23418,7 +23552,7 @@ 8.1541 { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 8.1542 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} 8.1543 as_fn_error $? "C preprocessor \"$CPP\" fails sanity check 8.1544 -See \`config.log' for more details" "$LINENO" 5; } 8.1545 +See \`config.log' for more details" "$LINENO" 5 ; } 8.1546 fi 8.1547 8.1548 ac_ext=cpp 8.1549 @@ -23702,7 +23836,7 @@ 8.1550 { $as_echo "$as_me:${as_lineno-$LINENO}: checking how to run the C++ preprocessor" >&5 8.1551 $as_echo_n "checking how to run the C++ preprocessor... " >&6; } 8.1552 if test -z "$CXXCPP"; then 8.1553 - if ${ac_cv_prog_CXXCPP+:} false; then : 8.1554 + if test "${ac_cv_prog_CXXCPP+set}" = set; then : 8.1555 $as_echo_n "(cached) " >&6 8.1556 else 8.1557 # Double quotes because CXXCPP needs to be expanded 8.1558 @@ -23818,7 +23952,7 @@ 8.1559 { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 8.1560 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} 8.1561 as_fn_error $? "C++ preprocessor \"$CXXCPP\" fails sanity check 8.1562 -See \`config.log' for more details" "$LINENO" 5; } 8.1563 +See \`config.log' for more details" "$LINENO" 5 ; } 8.1564 fi 8.1565 8.1566 ac_ext=cpp 8.1567 @@ -24120,7 +24254,7 @@ 8.1568 set dummy as; ac_word=$2 8.1569 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 8.1570 $as_echo_n "checking for $ac_word... " >&6; } 8.1571 -if ${ac_cv_path_AS+:} false; then : 8.1572 +if test "${ac_cv_path_AS+set}" = set; then : 8.1573 $as_echo_n "(cached) " >&6 8.1574 else 8.1575 case $AS in 8.1576 @@ -24434,7 +24568,7 @@ 8.1577 set dummy $ac_prog; ac_word=$2 8.1578 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 8.1579 $as_echo_n "checking for $ac_word... " >&6; } 8.1580 -if ${ac_cv_path_NM+:} false; then : 8.1581 +if test "${ac_cv_path_NM+set}" = set; then : 8.1582 $as_echo_n "(cached) " >&6 8.1583 else 8.1584 case $NM in 8.1585 @@ -24743,7 +24877,7 @@ 8.1586 set dummy strip; ac_word=$2 8.1587 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 8.1588 $as_echo_n "checking for $ac_word... " >&6; } 8.1589 -if ${ac_cv_path_STRIP+:} false; then : 8.1590 +if test "${ac_cv_path_STRIP+set}" = set; then : 8.1591 $as_echo_n "(cached) " >&6 8.1592 else 8.1593 case $STRIP in 8.1594 @@ -25049,7 +25183,7 @@ 8.1595 set dummy mcs; ac_word=$2 8.1596 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 8.1597 $as_echo_n "checking for $ac_word... " >&6; } 8.1598 -if ${ac_cv_path_MCS+:} false; then : 8.1599 +if test "${ac_cv_path_MCS+set}" = set; then : 8.1600 $as_echo_n "(cached) " >&6 8.1601 else 8.1602 case $MCS in 8.1603 @@ -25357,7 +25491,7 @@ 8.1604 set dummy ${ac_tool_prefix}nm; ac_word=$2 8.1605 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 8.1606 $as_echo_n "checking for $ac_word... " >&6; } 8.1607 -if ${ac_cv_prog_NM+:} false; then : 8.1608 +if test "${ac_cv_prog_NM+set}" = set; then : 8.1609 $as_echo_n "(cached) " >&6 8.1610 else 8.1611 if test -n "$NM"; then 8.1612 @@ -25397,7 +25531,7 @@ 8.1613 set dummy nm; ac_word=$2 8.1614 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 8.1615 $as_echo_n "checking for $ac_word... " >&6; } 8.1616 -if ${ac_cv_prog_ac_ct_NM+:} false; then : 8.1617 +if test "${ac_cv_prog_ac_ct_NM+set}" = set; then : 8.1618 $as_echo_n "(cached) " >&6 8.1619 else 8.1620 if test -n "$ac_ct_NM"; then 8.1621 @@ -25715,7 +25849,7 @@ 8.1622 set dummy ${ac_tool_prefix}strip; ac_word=$2 8.1623 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 8.1624 $as_echo_n "checking for $ac_word... " >&6; } 8.1625 -if ${ac_cv_prog_STRIP+:} false; then : 8.1626 +if test "${ac_cv_prog_STRIP+set}" = set; then : 8.1627 $as_echo_n "(cached) " >&6 8.1628 else 8.1629 if test -n "$STRIP"; then 8.1630 @@ -25755,7 +25889,7 @@ 8.1631 set dummy strip; ac_word=$2 8.1632 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 8.1633 $as_echo_n "checking for $ac_word... " >&6; } 8.1634 -if ${ac_cv_prog_ac_ct_STRIP+:} false; then : 8.1635 +if test "${ac_cv_prog_ac_ct_STRIP+set}" = set; then : 8.1636 $as_echo_n "(cached) " >&6 8.1637 else 8.1638 if test -n "$ac_ct_STRIP"; then 8.1639 @@ -26080,7 +26214,7 @@ 8.1640 set dummy $ac_tool_prefix$ac_prog; ac_word=$2 8.1641 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 8.1642 $as_echo_n "checking for $ac_word... " >&6; } 8.1643 -if ${ac_cv_prog_OBJCOPY+:} false; then : 8.1644 +if test "${ac_cv_prog_OBJCOPY+set}" = set; then : 8.1645 $as_echo_n "(cached) " >&6 8.1646 else 8.1647 if test -n "$OBJCOPY"; then 8.1648 @@ -26124,7 +26258,7 @@ 8.1649 set dummy $ac_prog; ac_word=$2 8.1650 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 8.1651 $as_echo_n "checking for $ac_word... " >&6; } 8.1652 -if ${ac_cv_prog_ac_ct_OBJCOPY+:} false; then : 8.1653 +if test "${ac_cv_prog_ac_ct_OBJCOPY+set}" = set; then : 8.1654 $as_echo_n "(cached) " >&6 8.1655 else 8.1656 if test -n "$ac_ct_OBJCOPY"; then 8.1657 @@ -26451,7 +26585,7 @@ 8.1658 set dummy $ac_tool_prefix$ac_prog; ac_word=$2 8.1659 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 8.1660 $as_echo_n "checking for $ac_word... " >&6; } 8.1661 -if ${ac_cv_prog_OBJDUMP+:} false; then : 8.1662 +if test "${ac_cv_prog_OBJDUMP+set}" = set; then : 8.1663 $as_echo_n "(cached) " >&6 8.1664 else 8.1665 if test -n "$OBJDUMP"; then 8.1666 @@ -26495,7 +26629,7 @@ 8.1667 set dummy $ac_prog; ac_word=$2 8.1668 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 8.1669 $as_echo_n "checking for $ac_word... " >&6; } 8.1670 -if ${ac_cv_prog_ac_ct_OBJDUMP+:} false; then : 8.1671 +if test "${ac_cv_prog_ac_ct_OBJDUMP+set}" = set; then : 8.1672 $as_echo_n "(cached) " >&6 8.1673 else 8.1674 if test -n "$ac_ct_OBJDUMP"; then 8.1675 @@ -26819,7 +26953,7 @@ 8.1676 set dummy lipo; ac_word=$2 8.1677 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 8.1678 $as_echo_n "checking for $ac_word... " >&6; } 8.1679 -if ${ac_cv_path_LIPO+:} false; then : 8.1680 +if test "${ac_cv_path_LIPO+set}" = set; then : 8.1681 $as_echo_n "(cached) " >&6 8.1682 else 8.1683 case $LIPO in 8.1684 @@ -27134,7 +27268,7 @@ 8.1685 8.1686 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ANSI C header files" >&5 8.1687 $as_echo_n "checking for ANSI C header files... " >&6; } 8.1688 -if ${ac_cv_header_stdc+:} false; then : 8.1689 +if test "${ac_cv_header_stdc+set}" = set; then : 8.1690 $as_echo_n "(cached) " >&6 8.1691 else 8.1692 cat confdefs.h - <<_ACEOF >conftest.$ac_ext 8.1693 @@ -27310,7 +27444,7 @@ 8.1694 for ac_header in stdio.h 8.1695 do : 8.1696 ac_fn_cxx_check_header_mongrel "$LINENO" "stdio.h" "ac_cv_header_stdio_h" "$ac_includes_default" 8.1697 -if test "x$ac_cv_header_stdio_h" = xyes; then : 8.1698 +if test "x$ac_cv_header_stdio_h" = x""yes; then : 8.1699 cat >>confdefs.h <<_ACEOF 8.1700 #define HAVE_STDIO_H 1 8.1701 _ACEOF 8.1702 @@ -27339,7 +27473,7 @@ 8.1703 # This bug is HP SR number 8606223364. 8.1704 { $as_echo "$as_me:${as_lineno-$LINENO}: checking size of int *" >&5 8.1705 $as_echo_n "checking size of int *... " >&6; } 8.1706 -if ${ac_cv_sizeof_int_p+:} false; then : 8.1707 +if test "${ac_cv_sizeof_int_p+set}" = set; then : 8.1708 $as_echo_n "(cached) " >&6 8.1709 else 8.1710 if ac_fn_cxx_compute_int "$LINENO" "(long int) (sizeof (int *))" "ac_cv_sizeof_int_p" "$ac_includes_default"; then : 8.1711 @@ -27349,7 +27483,7 @@ 8.1712 { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 8.1713 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} 8.1714 as_fn_error 77 "cannot compute sizeof (int *) 8.1715 -See \`config.log' for more details" "$LINENO" 5; } 8.1716 +See \`config.log' for more details" "$LINENO" 5 ; } 8.1717 else 8.1718 ac_cv_sizeof_int_p=0 8.1719 fi 8.1720 @@ -27396,7 +27530,7 @@ 8.1721 # 8.1722 { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether byte ordering is bigendian" >&5 8.1723 $as_echo_n "checking whether byte ordering is bigendian... " >&6; } 8.1724 -if ${ac_cv_c_bigendian+:} false; then : 8.1725 +if test "${ac_cv_c_bigendian+set}" = set; then : 8.1726 $as_echo_n "(cached) " >&6 8.1727 else 8.1728 ac_cv_c_bigendian=unknown 8.1729 @@ -28396,8 +28530,8 @@ 8.1730 have_x=disabled 8.1731 else 8.1732 case $x_includes,$x_libraries in #( 8.1733 - *\'*) as_fn_error $? "cannot use X directory names containing '" "$LINENO" 5;; #( 8.1734 - *,NONE | NONE,*) if ${ac_cv_have_x+:} false; then : 8.1735 + *\'*) as_fn_error $? "cannot use X directory names containing '" "$LINENO" 5 ;; #( 8.1736 + *,NONE | NONE,*) if test "${ac_cv_have_x+set}" = set; then : 8.1737 $as_echo_n "(cached) " >&6 8.1738 else 8.1739 # One or both of the vars are not set, and there is no cached value. 8.1740 @@ -28674,7 +28808,7 @@ 8.1741 else 8.1742 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dnet_ntoa in -ldnet" >&5 8.1743 $as_echo_n "checking for dnet_ntoa in -ldnet... " >&6; } 8.1744 -if ${ac_cv_lib_dnet_dnet_ntoa+:} false; then : 8.1745 +if test "${ac_cv_lib_dnet_dnet_ntoa+set}" = set; then : 8.1746 $as_echo_n "(cached) " >&6 8.1747 else 8.1748 ac_check_lib_save_LIBS=$LIBS 8.1749 @@ -28708,14 +28842,14 @@ 8.1750 fi 8.1751 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dnet_dnet_ntoa" >&5 8.1752 $as_echo "$ac_cv_lib_dnet_dnet_ntoa" >&6; } 8.1753 -if test "x$ac_cv_lib_dnet_dnet_ntoa" = xyes; then : 8.1754 +if test "x$ac_cv_lib_dnet_dnet_ntoa" = x""yes; then : 8.1755 X_EXTRA_LIBS="$X_EXTRA_LIBS -ldnet" 8.1756 fi 8.1757 8.1758 if test $ac_cv_lib_dnet_dnet_ntoa = no; then 8.1759 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dnet_ntoa in -ldnet_stub" >&5 8.1760 $as_echo_n "checking for dnet_ntoa in -ldnet_stub... " >&6; } 8.1761 -if ${ac_cv_lib_dnet_stub_dnet_ntoa+:} false; then : 8.1762 +if test "${ac_cv_lib_dnet_stub_dnet_ntoa+set}" = set; then : 8.1763 $as_echo_n "(cached) " >&6 8.1764 else 8.1765 ac_check_lib_save_LIBS=$LIBS 8.1766 @@ -28749,7 +28883,7 @@ 8.1767 fi 8.1768 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dnet_stub_dnet_ntoa" >&5 8.1769 $as_echo "$ac_cv_lib_dnet_stub_dnet_ntoa" >&6; } 8.1770 -if test "x$ac_cv_lib_dnet_stub_dnet_ntoa" = xyes; then : 8.1771 +if test "x$ac_cv_lib_dnet_stub_dnet_ntoa" = x""yes; then : 8.1772 X_EXTRA_LIBS="$X_EXTRA_LIBS -ldnet_stub" 8.1773 fi 8.1774 8.1775 @@ -28768,14 +28902,14 @@ 8.1776 # The functions gethostbyname, getservbyname, and inet_addr are 8.1777 # in -lbsd on LynxOS 3.0.1/i386, according to Lars Hecking. 8.1778 ac_fn_cxx_check_func "$LINENO" "gethostbyname" "ac_cv_func_gethostbyname" 8.1779 -if test "x$ac_cv_func_gethostbyname" = xyes; then : 8.1780 +if test "x$ac_cv_func_gethostbyname" = x""yes; then : 8.1781 8.1782 fi 8.1783 8.1784 if test $ac_cv_func_gethostbyname = no; then 8.1785 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for gethostbyname in -lnsl" >&5 8.1786 $as_echo_n "checking for gethostbyname in -lnsl... " >&6; } 8.1787 -if ${ac_cv_lib_nsl_gethostbyname+:} false; then : 8.1788 +if test "${ac_cv_lib_nsl_gethostbyname+set}" = set; then : 8.1789 $as_echo_n "(cached) " >&6 8.1790 else 8.1791 ac_check_lib_save_LIBS=$LIBS 8.1792 @@ -28809,14 +28943,14 @@ 8.1793 fi 8.1794 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_nsl_gethostbyname" >&5 8.1795 $as_echo "$ac_cv_lib_nsl_gethostbyname" >&6; } 8.1796 -if test "x$ac_cv_lib_nsl_gethostbyname" = xyes; then : 8.1797 +if test "x$ac_cv_lib_nsl_gethostbyname" = x""yes; then : 8.1798 X_EXTRA_LIBS="$X_EXTRA_LIBS -lnsl" 8.1799 fi 8.1800 8.1801 if test $ac_cv_lib_nsl_gethostbyname = no; then 8.1802 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for gethostbyname in -lbsd" >&5 8.1803 $as_echo_n "checking for gethostbyname in -lbsd... " >&6; } 8.1804 -if ${ac_cv_lib_bsd_gethostbyname+:} false; then : 8.1805 +if test "${ac_cv_lib_bsd_gethostbyname+set}" = set; then : 8.1806 $as_echo_n "(cached) " >&6 8.1807 else 8.1808 ac_check_lib_save_LIBS=$LIBS 8.1809 @@ -28850,7 +28984,7 @@ 8.1810 fi 8.1811 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_bsd_gethostbyname" >&5 8.1812 $as_echo "$ac_cv_lib_bsd_gethostbyname" >&6; } 8.1813 -if test "x$ac_cv_lib_bsd_gethostbyname" = xyes; then : 8.1814 +if test "x$ac_cv_lib_bsd_gethostbyname" = x""yes; then : 8.1815 X_EXTRA_LIBS="$X_EXTRA_LIBS -lbsd" 8.1816 fi 8.1817 8.1818 @@ -28865,14 +28999,14 @@ 8.1819 # must be given before -lnsl if both are needed. We assume that 8.1820 # if connect needs -lnsl, so does gethostbyname. 8.1821 ac_fn_cxx_check_func "$LINENO" "connect" "ac_cv_func_connect" 8.1822 -if test "x$ac_cv_func_connect" = xyes; then : 8.1823 +if test "x$ac_cv_func_connect" = x""yes; then : 8.1824 8.1825 fi 8.1826 8.1827 if test $ac_cv_func_connect = no; then 8.1828 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for connect in -lsocket" >&5 8.1829 $as_echo_n "checking for connect in -lsocket... " >&6; } 8.1830 -if ${ac_cv_lib_socket_connect+:} false; then : 8.1831 +if test "${ac_cv_lib_socket_connect+set}" = set; then : 8.1832 $as_echo_n "(cached) " >&6 8.1833 else 8.1834 ac_check_lib_save_LIBS=$LIBS 8.1835 @@ -28906,7 +29040,7 @@ 8.1836 fi 8.1837 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_socket_connect" >&5 8.1838 $as_echo "$ac_cv_lib_socket_connect" >&6; } 8.1839 -if test "x$ac_cv_lib_socket_connect" = xyes; then : 8.1840 +if test "x$ac_cv_lib_socket_connect" = x""yes; then : 8.1841 X_EXTRA_LIBS="-lsocket $X_EXTRA_LIBS" 8.1842 fi 8.1843 8.1844 @@ -28914,14 +29048,14 @@ 8.1845 8.1846 # Guillermo Gomez says -lposix is necessary on A/UX. 8.1847 ac_fn_cxx_check_func "$LINENO" "remove" "ac_cv_func_remove" 8.1848 -if test "x$ac_cv_func_remove" = xyes; then : 8.1849 +if test "x$ac_cv_func_remove" = x""yes; then : 8.1850 8.1851 fi 8.1852 8.1853 if test $ac_cv_func_remove = no; then 8.1854 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for remove in -lposix" >&5 8.1855 $as_echo_n "checking for remove in -lposix... " >&6; } 8.1856 -if ${ac_cv_lib_posix_remove+:} false; then : 8.1857 +if test "${ac_cv_lib_posix_remove+set}" = set; then : 8.1858 $as_echo_n "(cached) " >&6 8.1859 else 8.1860 ac_check_lib_save_LIBS=$LIBS 8.1861 @@ -28955,7 +29089,7 @@ 8.1862 fi 8.1863 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_posix_remove" >&5 8.1864 $as_echo "$ac_cv_lib_posix_remove" >&6; } 8.1865 -if test "x$ac_cv_lib_posix_remove" = xyes; then : 8.1866 +if test "x$ac_cv_lib_posix_remove" = x""yes; then : 8.1867 X_EXTRA_LIBS="$X_EXTRA_LIBS -lposix" 8.1868 fi 8.1869 8.1870 @@ -28963,14 +29097,14 @@ 8.1871 8.1872 # BSDI BSD/OS 2.1 needs -lipc for XOpenDisplay. 8.1873 ac_fn_cxx_check_func "$LINENO" "shmat" "ac_cv_func_shmat" 8.1874 -if test "x$ac_cv_func_shmat" = xyes; then : 8.1875 +if test "x$ac_cv_func_shmat" = x""yes; then : 8.1876 8.1877 fi 8.1878 8.1879 if test $ac_cv_func_shmat = no; then 8.1880 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for shmat in -lipc" >&5 8.1881 $as_echo_n "checking for shmat in -lipc... " >&6; } 8.1882 -if ${ac_cv_lib_ipc_shmat+:} false; then : 8.1883 +if test "${ac_cv_lib_ipc_shmat+set}" = set; then : 8.1884 $as_echo_n "(cached) " >&6 8.1885 else 8.1886 ac_check_lib_save_LIBS=$LIBS 8.1887 @@ -29004,7 +29138,7 @@ 8.1888 fi 8.1889 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_ipc_shmat" >&5 8.1890 $as_echo "$ac_cv_lib_ipc_shmat" >&6; } 8.1891 -if test "x$ac_cv_lib_ipc_shmat" = xyes; then : 8.1892 +if test "x$ac_cv_lib_ipc_shmat" = x""yes; then : 8.1893 X_EXTRA_LIBS="$X_EXTRA_LIBS -lipc" 8.1894 fi 8.1895 8.1896 @@ -29022,7 +29156,7 @@ 8.1897 # John Interrante, Karl Berry 8.1898 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for IceConnectionNumber in -lICE" >&5 8.1899 $as_echo_n "checking for IceConnectionNumber in -lICE... " >&6; } 8.1900 -if ${ac_cv_lib_ICE_IceConnectionNumber+:} false; then : 8.1901 +if test "${ac_cv_lib_ICE_IceConnectionNumber+set}" = set; then : 8.1902 $as_echo_n "(cached) " >&6 8.1903 else 8.1904 ac_check_lib_save_LIBS=$LIBS 8.1905 @@ -29056,7 +29190,7 @@ 8.1906 fi 8.1907 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_ICE_IceConnectionNumber" >&5 8.1908 $as_echo "$ac_cv_lib_ICE_IceConnectionNumber" >&6; } 8.1909 -if test "x$ac_cv_lib_ICE_IceConnectionNumber" = xyes; then : 8.1910 +if test "x$ac_cv_lib_ICE_IceConnectionNumber" = x""yes; then : 8.1911 X_PRE_LIBS="$X_PRE_LIBS -lSM -lICE" 8.1912 fi 8.1913 8.1914 @@ -30063,7 +30197,7 @@ 8.1915 LDFLAGS="$FREETYPE2_LIBS" 8.1916 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for FT_Init_FreeType in -lfreetype" >&5 8.1917 $as_echo_n "checking for FT_Init_FreeType in -lfreetype... " >&6; } 8.1918 -if ${ac_cv_lib_freetype_FT_Init_FreeType+:} false; then : 8.1919 +if test "${ac_cv_lib_freetype_FT_Init_FreeType+set}" = set; then : 8.1920 $as_echo_n "(cached) " >&6 8.1921 else 8.1922 ac_check_lib_save_LIBS=$LIBS 8.1923 @@ -30097,7 +30231,7 @@ 8.1924 fi 8.1925 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_freetype_FT_Init_FreeType" >&5 8.1926 $as_echo "$ac_cv_lib_freetype_FT_Init_FreeType" >&6; } 8.1927 -if test "x$ac_cv_lib_freetype_FT_Init_FreeType" = xyes; then : 8.1928 +if test "x$ac_cv_lib_freetype_FT_Init_FreeType" = x""yes; then : 8.1929 FREETYPE2_FOUND=true 8.1930 else 8.1931 as_fn_error $? "Could not find freetype2! $HELP_MSG " "$LINENO" 5 8.1932 @@ -30385,7 +30519,7 @@ 8.1933 for ac_header in alsa/asoundlib.h 8.1934 do : 8.1935 ac_fn_cxx_check_header_mongrel "$LINENO" "alsa/asoundlib.h" "ac_cv_header_alsa_asoundlib_h" "$ac_includes_default" 8.1936 -if test "x$ac_cv_header_alsa_asoundlib_h" = xyes; then : 8.1937 +if test "x$ac_cv_header_alsa_asoundlib_h" = x""yes; then : 8.1938 cat >>confdefs.h <<_ACEOF 8.1939 #define HAVE_ALSA_ASOUNDLIB_H 1 8.1940 _ACEOF 8.1941 @@ -30444,7 +30578,7 @@ 8.1942 USE_EXTERNAL_LIBJPEG=true 8.1943 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for main in -ljpeg" >&5 8.1944 $as_echo_n "checking for main in -ljpeg... " >&6; } 8.1945 -if ${ac_cv_lib_jpeg_main+:} false; then : 8.1946 +if test "${ac_cv_lib_jpeg_main+set}" = set; then : 8.1947 $as_echo_n "(cached) " >&6 8.1948 else 8.1949 ac_check_lib_save_LIBS=$LIBS 8.1950 @@ -30472,7 +30606,7 @@ 8.1951 fi 8.1952 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_jpeg_main" >&5 8.1953 $as_echo "$ac_cv_lib_jpeg_main" >&6; } 8.1954 -if test "x$ac_cv_lib_jpeg_main" = xyes; then : 8.1955 +if test "x$ac_cv_lib_jpeg_main" = x""yes; then : 8.1956 cat >>confdefs.h <<_ACEOF 8.1957 #define HAVE_LIBJPEG 1 8.1958 _ACEOF 8.1959 @@ -30496,7 +30630,7 @@ 8.1960 USE_EXTERNAL_LIBJPEG=true 8.1961 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for main in -lgif" >&5 8.1962 $as_echo_n "checking for main in -lgif... " >&6; } 8.1963 -if ${ac_cv_lib_gif_main+:} false; then : 8.1964 +if test "${ac_cv_lib_gif_main+set}" = set; then : 8.1965 $as_echo_n "(cached) " >&6 8.1966 else 8.1967 ac_check_lib_save_LIBS=$LIBS 8.1968 @@ -30524,7 +30658,7 @@ 8.1969 fi 8.1970 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_gif_main" >&5 8.1971 $as_echo "$ac_cv_lib_gif_main" >&6; } 8.1972 -if test "x$ac_cv_lib_gif_main" = xyes; then : 8.1973 +if test "x$ac_cv_lib_gif_main" = x""yes; then : 8.1974 cat >>confdefs.h <<_ACEOF 8.1975 #define HAVE_LIBGIF 1 8.1976 _ACEOF 8.1977 @@ -30554,7 +30688,7 @@ 8.1978 8.1979 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for compress in -lz" >&5 8.1980 $as_echo_n "checking for compress in -lz... " >&6; } 8.1981 -if ${ac_cv_lib_z_compress+:} false; then : 8.1982 +if test "${ac_cv_lib_z_compress+set}" = set; then : 8.1983 $as_echo_n "(cached) " >&6 8.1984 else 8.1985 ac_check_lib_save_LIBS=$LIBS 8.1986 @@ -30588,7 +30722,7 @@ 8.1987 fi 8.1988 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_z_compress" >&5 8.1989 $as_echo "$ac_cv_lib_z_compress" >&6; } 8.1990 -if test "x$ac_cv_lib_z_compress" = xyes; then : 8.1991 +if test "x$ac_cv_lib_z_compress" = x""yes; then : 8.1992 ZLIB_FOUND=yes 8.1993 else 8.1994 ZLIB_FOUND=no 8.1995 @@ -30681,7 +30815,7 @@ 8.1996 8.1997 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for cos in -lm" >&5 8.1998 $as_echo_n "checking for cos in -lm... " >&6; } 8.1999 -if ${ac_cv_lib_m_cos+:} false; then : 8.2000 +if test "${ac_cv_lib_m_cos+set}" = set; then : 8.2001 $as_echo_n "(cached) " >&6 8.2002 else 8.2003 ac_check_lib_save_LIBS=$LIBS 8.2004 @@ -30715,7 +30849,7 @@ 8.2005 fi 8.2006 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_m_cos" >&5 8.2007 $as_echo "$ac_cv_lib_m_cos" >&6; } 8.2008 -if test "x$ac_cv_lib_m_cos" = xyes; then : 8.2009 +if test "x$ac_cv_lib_m_cos" = x""yes; then : 8.2010 cat >>confdefs.h <<_ACEOF 8.2011 #define HAVE_LIBM 1 8.2012 _ACEOF 8.2013 @@ -30739,7 +30873,7 @@ 8.2014 LIBS="" 8.2015 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dlopen in -ldl" >&5 8.2016 $as_echo_n "checking for dlopen in -ldl... " >&6; } 8.2017 -if ${ac_cv_lib_dl_dlopen+:} false; then : 8.2018 +if test "${ac_cv_lib_dl_dlopen+set}" = set; then : 8.2019 $as_echo_n "(cached) " >&6 8.2020 else 8.2021 ac_check_lib_save_LIBS=$LIBS 8.2022 @@ -30773,7 +30907,7 @@ 8.2023 fi 8.2024 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dl_dlopen" >&5 8.2025 $as_echo "$ac_cv_lib_dl_dlopen" >&6; } 8.2026 -if test "x$ac_cv_lib_dl_dlopen" = xyes; then : 8.2027 +if test "x$ac_cv_lib_dl_dlopen" = x""yes; then : 8.2028 cat >>confdefs.h <<_ACEOF 8.2029 #define HAVE_LIBDL 1 8.2030 _ACEOF 8.2031 @@ -31417,7 +31551,7 @@ 8.2032 set dummy ccache; ac_word=$2 8.2033 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 8.2034 $as_echo_n "checking for $ac_word... " >&6; } 8.2035 -if ${ac_cv_path_CCACHE+:} false; then : 8.2036 +if test "${ac_cv_path_CCACHE+set}" = set; then : 8.2037 $as_echo_n "(cached) " >&6 8.2038 else 8.2039 case $CCACHE in 8.2040 @@ -31546,6 +31680,14 @@ 8.2041 8.2042 # Check for some common pitfalls 8.2043 8.2044 + if test x"$OPENJDK_BUILD_OS" = xwindows; then 8.2045 + file_to_test="$SRC_ROOT/LICENSE" 8.2046 + if test `$STAT -c '%a' "$file_to_test"` -lt 400; then 8.2047 + as_fn_error $? "Bad file permissions on src files. This is usually caused by cloning the repositories with a non cygwin hg in a directory not created in cygwin." "$LINENO" 5 8.2048 + fi 8.2049 + fi 8.2050 + 8.2051 + 8.2052 8.2053 { $as_echo "$as_me:${as_lineno-$LINENO}: checking if build directory is on local disk" >&5 8.2054 $as_echo_n "checking if build directory is on local disk... " >&6; } 8.2055 @@ -31576,6 +31718,8 @@ 8.2056 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $OUTPUT_DIR_IS_LOCAL" >&5 8.2057 $as_echo "$OUTPUT_DIR_IS_LOCAL" >&6; } 8.2058 8.2059 + 8.2060 + 8.2061 # Check if the user has any old-style ALT_ variables set. 8.2062 FOUND_ALT_VARIABLES=`env | grep ^ALT_` 8.2063 8.2064 @@ -31668,21 +31812,10 @@ 8.2065 :end' >>confcache 8.2066 if diff "$cache_file" confcache >/dev/null 2>&1; then :; else 8.2067 if test -w "$cache_file"; then 8.2068 - if test "x$cache_file" != "x/dev/null"; then 8.2069 + test "x$cache_file" != "x/dev/null" && 8.2070 { $as_echo "$as_me:${as_lineno-$LINENO}: updating cache $cache_file" >&5 8.2071 $as_echo "$as_me: updating cache $cache_file" >&6;} 8.2072 - if test ! -f "$cache_file" || test -h "$cache_file"; then 8.2073 - cat confcache >"$cache_file" 8.2074 - else 8.2075 - case $cache_file in #( 8.2076 - */* | ?:*) 8.2077 - mv -f confcache "$cache_file"$$ && 8.2078 - mv -f "$cache_file"$$ "$cache_file" ;; #( 8.2079 - *) 8.2080 - mv -f confcache "$cache_file" ;; 8.2081 - esac 8.2082 - fi 8.2083 - fi 8.2084 + cat confcache >$cache_file 8.2085 else 8.2086 { $as_echo "$as_me:${as_lineno-$LINENO}: not updating unwritable cache $cache_file" >&5 8.2087 $as_echo "$as_me: not updating unwritable cache $cache_file" >&6;} 8.2088 @@ -31714,7 +31847,7 @@ 8.2089 8.2090 8.2091 8.2092 -: "${CONFIG_STATUS=./config.status}" 8.2093 +: ${CONFIG_STATUS=./config.status} 8.2094 ac_write_fail=0 8.2095 ac_clean_files_save=$ac_clean_files 8.2096 ac_clean_files="$ac_clean_files $CONFIG_STATUS" 8.2097 @@ -31815,7 +31948,6 @@ 8.2098 IFS=" "" $as_nl" 8.2099 8.2100 # Find who we are. Look in the path if we contain no directory separator. 8.2101 -as_myself= 8.2102 case $0 in #(( 8.2103 *[\\/]* ) as_myself=$0 ;; 8.2104 *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR 8.2105 @@ -32123,7 +32255,7 @@ 8.2106 # values after options handling. 8.2107 ac_log=" 8.2108 This file was extended by OpenJDK $as_me jdk8, which was 8.2109 -generated by GNU Autoconf 2.68. Invocation command line was 8.2110 +generated by GNU Autoconf 2.67. Invocation command line was 8.2111 8.2112 CONFIG_FILES = $CONFIG_FILES 8.2113 CONFIG_HEADERS = $CONFIG_HEADERS 8.2114 @@ -32186,7 +32318,7 @@ 8.2115 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" 8.2116 ac_cs_version="\\ 8.2117 OpenJDK config.status jdk8 8.2118 -configured by $0, generated by GNU Autoconf 2.68, 8.2119 +configured by $0, generated by GNU Autoconf 2.67, 8.2120 with options \\"\$ac_cs_config\\" 8.2121 8.2122 Copyright (C) 2010 Free Software Foundation, Inc. 8.2123 @@ -32315,7 +32447,7 @@ 8.2124 "$OUTPUT_ROOT/spec.sh") CONFIG_FILES="$CONFIG_FILES $OUTPUT_ROOT/spec.sh:$AUTOCONF_DIR/spec.sh.in" ;; 8.2125 "$OUTPUT_ROOT/Makefile") CONFIG_FILES="$CONFIG_FILES $OUTPUT_ROOT/Makefile:$AUTOCONF_DIR/Makefile.in" ;; 8.2126 8.2127 - *) as_fn_error $? "invalid argument: \`$ac_config_target'" "$LINENO" 5;; 8.2128 + *) as_fn_error $? "invalid argument: \`$ac_config_target'" "$LINENO" 5 ;; 8.2129 esac 8.2130 done 8.2131 8.2132 @@ -32337,10 +32469,9 @@ 8.2133 # after its creation but before its name has been assigned to `$tmp'. 8.2134 $debug || 8.2135 { 8.2136 - tmp= ac_tmp= 8.2137 + tmp= 8.2138 trap 'exit_status=$? 8.2139 - : "${ac_tmp:=$tmp}" 8.2140 - { test ! -d "$ac_tmp" || rm -fr "$ac_tmp"; } && exit $exit_status 8.2141 + { test -z "$tmp" || test ! -d "$tmp" || rm -fr "$tmp"; } && exit $exit_status 8.2142 ' 0 8.2143 trap 'as_fn_exit 1' 1 2 13 15 8.2144 } 8.2145 @@ -32348,13 +32479,12 @@ 8.2146 8.2147 { 8.2148 tmp=`(umask 077 && mktemp -d "./confXXXXXX") 2>/dev/null` && 8.2149 - test -d "$tmp" 8.2150 + test -n "$tmp" && test -d "$tmp" 8.2151 } || 8.2152 { 8.2153 tmp=./conf$$-$RANDOM 8.2154 (umask 077 && mkdir "$tmp") 8.2155 } || as_fn_error $? "cannot create a temporary directory in ." "$LINENO" 5 8.2156 -ac_tmp=$tmp 8.2157 8.2158 # Set up the scripts for CONFIG_FILES section. 8.2159 # No need to generate them if there are no CONFIG_FILES. 8.2160 @@ -32376,7 +32506,7 @@ 8.2161 ac_cs_awk_cr=$ac_cr 8.2162 fi 8.2163 8.2164 -echo 'BEGIN {' >"$ac_tmp/subs1.awk" && 8.2165 +echo 'BEGIN {' >"$tmp/subs1.awk" && 8.2166 _ACEOF 8.2167 8.2168 8.2169 @@ -32404,7 +32534,7 @@ 8.2170 rm -f conf$$subs.sh 8.2171 8.2172 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 8.2173 -cat >>"\$ac_tmp/subs1.awk" <<\\_ACAWK && 8.2174 +cat >>"\$tmp/subs1.awk" <<\\_ACAWK && 8.2175 _ACEOF 8.2176 sed -n ' 8.2177 h 8.2178 @@ -32452,7 +32582,7 @@ 8.2179 rm -f conf$$subs.awk 8.2180 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 8.2181 _ACAWK 8.2182 -cat >>"\$ac_tmp/subs1.awk" <<_ACAWK && 8.2183 +cat >>"\$tmp/subs1.awk" <<_ACAWK && 8.2184 for (key in S) S_is_set[key] = 1 8.2185 FS = "" 8.2186 8.2187 @@ -32484,7 +32614,7 @@ 8.2188 sed "s/$ac_cr\$//; s/$ac_cr/$ac_cs_awk_cr/g" 8.2189 else 8.2190 cat 8.2191 -fi < "$ac_tmp/subs1.awk" > "$ac_tmp/subs.awk" \ 8.2192 +fi < "$tmp/subs1.awk" > "$tmp/subs.awk" \ 8.2193 || as_fn_error $? "could not setup config files machinery" "$LINENO" 5 8.2194 _ACEOF 8.2195 8.2196 @@ -32518,7 +32648,7 @@ 8.2197 # No need to generate them if there are no CONFIG_HEADERS. 8.2198 # This happens for instance with `./config.status Makefile'. 8.2199 if test -n "$CONFIG_HEADERS"; then 8.2200 -cat >"$ac_tmp/defines.awk" <<\_ACAWK || 8.2201 +cat >"$tmp/defines.awk" <<\_ACAWK || 8.2202 BEGIN { 8.2203 _ACEOF 8.2204 8.2205 @@ -32530,8 +32660,8 @@ 8.2206 # handling of long lines. 8.2207 ac_delim='%!_!# ' 8.2208 for ac_last_try in false false :; do 8.2209 - ac_tt=`sed -n "/$ac_delim/p" confdefs.h` 8.2210 - if test -z "$ac_tt"; then 8.2211 + ac_t=`sed -n "/$ac_delim/p" confdefs.h` 8.2212 + if test -z "$ac_t"; then 8.2213 break 8.2214 elif $ac_last_try; then 8.2215 as_fn_error $? "could not make $CONFIG_HEADERS" "$LINENO" 5 8.2216 @@ -32632,7 +32762,7 @@ 8.2217 esac 8.2218 case $ac_mode$ac_tag in 8.2219 :[FHL]*:*);; 8.2220 - :L* | :C*:*) as_fn_error $? "invalid tag \`$ac_tag'" "$LINENO" 5;; 8.2221 + :L* | :C*:*) as_fn_error $? "invalid tag \`$ac_tag'" "$LINENO" 5 ;; 8.2222 :[FH]-) ac_tag=-:-;; 8.2223 :[FH]*) ac_tag=$ac_tag:$ac_tag.in;; 8.2224 esac 8.2225 @@ -32651,7 +32781,7 @@ 8.2226 for ac_f 8.2227 do 8.2228 case $ac_f in 8.2229 - -) ac_f="$ac_tmp/stdin";; 8.2230 + -) ac_f="$tmp/stdin";; 8.2231 *) # Look for the file first in the build tree, then in the source tree 8.2232 # (if the path is not absolute). The absolute path cannot be DOS-style, 8.2233 # because $ac_f cannot contain `:'. 8.2234 @@ -32660,7 +32790,7 @@ 8.2235 [\\/$]*) false;; 8.2236 *) test -f "$srcdir/$ac_f" && ac_f="$srcdir/$ac_f";; 8.2237 esac || 8.2238 - as_fn_error 1 "cannot find input file: \`$ac_f'" "$LINENO" 5;; 8.2239 + as_fn_error 1 "cannot find input file: \`$ac_f'" "$LINENO" 5 ;; 8.2240 esac 8.2241 case $ac_f in *\'*) ac_f=`$as_echo "$ac_f" | sed "s/'/'\\\\\\\\''/g"`;; esac 8.2242 as_fn_append ac_file_inputs " '$ac_f'" 8.2243 @@ -32686,8 +32816,8 @@ 8.2244 esac 8.2245 8.2246 case $ac_tag in 8.2247 - *:-:* | *:-) cat >"$ac_tmp/stdin" \ 8.2248 - || as_fn_error $? "could not create $ac_file" "$LINENO" 5 ;; 8.2249 + *:-:* | *:-) cat >"$tmp/stdin" \ 8.2250 + || as_fn_error $? "could not create $ac_file" "$LINENO" 5 ;; 8.2251 esac 8.2252 ;; 8.2253 esac 8.2254 @@ -32812,22 +32942,21 @@ 8.2255 s&@abs_top_builddir@&$ac_abs_top_builddir&;t t 8.2256 $ac_datarootdir_hack 8.2257 " 8.2258 -eval sed \"\$ac_sed_extra\" "$ac_file_inputs" | $AWK -f "$ac_tmp/subs.awk" \ 8.2259 - >$ac_tmp/out || as_fn_error $? "could not create $ac_file" "$LINENO" 5 8.2260 +eval sed \"\$ac_sed_extra\" "$ac_file_inputs" | $AWK -f "$tmp/subs.awk" >$tmp/out \ 8.2261 + || as_fn_error $? "could not create $ac_file" "$LINENO" 5 8.2262 8.2263 test -z "$ac_datarootdir_hack$ac_datarootdir_seen" && 8.2264 - { ac_out=`sed -n '/\${datarootdir}/p' "$ac_tmp/out"`; test -n "$ac_out"; } && 8.2265 - { ac_out=`sed -n '/^[ ]*datarootdir[ ]*:*=/p' \ 8.2266 - "$ac_tmp/out"`; test -z "$ac_out"; } && 8.2267 + { ac_out=`sed -n '/\${datarootdir}/p' "$tmp/out"`; test -n "$ac_out"; } && 8.2268 + { ac_out=`sed -n '/^[ ]*datarootdir[ ]*:*=/p' "$tmp/out"`; test -z "$ac_out"; } && 8.2269 { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $ac_file contains a reference to the variable \`datarootdir' 8.2270 which seems to be undefined. Please make sure it is defined" >&5 8.2271 $as_echo "$as_me: WARNING: $ac_file contains a reference to the variable \`datarootdir' 8.2272 which seems to be undefined. Please make sure it is defined" >&2;} 8.2273 8.2274 - rm -f "$ac_tmp/stdin" 8.2275 + rm -f "$tmp/stdin" 8.2276 case $ac_file in 8.2277 - -) cat "$ac_tmp/out" && rm -f "$ac_tmp/out";; 8.2278 - *) rm -f "$ac_file" && mv "$ac_tmp/out" "$ac_file";; 8.2279 + -) cat "$tmp/out" && rm -f "$tmp/out";; 8.2280 + *) rm -f "$ac_file" && mv "$tmp/out" "$ac_file";; 8.2281 esac \ 8.2282 || as_fn_error $? "could not create $ac_file" "$LINENO" 5 8.2283 ;; 8.2284 @@ -32838,20 +32967,20 @@ 8.2285 if test x"$ac_file" != x-; then 8.2286 { 8.2287 $as_echo "/* $configure_input */" \ 8.2288 - && eval '$AWK -f "$ac_tmp/defines.awk"' "$ac_file_inputs" 8.2289 - } >"$ac_tmp/config.h" \ 8.2290 + && eval '$AWK -f "$tmp/defines.awk"' "$ac_file_inputs" 8.2291 + } >"$tmp/config.h" \ 8.2292 || as_fn_error $? "could not create $ac_file" "$LINENO" 5 8.2293 - if diff "$ac_file" "$ac_tmp/config.h" >/dev/null 2>&1; then 8.2294 + if diff "$ac_file" "$tmp/config.h" >/dev/null 2>&1; then 8.2295 { $as_echo "$as_me:${as_lineno-$LINENO}: $ac_file is unchanged" >&5 8.2296 $as_echo "$as_me: $ac_file is unchanged" >&6;} 8.2297 else 8.2298 rm -f "$ac_file" 8.2299 - mv "$ac_tmp/config.h" "$ac_file" \ 8.2300 + mv "$tmp/config.h" "$ac_file" \ 8.2301 || as_fn_error $? "could not create $ac_file" "$LINENO" 5 8.2302 fi 8.2303 else 8.2304 $as_echo "/* $configure_input */" \ 8.2305 - && eval '$AWK -f "$ac_tmp/defines.awk"' "$ac_file_inputs" \ 8.2306 + && eval '$AWK -f "$tmp/defines.awk"' "$ac_file_inputs" \ 8.2307 || as_fn_error $? "could not create -" "$LINENO" 5 8.2308 fi 8.2309 ;;
9.1 --- a/common/autoconf/jdk-options.m4 Thu Jan 03 12:44:32 2013 -0800 9.2 +++ b/common/autoconf/jdk-options.m4 Tue Jan 08 13:14:22 2013 -0800 9.3 @@ -1,5 +1,5 @@ 9.4 # 9.5 -# Copyright (c) 2011, 2012, Oracle and/or its affiliates. All rights reserved. 9.6 +# Copyright (c) 2011, 2013, Oracle and/or its affiliates. All rights reserved. 9.7 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. 9.8 # 9.9 # This code is free software; you can redistribute it and/or modify it 9.10 @@ -235,7 +235,7 @@ 9.11 # from configure, but only server is valid anyway. Fix this 9.12 # when hotspot makefiles are rewritten. 9.13 if test "x$MACOSX_UNIVERSAL" = xtrue; then 9.14 - HOTSPOT_TARGET=universal_product 9.15 + HOTSPOT_TARGET=universal_${HOTSPOT_EXPORT} 9.16 fi 9.17 9.18 ##### 9.19 @@ -369,13 +369,37 @@ 9.20 AC_SUBST(COMPRESS_JARS) 9.21 ]) 9.22 9.23 +############################################################################### 9.24 +# 9.25 +# Setup version numbers 9.26 +# 9.27 AC_DEFUN_ONCE([JDKOPT_SETUP_JDK_VERSION_NUMBERS], 9.28 [ 9.29 # Source the version numbers 9.30 -. $AUTOCONF_DIR/version.numbers 9.31 -if test "x$OPENJDK" = "xfalse"; then 9.32 - . $AUTOCONF_DIR/closed.version.numbers 9.33 +. $AUTOCONF_DIR/version-numbers 9.34 + 9.35 +# Get the settings from parameters 9.36 +AC_ARG_WITH(milestone, [AS_HELP_STRING([--with-milestone], 9.37 + [Set milestone value for build @<:@internal@:>@])]) 9.38 +if test "x$with_milestone" = xyes; then 9.39 + AC_MSG_ERROR([Milestone must have a value]) 9.40 +elif test "x$with_milestone" != x; then 9.41 + MILESTONE="$with_milestone" 9.42 +else 9.43 + MILESTONE=internal 9.44 fi 9.45 + 9.46 +AC_ARG_WITH(build-number, [AS_HELP_STRING([--with-build-number], 9.47 + [Set build number value for build @<:@b00@:>@])]) 9.48 +if test "x$with_build_number" = xyes; then 9.49 + AC_MSG_ERROR([Build number must have a value]) 9.50 +elif test "x$with_build_number" != x; then 9.51 + JDK_BUILD_NUMBER="$with_build_number" 9.52 +fi 9.53 +if test "x$JDK_BUILD_NUMBER" = x; then 9.54 + JDK_BUILD_NUMBER=b00 9.55 +fi 9.56 + 9.57 # Now set the JDK version, milestone, build number etc. 9.58 AC_SUBST(JDK_MAJOR_VERSION) 9.59 AC_SUBST(JDK_MINOR_VERSION) 9.60 @@ -394,9 +418,6 @@ 9.61 COPYRIGHT_YEAR=`date +'%Y'` 9.62 AC_SUBST(COPYRIGHT_YEAR) 9.63 9.64 -RUNTIME_NAME="$PRODUCT_NAME $PRODUCT_SUFFIX" 9.65 -AC_SUBST(RUNTIME_NAME) 9.66 - 9.67 if test "x$JDK_UPDATE_VERSION" != x; then 9.68 JDK_VERSION="${JDK_MAJOR_VERSION}.${JDK_MINOR_VERSION}.${JDK_MICRO_VERSION}_${JDK_UPDATE_VERSION}" 9.69 else 9.70 @@ -404,24 +425,12 @@ 9.71 fi 9.72 AC_SUBST(JDK_VERSION) 9.73 9.74 -if test "x$MILESTONE" != x; then 9.75 - RELEASE="${JDK_VERSION}-${MILESTONE}${BUILD_VARIANT_RELEASE}" 9.76 -else 9.77 - RELEASE="${JDK_VERSION}${BUILD_VARIANT_RELEASE}" 9.78 -fi 9.79 -AC_SUBST(RELEASE) 9.80 +BUILD_DATE=`date '+%Y_%m_%d_%H_%M'` 9.81 +# Avoid [:alnum:] since it depends on the locale. 9.82 +CLEAN_USERNAME=`echo "$USER" | $TR -d -c 'abcdefghijklmnopqrstuvqxyz0123456789'` 9.83 +USER_RELEASE_SUFFIX=`echo "${CLEAN_USERNAME}_${BUILD_DATE}" | $TR 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'` 9.84 +AC_SUBST(USER_RELEASE_SUFFIX) 9.85 9.86 -if test "x$JDK_BUILD_NUMBER" != x; then 9.87 - FULL_VERSION="${RELEASE}-${JDK_BUILD_NUMBER}" 9.88 -else 9.89 - JDK_BUILD_NUMBER=b00 9.90 - BUILD_DATE=`date '+%Y_%m_%d_%H_%M'` 9.91 - # Avoid [:alnum:] since it depends on the locale. 9.92 - CLEAN_USERNAME=`echo "$USER" | $TR -d -c 'abcdefghijklmnopqrstuvqxyz0123456789'` 9.93 - USER_RELEASE_SUFFIX=`echo "${CLEAN_USERNAME}_${BUILD_DATE}" | $TR 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'` 9.94 - FULL_VERSION="${RELEASE}-${USER_RELEASE_SUFFIX}-${JDK_BUILD_NUMBER}" 9.95 -fi 9.96 -AC_SUBST(FULL_VERSION) 9.97 COOKED_BUILD_NUMBER=`$ECHO $JDK_BUILD_NUMBER | $SED -e 's/^b//' -e 's/^0//'` 9.98 AC_SUBST(COOKED_BUILD_NUMBER) 9.99 ])
10.1 --- a/common/autoconf/spec.gmk.in Thu Jan 03 12:44:32 2013 -0800 10.2 +++ b/common/autoconf/spec.gmk.in Tue Jan 08 13:14:22 2013 -0800 10.3 @@ -1,5 +1,5 @@ 10.4 # 10.5 -# Copyright (c) 2011, 2012, Oracle and/or its affiliates. All rights reserved. 10.6 +# Copyright (c) 2011, 2013, Oracle and/or its affiliates. All rights reserved. 10.7 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. 10.8 # 10.9 # This code is free software; you can redistribute it and/or modify it 10.10 @@ -163,11 +163,22 @@ 10.11 10.12 # Different version strings generated from the above information. 10.13 JDK_VERSION:=@JDK_VERSION@ 10.14 -RUNTIME_NAME:=@RUNTIME_NAME@ 10.15 -FULL_VERSION:=@FULL_VERSION@ 10.16 -JRE_RELEASE_VERSION:=@FULL_VERSION@ 10.17 -RELEASE:=@RELEASE@ 10.18 +RUNTIME_NAME=$(PRODUCT_NAME) $(PRODUCT_SUFFIX) 10.19 COOKED_BUILD_NUMBER:=@COOKED_BUILD_NUMBER@ 10.20 +# These variables need to be generated here so that MILESTONE and 10.21 +# JDK_BUILD_NUMBER can be overridden on the make command line. 10.22 +ifeq ($(MILESTONE),) 10.23 + RELEASE=$(JDK_VERSION)$(BUILD_VARIANT_RELEASE) 10.24 +else 10.25 + RELEASE=$(JDK_VERSION)-$(MILESTONE)$(BUILD_VARIANT_RELEASE) 10.26 +endif 10.27 +ifeq ($(JDK_BUILD_NUMBER),b00) 10.28 + USER_RELEASE_SUFFIX=@USER_RELEASE_SUFFIX@ 10.29 + FULL_VERSION=$(RELEASE)-$(USER_RELEASE_SUFFIX)-$(JDK_BUILD_NUMBER) 10.30 +else 10.31 + FULL_VERSION=$(RELEASE)-$(JDK_BUILD_NUMBER) 10.32 +endif 10.33 +JRE_RELEASE_VERSION:=$(FULL_VERSION) 10.34 10.35 # How to compile the code: release, fastdebug or slowdebug 10.36 DEBUG_LEVEL:=@DEBUG_LEVEL@ 10.37 @@ -220,6 +231,7 @@ 10.38 HOTSPOT_OUTPUTDIR=$(BUILD_OUTPUT)/hotspot 10.39 JDK_OUTPUTDIR=$(BUILD_OUTPUT)/jdk 10.40 IMAGES_OUTPUTDIR=$(BUILD_OUTPUT)/images 10.41 +JCE_OUTPUTDIR=$(BUILD_OUTPUT)/jce-release 10.42 10.43 LANGTOOLS_DIST=$(LANGTOOLS_OUTPUTDIR)/dist 10.44 CORBA_DIST=$(CORBA_OUTPUTDIR)/dist 10.45 @@ -420,6 +432,8 @@ 10.46 10.47 NATIVE2ASCII=@FIXPATH@ $(BOOT_JDK)/bin/native2ascii 10.48 10.49 +JARSIGNER=@FIXPATH@ $(BOOT_JDK)/bin/jarsigner 10.50 + 10.51 # Base flags for RC 10.52 # Guarding this against resetting value. Legacy make files include spec multiple 10.53 # times. 10.54 @@ -440,10 +454,13 @@ 10.55 # CD is going away, but remains to cater for legacy makefiles. 10.56 CD:=cd 10.57 CHMOD:=@CHMOD@ 10.58 +COMM:=@COMM@ 10.59 CP:=@CP@ 10.60 +CPIO:=@CPIO@ 10.61 CUT:=@CUT@ 10.62 DATE:=@DATE@ 10.63 DIFF:=@DIFF@ 10.64 +DIRNAME:=@DIRNAME@ 10.65 FIND:=@FIND@ 10.66 FIND_DELETE:=@FIND_DELETE@ 10.67 ECHO:=@ECHO@ 10.68 @@ -468,6 +485,7 @@ 10.69 TIME:=@TIME@ 10.70 TR:=@TR@ 10.71 TOUCH:=@TOUCH@ 10.72 +UNIQ:=@UNIQ@ 10.73 WC:=@WC@ 10.74 XARGS:=@XARGS@ 10.75 ZIPEXE:=@ZIP@ 10.76 @@ -600,5 +618,21 @@ 10.77 OS_VERSION_MINOR:=@OS_VERSION_MINOR@ 10.78 OS_VERSION_MICRO:=@OS_VERSION_MICRO@ 10.79 10.80 +# Images directory definitions 10.81 +JDK_IMAGE_SUBDIR:=j2sdk-image 10.82 +JRE_IMAGE_SUBDIR:=j2re-image 10.83 +JDK_OVERLAY_IMAGE_SUBDIR:=j2sdk-overlay-image 10.84 +JRE_OVERLAY_IMAGE_SUBDIR:=j2re-overlay-image 10.85 +JDK_IMAGE_DIR:=$(IMAGES_OUTPUTDIR)/$(JDK_IMAGE_SUBDIR) 10.86 +JRE_IMAGE_DIR:=$(IMAGES_OUTPUTDIR)/$(JRE_IMAGE_SUBDIR) 10.87 +JDK_OVERLAY_IMAGE_DIR:=$(IMAGES_OUTPUTDIR)/$(JDK_OVERLAY_IMAGE_SUBDIR) 10.88 +JRE_OVERLAY_IMAGE_DIR:=$(IMAGES_OUTPUTDIR)/$(JRE_OVERLAY_IMAGE_SUBDIR) 10.89 + 10.90 +# Macosx bundles directory definitions 10.91 +JDK_BUNDLE_SUBDIR:=j2sdk-bundle/jdk$(JDK_VERSION).jdk/Contents 10.92 +JRE_BUNDLE_SUBDIR:=j2re-bundle/jre$(JDK_VERSION).jre/Contents 10.93 +JDK_BUNDLE_DIR:=$(IMAGES_OUTPUTDIR)/$(JDK_BUNDLE_SUBDIR) 10.94 +JRE_BUNDLE_DIR:=$(IMAGES_OUTPUTDIR)/$(JRE_BUNDLE_SUBDIR) 10.95 + 10.96 # Include the custom-spec.gmk file if it exists 10.97 -include $(dir @SPEC@)/custom-spec.gmk
11.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 11.2 +++ b/common/autoconf/version-numbers Tue Jan 08 13:14:22 2013 -0800 11.3 @@ -0,0 +1,38 @@ 11.4 +# 11.5 +# Copyright (c) 2011, 2013, 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 +JDK_MAJOR_VERSION=1 11.30 +JDK_MINOR_VERSION=8 11.31 +JDK_MICRO_VERSION=0 11.32 +JDK_UPDATE_VERSION= 11.33 +LAUNCHER_NAME=openjdk 11.34 +PRODUCT_NAME=OpenJDK 11.35 +PRODUCT_SUFFIX="Runtime Environment" 11.36 +JDK_RC_PLATFORM_NAME=Platform 11.37 +COMPANY_NAME=N/A 11.38 + 11.39 +# Might need better names for these 11.40 +MACOSX_BUNDLE_NAME_BASE="OpenJDK" 11.41 +MACOSX_BUNDLE_ID_BASE="net.java.openjdk"
12.1 --- a/common/autoconf/version.numbers Thu Jan 03 12:44:32 2013 -0800 12.2 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 12.3 @@ -1,40 +0,0 @@ 12.4 -# 12.5 -# Copyright (c) 2011, 2012, 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 -JDK_MAJOR_VERSION=1 12.30 -JDK_MINOR_VERSION=8 12.31 -JDK_MICRO_VERSION=0 12.32 -JDK_UPDATE_VERSION= 12.33 -JDK_BUILD_NUMBER= 12.34 -MILESTONE=internal 12.35 -LAUNCHER_NAME=openjdk 12.36 -PRODUCT_NAME=OpenJDK 12.37 -PRODUCT_SUFFIX="Runtime Environment" 12.38 -JDK_RC_PLATFORM_NAME=Platform 12.39 -COMPANY_NAME=N/A 12.40 - 12.41 -# Might need better names for these 12.42 -MACOSX_BUNDLE_NAME_BASE="OpenJDK" 12.43 -MACOSX_BUNDLE_ID_BASE="net.java.openjdk"
13.1 --- a/common/bin/compare.sh Thu Jan 03 12:44:32 2013 -0800 13.2 +++ b/common/bin/compare.sh Tue Jan 08 13:14:22 2013 -0800 13.3 @@ -1,6 +1,6 @@ 13.4 #!/bin/bash 13.5 # 13.6 -# Copyright (c) 2012, Oracle and/or its affiliates. All rights reserved. 13.7 +# Copyright (c) 2012, 2013 Oracle and/or its affiliates. All rights reserved. 13.8 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. 13.9 # 13.10 # This code is free software; you can redistribute it and/or modify it 13.11 @@ -98,24 +98,30 @@ 13.12 if test "x$SUFFIX" = "xclass"; then 13.13 # To improve performance when large diffs are found, do a rough filtering of classes 13.14 # elibeble for these exceptions 13.15 - if $GREP -R -e '[0-9]\{4\}_[0-9]\{2\}_[0-9]\{2\}_[0-9]\{2\}_[0-9]\{2\}-b[0-9]\{2\}' -e thePoint -e aPoint -e setItemsPtr ${THIS_FILE} > /dev/null; then 13.16 + if $GREP -R -e '[0-9]\{4\}_[0-9]\{2\}_[0-9]\{2\}_[0-9]\{2\}_[0-9]\{2\}-b[0-9]\{2\}' \ 13.17 + -e '[0-9]\{2\}/[0-9]\{2\}/[0-9]\{4\}' \ 13.18 + -e thePoint -e aPoint -e setItemsPtr ${THIS_FILE} > /dev/null; then 13.19 $JAVAP -c -constants -l -p ${OTHER_FILE} > ${OTHER_FILE}.javap 13.20 $JAVAP -c -constants -l -p ${THIS_FILE} > ${THIS_FILE}.javap 13.21 TMP=$($DIFF ${OTHER_FILE}.javap ${THIS_FILE}.javap | \ 13.22 $GREP '^[<>]' | \ 13.23 $SED -e '/[<>].*[0-9]\{4\}_[0-9]\{2\}_[0-9]\{2\}_[0-9]\{2\}_[0-9]\{2\}-b[0-9]\{2\}.*/d' \ 13.24 + -e '/[0-9]\{2\}\/[0-9]\{2\}\/[0-9]\{4\}/d' \ 13.25 -e '/[<>].*Point Lcom\/apple\/jobjc\/foundation\/NSPoint;/d' \ 13.26 -e '/[<>].*public com\.apple\.jobjc\.Pointer<com\.apple\.jobjc\..*itemsPtr();/d' \ 13.27 -e '/[<>].*public void setItemsPtr(com\.apple\.jobjc\.Pointer<com\.apple\.jobjc\..*);/d') 13.28 fi 13.29 fi 13.30 if test "x$SUFFIX" = "xproperties"; then 13.31 - $CAT $OTHER_FILE | $SED -e 's/\([^\\]\):/\1\\:/g' -e 's/\([^\\]\)=/\1\\=/g' -e 's/#.*/#/g' \ 13.32 - | $SED -f "$SRC_ROOT/common/makefiles/support/unicode2x.sed" \ 13.33 - | $SED -e '/^#/d' -e '/^$/d' \ 13.34 - -e :a -e '/\\$/N; s/\\\n//; ta' \ 13.35 - -e 's/^[ \t]*//;s/[ \t]*$//' \ 13.36 - -e 's/\\=/=/' | LANG=C $SORT > $OTHER_FILE.cleaned 13.37 + # Run through nawk to add possibly missing newline at end of file. 13.38 + $CAT $OTHER_FILE | $NAWK '{ print }' > $OTHER_FILE.cleaned 13.39 +# Disable this exception since we aren't changing the properties cleaning method yet. 13.40 +# $CAT $OTHER_FILE | $SED -e 's/\([^\\]\):/\1\\:/g' -e 's/\([^\\]\)=/\1\\=/g' -e 's/#.*/#/g' \ 13.41 +# | $SED -f "$SRC_ROOT/common/makefiles/support/unicode2x.sed" \ 13.42 +# | $SED -e '/^#/d' -e '/^$/d' \ 13.43 +# -e :a -e '/\\$/N; s/\\\n//; ta' \ 13.44 +# -e 's/^[ \t]*//;s/[ \t]*$//' \ 13.45 +# -e 's/\\=/=/' | LANG=C $SORT > $OTHER_FILE.cleaned 13.46 TMP=$(LANG=C $DIFF $OTHER_FILE.cleaned $THIS_FILE) 13.47 fi 13.48 if test -n "$TMP"; then 13.49 @@ -305,14 +311,17 @@ 13.50 THIS_FILE=$WORK_DIR/$f.this 13.51 $MKDIR -p $(dirname $OTHER_FILE) 13.52 $MKDIR -p $(dirname $THIS_FILE) 13.53 + #Note that | doesn't work on mac sed. 13.54 $CAT $OTHER_DIR/$f | $SED -e 's/\(-- Generated by javadoc \).*\( --\)/\1(removed)\2/' \ 13.55 -e 's/\(<meta name="date" content="\).*\(">\)/\1(removed)\2/' \ 13.56 - -e 's/\(Monday\|Tuesday\|Wednesday\|Thursday\|Friday\|Saturday\|Sunday\), [A-Z][a-z]* [0-9][0-9]*, [12][0-9]* [0-9][0-9:]* \(AM\|PM\) [A-Z][A-Z]*/(removed)/' \ 13.57 + -e 's/[A-Z][a-z]*, [A-Z][a-z]* [0-9][0-9]*, [12][0-9]* [0-9][0-9:]* [AMP]\{2,2\} [A-Z][A-Z]*/(removed)/' \ 13.58 + -e 's/[A-Z][a-z]* [A-Z][a-z]* [0-9][0-9] [0-9][0-9:]* [A-Z][A-Z]* [12][0-9]*/(removed)/' \ 13.59 -e 's/^\( from \).*\(\.idl\)$/\1(removed)\2/' \ 13.60 > $OTHER_FILE 13.61 $CAT $THIS_DIR/$f | $SED -e 's/\(-- Generated by javadoc \).*\( --\)/\1(removed)\2/' \ 13.62 -e 's/\(<meta name="date" content="\).*\(">\)/\1(removed)\2/' \ 13.63 - -e 's/\(Monday\|Tuesday\|Wednesday\|Thursday\|Friday\|Saturday\|Sunday\), [A-Z][a-z]* [0-9][0-9]*, [12][0-9]* [0-9][0-9:]* \(AM\|PM\) [A-Z][A-Z]*/(removed)/' \ 13.64 + -e 's/[A-Z][a-z]*, [A-Z][a-z]* [0-9][0-9]*, [12][0-9]* [0-9][0-9:]* [AMP]\{2,2\} [A-Z][A-Z]*/(removed)/' \ 13.65 + -e 's/[A-Z][a-z]* [A-Z][a-z]* [0-9][0-9] [0-9][0-9:]* [A-Z][A-Z]* [12][0-9]*/(removed)/' \ 13.66 -e 's/^\( from \).*\(\.idl\)$/\1(removed)\2/' \ 13.67 > $THIS_FILE 13.68 else 13.69 @@ -370,14 +379,14 @@ 13.70 (cd $OTHER_UNZIPDIR && $UNARCHIVE $OTHER_ZIP) 13.71 13.72 # Find all archives inside and unzip them as well to compare the contents rather than 13.73 - # the archives. 13.74 - EXCEPTIONS="" 13.75 - for pack in $($FIND $THIS_UNZIPDIR -name "*.pack" -o -name "*.pack.gz"); do 13.76 + # the archives. pie.jar.pack.gz i app3.war is corrupt, skip it. 13.77 + EXCEPTIONS="pie.jar.pack.gz" 13.78 + for pack in $($FIND $THIS_UNZIPDIR \( -name "*.pack" -o -name "*.pack.gz" \) -a ! -name pie.jar.pack.gz); do 13.79 ($UNPACK200 $pack $pack.jar) 13.80 # Filter out the unzipped archives from the diff below. 13.81 EXCEPTIONS="$EXCEPTIONS $pack $pack.jar" 13.82 done 13.83 - for pack in $($FIND $OTHER_UNZIPDIR -name "*.pack" -o -name "*.pack.gz"); do 13.84 + for pack in $($FIND $OTHER_UNZIPDIR \( -name "*.pack" -o -name "*.pack.gz" \) -a ! -name pie.jar.pack.gz); do 13.85 ($UNPACK200 $pack $pack.jar) 13.86 EXCEPTIONS="$EXCEPTIONS $pack $pack.jar" 13.87 done 13.88 @@ -1073,7 +1082,11 @@ 13.89 13.90 13.91 # Figure out the layout of the this build. Which kinds of images have been produced 13.92 -if [ -d "$THIS/deploy/j2sdk-image" ]; then 13.93 +if [ -d "$THIS/install/j2sdk-image" ]; then 13.94 + THIS_J2SDK="$THIS/install/j2sdk-image" 13.95 + THIS_J2RE="$THIS/install/j2re-image" 13.96 + echo "Comparing install images" 13.97 +elif [ -d "$THIS/deploy/j2sdk-image" ]; then 13.98 THIS_J2SDK="$THIS/deploy/j2sdk-image" 13.99 THIS_J2RE="$THIS/deploy/j2re-image" 13.100 echo "Comparing deploy images" 13.101 @@ -1081,9 +1094,16 @@ 13.102 THIS_J2SDK="$THIS/images/j2sdk-image" 13.103 THIS_J2RE="$THIS/images/j2re-image" 13.104 fi 13.105 + 13.106 if [ -d "$THIS/images/j2sdk-overlay-image" ]; then 13.107 - THIS_J2SDK_OVERLAY="$THIS/images/j2sdk-overlay-image" 13.108 - THIS_J2RE_OVERLAY="$THIS/images/j2re-overlay-image" 13.109 + if [ -d "$THIS/install/j2sdk-image" ]; then 13.110 + # If there is an install image, prefer that, it's also overlay 13.111 + THIS_J2SDK_OVERLAY="$THIS/install/j2sdk-image" 13.112 + THIS_J2RE_OVERLAY="$THIS/install/j2re-image" 13.113 + else 13.114 + THIS_J2SDK_OVERLAY="$THIS/images/j2sdk-overlay-image" 13.115 + THIS_J2RE_OVERLAY="$THIS/images/j2re-overlay-image" 13.116 + fi 13.117 fi 13.118 13.119 if [ -d "$THIS/images/j2sdk-bundle" ]; then 13.120 @@ -1100,7 +1120,9 @@ 13.121 OTHER_J2SDK_OVERLAY="$OTHER/j2sdk-image" 13.122 OTHER_J2RE_OVERLAY="$OTHER/j2re-image" 13.123 fi 13.124 - 13.125 +elif [ -d "$OTHER/images/j2sdk-image" ]; then 13.126 + OTHER_J2SDK="$OTHER/images/j2sdk-image" 13.127 + OTHER_J2RE="$OTHER/images/j2re-image" 13.128 fi 13.129 13.130 if [ -d "$OTHER/j2sdk-bundle" ]; then 13.131 @@ -1144,6 +1166,26 @@ 13.132 echo "WARNING! Other build doesn't contain docs, skipping doc compare." 13.133 fi 13.134 13.135 +if [ -d "$OTHER/images" ]; then 13.136 + OTHER_SEC_DIR="$OTHER/images" 13.137 +else 13.138 + OTHER_SEC_DIR="$OTHER/tmp" 13.139 +fi 13.140 +OTHER_SEC_BIN="$OTHER_SEC_DIR/sec-bin.zip" 13.141 +THIS_SEC_DIR="$THIS/images" 13.142 +THIS_SEC_BIN="$THIS_SEC_DIR/sec-bin.zip" 13.143 +if [ "$OPENJDK_TARGET_OS" = "windows" ]; then 13.144 + if [ "$OPENJDK_TARGET_CPU" = "x86_64" ]; then 13.145 + JGSS_WINDOWS_BIN="jgss-windows-x64-bin.zip" 13.146 + else 13.147 + JGSS_WINDOWS_BIN="jgss-windows-i586-bin.zip" 13.148 + fi 13.149 + OTHER_SEC_WINDOWS_BIN="$OTHER_SEC_DIR/sec-windows-bin.zip" 13.150 + OTHER_JGSS_WINDOWS_BIN="$OTHER_SEC_DIR/$JGSS_WINDOWS_BIN" 13.151 + THIS_SEC_WINDOWS_BIN="$THIS_SEC_DIR/sec-windows-bin.zip" 13.152 + THIS_JGSS_WINDOWS_BIN="$THIS_SEC_DIR/$JGSS_WINDOWS_BIN" 13.153 +fi 13.154 + 13.155 ########################################################################################## 13.156 # Do the work 13.157 13.158 @@ -1260,6 +1302,12 @@ 13.159 if [ -n "$THIS_J2SDK" ] && [ -n "$OTHER_J2SDK" ]; then 13.160 compare_all_zip_files $THIS_J2SDK $OTHER_J2SDK $COMPARE_ROOT/j2sdk 13.161 fi 13.162 + if [ -n "$THIS_SEC_BIN" ] && [ -n "$OTHER_SEC_BIN" ]; then 13.163 + if [ -n "$(echo $THIS_SEC_BIN | $FILTER)" ]; then 13.164 + echo "sec-bin.zip..." 13.165 + compare_zip_file $(dirname $THIS_SEC_BIN) $(dirname $OTHER_SEC_BIN) $COMPARE_ROOT/sec-bin sec-bin.zip 13.166 + fi 13.167 + fi 13.168 fi 13.169 13.170 if [ "$CMP_JARS" = "true" ]; then
14.1 --- a/common/bin/compare_exceptions.sh.incl Thu Jan 03 12:44:32 2013 -0800 14.2 +++ b/common/bin/compare_exceptions.sh.incl Tue Jan 08 13:14:22 2013 -0800 14.3 @@ -807,6 +807,10 @@ 14.4 14.5 if [ "$OPENJDK_TARGET_OS" = "windows" ]; then 14.6 14.7 +ACCEPTED_JARZIP_CONTENTS=" 14.8 +/bin/w2k_lsa_auth.dll 14.9 +" 14.10 + 14.11 # Probably should add all libs here 14.12 ACCEPTED_SMALL_SIZE_DIFF=" 14.13 ./demo/jvmti/gctest/lib/gctest.dll 14.14 @@ -815,6 +819,7 @@ 14.15 ./jre/bin/attach.dll 14.16 ./jre/bin/java_crw_demo.dll 14.17 ./jre/bin/jsoundds.dll 14.18 +./jre/bin/server/jvm.dll 14.19 ./bin/appletviewer.exe 14.20 ./bin/extcheck.exe 14.21 ./bin/idlj.exe
15.1 --- a/common/makefiles/IdlCompilation.gmk Thu Jan 03 12:44:32 2013 -0800 15.2 +++ b/common/makefiles/IdlCompilation.gmk Tue Jan 08 13:14:22 2013 -0800 15.3 @@ -87,7 +87,7 @@ 15.4 $1_SRC := $$(abspath $$($1_SRC)) 15.5 $1_BIN := $$(abspath $$($1_BIN)) 15.6 # Find all existing java files and existing class files. 15.7 -$$(shell $(MKDIR) -p $$($1_SRC) $$($1_BIN)) 15.8 +$$(eval $$(call MakeDir,$$($1_BIN))) 15.9 $1_SRCS := $$(shell find $$($1_SRC) -name "*.idl") 15.10 $1_BINS := $$(shell find $$($1_BIN) -name "*.java") 15.11 # Prepend the source/bin path to the filter expressions.
16.1 --- a/common/makefiles/JavaCompilation.gmk Thu Jan 03 12:44:32 2013 -0800 16.2 +++ b/common/makefiles/JavaCompilation.gmk Tue Jan 08 13:14:22 2013 -0800 16.3 @@ -111,9 +111,9 @@ 16.4 ifeq ($$(word 20,$$($1_GREP_INCLUDE_PATTERNS)),) 16.5 $1_GREP_INCLUDES:=| $(GREP) $$(patsubst %,$(SPACE)-e$(SPACE)$(DQUOTE)%$(DQUOTE),$$($1_GREP_INCLUDE_PATTERNS)) 16.6 else 16.7 - $$(shell $(MKDIR) -p $$($1_BIN) && $(RM) $$($1_BIN)/_the.$$($1_JARNAME)_include) 16.8 - $$(eval $$(call ListPathsSafelyNow,$1_GREP_INCLUDE_PATTERNS,\n, \ 16.9 - >> $$($1_BIN)/_the.$$($1_JARNAME)_include)) 16.10 + $1_GREP_INCLUDE_OUTPUT:=$(RM) $$($1_BIN)/_the.$$($1_JARNAME)_include && \ 16.11 + $$(strip $$(call ListPathsSafely,$1_GREP_INCLUDE_PATTERNS,\n, \ 16.12 + >> $$($1_BIN)/_the.$$($1_JARNAME)_include)) 16.13 $1_GREP_INCLUDES:=| $(GREP) -f $$($1_BIN)/_the.$$($1_JARNAME)_include 16.14 endif 16.15 endif 16.16 @@ -124,9 +124,9 @@ 16.17 ifeq ($$(word 20,$$($1_GREP_EXCLUDE_PATTERNS)),) 16.18 $1_GREP_EXCLUDES:=| $(GREP) -v $$(patsubst %,$(SPACE)-e$(SPACE)$(DQUOTE)%$(DQUOTE),$$($1_GREP_EXCLUDE_PATTERNS)) 16.19 else 16.20 - $$(shell $(MKDIR) -p $$($1_BIN) && $(RM) $$($1_BIN)/_the.$$($1_JARNAME)_exclude) 16.21 - $$(eval $$(call ListPathsSafelyNow,$1_GREP_EXCLUDE_PATTERNS,\n, \ 16.22 - >> $$($1_BIN)/_the.$$($1_JARNAME)_exclude)) 16.23 + $1_GREP_EXCLUDE_OUTPUT=$(RM) $$($1_BIN)/_the.$$($1_JARNAME)_exclude && \ 16.24 + $$(strip $$(call ListPathsSafely,$1_GREP_EXCLUDE_PATTERNS,\n, \ 16.25 + >> $$($1_BIN)/_the.$$($1_JARNAME)_exclude)) 16.26 $1_GREP_EXCLUDES:=| $(GREP) -v -f $$($1_BIN)/_the.$$($1_JARNAME)_exclude 16.27 endif 16.28 endif 16.29 @@ -137,19 +137,25 @@ 16.30 else 16.31 $1_JARINDEX = true 16.32 endif 16.33 - # When this macro is run in the same makefile as the java compilation, dependencies are transfered 16.34 - # in make variables. When the macro is run in a different makefile than the java compilation, the 16.35 - # dependencies need to be found in the filesystem. 16.36 + # When this macro is run in the same makefile as the java compilation, dependencies are 16.37 + # transfered in make variables. When the macro is run in a different makefile than the 16.38 + # java compilation, the dependencies need to be found in the filesystem. 16.39 ifneq (,$2) 16.40 $1_DEPS:=$2 16.41 else 16.42 + $1_DEPS:=$$(filter $$(addprefix %,$$($1_FIND_PATTERNS)),\ 16.43 + $$(call CacheFind $$($1_SRCS))) 16.44 + ifneq (,$$($1_GREP_INCLUDE_PATTERNS)) 16.45 + $1_DEPS:=$$(filter $$(addsuffix %,$$($1_GREP_INCLUDE_PATTERNS)),$$($1_DEPS)) 16.46 + endif 16.47 + ifneq (,$$($1_GREP_EXCLUDE_PATTERNS)) 16.48 + $1_DEPS:=$$(filter-out $$(addsuffix %,$$($1_GREP_EXCLUDE_PATTERNS)),$$($1_DEPS)) 16.49 + endif 16.50 # The subst of \ is needed because $ has to be escaped with \ in EXTRA_FILES for the command 16.51 # lines, but not here for use in make dependencies. 16.52 - $1_DEPS:=$$(shell $(FIND) $$($1_SRCS) -type f -a \( $$($1_FIND_PATTERNS) \) \ 16.53 - $$($1_GREP_INCLUDES) $$($1_GREP_EXCLUDES)) \ 16.54 - $$(subst \,,$$(foreach src,$$($1_SRCS),$$(addprefix $$(src)/,$$($1_EXTRA_FILES)))) 16.55 + $1_DEPS+=$$(subst \,,$$(foreach src,$$($1_SRCS),$$(addprefix $$(src)/,$$($1_EXTRA_FILES)))) 16.56 ifeq (,$$($1_SKIP_METAINF)) 16.57 - $1_DEPS+=$$(shell $(FIND) $$(addsuffix /META-INF,$$($1_SRCS)) -type f 2> /dev/null) 16.58 + $1_DEPS+=$$(call CacheFind $$(wildcard $$(addsuffix /META-INF,$$($1_SRCS)))) 16.59 endif 16.60 endif 16.61 16.62 @@ -210,6 +216,8 @@ 16.63 # Here is the rule that creates/updates the jar file. 16.64 $$($1_JAR) : $$($1_DEPS) 16.65 $(MKDIR) -p $$($1_BIN) 16.66 + $$($1_GREP_INCLUDE_OUTPUT) 16.67 + $$($1_GREP_EXCLUDE_OUTPUT) 16.68 $$(if $$($1_MANIFEST),\ 16.69 $(SED) -e "s#@@RELEASE@@#$(RELEASE)#" \ 16.70 -e "s#@@COMPANY_NAME@@#$(COMPANY_NAME)#" $$($1_MANIFEST) > $$($1_MANIFEST_FILE) \ 16.71 @@ -242,14 +250,14 @@ 16.72 define SetupZipArchive 16.73 # param 1 is for example ZIP_MYSOURCE 16.74 # param 2,3,4,5,6,7,8,9 are named args. 16.75 - # SRC,ZIP,INCLUDES,EXCLUDES,EXCLUDE_FILES,SUFFIXES,EXTRA_DEPS 16.76 + # SRC,ZIP,INCLUDES,INCLUDE_FILES,EXCLUDES,EXCLUDE_FILES,SUFFIXES,EXTRA_DEPS 16.77 $(foreach i,2 3 4 5 6 7 8 9 10 11 12 13 14 15, $(if $($i),$1_$(strip $($i)))$(NEWLINE)) 16.78 $(call LogSetupMacroEntry,SetupZipArchive($1),$2,$3,$4,$5,$6,$7,$8,$9,$(10),$(11),$(12),$(13),$(14),$(15)) 16.79 $(if $(16),$(error Internal makefile error: Too many arguments to SetupZipArchive, please update JavaCompilation.gmk)) 16.80 16.81 # Find all files in the source tree. 16.82 - $1_SUFFIX_FILTER := $$(patsubst %,-o -name $(DQUOTE)*%$(DQUOTE),$$($1_SUFFIXES)) 16.83 - $1_ALL_SRCS := $$(foreach i,$$($1_SRC), $$(shell $(FIND) $$i -type f -a ! -name "_the.*" \( -name FALSE_DUMMY $$($1_SUFFIX_FILTER) \) )) 16.84 + $1_ALL_SRCS := $$(call not-containing,_the.,\ 16.85 + $$(filter $$(addprefix %,$$($1_SUFFIXES)),$$(call CacheFind $$($1_SRC)))) 16.86 16.87 ifneq ($$($1_INCLUDES),) 16.88 $1_SRC_INCLUDES := $$(foreach i,$$($1_SRC),$$(addprefix $$i/,$$(addsuffix /%,$$($1_INCLUDES)))) 16.89 @@ -259,6 +267,12 @@ 16.90 else 16.91 $1_ZIP_INCLUDES := $$(addprefix -i$(SPACE)$(DQUOTE),$$(addsuffix /*$(DQUOTE),$$($1_INCLUDES))) 16.92 endif 16.93 + endif 16.94 + ifneq ($$($1_INCLUDE_FILES),) 16.95 + $1_SRC_INCLUDES += $$(foreach i,$$($1_SRC),$$(addprefix $$i/,$$($1_INCLUDE_FILES))) 16.96 + $1_ZIP_INCLUDES += $$(addprefix -i$(SPACE),$$($1_INCLUDE_FILES)) 16.97 + endif 16.98 + ifneq ($$($1_SRC_INCLUDES),) 16.99 $1_ALL_SRCS := $$(filter $$($1_SRC_INCLUDES),$$($1_ALL_SRCS)) 16.100 endif 16.101 ifneq ($$($1_EXCLUDES),) 16.102 @@ -376,7 +390,7 @@ 16.103 $$(foreach d,$$($1_SRC), $$(if $$(wildcard $$d),,$$(error SRC specified to SetupJavaCompilation $1 contains missing directory $$d))) 16.104 $$(eval $$(call MakeDir,$$($1_BIN))) 16.105 # Find all files in the source trees. 16.106 - $1_ALL_SRCS := $$(filter-out $(OVR_SRCS),$$(shell $(FIND) $$($1_SRC) -type f)) 16.107 + $1_ALL_SRCS += $$(filter-out $(OVR_SRCS),$$(call CacheFind,$$($1_SRC))) 16.108 # Extract the java files. 16.109 ifneq ($$($1_EXCLUDE_FILES),) 16.110 $1_EXCLUDE_FILES_PATTERN:=$$(addprefix %,$$($1_EXCLUDE_FILES)) 16.111 @@ -408,8 +422,6 @@ 16.112 16.113 # Find all files to be copied from source to bin. 16.114 ifneq (,$$($1_COPY)) 16.115 - # Rewrite list of patterns into a find statement. 16.116 - $1_COPY_PATTERN:=$(FALSE_FIND_PATTERN) $$(patsubst %,$(SPACE)-o$(SPACE)-name$(SPACE)$(DQUOTE)*%$(DQUOTE),$$($1_COPY)) 16.117 # Search for all files to be copied. 16.118 $1_ALL_COPIES := $$(filter $$(addprefix %,$$($1_COPY)),$$($1_ALL_SRCS)) 16.119 # Copy these explicitly 16.120 @@ -436,8 +448,6 @@ 16.121 16.122 # Find all property files to be copied and cleaned from source to bin. 16.123 ifneq (,$$($1_CLEAN)) 16.124 - # Rewrite list of patterns into a find statement. 16.125 - $1_CLEAN_PATTERN:=$(FALSE_FIND_PATTERN) $$(patsubst %,$(SPACE)-o$(SPACE)-name$(SPACE)$(DQUOTE)*%$(DQUOTE),$$($1_CLEAN)) 16.126 # Search for all files to be copied. 16.127 $1_ALL_CLEANS := $$(filter $$(addprefix %,$$($1_CLEAN)),$$($1_ALL_SRCS)) 16.128 # Copy and clean must also respect filters.
17.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 17.2 +++ b/common/makefiles/Jprt.gmk Tue Jan 08 13:14:22 2013 -0800 17.3 @@ -0,0 +1,193 @@ 17.4 +# 17.5 +# Copyright (c) 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 +# This file is included by the root NewerMakefile and contains targets 17.30 +# and utilities needed by JPRT. 17.31 + 17.32 +# Utilities used in this Makefile 17.33 +CAT=cat 17.34 +CMP=cmp 17.35 +CP=cp 17.36 +ECHO=echo 17.37 +MKDIR=mkdir 17.38 +PRINTF=printf 17.39 +PWD=pwd 17.40 +# Insure we have a path that looks like it came from pwd 17.41 +# (This is mostly for Windows sake and drive letters) 17.42 +define UnixPath # path 17.43 +$(shell (cd "$1" && $(PWD))) 17.44 +endef 17.45 + 17.46 +BUILD_DIR_ROOT:=$(root_dir)/build 17.47 + 17.48 +# Appears to be an open build 17.49 +OPEN_BUILD := \ 17.50 +$(shell \ 17.51 + if [ -d $(root_dir)/jdk/src/closed \ 17.52 + -o -d $(root_dir)/jdk/make/closed \ 17.53 + -o -d $(root_dir)/jdk/test/closed \ 17.54 + -o -d $(root_dir)/hotspot/src/closed \ 17.55 + -o -d $(root_dir)/hotspot/make/closed \ 17.56 + -o -d $(root_dir)/hotspot/test/closed ] ; then \ 17.57 + echo "false"; \ 17.58 + else \ 17.59 + echo "true"; \ 17.60 + fi \ 17.61 + ) 17.62 +ifdef OPENJDK 17.63 + OPEN_BUILD=true 17.64 +endif 17.65 + 17.66 +########################################################################### 17.67 +# To help in adoption of the new configure&&make build process, a bridge 17.68 +# build will use the old settings to run configure and do the build. 17.69 + 17.70 +# Build with the configure bridge. After running configure, restart make 17.71 +# to parse the new spec file. 17.72 +BRIDGE_TARGETS := all 17.73 +bridgeBuild: bridge2configure 17.74 + @cd $(root_dir) && $(MAKE) -f NewMakefile.gmk $(BRIDGE_TARGETS) 17.75 + 17.76 +# Bridge from old Makefile ALT settings to configure options 17.77 +bridge2configure: $(BUILD_DIR_ROOT)/.bridge2configureOpts 17.78 + bash ./configure $(strip $(shell $(CAT) $<)) 17.79 + 17.80 +# Create a file with configure options created from old Makefile mechanisms. 17.81 +$(BUILD_DIR_ROOT)/.bridge2configureOpts: $(BUILD_DIR_ROOT)/.bridge2configureOptsLatest 17.82 + $(RM) $@ 17.83 + $(CP) $< $@ 17.84 + 17.85 +# Use this file to only change when obvious things have changed 17.86 +$(BUILD_DIR_ROOT)/.bridge2configureOptsLatest: FRC 17.87 + $(RM) $@.tmp 17.88 + $(MKDIR) -p $(BUILD_DIR_ROOT) 17.89 + @$(ECHO) " --with-debug-level=$(if $(DEBUG_LEVEL),$(DEBUG_LEVEL),release) " >> $@.tmp 17.90 +ifdef ARCH_DATA_MODEL 17.91 + @$(ECHO) " --with-target-bits=$(ARCH_DATA_MODEL) " >> $@.tmp 17.92 +endif 17.93 +ifeq ($(ARCH_DATA_MODEL),32) 17.94 + @$(ECHO) " --with-jvm-variants=client,server " >> $@.tmp 17.95 +endif 17.96 +ifdef ALT_PARALLEL_COMPILE_JOBS 17.97 + @$(ECHO) " --with-num-cores=$(ALT_PARALLEL_COMPILE_JOBS) " >> $@.tmp 17.98 +endif 17.99 +ifdef ALT_BOOTDIR 17.100 + @$(ECHO) " --with-boot-jdk=$(call UnixPath,$(ALT_BOOTDIR)) " >> $@.tmp 17.101 +endif 17.102 +ifdef ALT_CUPS_HEADERS_PATH 17.103 + @$(ECHO) " --with-cups-include=$(call UnixPath,$(ALT_CUPS_HEADERS_PATH)) " >> $@.tmp 17.104 +endif 17.105 +ifdef ALT_FREETYPE_HEADERS_PATH 17.106 + @$(ECHO) " --with-freetype=$(call UnixPath,$(ALT_FREETYPE_HEADERS_PATH)/..) " >> $@.tmp 17.107 +endif 17.108 +ifeq ($(OPEN_BUILD),true) 17.109 + @$(ECHO) " --enable-openjdk-only " >> $@.tmp 17.110 +else 17.111 + # Todo: move to closed? 17.112 + ifdef ALT_MOZILLA_HEADERS_PATH 17.113 + @$(ECHO) " --with-mozilla-headers=$(call UnixPath,$(ALT_MOZILLA_HEADERS_PATH)) " >> $@.tmp 17.114 + endif 17.115 + ifdef ALT_JUNIT_DIR 17.116 + @$(ECHO) " --with-junit-dir=$(call UnixPath,$(ALT_JUNIT_DIR)) " >> $@.tmp 17.117 + endif 17.118 + ifdef ANT_HOME 17.119 + @$(ECHO) " --with-ant-home=$(call UnixPath,$(ANT_HOME)) " >> $@.tmp 17.120 + endif 17.121 + ifdef ALT_JAVAFX_ZIP_DIR 17.122 + @$(ECHO) " --with-javafx-zip-dir=$(call UnixPath,$(ALT_JAVAFX_ZIP_DIR)) " >> $@.tmp 17.123 + endif 17.124 + ifdef ALT_WIXDIR 17.125 + @$(ECHO) " --with-wix=$(call UnixPath,$(ALT_WIXDIR)) " >> $@.tmp 17.126 + endif 17.127 + ifdef ALT_CCSS_SIGNING_DIR 17.128 + @$(ECHO) " --with-ccss-signing=$(call UnixPath,$(ALT_CCSS_SIGNING_DIR)) " >> $@.tmp 17.129 + endif 17.130 + ifdef ALT_SLASH_JAVA 17.131 + @$(ECHO) " --with-java-devtools=$(call UnixPath,$(ALT_SLASH_JAVA)/devtools) " >> $@.tmp 17.132 + endif 17.133 +endif 17.134 + @if [ -f $@ ] ; then \ 17.135 + if ! $(CMP) $@ $@.tmp > /dev/null ; then \ 17.136 + $(CP) $@.tmp $@ ; \ 17.137 + fi ; \ 17.138 + else \ 17.139 + $(CP) $@.tmp $@ ; \ 17.140 + fi 17.141 + $(RM) $@.tmp 17.142 + 17.143 +PHONY_LIST += bridge2configure bridgeBuild 17.144 + 17.145 +########################################################################### 17.146 +# JPRT targets 17.147 + 17.148 +ifndef JPRT_ARCHIVE_BUNDLE 17.149 + JPRT_ARCHIVE_BUNDLE=/tmp/jprt_bundles/j2sdk-image.zip 17.150 +endif 17.151 + 17.152 +# These targets execute in a SPEC free context, before calling bridgeBuild 17.153 +# to generate the SPEC. 17.154 +jprt_build_product: DEBUG_LEVEL=release 17.155 +jprt_build_product: BUILD_DIRNAME=*-release 17.156 +jprt_build_product: jprt_build_generic 17.157 + 17.158 +jprt_build_fastdebug: DEBUG_LEVEL=fastdebug 17.159 +jprt_build_fastdebug: BUILD_DIRNAME=*-fastdebug 17.160 +jprt_build_fastdebug: jprt_build_generic 17.161 + 17.162 +jprt_build_debug: DEBUG_LEVEL=slowdebug 17.163 +jprt_build_debug: BUILD_DIRNAME=*-debug 17.164 +jprt_build_debug: jprt_build_generic 17.165 + 17.166 +jprt_build_generic: BRIDGE_TARGETS+=jprt_bundle 17.167 +jprt_build_generic: bridgeBuild 17.168 + 17.169 +# This target must be called in the context of a SPEC file 17.170 +jprt_bundle: $(JPRT_ARCHIVE_BUNDLE) 17.171 + @$(call CheckIfMakeAtEnd) 17.172 + 17.173 +# This target must be called in the context of a SPEC file 17.174 +$(JPRT_ARCHIVE_BUNDLE): bundles 17.175 + $(MKDIR) -p $(@D) 17.176 + $(RM) $@ 17.177 + $(CP) $(BUILD_OUTPUT)/bundles/j2sdk-image.zip $@ 17.178 + 17.179 +# This target must be called in the context of a SPEC file 17.180 +bundles: all 17.181 + @$(call TargetEnter) 17.182 + $(MKDIR) -p $(BUILD_OUTPUT)/bundles 17.183 + $(CD) $(IMAGES_OUTPUTDIR)/j2sdk-image && $(ZIP) -q -r $(BUILD_OUTPUT)/bundles/j2sdk-image.zip . 17.184 + $(CD) $(IMAGES_OUTPUTDIR)/j2re-image && $(ZIP) -q -r $(BUILD_OUTPUT)/bundles/j2re-image.zip . 17.185 + @$(call TargetExit) 17.186 + 17.187 +# Keep track of phony targets 17.188 +PHONY_LIST += jprt_build_product jprt_build_fastdebug jprt_build_debug \ 17.189 + jprt_build_generic bundles jprt_bundle 17.190 + 17.191 +########################################################################### 17.192 +# Phony targets 17.193 +.PHONY: $(PHONY_LIST) 17.194 + 17.195 +# Force target 17.196 +FRC:
18.1 --- a/common/makefiles/Main.gmk Thu Jan 03 12:44:32 2013 -0800 18.2 +++ b/common/makefiles/Main.gmk Tue Jan 08 13:14:22 2013 -0800 18.3 @@ -65,7 +65,15 @@ 18.4 18.5 ### Main targets 18.6 18.7 -all: jdk 18.8 +default: jdk 18.9 + @$(call CheckIfMakeAtEnd) 18.10 + 18.11 +all: images docs 18.12 + @$(call CheckIfMakeAtEnd) 18.13 + 18.14 +ifeq ($(OPENJDK_TARGET_OS)-$(OPENJDK_TARGET_CPU_BITS),solaris-64) 18.15 + all: overlay-images 18.16 +endif 18.17 18.18 start-make: 18.19 @$(call AtMakeStart) 18.20 @@ -126,12 +134,6 @@ 18.21 @($(CD) $(JDK_TOPDIR)/makefiles && $(BUILD_LOG_WRAPPER) $(MAKE) $(MAKE_ARGS) -f BuildJdk.gmk overlay-images) 18.22 @$(call TargetExit) 18.23 18.24 -bundles: images bundles-only 18.25 -bundles-only: start-make 18.26 - @$(call TargetEnter) 18.27 - @($(CD) $(JDK_TOPDIR)/makefiles && $(BUILD_LOG_WRAPPER) $(MAKE) $(MAKE_ARGS) -f BuildJdk.gmk bundles) 18.28 - @$(call TargetExit) 18.29 - 18.30 install: images install-only 18.31 install-only: start-make 18.32 @$(call TargetEnter) 18.33 @@ -144,6 +146,12 @@ 18.34 @($(CD) $(SRC_ROOT)/common/makefiles/javadoc && $(BUILD_LOG_WRAPPER) $(MAKE) $(MAKE_ARGS) -f Javadoc.gmk docs) 18.35 @$(call TargetExit) 18.36 18.37 +sign-jars: jdk sign-jars-only 18.38 +sign-jars-only: start-make 18.39 + @$(call TargetEnter) 18.40 + @($(CD) $(JDK_TOPDIR)/makefiles && $(BUILD_LOG_WRAPPER) $(MAKE) $(MAKE_ARGS) -f BuildJdk.gmk sign-jars) 18.41 + @$(call TargetExit) 18.42 + 18.43 bootcycle-images: 18.44 @$(ECHO) Boot cycle build step 1: Building the JDK image normally 18.45 @($(CD) $(SRC_ROOT)/common/makefiles && $(BUILD_LOG_WRAPPER) $(MAKE) SPEC=$(SPEC) images)
19.1 --- a/common/makefiles/MakeBase.gmk Thu Jan 03 12:44:32 2013 -0800 19.2 +++ b/common/makefiles/MakeBase.gmk Tue Jan 08 13:14:22 2013 -0800 19.3 @@ -391,4 +391,46 @@ 19.4 endef 19.5 endif 19.6 19.7 +# Convenience functions for working around make's limitations with $(filter ). 19.8 +containing = $(foreach v,$2,$(if $(findstring $1,$v),$v)) 19.9 +not-containing = $(foreach v,$2,$(if $(findstring $1,$v),,$v)) 19.10 + 19.11 +################################################################################ 19.12 +# In Cygwin, finds are very costly, both because of expensive forks and because 19.13 +# of bad file system caching. Find is used extensively in $(shell) commands to 19.14 +# find source files. This makes rerunning make with no or few changes rather 19.15 +# expensive. To speed this up, these two macros are used to cache the results 19.16 +# of simple find commands for reuse. 19.17 +# 19.18 +# Runs a find and stores both the directories where it was run and the results. 19.19 +# This macro can be called multiple times to add to the cache. Only finds files 19.20 +# with no filters. 19.21 +# 19.22 +# Needs to be called with $(eval ) 19.23 +# 19.24 +# Param 1 - Dir to find in 19.25 +ifeq ($(OPENJDK_BUILD_OS),windows) 19.26 +define FillCacheFind 19.27 + FIND_CACHE_DIR += $1 19.28 + FIND_CACHE := $$(sort $$(FIND_CACHE) $$(shell $(FIND) $1 -type f -o -type l)) 19.29 +endef 19.30 +else 19.31 +define FillCacheFind 19.32 +endef 19.33 +endif 19.34 + 19.35 +# Mimics find by looking in the cache if all of the directories have been cached. 19.36 +# Otherwise reverts to shell find. This is safe to call on all platforms, even if 19.37 +# cache is deactivated. 19.38 +# 19.39 +# The extra - is needed when FIND_CACHE_DIR is empty but should be harmless. 19.40 +# Param 1 - Dirs to find in 19.41 +define CacheFind 19.42 + $(if $(filter-out $(addsuffix %,- $(FIND_CACHE_DIR)),$1),\ 19.43 + $(shell $(FIND) $1 -type f -o -type l),\ 19.44 + $(filter $(addsuffix %,$1),$(FIND_CACHE))) 19.45 +endef 19.46 + 19.47 +################################################################################ 19.48 + 19.49 endif # _MAKEBASE_GMK
20.1 --- a/common/makefiles/MakeHelpers.gmk Thu Jan 03 12:44:32 2013 -0800 20.2 +++ b/common/makefiles/MakeHelpers.gmk Tue Jan 08 13:14:22 2013 -0800 20.3 @@ -50,7 +50,7 @@ 20.4 20.5 # Global targets are possible to run either with or without a SPEC. The prototypical 20.6 # global target is "help". 20.7 -global_targets=help configure 20.8 +global_targets=help jprt% bridgeBuild 20.9 20.10 ############################## 20.11 # Functions 20.12 @@ -112,7 +112,7 @@ 20.13 20.14 # Do not indent this function, this will add whitespace at the start which the caller won't handle 20.15 define GetRealTarget 20.16 -$(strip $(if $(MAKECMDGOALS),$(MAKECMDGOALS),all)) 20.17 +$(strip $(if $(MAKECMDGOALS),$(MAKECMDGOALS),default)) 20.18 endef 20.19 20.20 # Do not indent this function, this will add whitespace at the start which the caller won't handle 20.21 @@ -126,10 +126,7 @@ 20.22 # Check if the current target is the last goal 20.23 $(if $(filter $@,$(call LastGoal)),$(call AtMakeEnd)) 20.24 # If the target is 'foo-only', check if our goal was stated as 'foo' 20.25 - $(if $(filter $(patsubst %-only,%,$@),$(call LastGoal)),$(call AtMakeEnd)) 20.26 - # If no goal is given, 'all' is default, but the last target executed for all is 'jdk-only'. Check for that, too. 20.27 - # At most one of the tests can be true. 20.28 - $(if $(subst all,,$(call LastGoal)),,$(if $(filter $@,jdk-only),$(call AtMakeEnd))) 20.29 + $(if $(filter $@,$(call LastGoal)-only),$(call AtMakeEnd)) 20.30 endef 20.31 20.32 # Hook to be called when starting to execute a top-level target
21.1 --- a/common/makefiles/Makefile Thu Jan 03 12:44:32 2013 -0800 21.2 +++ b/common/makefiles/Makefile Tue Jan 08 13:14:22 2013 -0800 21.3 @@ -23,109 +23,4 @@ 21.4 # questions. 21.5 # 21.6 21.7 -# This must be the first rule 21.8 -all: 21.9 - 21.10 -# Inclusion of this pseudo-target will cause make to execute this file 21.11 -# serially, regardless of -j. Recursively called makefiles will not be 21.12 -# affected, however. This is required for correct dependency management. 21.13 -.NOTPARALLEL: 21.14 - 21.15 -# The shell code below will be executed on /usr/ccs/bin/make on Solaris, but not in GNU make. 21.16 -# /usr/ccs/bin/make lacks basically every other flow control mechanism. 21.17 -TEST_FOR_NON_GNUMAKE:sh=echo You are not using GNU make/gmake, this is a requirement. Check your path. 1>&2 && exit 1 21.18 - 21.19 -# Assume we have GNU make, but check version. 21.20 -ifeq (,$(findstring 3.81,$(MAKE_VERSION))) 21.21 - ifeq (,$(findstring 3.82,$(MAKE_VERSION))) 21.22 - $(error This version of GNU Make is too low ($(MAKE_VERSION)). Check your path, or upgrade to 3.81 or newer.) 21.23 - endif 21.24 -endif 21.25 - 21.26 -# Locate this Makefile 21.27 -ifeq ($(filter /%,$(lastword $(MAKEFILE_LIST))),) 21.28 - makefile_path:=$(CURDIR)/$(lastword $(MAKEFILE_LIST)) 21.29 -else 21.30 - makefile_path:=$(lastword $(MAKEFILE_LIST)) 21.31 -endif 21.32 -root_dir:=$(patsubst %/common/makefiles/Makefile,%,$(makefile_path)) 21.33 - 21.34 -# ... and then we can include our helper functions 21.35 -include $(dir $(makefile_path))/MakeHelpers.gmk 21.36 - 21.37 -$(eval $(call ParseLogLevel)) 21.38 -$(eval $(call ParseConfAndSpec)) 21.39 - 21.40 -# Now determine if we have zero, one or several configurations to build. 21.41 -ifeq ($(SPEC),) 21.42 - # Since we got past ParseConfAndSpec, we must be building a global target. Do nothing. 21.43 -else 21.44 - ifeq ($(words $(SPEC)),1) 21.45 - # We are building a single configuration. This is the normal case. Execute the Main.gmk file. 21.46 - include $(dir $(makefile_path))/Main.gmk 21.47 - else 21.48 - # We are building multiple configurations. 21.49 - # First, find out the valid targets 21.50 - # Run the makefile with an arbitraty SPEC using -p -q (quiet dry-run and dump rules) to find 21.51 - # available PHONY targets. Use this list as valid targets to pass on to the repeated calls. 21.52 - all_phony_targets=$(filter-out $(global_targets), $(strip $(shell \ 21.53 - $(MAKE) -p -q -f $(makefile_path) SPEC=$(firstword $(SPEC)) | \ 21.54 - grep ^.PHONY: | head -n 1 | cut -d " " -f 2-))) 21.55 - 21.56 -$(all_phony_targets): 21.57 - @$(foreach spec,$(SPEC),($(MAKE) -f $(makefile_path) SPEC=$(spec) $(VERBOSE) VERBOSE=$(VERBOSE) $@) &&) true 21.58 - 21.59 - endif 21.60 -endif 21.61 - 21.62 -# Here are "global" targets, i.e. targets that can be executed without specifying a single configuration. 21.63 -# If you addd more global targets, please update the variable global_targets in MakeHelpers. 21.64 - 21.65 -help: 21.66 - $(info ) 21.67 - $(info OpenJDK Makefile help) 21.68 - $(info =====================) 21.69 - $(info ) 21.70 - $(info Common make targets) 21.71 - $(info . make [all] # Compile all code but do not create images) 21.72 - $(info . make images # Create complete j2sdk and j2re images) 21.73 - $(info . make overlay-images # Create limited images for sparc 64 bit platforms) 21.74 - $(info . make bootcycle-images # Build images twice, second time with newly build JDK) 21.75 - $(info . make install # Install the generated images locally) 21.76 - $(info . make clean # Remove all files generated by make, but not those) 21.77 - $(info . # generated by configure) 21.78 - $(info . make dist-clean # Remove all files, including configuration) 21.79 - $(info . make help # Give some help on using make) 21.80 - $(info . make test # Run tests, default is all tests (see TEST below)) 21.81 - $(info ) 21.82 - $(info Targets for specific components) 21.83 - $(info (Component is any of langtools, corba, jaxp, jaxws, hotspot, jdk, images or overlay-images)) 21.84 - $(info . make <component> # Build <component> and everything it depends on. ) 21.85 - $(info . make <component>-only # Build <component> only, without dependencies. This) 21.86 - $(info . # is faster but can result in incorrect build results!) 21.87 - $(info . make clean-<component> # Remove files generated by make for <component>) 21.88 - $(info ) 21.89 - $(info Useful make variables) 21.90 - $(info . make CONF= # Build all configurations (note, assignment is empty)) 21.91 - $(info . make CONF=<substring> # Build the configuration(s) with a name matching) 21.92 - $(info . # <substring>) 21.93 - $(info ) 21.94 - $(info . make LOG=<loglevel> # Change the log level from warn to <loglevel>) 21.95 - $(info . # Available log levels are:) 21.96 - $(info . # 'warn' (default), 'info', 'debug' and 'trace') 21.97 - $(info . # To see executed command lines, use LOG=debug) 21.98 - $(info ) 21.99 - $(info . make JOBS=<n> # Run <n> parallel make jobs) 21.100 - $(info . # Note that -jN does not work as expected!) 21.101 - $(info ) 21.102 - $(info . make test TEST=<test> # Only run the given test or tests, e.g.) 21.103 - $(info . # make test TEST="jdk_lang jdk_net") 21.104 - $(info ) 21.105 - 21.106 -configure: 21.107 - @$(SHELL) $(root_dir)/configure $(CONFIGURE_ARGS) 21.108 - @echo ==================================================== 21.109 - @echo "Note: This is a non-recommended way of running configure." 21.110 - @echo "Instead, run 'sh configure' in the top-level directory" 21.111 - 21.112 -.PHONY: help configure 21.113 +include ../../NewMakefile.gmk
22.1 --- a/common/makefiles/NativeCompilation.gmk Thu Jan 03 12:44:32 2013 -0800 22.2 +++ b/common/makefiles/NativeCompilation.gmk Tue Jan 08 13:14:22 2013 -0800 22.3 @@ -236,7 +236,7 @@ 22.4 $$(foreach d,$$($1_SRC), $$(if $$(wildcard $$d),,$$(error SRC specified to SetupNativeCompilation $1 contains missing directory $$d))) 22.5 22.6 # Find all files in the source trees. Sort to remove duplicates. 22.7 - $1_ALL_SRCS := $$(sort $$(shell $(FIND) $$($1_SRC) -type f)) 22.8 + $1_ALL_SRCS := $$(sort $$(call CacheFind,$$($1_SRC))) 22.9 # Extract the C/C++ files. 22.10 $1_EXCLUDE_FILES:=$$(foreach i,$$($1_SRC),$$(addprefix $$i/,$$($1_EXCLUDE_FILES))) 22.11 $1_INCLUDE_FILES:=$$(foreach i,$$($1_SRC),$$(addprefix $$i/,$$($1_INCLUDE_FILES)))
23.1 --- a/common/makefiles/javadoc/Javadoc.gmk Thu Jan 03 12:44:32 2013 -0800 23.2 +++ b/common/makefiles/javadoc/Javadoc.gmk Tue Jan 08 13:14:22 2013 -0800 23.3 @@ -32,8 +32,6 @@ 23.4 # Definitions for $(DOCSDIR), $(MKDIR), $(BINDIR), etc. 23.5 # 23.6 23.7 -CLASSPATH_SEPARATOR = : 23.8 - 23.9 DOCSDIR=$(OUTPUT_ROOT)/docs 23.10 TEMPDIR=$(OUTPUT_ROOT)/docstemp 23.11 23.12 @@ -137,7 +135,7 @@ 23.13 # List of all possible directories for javadoc to look for sources 23.14 # NOTE: Quotes are required around sourcepath argument only on Windows. 23.15 # Otherwise, you get "No packages or classes specified." due 23.16 -# to $(CLASSPATH_SEPARATOR) being interpreted as an end of 23.17 +# to $(PATH_SEP) being interpreted as an end of 23.18 # command (newline or shell ; character) 23.19 ALL_SOURCE_DIRS = $(JDK_SHARE_CLASSES) \ 23.20 $(JDK_IMPSRC) \ 23.21 @@ -154,7 +152,7 @@ 23.22 EMPTY:= 23.23 SPACE:= $(EMPTY) $(EMPTY) 23.24 RELEASEDOCS_SOURCEPATH = \ 23.25 - $(subst $(SPACE),$(CLASSPATH_SEPARATOR),$(strip $(ALL_SOURCE_DIRS))) 23.26 + $(subst $(SPACE),$(PATH_SEP),$(strip $(ALL_SOURCE_DIRS))) 23.27 23.28 define prep-target 23.29 $(MKDIR) -p $(@D)
24.1 --- a/common/src/fixpath.c Thu Jan 03 12:44:32 2013 -0800 24.2 +++ b/common/src/fixpath.c Tue Jan 08 13:14:22 2013 -0800 24.3 @@ -29,6 +29,29 @@ 24.4 #include <string.h> 24.5 #include <malloc.h> 24.6 24.7 +void report_error() 24.8 +{ 24.9 + LPVOID lpMsgBuf; 24.10 + DWORD dw = GetLastError(); 24.11 + 24.12 + FormatMessage( 24.13 + FORMAT_MESSAGE_ALLOCATE_BUFFER | 24.14 + FORMAT_MESSAGE_FROM_SYSTEM | 24.15 + FORMAT_MESSAGE_IGNORE_INSERTS, 24.16 + NULL, 24.17 + dw, 24.18 + MAKELANGID(LANG_NEUTRAL, SUBLANG_DEFAULT), 24.19 + (LPTSTR) &lpMsgBuf, 24.20 + 0, 24.21 + NULL); 24.22 + 24.23 + fprintf(stderr, 24.24 + "Could not start process! Failed with error %d: %s\n", 24.25 + dw, lpMsgBuf); 24.26 + 24.27 + LocalFree(lpMsgBuf); 24.28 +} 24.29 + 24.30 /* 24.31 * Test if pos points to /cygdrive/_/ where _ can 24.32 * be any character. 24.33 @@ -256,7 +279,7 @@ 24.34 DWORD exitCode; 24.35 24.36 if (argc<3 || argv[1][0] != '-' || (argv[1][1] != 'c' && argv[1][1] != 'm')) { 24.37 - fprintf(stderr, "Usage: fixpath -c|m<path@path@...> /cygdrive/c/WINDOWS/notepad.exe /cygdrive/c/x/test.txt"); 24.38 + fprintf(stderr, "Usage: fixpath -c|m<path@path@...> /cygdrive/c/WINDOWS/notepad.exe /cygdrive/c/x/test.txt\n"); 24.39 exit(0); 24.40 } 24.41 24.42 @@ -308,11 +331,10 @@ 24.43 0, 24.44 &si, 24.45 &pi); 24.46 - if(!rc) 24.47 - { 24.48 - //Could not start process; 24.49 - fprintf(stderr, "Could not start process!\n"); 24.50 - exit(-1); 24.51 + if(!rc) { 24.52 + // Could not start process for some reason. Try to report why: 24.53 + report_error(); 24.54 + exit(rc); 24.55 } 24.56 24.57 WaitForSingleObject(pi.hProcess,INFINITE);
25.1 --- a/make/jprt.properties Thu Jan 03 12:44:32 2013 -0800 25.2 +++ b/make/jprt.properties Tue Jan 08 13:14:22 2013 -0800 25.3 @@ -28,6 +28,9 @@ 25.4 # Locked down to jdk8 25.5 jprt.tools.default.release=jdk8 25.6 25.7 +# Unix toolkit to use for building on windows 25.8 +jprt.windows.jdk8.build.unix.toolkit=cygwin 25.9 + 25.10 # The different build flavors we want, we override here so we just get these 2 25.11 jprt.build.flavors=product,fastdebug 25.12
