Mercurial > jdk8-mips64-public / changeset
changeset
Merge
Wed, 16 Jan 2013 22:16:51 -0800
- author
- katleman
- date
- Wed, 16 Jan 2013 22:16:51 -0800
- changeset 581
- dc84b505b408
- parent 555
- 4090847a5444
- parent 580
- fe1c94aca5a8
- child 586
- f9163f9cb1da
- child 587
- 5a5e97f9ac0a
- child 594
- 2e12a508d7ae
- child 623
- b80abec66e70
Merge
| common/autoconf/closed.version.numbers | file | annotate | diff | comparison | revisions | |
| common/autoconf/version.numbers | file | annotate | diff | comparison | revisions | |
| common/bin/compare_exceptions.sh.incl | file | annotate | diff | comparison | revisions |
1.1 --- a/Makefile Wed Jan 16 11:59:37 2013 -0800 1.2 +++ b/Makefile Wed Jan 16 22:16:51 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 Wed Jan 16 11:59:37 2013 -0800 2.2 +++ b/NewMakefile.gmk Wed Jan 16 22:16:51 2013 -0800 2.3 @@ -23,273 +23,109 @@ 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 +# ... and then we can include our helper functions 2.226 +include $(root_dir)/common/makefiles/MakeHelpers.gmk 2.227 2.228 -jprt_build_debug: DEBUG_LEVEL=slowdebug 2.229 -jprt_build_debug: BUILD_DIRNAME=*-debug 2.230 -jprt_build_debug: jprt_build_generic 2.231 +$(eval $(call ParseLogLevel)) 2.232 +$(eval $(call ParseConfAndSpec)) 2.233 2.234 -jprt_build_generic: $(JPRT_ARCHIVE_BUNDLE) 2.235 +# Now determine if we have zero, one or several configurations to build. 2.236 +ifeq ($(SPEC),) 2.237 + # Since we got past ParseConfAndSpec, we must be building a global target. Do nothing. 2.238 +else 2.239 + ifeq ($(words $(SPEC)),1) 2.240 + # We are building a single configuration. This is the normal case. Execute the Main.gmk file. 2.241 + include $(root_dir)/common/makefiles/Main.gmk 2.242 + else 2.243 + # We are building multiple configurations. 2.244 + # First, find out the valid targets 2.245 + # Run the makefile with an arbitraty SPEC using -p -q (quiet dry-run and dump rules) to find 2.246 + # available PHONY targets. Use this list as valid targets to pass on to the repeated calls. 2.247 + all_phony_targets=$(filter-out $(global_targets), $(strip $(shell \ 2.248 + $(MAKE) -p -q -f common/makefiles SPEC=$(firstword $(SPEC)) | \ 2.249 + grep ^.PHONY: | head -n 1 | cut -d " " -f 2-))) 2.250 2.251 -$(JPRT_ARCHIVE_BUNDLE): bridgeBuild bundles 2.252 - $(MKDIR) -p $(@D) 2.253 - $(RM) $@ 2.254 - $(CP) $(BUILD_DIR_ROOT)/$(BUILD_DIRNAME)/bundles/j2sdk-image.zip $@ 2.255 +$(all_phony_targets): 2.256 + @$(foreach spec,$(SPEC),($(MAKE) -f NewMakefile.gmk SPEC=$(spec) $(VERBOSE) VERBOSE=$(VERBOSE) $@) &&) true 2.257 2.258 -# Keep track of phony targets 2.259 -PHONY_LIST += jprt_build_product jprt_build_fastdebug jprt_build_debug \ 2.260 - jprt_build_generic 2.261 + endif 2.262 +endif 2.263 2.264 -########################################################################### 2.265 -# Help target 2.266 +# Include this after a potential spec file has been included so that the bundles target 2.267 +# has access to the spec variables. 2.268 +include $(root_dir)/common/makefiles/Jprt.gmk 2.269 2.270 -HELP_FORMAT=%12s%s\n 2.271 +# Here are "global" targets, i.e. targets that can be executed without specifying a single configuration. 2.272 +# If you addd more global targets, please update the variable global_targets in MakeHelpers. 2.273 2.274 help: 2.275 - @$(PRINTF) "# JDK Makefile\n" 2.276 - @$(PRINTF) "#\n" 2.277 - @$(PRINTF) "# Usage: make [Target]\n" 2.278 - @$(PRINTF) "#\n" 2.279 - @$(PRINTF) "# $(HELP_FORMAT)" "Target " "Description" 2.280 - @$(PRINTF) "# $(HELP_FORMAT)" "------ " "-----------" 2.281 - @for i in $(USER_TARGETS) ; do \ 2.282 - $(MAKE) help_$${i} ; \ 2.283 - done 2.284 - @$(PRINTF) "#\n" 2.285 + $(info ) 2.286 + $(info OpenJDK Makefile help) 2.287 + $(info =====================) 2.288 + $(info ) 2.289 + $(info Common make targets) 2.290 + $(info . make [default] # Compile all product in langtools, hotspot, jaxp, jaxws,) 2.291 + $(info . # corba and jdk) 2.292 + $(info . make all # Compile everything, all repos and images) 2.293 + $(info . make images # Create complete j2sdk and j2re images) 2.294 + $(info . make overlay-images # Create limited images for sparc 64 bit platforms) 2.295 + $(info . make bootcycle-images # Build images twice, second time with newly build JDK) 2.296 + $(info . make install # Install the generated images locally) 2.297 + $(info . make clean # Remove all files generated by make, but not those) 2.298 + $(info . # generated by configure) 2.299 + $(info . make dist-clean # Remove all files, including configuration) 2.300 + $(info . make help # Give some help on using make) 2.301 + $(info . make test # Run tests, default is all tests (see TEST below)) 2.302 + $(info ) 2.303 + $(info Targets for specific components) 2.304 + $(info (Component is any of langtools, corba, jaxp, jaxws, hotspot, jdk, images or overlay-images)) 2.305 + $(info . make <component> # Build <component> and everything it depends on. ) 2.306 + $(info . make <component>-only # Build <component> only, without dependencies. This) 2.307 + $(info . # is faster but can result in incorrect build results!) 2.308 + $(info . make clean-<component> # Remove files generated by make for <component>) 2.309 + $(info ) 2.310 + $(info Useful make variables) 2.311 + $(info . make CONF= # Build all configurations (note, assignment is empty)) 2.312 + $(info . make CONF=<substring> # Build the configuration(s) with a name matching) 2.313 + $(info . # <substring>) 2.314 + $(info ) 2.315 + $(info . make LOG=<loglevel> # Change the log level from warn to <loglevel>) 2.316 + $(info . # Available log levels are:) 2.317 + $(info . # 'warn' (default), 'info', 'debug' and 'trace') 2.318 + $(info . # To see executed command lines, use LOG=debug) 2.319 + $(info ) 2.320 + $(info . make JOBS=<n> # Run <n> parallel make jobs) 2.321 + $(info . # Note that -jN does not work as expected!) 2.322 + $(info ) 2.323 + $(info . make test TEST=<test> # Only run the given test or tests, e.g.) 2.324 + $(info . # make test TEST="jdk_lang jdk_net") 2.325 + $(info ) 2.326 2.327 -help_all: 2.328 - @$(PRINTF) "# $(HELP_FORMAT)" "$(subst help_,,$@) - " \ 2.329 - "Build the entire jdk but not the images" 2.330 -help_images: 2.331 - @$(PRINTF) "# $(HELP_FORMAT)" "$(subst help_,,$@) - " \ 2.332 - "Create the jdk images for the builds" 2.333 -help_deploy: 2.334 - @$(PRINTF) "# $(HELP_FORMAT)" "$(subst help_,,$@) - " \ 2.335 - "Create the jdk deploy images from the jdk images" 2.336 -help_install: 2.337 - @$(PRINTF) "# $(HELP_FORMAT)" "$(subst help_,,$@) - " \ 2.338 - "Create the jdk install bundles from the deploy images" 2.339 -help_clean: 2.340 - @$(PRINTF) "# $(HELP_FORMAT)" "$(subst help_,,$@) - " \ 2.341 - "Clean and prepare for a fresh build from scratch" 2.342 -help_clobber: 2.343 - @$(PRINTF) "# $(HELP_FORMAT)" "$(subst help_,,$@) - " \ 2.344 - "Clean and also purge any hidden derived data" 2.345 -help_checks: 2.346 - @$(PRINTF) "# $(HELP_FORMAT)" "$(subst help_,,$@) - " \ 2.347 - "Perform various checks to make sure we can build" 2.348 -help_sanity: 2.349 - @$(PRINTF) "# $(HELP_FORMAT)" "$(subst help_,,$@) - " \ 2.350 - "Same as 'make checks'" 2.351 -help_javadocs: 2.352 - @$(PRINTF) "# $(HELP_FORMAT)" "$(subst help_,,$@) - " \ 2.353 - "Build the javadocs" 2.354 -help_help: 2.355 - @$(PRINTF) "# $(HELP_FORMAT)" "$(subst help_,,$@) - " \ 2.356 - "Print out the help messages" 2.357 - 2.358 -# Keep track of user targets 2.359 -USER_TARGETS += help 2.360 - 2.361 -########################################################################### 2.362 -# Phony targets 2.363 -.PHONY: $(PHONY_LIST) $(USER_TARGETS) 2.364 - 2.365 -# Force target 2.366 -FRC: 2.367 +.PHONY: help
3.1 --- a/common/autoconf/Makefile.in Wed Jan 16 11:59:37 2013 -0800 3.2 +++ b/common/autoconf/Makefile.in Wed Jan 16 22:16:51 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 Wed Jan 16 11:59:37 2013 -0800 4.2 +++ b/common/autoconf/autogen.sh Wed Jan 16 22:16:51 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 Wed Jan 16 11:59:37 2013 -0800 5.2 +++ b/common/autoconf/basics.m4 Wed Jan 16 22:16:51 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/basics_windows.m4 Wed Jan 16 11:59:37 2013 -0800 6.2 +++ b/common/autoconf/basics_windows.m4 Wed Jan 16 22:16:51 2013 -0800 6.3 @@ -175,7 +175,7 @@ 6.4 # bat and cmd files are not always considered executable in cygwin causing which 6.5 # to not find them 6.6 if test "x$new_path" = x \ 6.7 - && test "x`$ECHO \"$path\" | $GREP -e \"\\.bat$\" -e \"\\.cmd$\"`" != x \ 6.8 + && test "x`$ECHO \"$path\" | $GREP -i -e \"\\.bat$\" -e \"\\.cmd$\"`" != x \ 6.9 && test "x`$LS \"$path\" 2>/dev/null`" != x; then 6.10 new_path=`$CYGPATH -u "$path"` 6.11 fi 6.12 @@ -191,7 +191,7 @@ 6.13 # bat and cmd files are not always considered executable in cygwin causing which 6.14 # to not find them 6.15 if test "x$new_path" = x \ 6.16 - && test "x`$ECHO \"$path\" | $GREP -e \"\\.bat$\" -e \"\\.cmd$\"`" != x \ 6.17 + && test "x`$ECHO \"$path\" | $GREP -i -e \"\\.bat$\" -e \"\\.cmd$\"`" != x \ 6.18 && test "x`$LS \"$path\" 2>/dev/null`" != x; then 6.19 new_path=`$CYGPATH -u "$path"` 6.20 fi
7.1 --- a/common/autoconf/build-aux/autoconf-config.guess Wed Jan 16 11:59:37 2013 -0800 7.2 +++ b/common/autoconf/build-aux/autoconf-config.guess Wed Jan 16 22:16:51 2013 -0800 7.3 @@ -1,4 +1,29 @@ 7.4 #! /bin/sh 7.5 +# 7.6 +# Copyright (c) 2012, 2013, Oracle and/or its affiliates. All rights reserved. 7.7 +# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. 7.8 +# 7.9 +# This code is free software; you can redistribute it and/or modify it 7.10 +# under the terms of the GNU General Public License version 2 only, as 7.11 +# published by the Free Software Foundation. Oracle designates this 7.12 +# particular file as subject to the "Classpath" exception as provided 7.13 +# by Oracle in the LICENSE file that accompanied this code. 7.14 +# 7.15 +# This code is distributed in the hope that it will be useful, but WITHOUT 7.16 +# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or 7.17 +# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License 7.18 +# version 2 for more details (a copy is included in the LICENSE file that 7.19 +# accompanied this code). 7.20 +# 7.21 +# You should have received a copy of the GNU General Public License version 7.22 +# 2 along with this work; if not, write to the Free Software Foundation, 7.23 +# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. 7.24 +# 7.25 +# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA 7.26 +# or visit www.oracle.com if you need additional information or have any 7.27 +# questions. 7.28 +# 7.29 + 7.30 # Attempt to guess a canonical system name. 7.31 # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 7.32 # 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008
8.1 --- a/common/autoconf/build-aux/config.sub Wed Jan 16 11:59:37 2013 -0800 8.2 +++ b/common/autoconf/build-aux/config.sub Wed Jan 16 22:16:51 2013 -0800 8.3 @@ -1,4 +1,30 @@ 8.4 #! /bin/sh 8.5 + 8.6 +# 8.7 +# Copyright (c) 2012, 2013, Oracle and/or its affiliates. All rights reserved. 8.8 +# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. 8.9 +# 8.10 +# This code is free software; you can redistribute it and/or modify it 8.11 +# under the terms of the GNU General Public License version 2 only, as 8.12 +# published by the Free Software Foundation. Oracle designates this 8.13 +# particular file as subject to the "Classpath" exception as provided 8.14 +# by Oracle in the LICENSE file that accompanied this code. 8.15 +# 8.16 +# This code is distributed in the hope that it will be useful, but WITHOUT 8.17 +# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or 8.18 +# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License 8.19 +# version 2 for more details (a copy is included in the LICENSE file that 8.20 +# accompanied this code). 8.21 +# 8.22 +# You should have received a copy of the GNU General Public License version 8.23 +# 2 along with this work; if not, write to the Free Software Foundation, 8.24 +# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. 8.25 +# 8.26 +# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA 8.27 +# or visit www.oracle.com if you need additional information or have any 8.28 +# questions. 8.29 +# 8.30 + 8.31 # Configuration validation subroutine script. 8.32 # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 8.33 # 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008
9.1 --- a/common/autoconf/build-aux/pkg.m4 Wed Jan 16 11:59:37 2013 -0800 9.2 +++ b/common/autoconf/build-aux/pkg.m4 Wed Jan 16 22:16:51 2013 -0800 9.3 @@ -1,4 +1,30 @@ 9.4 # pkg.m4 - Macros to locate and utilise pkg-config. -*- Autoconf -*- 9.5 + 9.6 +# 9.7 +# Copyright (c) 2012, 2013, Oracle and/or its affiliates. All rights reserved. 9.8 +# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. 9.9 +# 9.10 +# This code is free software; you can redistribute it and/or modify it 9.11 +# under the terms of the GNU General Public License version 2 only, as 9.12 +# published by the Free Software Foundation. Oracle designates this 9.13 +# particular file as subject to the "Classpath" exception as provided 9.14 +# by Oracle in the LICENSE file that accompanied this code. 9.15 +# 9.16 +# This code is distributed in the hope that it will be useful, but WITHOUT 9.17 +# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or 9.18 +# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License 9.19 +# version 2 for more details (a copy is included in the LICENSE file that 9.20 +# accompanied this code). 9.21 +# 9.22 +# You should have received a copy of the GNU General Public License version 9.23 +# 2 along with this work; if not, write to the Free Software Foundation, 9.24 +# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. 9.25 +# 9.26 +# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA 9.27 +# or visit www.oracle.com if you need additional information or have any 9.28 +# questions. 9.29 +# 9.30 + 9.31 # 9.32 # Copyright © 2004 Scott James Remnant <scott@netsplit.com>. 9.33 #
10.1 --- a/common/autoconf/closed.version.numbers Wed Jan 16 11:59:37 2013 -0800 10.2 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 10.3 @@ -1,32 +0,0 @@ 10.4 -# 10.5 -# Copyright (c) 2012, Oracle and/or its affiliates. All rights reserved. 10.6 -# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. 10.7 -# 10.8 -# This code is free software; you can redistribute it and/or modify it 10.9 -# under the terms of the GNU General Public License version 2 only, as 10.10 -# published by the Free Software Foundation. 10.11 -# 10.12 -# This code is distributed in the hope that it will be useful, but WITHOUT 10.13 -# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or 10.14 -# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License 10.15 -# version 2 for more details (a copy is included in the LICENSE file that 10.16 -# accompanied this code). 10.17 -# 10.18 -# You should have received a copy of the GNU General Public License version 10.19 -# 2 along with this work; if not, write to the Free Software Foundation, 10.20 -# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. 10.21 -# 10.22 -# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA 10.23 -# or visit www.oracle.com if you need additional information or have any 10.24 -# questions. 10.25 -# 10.26 - 10.27 -LAUNCHER_NAME=java 10.28 -PRODUCT_NAME="Java(TM)" 10.29 -PRODUCT_SUFFIX="SE Runtime Environment" 10.30 -JDK_RC_PLATFORM_NAME="Platform SE" 10.31 -COMPANY_NAME="Oracle Corporation" 10.32 - 10.33 -# Might need better names for these 10.34 -MACOSX_BUNDLE_NAME_BASE="Java SE" 10.35 -MACOSX_BUNDLE_ID_BASE="com.oracle.java"
11.1 --- a/common/autoconf/compare.sh.in Wed Jan 16 11:59:37 2013 -0800 11.2 +++ b/common/autoconf/compare.sh.in Wed Jan 16 22:16:51 2013 -0800 11.3 @@ -1,6 +1,6 @@ 11.4 #!/bin/bash 11.5 # 11.6 -# Copyright (c) 2012, Oracle and/or its affiliates. All rights reserved. 11.7 +# Copyright (c) 2012, 2013 Oracle and/or its affiliates. All rights reserved. 11.8 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. 11.9 # 11.10 # This code is free software; you can redistribute it and/or modify it 11.11 @@ -48,6 +48,7 @@ 11.12 JAVAP="@FIXPATH@ @BOOT_JDK@/bin/javap" 11.13 LDD="@LDD@" 11.14 MKDIR="@MKDIR@" 11.15 +NAWK="@NAWK@" 11.16 NM="@NM@" 11.17 OBJDUMP="@OBJDUMP@" 11.18 OTOOL="@OTOOL@"
12.1 --- a/common/autoconf/configure.ac Wed Jan 16 11:59:37 2013 -0800 12.2 +++ b/common/autoconf/configure.ac Wed Jan 16 22:16:51 2013 -0800 12.3 @@ -83,6 +83,9 @@ 12.4 BASIC_SETUP_PATHS 12.5 BASIC_SETUP_LOGGING 12.6 12.7 +# Check if it's a pure open build or if custom sources are to be used. 12.8 +JDKOPT_SETUP_OPEN_OR_CUSTOM 12.9 + 12.10 # These are needed to be able to create a configuration name (and thus the output directory) 12.11 JDKOPT_SETUP_JDK_VARIANT 12.12 JDKOPT_SETUP_JVM_VARIANTS
13.1 --- a/common/autoconf/generated-configure.sh Wed Jan 16 11:59:37 2013 -0800 13.2 +++ b/common/autoconf/generated-configure.sh Wed Jan 16 22:16:51 2013 -0800 13.3 @@ -1,6 +1,6 @@ 13.4 #! /bin/sh 13.5 # Guess values for system-dependent variables and create Makefiles. 13.6 -# Generated by GNU Autoconf 2.68 for OpenJDK jdk8. 13.7 +# Generated by GNU Autoconf 2.67 for OpenJDK jdk8. 13.8 # 13.9 # Report bugs to <build-dev@openjdk.java.net>. 13.10 # 13.11 @@ -91,7 +91,6 @@ 13.12 IFS=" "" $as_nl" 13.13 13.14 # Find who we are. Look in the path if we contain no directory separator. 13.15 -as_myself= 13.16 case $0 in #(( 13.17 *[\\/]* ) as_myself=$0 ;; 13.18 *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR 13.19 @@ -217,18 +216,11 @@ 13.20 # We cannot yet assume a decent shell, so we have to provide a 13.21 # neutralization value for shells without unset; and this also 13.22 # works around shells that cannot unset nonexistent variables. 13.23 - # Preserve -v and -x to the replacement shell. 13.24 BASH_ENV=/dev/null 13.25 ENV=/dev/null 13.26 (unset BASH_ENV) >/dev/null 2>&1 && unset BASH_ENV ENV 13.27 export CONFIG_SHELL 13.28 - case $- in # (((( 13.29 - *v*x* | *x*v* ) as_opts=-vx ;; 13.30 - *v* ) as_opts=-v ;; 13.31 - *x* ) as_opts=-x ;; 13.32 - * ) as_opts= ;; 13.33 - esac 13.34 - exec "$CONFIG_SHELL" $as_opts "$as_myself" ${1+"$@"} 13.35 + exec "$CONFIG_SHELL" "$as_myself" ${1+"$@"} 13.36 fi 13.37 13.38 if test x$as_have_required = xno; then : 13.39 @@ -760,10 +752,7 @@ 13.40 JAVA_CHECK 13.41 JAVAC_CHECK 13.42 COOKED_BUILD_NUMBER 13.43 -FULL_VERSION 13.44 -RELEASE 13.45 JDK_VERSION 13.46 -RUNTIME_NAME 13.47 COPYRIGHT_YEAR 13.48 MACOSX_BUNDLE_ID_BASE 13.49 MACOSX_BUNDLE_NAME_BASE 13.50 @@ -778,6 +767,7 @@ 13.51 JDK_MICRO_VERSION 13.52 JDK_MINOR_VERSION 13.53 JDK_MAJOR_VERSION 13.54 +USER_RELEASE_SUFFIX 13.55 COMPRESS_JARS 13.56 UNLIMITED_CRYPTO 13.57 CACERTS_FILE 13.58 @@ -785,14 +775,12 @@ 13.59 BUILD_HEADLESS 13.60 SUPPORT_HEADFUL 13.61 SUPPORT_HEADLESS 13.62 -SET_OPENJDK 13.63 BDEPS_FTP 13.64 BDEPS_UNZIP 13.65 OS_VERSION_MICRO 13.66 OS_VERSION_MINOR 13.67 OS_VERSION_MAJOR 13.68 PKG_CONFIG 13.69 -COMM 13.70 TIME 13.71 STAT 13.72 HG 13.73 @@ -825,6 +813,7 @@ 13.74 JVM_VARIANT_SERVER 13.75 JVM_VARIANTS 13.76 JDK_VARIANT 13.77 +SET_OPENJDK 13.78 BUILD_LOG_WRAPPER 13.79 BUILD_LOG_PREVIOUS 13.80 BUILD_LOG 13.81 @@ -908,7 +897,9 @@ 13.82 DIFF 13.83 DATE 13.84 CUT 13.85 +CPIO 13.86 CP 13.87 +COMM 13.88 CMP 13.89 CHMOD 13.90 CAT 13.91 @@ -963,6 +954,7 @@ 13.92 with_sys_root 13.93 with_tools_dir 13.94 with_devkit 13.95 +enable_openjdk_only 13.96 with_jdk_variant 13.97 with_jvm_variants 13.98 enable_debug 13.99 @@ -972,11 +964,13 @@ 13.100 with_builddeps_server 13.101 with_builddeps_dir 13.102 with_builddeps_group 13.103 -enable_openjdk_only 13.104 enable_headful 13.105 enable_hotspot_test_in_build 13.106 with_cacerts_file 13.107 enable_unlimited_crypto 13.108 +with_milestone 13.109 +with_build_number 13.110 +with_user_release_suffix 13.111 with_boot_jdk 13.112 with_boot_jdk_jvmargs 13.113 with_add_source_root 13.114 @@ -1439,7 +1433,7 @@ 13.115 $as_echo "$as_me: WARNING: you should use --build, --host, --target" >&2 13.116 expr "x$ac_option" : ".*[^-._$as_cr_alnum]" >/dev/null && 13.117 $as_echo "$as_me: WARNING: invalid host type: $ac_option" >&2 13.118 - : "${build_alias=$ac_option} ${host_alias=$ac_option} ${target_alias=$ac_option}" 13.119 + : ${build_alias=$ac_option} ${host_alias=$ac_option} ${target_alias=$ac_option} 13.120 ;; 13.121 13.122 esac 13.123 @@ -1655,10 +1649,10 @@ 13.124 --disable-option-checking ignore unrecognized --enable/--with options 13.125 --disable-FEATURE do not include FEATURE (same as --enable-FEATURE=no) 13.126 --enable-FEATURE[=ARG] include FEATURE [ARG=yes] 13.127 + --enable-openjdk-only suppress building custom source even if present 13.128 + [disabled] 13.129 --enable-debug set the debug level to fastdebug (shorthand for 13.130 --with-debug-level=fastdebug) [disabled] 13.131 - --enable-openjdk-only supress building closed source even if present 13.132 - [disabled] 13.133 --disable-headful disable building headful support (graphical UI 13.134 support) [enabled] 13.135 --enable-hotspot-test-in-build 13.136 @@ -1706,6 +1700,11 @@ 13.137 --with-builddeps-group chgrp the downloaded build dependencies to this 13.138 group 13.139 --with-cacerts-file specify alternative cacerts file 13.140 + --with-milestone Set milestone value for build [internal] 13.141 + --with-build-number Set build number value for build [b00] 13.142 + --with-user-release-suffix 13.143 + Add a custom string to the version string if build 13.144 + number isn't set.[username_builddateb00] 13.145 --with-boot-jdk path to Boot JDK (used to bootstrap build) [probed] 13.146 --with-boot-jdk-jvmargs specify JVM arguments to be passed to all 13.147 invocations of the Boot JDK, overriding the default 13.148 @@ -1859,7 +1858,7 @@ 13.149 if $ac_init_version; then 13.150 cat <<\_ACEOF 13.151 OpenJDK configure jdk8 13.152 -generated by GNU Autoconf 2.68 13.153 +generated by GNU Autoconf 2.67 13.154 13.155 Copyright (C) 2010 Free Software Foundation, Inc. 13.156 This configure script is free software; the Free Software Foundation 13.157 @@ -1905,7 +1904,7 @@ 13.158 13.159 ac_retval=1 13.160 fi 13.161 - eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno 13.162 + eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;} 13.163 as_fn_set_status $ac_retval 13.164 13.165 } # ac_fn_c_try_compile 13.166 @@ -1943,7 +1942,7 @@ 13.167 13.168 ac_retval=1 13.169 fi 13.170 - eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno 13.171 + eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;} 13.172 as_fn_set_status $ac_retval 13.173 13.174 } # ac_fn_cxx_try_compile 13.175 @@ -1981,7 +1980,7 @@ 13.176 13.177 ac_retval=1 13.178 fi 13.179 - eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno 13.180 + eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;} 13.181 as_fn_set_status $ac_retval 13.182 13.183 } # ac_fn_objc_try_compile 13.184 @@ -2018,7 +2017,7 @@ 13.185 13.186 ac_retval=1 13.187 fi 13.188 - eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno 13.189 + eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;} 13.190 as_fn_set_status $ac_retval 13.191 13.192 } # ac_fn_c_try_cpp 13.193 @@ -2055,7 +2054,7 @@ 13.194 13.195 ac_retval=1 13.196 fi 13.197 - eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno 13.198 + eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;} 13.199 as_fn_set_status $ac_retval 13.200 13.201 } # ac_fn_cxx_try_cpp 13.202 @@ -2068,10 +2067,10 @@ 13.203 ac_fn_cxx_check_header_mongrel () 13.204 { 13.205 as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack 13.206 - if eval \${$3+:} false; then : 13.207 + if eval "test \"\${$3+set}\"" = set; then : 13.208 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5 13.209 $as_echo_n "checking for $2... " >&6; } 13.210 -if eval \${$3+:} false; then : 13.211 +if eval "test \"\${$3+set}\"" = set; then : 13.212 $as_echo_n "(cached) " >&6 13.213 fi 13.214 eval ac_res=\$$3 13.215 @@ -2138,7 +2137,7 @@ 13.216 esac 13.217 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5 13.218 $as_echo_n "checking for $2... " >&6; } 13.219 -if eval \${$3+:} false; then : 13.220 +if eval "test \"\${$3+set}\"" = set; then : 13.221 $as_echo_n "(cached) " >&6 13.222 else 13.223 eval "$3=\$ac_header_compiler" 13.224 @@ -2147,7 +2146,7 @@ 13.225 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 13.226 $as_echo "$ac_res" >&6; } 13.227 fi 13.228 - eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno 13.229 + eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;} 13.230 13.231 } # ac_fn_cxx_check_header_mongrel 13.232 13.233 @@ -2188,7 +2187,7 @@ 13.234 ac_retval=$ac_status 13.235 fi 13.236 rm -rf conftest.dSYM conftest_ipa8_conftest.oo 13.237 - eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno 13.238 + eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;} 13.239 as_fn_set_status $ac_retval 13.240 13.241 } # ac_fn_cxx_try_run 13.242 @@ -2202,7 +2201,7 @@ 13.243 as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack 13.244 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5 13.245 $as_echo_n "checking for $2... " >&6; } 13.246 -if eval \${$3+:} false; then : 13.247 +if eval "test \"\${$3+set}\"" = set; then : 13.248 $as_echo_n "(cached) " >&6 13.249 else 13.250 cat confdefs.h - <<_ACEOF >conftest.$ac_ext 13.251 @@ -2220,7 +2219,7 @@ 13.252 eval ac_res=\$$3 13.253 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 13.254 $as_echo "$ac_res" >&6; } 13.255 - eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno 13.256 + eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;} 13.257 13.258 } # ac_fn_cxx_check_header_compile 13.259 13.260 @@ -2397,7 +2396,7 @@ 13.261 rm -f conftest.val 13.262 13.263 fi 13.264 - eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno 13.265 + eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;} 13.266 as_fn_set_status $ac_retval 13.267 13.268 } # ac_fn_cxx_compute_int 13.269 @@ -2443,7 +2442,7 @@ 13.270 # interfere with the next link command; also delete a directory that is 13.271 # left behind by Apple's compiler. We do this before executing the actions. 13.272 rm -rf conftest.dSYM conftest_ipa8_conftest.oo 13.273 - eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno 13.274 + eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;} 13.275 as_fn_set_status $ac_retval 13.276 13.277 } # ac_fn_cxx_try_link 13.278 @@ -2456,7 +2455,7 @@ 13.279 as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack 13.280 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5 13.281 $as_echo_n "checking for $2... " >&6; } 13.282 -if eval \${$3+:} false; then : 13.283 +if eval "test \"\${$3+set}\"" = set; then : 13.284 $as_echo_n "(cached) " >&6 13.285 else 13.286 cat confdefs.h - <<_ACEOF >conftest.$ac_ext 13.287 @@ -2511,7 +2510,7 @@ 13.288 eval ac_res=\$$3 13.289 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 13.290 $as_echo "$ac_res" >&6; } 13.291 - eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno 13.292 + eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;} 13.293 13.294 } # ac_fn_cxx_check_func 13.295 13.296 @@ -2524,7 +2523,7 @@ 13.297 as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack 13.298 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5 13.299 $as_echo_n "checking for $2... " >&6; } 13.300 -if eval \${$3+:} false; then : 13.301 +if eval "test \"\${$3+set}\"" = set; then : 13.302 $as_echo_n "(cached) " >&6 13.303 else 13.304 cat confdefs.h - <<_ACEOF >conftest.$ac_ext 13.305 @@ -2542,7 +2541,7 @@ 13.306 eval ac_res=\$$3 13.307 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 13.308 $as_echo "$ac_res" >&6; } 13.309 - eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno 13.310 + eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;} 13.311 13.312 } # ac_fn_c_check_header_compile 13.313 cat >config.log <<_ACEOF 13.314 @@ -2550,7 +2549,7 @@ 13.315 running configure, to aid debugging if configure makes a mistake. 13.316 13.317 It was created by OpenJDK $as_me jdk8, which was 13.318 -generated by GNU Autoconf 2.68. Invocation command line was 13.319 +generated by GNU Autoconf 2.67. Invocation command line was 13.320 13.321 $ $0 $@ 13.322 13.323 @@ -2808,7 +2807,7 @@ 13.324 || { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 13.325 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} 13.326 as_fn_error $? "failed to load site script $ac_site_file 13.327 -See \`config.log' for more details" "$LINENO" 5; } 13.328 +See \`config.log' for more details" "$LINENO" 5 ; } 13.329 fi 13.330 done 13.331 13.332 @@ -2991,7 +2990,7 @@ 13.333 13.334 # Include these first... 13.335 # 13.336 -# Copyright (c) 2011, 2012, Oracle and/or its affiliates. All rights reserved. 13.337 +# Copyright (c) 2011, 2013, Oracle and/or its affiliates. All rights reserved. 13.338 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. 13.339 # 13.340 # This code is free software; you can redistribute it and/or modify it 13.341 @@ -3088,6 +3087,10 @@ 13.342 # Argument 3: what to do otherwise (remote disk or failure) 13.343 13.344 13.345 +# Check that source files have basic read permissions set. This might 13.346 +# not be the case in cygwin in certain conditions. 13.347 + 13.348 + 13.349 13.350 13.351 # 13.352 @@ -3402,7 +3405,7 @@ 13.353 13.354 13.355 # 13.356 -# Copyright (c) 2011, 2012, Oracle and/or its affiliates. All rights reserved. 13.357 +# Copyright (c) 2011, 2013, Oracle and/or its affiliates. All rights reserved. 13.358 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. 13.359 # 13.360 # This code is free software; you can redistribute it and/or modify it 13.361 @@ -3433,7 +3436,18 @@ 13.362 13.363 13.364 13.365 - 13.366 +############################################################################### 13.367 +# 13.368 +# Should we build only OpenJDK even if closed sources are present? 13.369 +# 13.370 + 13.371 + 13.372 + 13.373 + 13.374 +############################################################################### 13.375 +# 13.376 +# Setup version numbers 13.377 +# 13.378 13.379 13.380 13.381 @@ -3683,7 +3697,7 @@ 13.382 #CUSTOM_AUTOCONF_INCLUDE 13.383 13.384 # Do not change or remove the following line, it is needed for consistency checks: 13.385 -DATE_WHEN_GENERATED=1355963953 13.386 +DATE_WHEN_GENERATED=1358165331 13.387 13.388 ############################################################################### 13.389 # 13.390 @@ -3721,7 +3735,7 @@ 13.391 set dummy $ac_prog; ac_word=$2 13.392 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 13.393 $as_echo_n "checking for $ac_word... " >&6; } 13.394 -if ${ac_cv_path_BASENAME+:} false; then : 13.395 +if test "${ac_cv_path_BASENAME+set}" = set; then : 13.396 $as_echo_n "(cached) " >&6 13.397 else 13.398 case $BASENAME in 13.399 @@ -3780,7 +3794,7 @@ 13.400 set dummy $ac_prog; ac_word=$2 13.401 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 13.402 $as_echo_n "checking for $ac_word... " >&6; } 13.403 -if ${ac_cv_path_BASH+:} false; then : 13.404 +if test "${ac_cv_path_BASH+set}" = set; then : 13.405 $as_echo_n "(cached) " >&6 13.406 else 13.407 case $BASH in 13.408 @@ -3839,7 +3853,7 @@ 13.409 set dummy $ac_prog; ac_word=$2 13.410 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 13.411 $as_echo_n "checking for $ac_word... " >&6; } 13.412 -if ${ac_cv_path_CAT+:} false; then : 13.413 +if test "${ac_cv_path_CAT+set}" = set; then : 13.414 $as_echo_n "(cached) " >&6 13.415 else 13.416 case $CAT in 13.417 @@ -3898,7 +3912,7 @@ 13.418 set dummy $ac_prog; ac_word=$2 13.419 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 13.420 $as_echo_n "checking for $ac_word... " >&6; } 13.421 -if ${ac_cv_path_CHMOD+:} false; then : 13.422 +if test "${ac_cv_path_CHMOD+set}" = set; then : 13.423 $as_echo_n "(cached) " >&6 13.424 else 13.425 case $CHMOD in 13.426 @@ -3957,7 +3971,7 @@ 13.427 set dummy $ac_prog; ac_word=$2 13.428 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 13.429 $as_echo_n "checking for $ac_word... " >&6; } 13.430 -if ${ac_cv_path_CMP+:} false; then : 13.431 +if test "${ac_cv_path_CMP+set}" = set; then : 13.432 $as_echo_n "(cached) " >&6 13.433 else 13.434 case $CMP in 13.435 @@ -4010,13 +4024,72 @@ 13.436 13.437 13.438 13.439 + for ac_prog in comm 13.440 +do 13.441 + # Extract the first word of "$ac_prog", so it can be a program name with args. 13.442 +set dummy $ac_prog; ac_word=$2 13.443 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 13.444 +$as_echo_n "checking for $ac_word... " >&6; } 13.445 +if test "${ac_cv_path_COMM+set}" = set; then : 13.446 + $as_echo_n "(cached) " >&6 13.447 +else 13.448 + case $COMM in 13.449 + [\\/]* | ?:[\\/]*) 13.450 + ac_cv_path_COMM="$COMM" # Let the user override the test with a path. 13.451 + ;; 13.452 + *) 13.453 + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR 13.454 +for as_dir in $PATH 13.455 +do 13.456 + IFS=$as_save_IFS 13.457 + test -z "$as_dir" && as_dir=. 13.458 + for ac_exec_ext in '' $ac_executable_extensions; do 13.459 + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then 13.460 + ac_cv_path_COMM="$as_dir/$ac_word$ac_exec_ext" 13.461 + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 13.462 + break 2 13.463 + fi 13.464 +done 13.465 + done 13.466 +IFS=$as_save_IFS 13.467 + 13.468 + ;; 13.469 +esac 13.470 +fi 13.471 +COMM=$ac_cv_path_COMM 13.472 +if test -n "$COMM"; then 13.473 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $COMM" >&5 13.474 +$as_echo "$COMM" >&6; } 13.475 +else 13.476 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 13.477 +$as_echo "no" >&6; } 13.478 +fi 13.479 + 13.480 + 13.481 + test -n "$COMM" && break 13.482 +done 13.483 + 13.484 + 13.485 + if test "x$COMM" = x; then 13.486 + if test "xcomm" = x; then 13.487 + PROG_NAME=comm 13.488 + else 13.489 + PROG_NAME=comm 13.490 + fi 13.491 + { $as_echo "$as_me:${as_lineno-$LINENO}: Could not find $PROG_NAME!" >&5 13.492 +$as_echo "$as_me: Could not find $PROG_NAME!" >&6;} 13.493 + as_fn_error $? "Cannot continue" "$LINENO" 5 13.494 + fi 13.495 + 13.496 + 13.497 + 13.498 for ac_prog in cp 13.499 do 13.500 # Extract the first word of "$ac_prog", so it can be a program name with args. 13.501 set dummy $ac_prog; ac_word=$2 13.502 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 13.503 $as_echo_n "checking for $ac_word... " >&6; } 13.504 -if ${ac_cv_path_CP+:} false; then : 13.505 +if test "${ac_cv_path_CP+set}" = set; then : 13.506 $as_echo_n "(cached) " >&6 13.507 else 13.508 case $CP in 13.509 @@ -4069,13 +4142,72 @@ 13.510 13.511 13.512 13.513 + for ac_prog in cpio 13.514 +do 13.515 + # Extract the first word of "$ac_prog", so it can be a program name with args. 13.516 +set dummy $ac_prog; ac_word=$2 13.517 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 13.518 +$as_echo_n "checking for $ac_word... " >&6; } 13.519 +if test "${ac_cv_path_CPIO+set}" = set; then : 13.520 + $as_echo_n "(cached) " >&6 13.521 +else 13.522 + case $CPIO in 13.523 + [\\/]* | ?:[\\/]*) 13.524 + ac_cv_path_CPIO="$CPIO" # Let the user override the test with a path. 13.525 + ;; 13.526 + *) 13.527 + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR 13.528 +for as_dir in $PATH 13.529 +do 13.530 + IFS=$as_save_IFS 13.531 + test -z "$as_dir" && as_dir=. 13.532 + for ac_exec_ext in '' $ac_executable_extensions; do 13.533 + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then 13.534 + ac_cv_path_CPIO="$as_dir/$ac_word$ac_exec_ext" 13.535 + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 13.536 + break 2 13.537 + fi 13.538 +done 13.539 + done 13.540 +IFS=$as_save_IFS 13.541 + 13.542 + ;; 13.543 +esac 13.544 +fi 13.545 +CPIO=$ac_cv_path_CPIO 13.546 +if test -n "$CPIO"; then 13.547 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CPIO" >&5 13.548 +$as_echo "$CPIO" >&6; } 13.549 +else 13.550 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 13.551 +$as_echo "no" >&6; } 13.552 +fi 13.553 + 13.554 + 13.555 + test -n "$CPIO" && break 13.556 +done 13.557 + 13.558 + 13.559 + if test "x$CPIO" = x; then 13.560 + if test "xcpio" = x; then 13.561 + PROG_NAME=cpio 13.562 + else 13.563 + PROG_NAME=cpio 13.564 + fi 13.565 + { $as_echo "$as_me:${as_lineno-$LINENO}: Could not find $PROG_NAME!" >&5 13.566 +$as_echo "$as_me: Could not find $PROG_NAME!" >&6;} 13.567 + as_fn_error $? "Cannot continue" "$LINENO" 5 13.568 + fi 13.569 + 13.570 + 13.571 + 13.572 for ac_prog in cut 13.573 do 13.574 # Extract the first word of "$ac_prog", so it can be a program name with args. 13.575 set dummy $ac_prog; ac_word=$2 13.576 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 13.577 $as_echo_n "checking for $ac_word... " >&6; } 13.578 -if ${ac_cv_path_CUT+:} false; then : 13.579 +if test "${ac_cv_path_CUT+set}" = set; then : 13.580 $as_echo_n "(cached) " >&6 13.581 else 13.582 case $CUT in 13.583 @@ -4134,7 +4266,7 @@ 13.584 set dummy $ac_prog; ac_word=$2 13.585 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 13.586 $as_echo_n "checking for $ac_word... " >&6; } 13.587 -if ${ac_cv_path_DATE+:} false; then : 13.588 +if test "${ac_cv_path_DATE+set}" = set; then : 13.589 $as_echo_n "(cached) " >&6 13.590 else 13.591 case $DATE in 13.592 @@ -4193,7 +4325,7 @@ 13.593 set dummy $ac_prog; ac_word=$2 13.594 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 13.595 $as_echo_n "checking for $ac_word... " >&6; } 13.596 -if ${ac_cv_path_DIFF+:} false; then : 13.597 +if test "${ac_cv_path_DIFF+set}" = set; then : 13.598 $as_echo_n "(cached) " >&6 13.599 else 13.600 case $DIFF in 13.601 @@ -4252,7 +4384,7 @@ 13.602 set dummy $ac_prog; ac_word=$2 13.603 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 13.604 $as_echo_n "checking for $ac_word... " >&6; } 13.605 -if ${ac_cv_path_DIRNAME+:} false; then : 13.606 +if test "${ac_cv_path_DIRNAME+set}" = set; then : 13.607 $as_echo_n "(cached) " >&6 13.608 else 13.609 case $DIRNAME in 13.610 @@ -4311,7 +4443,7 @@ 13.611 set dummy $ac_prog; ac_word=$2 13.612 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 13.613 $as_echo_n "checking for $ac_word... " >&6; } 13.614 -if ${ac_cv_path_ECHO+:} false; then : 13.615 +if test "${ac_cv_path_ECHO+set}" = set; then : 13.616 $as_echo_n "(cached) " >&6 13.617 else 13.618 case $ECHO in 13.619 @@ -4370,7 +4502,7 @@ 13.620 set dummy $ac_prog; ac_word=$2 13.621 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 13.622 $as_echo_n "checking for $ac_word... " >&6; } 13.623 -if ${ac_cv_path_EXPR+:} false; then : 13.624 +if test "${ac_cv_path_EXPR+set}" = set; then : 13.625 $as_echo_n "(cached) " >&6 13.626 else 13.627 case $EXPR in 13.628 @@ -4429,7 +4561,7 @@ 13.629 set dummy $ac_prog; ac_word=$2 13.630 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 13.631 $as_echo_n "checking for $ac_word... " >&6; } 13.632 -if ${ac_cv_path_FILE+:} false; then : 13.633 +if test "${ac_cv_path_FILE+set}" = set; then : 13.634 $as_echo_n "(cached) " >&6 13.635 else 13.636 case $FILE in 13.637 @@ -4488,7 +4620,7 @@ 13.638 set dummy $ac_prog; ac_word=$2 13.639 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 13.640 $as_echo_n "checking for $ac_word... " >&6; } 13.641 -if ${ac_cv_path_FIND+:} false; then : 13.642 +if test "${ac_cv_path_FIND+set}" = set; then : 13.643 $as_echo_n "(cached) " >&6 13.644 else 13.645 case $FIND in 13.646 @@ -4547,7 +4679,7 @@ 13.647 set dummy $ac_prog; ac_word=$2 13.648 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 13.649 $as_echo_n "checking for $ac_word... " >&6; } 13.650 -if ${ac_cv_path_HEAD+:} false; then : 13.651 +if test "${ac_cv_path_HEAD+set}" = set; then : 13.652 $as_echo_n "(cached) " >&6 13.653 else 13.654 case $HEAD in 13.655 @@ -4606,7 +4738,7 @@ 13.656 set dummy $ac_prog; ac_word=$2 13.657 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 13.658 $as_echo_n "checking for $ac_word... " >&6; } 13.659 -if ${ac_cv_path_LN+:} false; then : 13.660 +if test "${ac_cv_path_LN+set}" = set; then : 13.661 $as_echo_n "(cached) " >&6 13.662 else 13.663 case $LN in 13.664 @@ -4665,7 +4797,7 @@ 13.665 set dummy $ac_prog; ac_word=$2 13.666 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 13.667 $as_echo_n "checking for $ac_word... " >&6; } 13.668 -if ${ac_cv_path_LS+:} false; then : 13.669 +if test "${ac_cv_path_LS+set}" = set; then : 13.670 $as_echo_n "(cached) " >&6 13.671 else 13.672 case $LS in 13.673 @@ -4724,7 +4856,7 @@ 13.674 set dummy $ac_prog; ac_word=$2 13.675 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 13.676 $as_echo_n "checking for $ac_word... " >&6; } 13.677 -if ${ac_cv_path_MKDIR+:} false; then : 13.678 +if test "${ac_cv_path_MKDIR+set}" = set; then : 13.679 $as_echo_n "(cached) " >&6 13.680 else 13.681 case $MKDIR in 13.682 @@ -4783,7 +4915,7 @@ 13.683 set dummy $ac_prog; ac_word=$2 13.684 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 13.685 $as_echo_n "checking for $ac_word... " >&6; } 13.686 -if ${ac_cv_path_MKTEMP+:} false; then : 13.687 +if test "${ac_cv_path_MKTEMP+set}" = set; then : 13.688 $as_echo_n "(cached) " >&6 13.689 else 13.690 case $MKTEMP in 13.691 @@ -4842,7 +4974,7 @@ 13.692 set dummy $ac_prog; ac_word=$2 13.693 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 13.694 $as_echo_n "checking for $ac_word... " >&6; } 13.695 -if ${ac_cv_path_MV+:} false; then : 13.696 +if test "${ac_cv_path_MV+set}" = set; then : 13.697 $as_echo_n "(cached) " >&6 13.698 else 13.699 case $MV in 13.700 @@ -4901,7 +5033,7 @@ 13.701 set dummy $ac_prog; ac_word=$2 13.702 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 13.703 $as_echo_n "checking for $ac_word... " >&6; } 13.704 -if ${ac_cv_path_PRINTF+:} false; then : 13.705 +if test "${ac_cv_path_PRINTF+set}" = set; then : 13.706 $as_echo_n "(cached) " >&6 13.707 else 13.708 case $PRINTF in 13.709 @@ -4960,7 +5092,7 @@ 13.710 set dummy $ac_prog; ac_word=$2 13.711 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 13.712 $as_echo_n "checking for $ac_word... " >&6; } 13.713 -if ${ac_cv_path_THEPWDCMD+:} false; then : 13.714 +if test "${ac_cv_path_THEPWDCMD+set}" = set; then : 13.715 $as_echo_n "(cached) " >&6 13.716 else 13.717 case $THEPWDCMD in 13.718 @@ -5019,7 +5151,7 @@ 13.719 set dummy $ac_prog; ac_word=$2 13.720 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 13.721 $as_echo_n "checking for $ac_word... " >&6; } 13.722 -if ${ac_cv_path_RM+:} false; then : 13.723 +if test "${ac_cv_path_RM+set}" = set; then : 13.724 $as_echo_n "(cached) " >&6 13.725 else 13.726 case $RM in 13.727 @@ -5078,7 +5210,7 @@ 13.728 set dummy $ac_prog; ac_word=$2 13.729 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 13.730 $as_echo_n "checking for $ac_word... " >&6; } 13.731 -if ${ac_cv_path_SH+:} false; then : 13.732 +if test "${ac_cv_path_SH+set}" = set; then : 13.733 $as_echo_n "(cached) " >&6 13.734 else 13.735 case $SH in 13.736 @@ -5137,7 +5269,7 @@ 13.737 set dummy $ac_prog; ac_word=$2 13.738 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 13.739 $as_echo_n "checking for $ac_word... " >&6; } 13.740 -if ${ac_cv_path_SORT+:} false; then : 13.741 +if test "${ac_cv_path_SORT+set}" = set; then : 13.742 $as_echo_n "(cached) " >&6 13.743 else 13.744 case $SORT in 13.745 @@ -5196,7 +5328,7 @@ 13.746 set dummy $ac_prog; ac_word=$2 13.747 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 13.748 $as_echo_n "checking for $ac_word... " >&6; } 13.749 -if ${ac_cv_path_TAIL+:} false; then : 13.750 +if test "${ac_cv_path_TAIL+set}" = set; then : 13.751 $as_echo_n "(cached) " >&6 13.752 else 13.753 case $TAIL in 13.754 @@ -5255,7 +5387,7 @@ 13.755 set dummy $ac_prog; ac_word=$2 13.756 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 13.757 $as_echo_n "checking for $ac_word... " >&6; } 13.758 -if ${ac_cv_path_TAR+:} false; then : 13.759 +if test "${ac_cv_path_TAR+set}" = set; then : 13.760 $as_echo_n "(cached) " >&6 13.761 else 13.762 case $TAR in 13.763 @@ -5314,7 +5446,7 @@ 13.764 set dummy $ac_prog; ac_word=$2 13.765 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 13.766 $as_echo_n "checking for $ac_word... " >&6; } 13.767 -if ${ac_cv_path_TEE+:} false; then : 13.768 +if test "${ac_cv_path_TEE+set}" = set; then : 13.769 $as_echo_n "(cached) " >&6 13.770 else 13.771 case $TEE in 13.772 @@ -5373,7 +5505,7 @@ 13.773 set dummy $ac_prog; ac_word=$2 13.774 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 13.775 $as_echo_n "checking for $ac_word... " >&6; } 13.776 -if ${ac_cv_path_TOUCH+:} false; then : 13.777 +if test "${ac_cv_path_TOUCH+set}" = set; then : 13.778 $as_echo_n "(cached) " >&6 13.779 else 13.780 case $TOUCH in 13.781 @@ -5432,7 +5564,7 @@ 13.782 set dummy $ac_prog; ac_word=$2 13.783 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 13.784 $as_echo_n "checking for $ac_word... " >&6; } 13.785 -if ${ac_cv_path_TR+:} false; then : 13.786 +if test "${ac_cv_path_TR+set}" = set; then : 13.787 $as_echo_n "(cached) " >&6 13.788 else 13.789 case $TR in 13.790 @@ -5491,7 +5623,7 @@ 13.791 set dummy $ac_prog; ac_word=$2 13.792 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 13.793 $as_echo_n "checking for $ac_word... " >&6; } 13.794 -if ${ac_cv_path_UNAME+:} false; then : 13.795 +if test "${ac_cv_path_UNAME+set}" = set; then : 13.796 $as_echo_n "(cached) " >&6 13.797 else 13.798 case $UNAME in 13.799 @@ -5550,7 +5682,7 @@ 13.800 set dummy $ac_prog; ac_word=$2 13.801 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 13.802 $as_echo_n "checking for $ac_word... " >&6; } 13.803 -if ${ac_cv_path_UNIQ+:} false; then : 13.804 +if test "${ac_cv_path_UNIQ+set}" = set; then : 13.805 $as_echo_n "(cached) " >&6 13.806 else 13.807 case $UNIQ in 13.808 @@ -5609,7 +5741,7 @@ 13.809 set dummy $ac_prog; ac_word=$2 13.810 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 13.811 $as_echo_n "checking for $ac_word... " >&6; } 13.812 -if ${ac_cv_path_WC+:} false; then : 13.813 +if test "${ac_cv_path_WC+set}" = set; then : 13.814 $as_echo_n "(cached) " >&6 13.815 else 13.816 case $WC in 13.817 @@ -5668,7 +5800,7 @@ 13.818 set dummy $ac_prog; ac_word=$2 13.819 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 13.820 $as_echo_n "checking for $ac_word... " >&6; } 13.821 -if ${ac_cv_path_WHICH+:} false; then : 13.822 +if test "${ac_cv_path_WHICH+set}" = set; then : 13.823 $as_echo_n "(cached) " >&6 13.824 else 13.825 case $WHICH in 13.826 @@ -5727,7 +5859,7 @@ 13.827 set dummy $ac_prog; ac_word=$2 13.828 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 13.829 $as_echo_n "checking for $ac_word... " >&6; } 13.830 -if ${ac_cv_path_XARGS+:} false; then : 13.831 +if test "${ac_cv_path_XARGS+set}" = set; then : 13.832 $as_echo_n "(cached) " >&6 13.833 else 13.834 case $XARGS in 13.835 @@ -5787,7 +5919,7 @@ 13.836 set dummy $ac_prog; ac_word=$2 13.837 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 13.838 $as_echo_n "checking for $ac_word... " >&6; } 13.839 -if ${ac_cv_prog_AWK+:} false; then : 13.840 +if test "${ac_cv_prog_AWK+set}" = set; then : 13.841 $as_echo_n "(cached) " >&6 13.842 else 13.843 if test -n "$AWK"; then 13.844 @@ -5837,7 +5969,7 @@ 13.845 13.846 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for grep that handles long lines and -e" >&5 13.847 $as_echo_n "checking for grep that handles long lines and -e... " >&6; } 13.848 -if ${ac_cv_path_GREP+:} false; then : 13.849 +if test "${ac_cv_path_GREP+set}" = set; then : 13.850 $as_echo_n "(cached) " >&6 13.851 else 13.852 if test -z "$GREP"; then 13.853 @@ -5912,7 +6044,7 @@ 13.854 13.855 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for egrep" >&5 13.856 $as_echo_n "checking for egrep... " >&6; } 13.857 -if ${ac_cv_path_EGREP+:} false; then : 13.858 +if test "${ac_cv_path_EGREP+set}" = set; then : 13.859 $as_echo_n "(cached) " >&6 13.860 else 13.861 if echo a | $GREP -E '(a|b)' >/dev/null 2>&1 13.862 @@ -5991,7 +6123,7 @@ 13.863 13.864 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for fgrep" >&5 13.865 $as_echo_n "checking for fgrep... " >&6; } 13.866 -if ${ac_cv_path_FGREP+:} false; then : 13.867 +if test "${ac_cv_path_FGREP+set}" = set; then : 13.868 $as_echo_n "(cached) " >&6 13.869 else 13.870 if echo 'ab*c' | $GREP -F 'ab*c' >/dev/null 2>&1 13.871 @@ -6070,7 +6202,7 @@ 13.872 13.873 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for a sed that does not truncate output" >&5 13.874 $as_echo_n "checking for a sed that does not truncate output... " >&6; } 13.875 -if ${ac_cv_path_SED+:} false; then : 13.876 +if test "${ac_cv_path_SED+set}" = set; then : 13.877 $as_echo_n "(cached) " >&6 13.878 else 13.879 ac_script=s/aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa/bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb/ 13.880 @@ -6156,7 +6288,7 @@ 13.881 set dummy $ac_prog; ac_word=$2 13.882 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 13.883 $as_echo_n "checking for $ac_word... " >&6; } 13.884 -if ${ac_cv_path_NAWK+:} false; then : 13.885 +if test "${ac_cv_path_NAWK+set}" = set; then : 13.886 $as_echo_n "(cached) " >&6 13.887 else 13.888 case $NAWK in 13.889 @@ -6216,7 +6348,7 @@ 13.890 set dummy cygpath; ac_word=$2 13.891 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 13.892 $as_echo_n "checking for $ac_word... " >&6; } 13.893 -if ${ac_cv_path_CYGPATH+:} false; then : 13.894 +if test "${ac_cv_path_CYGPATH+set}" = set; then : 13.895 $as_echo_n "(cached) " >&6 13.896 else 13.897 case $CYGPATH in 13.898 @@ -6256,7 +6388,7 @@ 13.899 set dummy readlink; ac_word=$2 13.900 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 13.901 $as_echo_n "checking for $ac_word... " >&6; } 13.902 -if ${ac_cv_path_READLINK+:} false; then : 13.903 +if test "${ac_cv_path_READLINK+set}" = set; then : 13.904 $as_echo_n "(cached) " >&6 13.905 else 13.906 case $READLINK in 13.907 @@ -6296,7 +6428,7 @@ 13.908 set dummy df; ac_word=$2 13.909 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 13.910 $as_echo_n "checking for $ac_word... " >&6; } 13.911 -if ${ac_cv_path_DF+:} false; then : 13.912 +if test "${ac_cv_path_DF+set}" = set; then : 13.913 $as_echo_n "(cached) " >&6 13.914 else 13.915 case $DF in 13.916 @@ -6336,7 +6468,7 @@ 13.917 set dummy SetFile; ac_word=$2 13.918 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 13.919 $as_echo_n "checking for $ac_word... " >&6; } 13.920 -if ${ac_cv_path_SETFILE+:} false; then : 13.921 +if test "${ac_cv_path_SETFILE+set}" = set; then : 13.922 $as_echo_n "(cached) " >&6 13.923 else 13.924 case $SETFILE in 13.925 @@ -6382,7 +6514,7 @@ 13.926 13.927 { $as_echo "$as_me:${as_lineno-$LINENO}: checking build system type" >&5 13.928 $as_echo_n "checking build system type... " >&6; } 13.929 -if ${ac_cv_build+:} false; then : 13.930 +if test "${ac_cv_build+set}" = set; then : 13.931 $as_echo_n "(cached) " >&6 13.932 else 13.933 ac_build_alias=$build_alias 13.934 @@ -6398,7 +6530,7 @@ 13.935 $as_echo "$ac_cv_build" >&6; } 13.936 case $ac_cv_build in 13.937 *-*-*) ;; 13.938 -*) as_fn_error $? "invalid value of canonical build" "$LINENO" 5;; 13.939 +*) as_fn_error $? "invalid value of canonical build" "$LINENO" 5 ;; 13.940 esac 13.941 build=$ac_cv_build 13.942 ac_save_IFS=$IFS; IFS='-' 13.943 @@ -6416,7 +6548,7 @@ 13.944 13.945 { $as_echo "$as_me:${as_lineno-$LINENO}: checking host system type" >&5 13.946 $as_echo_n "checking host system type... " >&6; } 13.947 -if ${ac_cv_host+:} false; then : 13.948 +if test "${ac_cv_host+set}" = set; then : 13.949 $as_echo_n "(cached) " >&6 13.950 else 13.951 if test "x$host_alias" = x; then 13.952 @@ -6431,7 +6563,7 @@ 13.953 $as_echo "$ac_cv_host" >&6; } 13.954 case $ac_cv_host in 13.955 *-*-*) ;; 13.956 -*) as_fn_error $? "invalid value of canonical host" "$LINENO" 5;; 13.957 +*) as_fn_error $? "invalid value of canonical host" "$LINENO" 5 ;; 13.958 esac 13.959 host=$ac_cv_host 13.960 ac_save_IFS=$IFS; IFS='-' 13.961 @@ -6449,7 +6581,7 @@ 13.962 13.963 { $as_echo "$as_me:${as_lineno-$LINENO}: checking target system type" >&5 13.964 $as_echo_n "checking target system type... " >&6; } 13.965 -if ${ac_cv_target+:} false; then : 13.966 +if test "${ac_cv_target+set}" = set; then : 13.967 $as_echo_n "(cached) " >&6 13.968 else 13.969 if test "x$target_alias" = x; then 13.970 @@ -6464,7 +6596,7 @@ 13.971 $as_echo "$ac_cv_target" >&6; } 13.972 case $ac_cv_target in 13.973 *-*-*) ;; 13.974 -*) as_fn_error $? "invalid value of canonical target" "$LINENO" 5;; 13.975 +*) as_fn_error $? "invalid value of canonical target" "$LINENO" 5 ;; 13.976 esac 13.977 target=$ac_cv_target 13.978 ac_save_IFS=$IFS; IFS='-' 13.979 @@ -7355,6 +7487,53 @@ 13.980 13.981 13.982 13.983 +# Check if it's a pure open build or if custom sources are to be used. 13.984 + 13.985 + # Check whether --enable-openjdk-only was given. 13.986 +if test "${enable_openjdk_only+set}" = set; then : 13.987 + enableval=$enable_openjdk_only; 13.988 +else 13.989 + enable_openjdk_only="no" 13.990 +fi 13.991 + 13.992 + 13.993 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for presence of closed sources" >&5 13.994 +$as_echo_n "checking for presence of closed sources... " >&6; } 13.995 + if test -d "$SRC_ROOT/jdk/src/closed"; then 13.996 + CLOSED_SOURCE_PRESENT=yes 13.997 + else 13.998 + CLOSED_SOURCE_PRESENT=no 13.999 + fi 13.1000 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CLOSED_SOURCE_PRESENT" >&5 13.1001 +$as_echo "$CLOSED_SOURCE_PRESENT" >&6; } 13.1002 + 13.1003 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking if closed source is suppressed (openjdk-only)" >&5 13.1004 +$as_echo_n "checking if closed source is suppressed (openjdk-only)... " >&6; } 13.1005 + SUPPRESS_CLOSED_SOURCE="$enable_openjdk_only" 13.1006 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $SUPPRESS_CLOSED_SOURCE" >&5 13.1007 +$as_echo "$SUPPRESS_CLOSED_SOURCE" >&6; } 13.1008 + 13.1009 + if test "x$CLOSED_SOURCE_PRESENT" = xno; then 13.1010 + OPENJDK=true 13.1011 + if test "x$SUPPRESS_CLOSED_SOURCE" = "xyes"; then 13.1012 + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: No closed source present, --enable-openjdk-only makes no sense" >&5 13.1013 +$as_echo "$as_me: WARNING: No closed source present, --enable-openjdk-only makes no sense" >&2;} 13.1014 + fi 13.1015 + else 13.1016 + if test "x$SUPPRESS_CLOSED_SOURCE" = "xyes"; then 13.1017 + OPENJDK=true 13.1018 + else 13.1019 + OPENJDK=false 13.1020 + fi 13.1021 + fi 13.1022 + 13.1023 + if test "x$OPENJDK" = "xtrue"; then 13.1024 + SET_OPENJDK="OPENJDK=true" 13.1025 + fi 13.1026 + 13.1027 + 13.1028 + 13.1029 + 13.1030 # These are needed to be able to create a configuration name (and thus the output directory) 13.1031 13.1032 ############################################################################### 13.1033 @@ -7584,7 +7763,7 @@ 13.1034 # from configure, but only server is valid anyway. Fix this 13.1035 # when hotspot makefiles are rewritten. 13.1036 if test "x$MACOSX_UNIVERSAL" = xtrue; then 13.1037 - HOTSPOT_TARGET=universal_product 13.1038 + HOTSPOT_TARGET=universal_${HOTSPOT_EXPORT} 13.1039 fi 13.1040 13.1041 ##### 13.1042 @@ -7883,7 +8062,7 @@ 13.1043 set dummy $ac_prog; ac_word=$2 13.1044 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 13.1045 $as_echo_n "checking for $ac_word... " >&6; } 13.1046 -if ${ac_cv_prog_PKGHANDLER+:} false; then : 13.1047 +if test "${ac_cv_prog_PKGHANDLER+set}" = set; then : 13.1048 $as_echo_n "(cached) " >&6 13.1049 else 13.1050 if test -n "$PKGHANDLER"; then 13.1051 @@ -7985,7 +8164,7 @@ 13.1052 # bat and cmd files are not always considered executable in cygwin causing which 13.1053 # to not find them 13.1054 if test "x$new_path" = x \ 13.1055 - && test "x`$ECHO \"$path\" | $GREP -e \"\\.bat$\" -e \"\\.cmd$\"`" != x \ 13.1056 + && test "x`$ECHO \"$path\" | $GREP -i -e \"\\.bat$\" -e \"\\.cmd$\"`" != x \ 13.1057 && test "x`$LS \"$path\" 2>/dev/null`" != x; then 13.1058 new_path=`$CYGPATH -u "$path"` 13.1059 fi 13.1060 @@ -8001,7 +8180,7 @@ 13.1061 # bat and cmd files are not always considered executable in cygwin causing which 13.1062 # to not find them 13.1063 if test "x$new_path" = x \ 13.1064 - && test "x`$ECHO \"$path\" | $GREP -e \"\\.bat$\" -e \"\\.cmd$\"`" != x \ 13.1065 + && test "x`$ECHO \"$path\" | $GREP -i -e \"\\.bat$\" -e \"\\.cmd$\"`" != x \ 13.1066 && test "x`$LS \"$path\" 2>/dev/null`" != x; then 13.1067 new_path=`$CYGPATH -u "$path"` 13.1068 fi 13.1069 @@ -8248,7 +8427,7 @@ 13.1070 set dummy $ac_prog; ac_word=$2 13.1071 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 13.1072 $as_echo_n "checking for $ac_word... " >&6; } 13.1073 -if ${ac_cv_path_CHECK_GMAKE+:} false; then : 13.1074 +if test "${ac_cv_path_CHECK_GMAKE+set}" = set; then : 13.1075 $as_echo_n "(cached) " >&6 13.1076 else 13.1077 case $CHECK_GMAKE in 13.1078 @@ -8342,7 +8521,7 @@ 13.1079 # bat and cmd files are not always considered executable in cygwin causing which 13.1080 # to not find them 13.1081 if test "x$new_path" = x \ 13.1082 - && test "x`$ECHO \"$path\" | $GREP -e \"\\.bat$\" -e \"\\.cmd$\"`" != x \ 13.1083 + && test "x`$ECHO \"$path\" | $GREP -i -e \"\\.bat$\" -e \"\\.cmd$\"`" != x \ 13.1084 && test "x`$LS \"$path\" 2>/dev/null`" != x; then 13.1085 new_path=`$CYGPATH -u "$path"` 13.1086 fi 13.1087 @@ -8358,7 +8537,7 @@ 13.1088 # bat and cmd files are not always considered executable in cygwin causing which 13.1089 # to not find them 13.1090 if test "x$new_path" = x \ 13.1091 - && test "x`$ECHO \"$path\" | $GREP -e \"\\.bat$\" -e \"\\.cmd$\"`" != x \ 13.1092 + && test "x`$ECHO \"$path\" | $GREP -i -e \"\\.bat$\" -e \"\\.cmd$\"`" != x \ 13.1093 && test "x`$LS \"$path\" 2>/dev/null`" != x; then 13.1094 new_path=`$CYGPATH -u "$path"` 13.1095 fi 13.1096 @@ -8602,7 +8781,7 @@ 13.1097 set dummy $ac_prog; ac_word=$2 13.1098 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 13.1099 $as_echo_n "checking for $ac_word... " >&6; } 13.1100 -if ${ac_cv_path_CHECK_MAKE+:} false; then : 13.1101 +if test "${ac_cv_path_CHECK_MAKE+set}" = set; then : 13.1102 $as_echo_n "(cached) " >&6 13.1103 else 13.1104 case $CHECK_MAKE in 13.1105 @@ -8696,7 +8875,7 @@ 13.1106 # bat and cmd files are not always considered executable in cygwin causing which 13.1107 # to not find them 13.1108 if test "x$new_path" = x \ 13.1109 - && test "x`$ECHO \"$path\" | $GREP -e \"\\.bat$\" -e \"\\.cmd$\"`" != x \ 13.1110 + && test "x`$ECHO \"$path\" | $GREP -i -e \"\\.bat$\" -e \"\\.cmd$\"`" != x \ 13.1111 && test "x`$LS \"$path\" 2>/dev/null`" != x; then 13.1112 new_path=`$CYGPATH -u "$path"` 13.1113 fi 13.1114 @@ -8712,7 +8891,7 @@ 13.1115 # bat and cmd files are not always considered executable in cygwin causing which 13.1116 # to not find them 13.1117 if test "x$new_path" = x \ 13.1118 - && test "x`$ECHO \"$path\" | $GREP -e \"\\.bat$\" -e \"\\.cmd$\"`" != x \ 13.1119 + && test "x`$ECHO \"$path\" | $GREP -i -e \"\\.bat$\" -e \"\\.cmd$\"`" != x \ 13.1120 && test "x`$LS \"$path\" 2>/dev/null`" != x; then 13.1121 new_path=`$CYGPATH -u "$path"` 13.1122 fi 13.1123 @@ -8961,7 +9140,7 @@ 13.1124 set dummy $ac_prog; ac_word=$2 13.1125 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 13.1126 $as_echo_n "checking for $ac_word... " >&6; } 13.1127 -if ${ac_cv_path_CHECK_TOOLSDIR_GMAKE+:} false; then : 13.1128 +if test "${ac_cv_path_CHECK_TOOLSDIR_GMAKE+set}" = set; then : 13.1129 $as_echo_n "(cached) " >&6 13.1130 else 13.1131 case $CHECK_TOOLSDIR_GMAKE in 13.1132 @@ -9055,7 +9234,7 @@ 13.1133 # bat and cmd files are not always considered executable in cygwin causing which 13.1134 # to not find them 13.1135 if test "x$new_path" = x \ 13.1136 - && test "x`$ECHO \"$path\" | $GREP -e \"\\.bat$\" -e \"\\.cmd$\"`" != x \ 13.1137 + && test "x`$ECHO \"$path\" | $GREP -i -e \"\\.bat$\" -e \"\\.cmd$\"`" != x \ 13.1138 && test "x`$LS \"$path\" 2>/dev/null`" != x; then 13.1139 new_path=`$CYGPATH -u "$path"` 13.1140 fi 13.1141 @@ -9071,7 +9250,7 @@ 13.1142 # bat and cmd files are not always considered executable in cygwin causing which 13.1143 # to not find them 13.1144 if test "x$new_path" = x \ 13.1145 - && test "x`$ECHO \"$path\" | $GREP -e \"\\.bat$\" -e \"\\.cmd$\"`" != x \ 13.1146 + && test "x`$ECHO \"$path\" | $GREP -i -e \"\\.bat$\" -e \"\\.cmd$\"`" != x \ 13.1147 && test "x`$LS \"$path\" 2>/dev/null`" != x; then 13.1148 new_path=`$CYGPATH -u "$path"` 13.1149 fi 13.1150 @@ -9314,7 +9493,7 @@ 13.1151 set dummy $ac_prog; ac_word=$2 13.1152 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 13.1153 $as_echo_n "checking for $ac_word... " >&6; } 13.1154 -if ${ac_cv_path_CHECK_TOOLSDIR_MAKE+:} false; then : 13.1155 +if test "${ac_cv_path_CHECK_TOOLSDIR_MAKE+set}" = set; then : 13.1156 $as_echo_n "(cached) " >&6 13.1157 else 13.1158 case $CHECK_TOOLSDIR_MAKE in 13.1159 @@ -9408,7 +9587,7 @@ 13.1160 # bat and cmd files are not always considered executable in cygwin causing which 13.1161 # to not find them 13.1162 if test "x$new_path" = x \ 13.1163 - && test "x`$ECHO \"$path\" | $GREP -e \"\\.bat$\" -e \"\\.cmd$\"`" != x \ 13.1164 + && test "x`$ECHO \"$path\" | $GREP -i -e \"\\.bat$\" -e \"\\.cmd$\"`" != x \ 13.1165 && test "x`$LS \"$path\" 2>/dev/null`" != x; then 13.1166 new_path=`$CYGPATH -u "$path"` 13.1167 fi 13.1168 @@ -9424,7 +9603,7 @@ 13.1169 # bat and cmd files are not always considered executable in cygwin causing which 13.1170 # to not find them 13.1171 if test "x$new_path" = x \ 13.1172 - && test "x`$ECHO \"$path\" | $GREP -e \"\\.bat$\" -e \"\\.cmd$\"`" != x \ 13.1173 + && test "x`$ECHO \"$path\" | $GREP -i -e \"\\.bat$\" -e \"\\.cmd$\"`" != x \ 13.1174 && test "x`$LS \"$path\" 2>/dev/null`" != x; then 13.1175 new_path=`$CYGPATH -u "$path"` 13.1176 fi 13.1177 @@ -9710,7 +9889,7 @@ 13.1178 set dummy $ac_prog; ac_word=$2 13.1179 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 13.1180 $as_echo_n "checking for $ac_word... " >&6; } 13.1181 -if ${ac_cv_path_UNZIP+:} false; then : 13.1182 +if test "${ac_cv_path_UNZIP+set}" = set; then : 13.1183 $as_echo_n "(cached) " >&6 13.1184 else 13.1185 case $UNZIP in 13.1186 @@ -9769,7 +9948,7 @@ 13.1187 set dummy $ac_prog; ac_word=$2 13.1188 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 13.1189 $as_echo_n "checking for $ac_word... " >&6; } 13.1190 -if ${ac_cv_path_ZIP+:} false; then : 13.1191 +if test "${ac_cv_path_ZIP+set}" = set; then : 13.1192 $as_echo_n "(cached) " >&6 13.1193 else 13.1194 case $ZIP in 13.1195 @@ -9828,7 +10007,7 @@ 13.1196 set dummy ldd; ac_word=$2 13.1197 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 13.1198 $as_echo_n "checking for $ac_word... " >&6; } 13.1199 -if ${ac_cv_path_LDD+:} false; then : 13.1200 +if test "${ac_cv_path_LDD+set}" = set; then : 13.1201 $as_echo_n "(cached) " >&6 13.1202 else 13.1203 case $LDD in 13.1204 @@ -9874,7 +10053,7 @@ 13.1205 set dummy otool; ac_word=$2 13.1206 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 13.1207 $as_echo_n "checking for $ac_word... " >&6; } 13.1208 -if ${ac_cv_path_OTOOL+:} false; then : 13.1209 +if test "${ac_cv_path_OTOOL+set}" = set; then : 13.1210 $as_echo_n "(cached) " >&6 13.1211 else 13.1212 case $OTOOL in 13.1213 @@ -9919,7 +10098,7 @@ 13.1214 set dummy $ac_prog; ac_word=$2 13.1215 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 13.1216 $as_echo_n "checking for $ac_word... " >&6; } 13.1217 -if ${ac_cv_path_READELF+:} false; then : 13.1218 +if test "${ac_cv_path_READELF+set}" = set; then : 13.1219 $as_echo_n "(cached) " >&6 13.1220 else 13.1221 case $READELF in 13.1222 @@ -9962,7 +10141,7 @@ 13.1223 set dummy hg; ac_word=$2 13.1224 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 13.1225 $as_echo_n "checking for $ac_word... " >&6; } 13.1226 -if ${ac_cv_path_HG+:} false; then : 13.1227 +if test "${ac_cv_path_HG+set}" = set; then : 13.1228 $as_echo_n "(cached) " >&6 13.1229 else 13.1230 case $HG in 13.1231 @@ -10002,7 +10181,7 @@ 13.1232 set dummy stat; ac_word=$2 13.1233 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 13.1234 $as_echo_n "checking for $ac_word... " >&6; } 13.1235 -if ${ac_cv_path_STAT+:} false; then : 13.1236 +if test "${ac_cv_path_STAT+set}" = set; then : 13.1237 $as_echo_n "(cached) " >&6 13.1238 else 13.1239 case $STAT in 13.1240 @@ -10042,7 +10221,7 @@ 13.1241 set dummy time; ac_word=$2 13.1242 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 13.1243 $as_echo_n "checking for $ac_word... " >&6; } 13.1244 -if ${ac_cv_path_TIME+:} false; then : 13.1245 +if test "${ac_cv_path_TIME+set}" = set; then : 13.1246 $as_echo_n "(cached) " >&6 13.1247 else 13.1248 case $TIME in 13.1249 @@ -10087,7 +10266,7 @@ 13.1250 set dummy $ac_prog; ac_word=$2 13.1251 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 13.1252 $as_echo_n "checking for $ac_word... " >&6; } 13.1253 -if ${ac_cv_path_COMM+:} false; then : 13.1254 +if test "${ac_cv_path_COMM+set}" = set; then : 13.1255 $as_echo_n "(cached) " >&6 13.1256 else 13.1257 case $COMM in 13.1258 @@ -10151,7 +10330,7 @@ 13.1259 set dummy ${ac_tool_prefix}pkg-config; ac_word=$2 13.1260 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 13.1261 $as_echo_n "checking for $ac_word... " >&6; } 13.1262 -if ${ac_cv_path_PKG_CONFIG+:} false; then : 13.1263 +if test "${ac_cv_path_PKG_CONFIG+set}" = set; then : 13.1264 $as_echo_n "(cached) " >&6 13.1265 else 13.1266 case $PKG_CONFIG in 13.1267 @@ -10194,7 +10373,7 @@ 13.1268 set dummy pkg-config; ac_word=$2 13.1269 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 13.1270 $as_echo_n "checking for $ac_word... " >&6; } 13.1271 -if ${ac_cv_path_ac_pt_PKG_CONFIG+:} false; then : 13.1272 +if test "${ac_cv_path_ac_pt_PKG_CONFIG+set}" = set; then : 13.1273 $as_echo_n "(cached) " >&6 13.1274 else 13.1275 case $ac_pt_PKG_CONFIG in 13.1276 @@ -10367,7 +10546,7 @@ 13.1277 set dummy $ac_prog; ac_word=$2 13.1278 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 13.1279 $as_echo_n "checking for $ac_word... " >&6; } 13.1280 -if ${ac_cv_prog_BDEPS_UNZIP+:} false; then : 13.1281 +if test "${ac_cv_prog_BDEPS_UNZIP+set}" = set; then : 13.1282 $as_echo_n "(cached) " >&6 13.1283 else 13.1284 if test -n "$BDEPS_UNZIP"; then 13.1285 @@ -10413,7 +10592,7 @@ 13.1286 set dummy $ac_prog; ac_word=$2 13.1287 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 13.1288 $as_echo_n "checking for $ac_word... " >&6; } 13.1289 -if ${ac_cv_prog_BDEPS_FTP+:} false; then : 13.1290 +if test "${ac_cv_prog_BDEPS_FTP+set}" = set; then : 13.1291 $as_echo_n "(cached) " >&6 13.1292 else 13.1293 if test -n "$BDEPS_FTP"; then 13.1294 @@ -10462,54 +10641,6 @@ 13.1295 13.1296 ############################################################################### 13.1297 # 13.1298 -# Should we build only OpenJDK even if closed sources are present? 13.1299 -# 13.1300 -# Check whether --enable-openjdk-only was given. 13.1301 -if test "${enable_openjdk_only+set}" = set; then : 13.1302 - enableval=$enable_openjdk_only; 13.1303 -else 13.1304 - enable_openjdk_only="no" 13.1305 -fi 13.1306 - 13.1307 - 13.1308 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for presence of closed sources" >&5 13.1309 -$as_echo_n "checking for presence of closed sources... " >&6; } 13.1310 -if test -d "$SRC_ROOT/jdk/src/closed"; then 13.1311 - CLOSED_SOURCE_PRESENT=yes 13.1312 -else 13.1313 - CLOSED_SOURCE_PRESENT=no 13.1314 -fi 13.1315 -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $CLOSED_SOURCE_PRESENT" >&5 13.1316 -$as_echo "$CLOSED_SOURCE_PRESENT" >&6; } 13.1317 - 13.1318 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if closed source is supressed (openjdk-only)" >&5 13.1319 -$as_echo_n "checking if closed source is supressed (openjdk-only)... " >&6; } 13.1320 -SUPRESS_CLOSED_SOURCE="$enable_openjdk_only" 13.1321 -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $SUPRESS_CLOSED_SOURCE" >&5 13.1322 -$as_echo "$SUPRESS_CLOSED_SOURCE" >&6; } 13.1323 - 13.1324 -if test "x$CLOSED_SOURCE_PRESENT" = xno; then 13.1325 - OPENJDK=true 13.1326 - if test "x$SUPRESS_CLOSED_SOURCE" = "xyes"; then 13.1327 - { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: No closed source present, --enable-openjdk-only makes no sense" >&5 13.1328 -$as_echo "$as_me: WARNING: No closed source present, --enable-openjdk-only makes no sense" >&2;} 13.1329 - fi 13.1330 -else 13.1331 - if test "x$SUPRESS_CLOSED_SOURCE" = "xyes"; then 13.1332 - OPENJDK=true 13.1333 - else 13.1334 - OPENJDK=false 13.1335 - fi 13.1336 -fi 13.1337 - 13.1338 -if test "x$OPENJDK" = "xtrue"; then 13.1339 - SET_OPENJDK="OPENJDK=true" 13.1340 -fi 13.1341 - 13.1342 - 13.1343 - 13.1344 -############################################################################### 13.1345 -# 13.1346 # Should we build a JDK/JVM with headful support (ie a graphical ui)? 13.1347 # We always build headless support. 13.1348 # 13.1349 @@ -10608,10 +10739,56 @@ 13.1350 13.1351 13.1352 # Source the version numbers 13.1353 -. $AUTOCONF_DIR/version.numbers 13.1354 -if test "x$OPENJDK" = "xfalse"; then 13.1355 - . $AUTOCONF_DIR/closed.version.numbers 13.1356 -fi 13.1357 +. $AUTOCONF_DIR/version-numbers 13.1358 + 13.1359 +# Get the settings from parameters 13.1360 + 13.1361 +# Check whether --with-milestone was given. 13.1362 +if test "${with_milestone+set}" = set; then : 13.1363 + withval=$with_milestone; 13.1364 +fi 13.1365 + 13.1366 +if test "x$with_milestone" = xyes; then 13.1367 + as_fn_error $? "Milestone must have a value" "$LINENO" 5 13.1368 +elif test "x$with_milestone" != x; then 13.1369 + MILESTONE="$with_milestone" 13.1370 +else 13.1371 + MILESTONE=internal 13.1372 +fi 13.1373 + 13.1374 + 13.1375 +# Check whether --with-build-number was given. 13.1376 +if test "${with_build_number+set}" = set; then : 13.1377 + withval=$with_build_number; 13.1378 +fi 13.1379 + 13.1380 +if test "x$with_build_number" = xyes; then 13.1381 + as_fn_error $? "Build number must have a value" "$LINENO" 5 13.1382 +elif test "x$with_build_number" != x; then 13.1383 + JDK_BUILD_NUMBER="$with_build_number" 13.1384 +fi 13.1385 +if test "x$JDK_BUILD_NUMBER" = x; then 13.1386 + JDK_BUILD_NUMBER=b00 13.1387 +fi 13.1388 + 13.1389 + 13.1390 +# Check whether --with-user-release-suffix was given. 13.1391 +if test "${with_user_release_suffix+set}" = set; then : 13.1392 + withval=$with_user_release_suffix; 13.1393 +fi 13.1394 + 13.1395 +if test "x$with_user_release_suffix" = xyes; then 13.1396 + as_fn_error $? "Release suffix must have a value" "$LINENO" 5 13.1397 +elif test "x$with_user_release_suffix" != x; then 13.1398 + USER_RELEASE_SUFFIX="$with_user_release_suffix" 13.1399 +else 13.1400 + BUILD_DATE=`date '+%Y_%m_%d_%H_%M'` 13.1401 + # Avoid [:alnum:] since it depends on the locale. 13.1402 + CLEAN_USERNAME=`echo "$USER" | $TR -d -c 'abcdefghijklmnopqrstuvqxyz0123456789'` 13.1403 + USER_RELEASE_SUFFIX=`echo "${CLEAN_USERNAME}_${BUILD_DATE}" | $TR 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'` 13.1404 +fi 13.1405 + 13.1406 + 13.1407 # Now set the JDK version, milestone, build number etc. 13.1408 13.1409 13.1410 @@ -10630,33 +10807,12 @@ 13.1411 COPYRIGHT_YEAR=`date +'%Y'` 13.1412 13.1413 13.1414 -RUNTIME_NAME="$PRODUCT_NAME $PRODUCT_SUFFIX" 13.1415 - 13.1416 - 13.1417 if test "x$JDK_UPDATE_VERSION" != x; then 13.1418 - JDK_VERSION="${JDK_MAJOR_VERSION}.${JDK_MINOR_VERSION}.${JDK_MICRO_VERSION}_${JDK_UPDATE_VERSION}" 13.1419 -else 13.1420 - JDK_VERSION="${JDK_MAJOR_VERSION}.${JDK_MINOR_VERSION}.${JDK_MICRO_VERSION}" 13.1421 -fi 13.1422 - 13.1423 - 13.1424 -if test "x$MILESTONE" != x; then 13.1425 - RELEASE="${JDK_VERSION}-${MILESTONE}${BUILD_VARIANT_RELEASE}" 13.1426 -else 13.1427 - RELEASE="${JDK_VERSION}${BUILD_VARIANT_RELEASE}" 13.1428 -fi 13.1429 - 13.1430 - 13.1431 -if test "x$JDK_BUILD_NUMBER" != x; then 13.1432 - FULL_VERSION="${RELEASE}-${JDK_BUILD_NUMBER}" 13.1433 -else 13.1434 - JDK_BUILD_NUMBER=b00 13.1435 - BUILD_DATE=`date '+%Y_%m_%d_%H_%M'` 13.1436 - # Avoid [:alnum:] since it depends on the locale. 13.1437 - CLEAN_USERNAME=`echo "$USER" | $TR -d -c 'abcdefghijklmnopqrstuvqxyz0123456789'` 13.1438 - USER_RELEASE_SUFFIX=`echo "${CLEAN_USERNAME}_${BUILD_DATE}" | $TR 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'` 13.1439 - FULL_VERSION="${RELEASE}-${USER_RELEASE_SUFFIX}-${JDK_BUILD_NUMBER}" 13.1440 -fi 13.1441 + JDK_VERSION="${JDK_MAJOR_VERSION}.${JDK_MINOR_VERSION}.${JDK_MICRO_VERSION}_${JDK_UPDATE_VERSION}" 13.1442 +else 13.1443 + JDK_VERSION="${JDK_MAJOR_VERSION}.${JDK_MINOR_VERSION}.${JDK_MICRO_VERSION}" 13.1444 +fi 13.1445 + 13.1446 13.1447 COOKED_BUILD_NUMBER=`$ECHO $JDK_BUILD_NUMBER | $SED -e 's/^b//' -e 's/^0//'` 13.1448 13.1449 @@ -11702,7 +11858,7 @@ 13.1450 set dummy javac; ac_word=$2 13.1451 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 13.1452 $as_echo_n "checking for $ac_word... " >&6; } 13.1453 -if ${ac_cv_path_JAVAC_CHECK+:} false; then : 13.1454 +if test "${ac_cv_path_JAVAC_CHECK+set}" = set; then : 13.1455 $as_echo_n "(cached) " >&6 13.1456 else 13.1457 case $JAVAC_CHECK in 13.1458 @@ -11742,7 +11898,7 @@ 13.1459 set dummy java; ac_word=$2 13.1460 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 13.1461 $as_echo_n "checking for $ac_word... " >&6; } 13.1462 -if ${ac_cv_path_JAVA_CHECK+:} false; then : 13.1463 +if test "${ac_cv_path_JAVA_CHECK+set}" = set; then : 13.1464 $as_echo_n "(cached) " >&6 13.1465 else 13.1466 case $JAVA_CHECK in 13.1467 @@ -15801,7 +15957,7 @@ 13.1468 set dummy link; ac_word=$2 13.1469 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 13.1470 $as_echo_n "checking for $ac_word... " >&6; } 13.1471 -if ${ac_cv_path_CYGWIN_LINK+:} false; then : 13.1472 +if test "${ac_cv_path_CYGWIN_LINK+set}" = set; then : 13.1473 $as_echo_n "(cached) " >&6 13.1474 else 13.1475 case $CYGWIN_LINK in 13.1476 @@ -16248,7 +16404,7 @@ 13.1477 # bat and cmd files are not always considered executable in cygwin causing which 13.1478 # to not find them 13.1479 if test "x$new_path" = x \ 13.1480 - && test "x`$ECHO \"$path\" | $GREP -e \"\\.bat$\" -e \"\\.cmd$\"`" != x \ 13.1481 + && test "x`$ECHO \"$path\" | $GREP -i -e \"\\.bat$\" -e \"\\.cmd$\"`" != x \ 13.1482 && test "x`$LS \"$path\" 2>/dev/null`" != x; then 13.1483 new_path=`$CYGPATH -u "$path"` 13.1484 fi 13.1485 @@ -16264,7 +16420,7 @@ 13.1486 # bat and cmd files are not always considered executable in cygwin causing which 13.1487 # to not find them 13.1488 if test "x$new_path" = x \ 13.1489 - && test "x`$ECHO \"$path\" | $GREP -e \"\\.bat$\" -e \"\\.cmd$\"`" != x \ 13.1490 + && test "x`$ECHO \"$path\" | $GREP -i -e \"\\.bat$\" -e \"\\.cmd$\"`" != x \ 13.1491 && test "x`$LS \"$path\" 2>/dev/null`" != x; then 13.1492 new_path=`$CYGPATH -u "$path"` 13.1493 fi 13.1494 @@ -16790,7 +16946,7 @@ 13.1495 set dummy $ac_prog; ac_word=$2 13.1496 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 13.1497 $as_echo_n "checking for $ac_word... " >&6; } 13.1498 -if ${ac_cv_path_BUILD_CC+:} false; then : 13.1499 +if test "${ac_cv_path_BUILD_CC+set}" = set; then : 13.1500 $as_echo_n "(cached) " >&6 13.1501 else 13.1502 case $BUILD_CC in 13.1503 @@ -16848,7 +17004,7 @@ 13.1504 # bat and cmd files are not always considered executable in cygwin causing which 13.1505 # to not find them 13.1506 if test "x$new_path" = x \ 13.1507 - && test "x`$ECHO \"$path\" | $GREP -e \"\\.bat$\" -e \"\\.cmd$\"`" != x \ 13.1508 + && test "x`$ECHO \"$path\" | $GREP -i -e \"\\.bat$\" -e \"\\.cmd$\"`" != x \ 13.1509 && test "x`$LS \"$path\" 2>/dev/null`" != x; then 13.1510 new_path=`$CYGPATH -u "$path"` 13.1511 fi 13.1512 @@ -16864,7 +17020,7 @@ 13.1513 # bat and cmd files are not always considered executable in cygwin causing which 13.1514 # to not find them 13.1515 if test "x$new_path" = x \ 13.1516 - && test "x`$ECHO \"$path\" | $GREP -e \"\\.bat$\" -e \"\\.cmd$\"`" != x \ 13.1517 + && test "x`$ECHO \"$path\" | $GREP -i -e \"\\.bat$\" -e \"\\.cmd$\"`" != x \ 13.1518 && test "x`$LS \"$path\" 2>/dev/null`" != x; then 13.1519 new_path=`$CYGPATH -u "$path"` 13.1520 fi 13.1521 @@ -17101,7 +17257,7 @@ 13.1522 set dummy $ac_prog; ac_word=$2 13.1523 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 13.1524 $as_echo_n "checking for $ac_word... " >&6; } 13.1525 -if ${ac_cv_path_BUILD_CXX+:} false; then : 13.1526 +if test "${ac_cv_path_BUILD_CXX+set}" = set; then : 13.1527 $as_echo_n "(cached) " >&6 13.1528 else 13.1529 case $BUILD_CXX in 13.1530 @@ -17159,7 +17315,7 @@ 13.1531 # bat and cmd files are not always considered executable in cygwin causing which 13.1532 # to not find them 13.1533 if test "x$new_path" = x \ 13.1534 - && test "x`$ECHO \"$path\" | $GREP -e \"\\.bat$\" -e \"\\.cmd$\"`" != x \ 13.1535 + && test "x`$ECHO \"$path\" | $GREP -i -e \"\\.bat$\" -e \"\\.cmd$\"`" != x \ 13.1536 && test "x`$LS \"$path\" 2>/dev/null`" != x; then 13.1537 new_path=`$CYGPATH -u "$path"` 13.1538 fi 13.1539 @@ -17175,7 +17331,7 @@ 13.1540 # bat and cmd files are not always considered executable in cygwin causing which 13.1541 # to not find them 13.1542 if test "x$new_path" = x \ 13.1543 - && test "x`$ECHO \"$path\" | $GREP -e \"\\.bat$\" -e \"\\.cmd$\"`" != x \ 13.1544 + && test "x`$ECHO \"$path\" | $GREP -i -e \"\\.bat$\" -e \"\\.cmd$\"`" != x \ 13.1545 && test "x`$LS \"$path\" 2>/dev/null`" != x; then 13.1546 new_path=`$CYGPATH -u "$path"` 13.1547 fi 13.1548 @@ -17410,7 +17566,7 @@ 13.1549 set dummy ld; ac_word=$2 13.1550 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 13.1551 $as_echo_n "checking for $ac_word... " >&6; } 13.1552 -if ${ac_cv_path_BUILD_LD+:} false; then : 13.1553 +if test "${ac_cv_path_BUILD_LD+set}" = set; then : 13.1554 $as_echo_n "(cached) " >&6 13.1555 else 13.1556 case $BUILD_LD in 13.1557 @@ -17465,7 +17621,7 @@ 13.1558 # bat and cmd files are not always considered executable in cygwin causing which 13.1559 # to not find them 13.1560 if test "x$new_path" = x \ 13.1561 - && test "x`$ECHO \"$path\" | $GREP -e \"\\.bat$\" -e \"\\.cmd$\"`" != x \ 13.1562 + && test "x`$ECHO \"$path\" | $GREP -i -e \"\\.bat$\" -e \"\\.cmd$\"`" != x \ 13.1563 && test "x`$LS \"$path\" 2>/dev/null`" != x; then 13.1564 new_path=`$CYGPATH -u "$path"` 13.1565 fi 13.1566 @@ -17481,7 +17637,7 @@ 13.1567 # bat and cmd files are not always considered executable in cygwin causing which 13.1568 # to not find them 13.1569 if test "x$new_path" = x \ 13.1570 - && test "x`$ECHO \"$path\" | $GREP -e \"\\.bat$\" -e \"\\.cmd$\"`" != x \ 13.1571 + && test "x`$ECHO \"$path\" | $GREP -i -e \"\\.bat$\" -e \"\\.cmd$\"`" != x \ 13.1572 && test "x`$LS \"$path\" 2>/dev/null`" != x; then 13.1573 new_path=`$CYGPATH -u "$path"` 13.1574 fi 13.1575 @@ -17922,7 +18078,7 @@ 13.1576 set dummy $ac_prog; ac_word=$2 13.1577 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 13.1578 $as_echo_n "checking for $ac_word... " >&6; } 13.1579 -if ${ac_cv_path_TOOLS_DIR_CC+:} false; then : 13.1580 +if test "${ac_cv_path_TOOLS_DIR_CC+set}" = set; then : 13.1581 $as_echo_n "(cached) " >&6 13.1582 else 13.1583 case $TOOLS_DIR_CC in 13.1584 @@ -17974,7 +18130,7 @@ 13.1585 set dummy $ac_prog; ac_word=$2 13.1586 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 13.1587 $as_echo_n "checking for $ac_word... " >&6; } 13.1588 -if ${ac_cv_path_POTENTIAL_CC+:} false; then : 13.1589 +if test "${ac_cv_path_POTENTIAL_CC+set}" = set; then : 13.1590 $as_echo_n "(cached) " >&6 13.1591 else 13.1592 case $POTENTIAL_CC in 13.1593 @@ -18063,7 +18219,7 @@ 13.1594 # bat and cmd files are not always considered executable in cygwin causing which 13.1595 # to not find them 13.1596 if test "x$new_path" = x \ 13.1597 - && test "x`$ECHO \"$path\" | $GREP -e \"\\.bat$\" -e \"\\.cmd$\"`" != x \ 13.1598 + && test "x`$ECHO \"$path\" | $GREP -i -e \"\\.bat$\" -e \"\\.cmd$\"`" != x \ 13.1599 && test "x`$LS \"$path\" 2>/dev/null`" != x; then 13.1600 new_path=`$CYGPATH -u "$path"` 13.1601 fi 13.1602 @@ -18079,7 +18235,7 @@ 13.1603 # bat and cmd files are not always considered executable in cygwin causing which 13.1604 # to not find them 13.1605 if test "x$new_path" = x \ 13.1606 - && test "x`$ECHO \"$path\" | $GREP -e \"\\.bat$\" -e \"\\.cmd$\"`" != x \ 13.1607 + && test "x`$ECHO \"$path\" | $GREP -i -e \"\\.bat$\" -e \"\\.cmd$\"`" != x \ 13.1608 && test "x`$LS \"$path\" 2>/dev/null`" != x; then 13.1609 new_path=`$CYGPATH -u "$path"` 13.1610 fi 13.1611 @@ -18387,7 +18543,7 @@ 13.1612 set dummy $ac_tool_prefix$ac_prog; ac_word=$2 13.1613 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 13.1614 $as_echo_n "checking for $ac_word... " >&6; } 13.1615 -if ${ac_cv_prog_PROPER_COMPILER_CC+:} false; then : 13.1616 +if test "${ac_cv_prog_PROPER_COMPILER_CC+set}" = set; then : 13.1617 $as_echo_n "(cached) " >&6 13.1618 else 13.1619 if test -n "$PROPER_COMPILER_CC"; then 13.1620 @@ -18431,7 +18587,7 @@ 13.1621 set dummy $ac_prog; ac_word=$2 13.1622 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 13.1623 $as_echo_n "checking for $ac_word... " >&6; } 13.1624 -if ${ac_cv_prog_ac_ct_PROPER_COMPILER_CC+:} false; then : 13.1625 +if test "${ac_cv_prog_ac_ct_PROPER_COMPILER_CC+set}" = set; then : 13.1626 $as_echo_n "(cached) " >&6 13.1627 else 13.1628 if test -n "$ac_ct_PROPER_COMPILER_CC"; then 13.1629 @@ -18499,7 +18655,7 @@ 13.1630 # bat and cmd files are not always considered executable in cygwin causing which 13.1631 # to not find them 13.1632 if test "x$new_path" = x \ 13.1633 - && test "x`$ECHO \"$path\" | $GREP -e \"\\.bat$\" -e \"\\.cmd$\"`" != x \ 13.1634 + && test "x`$ECHO \"$path\" | $GREP -i -e \"\\.bat$\" -e \"\\.cmd$\"`" != x \ 13.1635 && test "x`$LS \"$path\" 2>/dev/null`" != x; then 13.1636 new_path=`$CYGPATH -u "$path"` 13.1637 fi 13.1638 @@ -18515,7 +18671,7 @@ 13.1639 # bat and cmd files are not always considered executable in cygwin causing which 13.1640 # to not find them 13.1641 if test "x$new_path" = x \ 13.1642 - && test "x`$ECHO \"$path\" | $GREP -e \"\\.bat$\" -e \"\\.cmd$\"`" != x \ 13.1643 + && test "x`$ECHO \"$path\" | $GREP -i -e \"\\.bat$\" -e \"\\.cmd$\"`" != x \ 13.1644 && test "x`$LS \"$path\" 2>/dev/null`" != x; then 13.1645 new_path=`$CYGPATH -u "$path"` 13.1646 fi 13.1647 @@ -18881,7 +19037,7 @@ 13.1648 set dummy $ac_tool_prefix$ac_prog; ac_word=$2 13.1649 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 13.1650 $as_echo_n "checking for $ac_word... " >&6; } 13.1651 -if ${ac_cv_prog_CC+:} false; then : 13.1652 +if test "${ac_cv_prog_CC+set}" = set; then : 13.1653 $as_echo_n "(cached) " >&6 13.1654 else 13.1655 if test -n "$CC"; then 13.1656 @@ -18925,7 +19081,7 @@ 13.1657 set dummy $ac_prog; ac_word=$2 13.1658 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 13.1659 $as_echo_n "checking for $ac_word... " >&6; } 13.1660 -if ${ac_cv_prog_ac_ct_CC+:} false; then : 13.1661 +if test "${ac_cv_prog_ac_ct_CC+set}" = set; then : 13.1662 $as_echo_n "(cached) " >&6 13.1663 else 13.1664 if test -n "$ac_ct_CC"; then 13.1665 @@ -18978,7 +19134,7 @@ 13.1666 test -z "$CC" && { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 13.1667 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} 13.1668 as_fn_error $? "no acceptable C compiler found in \$PATH 13.1669 -See \`config.log' for more details" "$LINENO" 5; } 13.1670 +See \`config.log' for more details" "$LINENO" 5 ; } 13.1671 13.1672 # Provide some information about the compiler. 13.1673 $as_echo "$as_me:${as_lineno-$LINENO}: checking for C compiler version" >&5 13.1674 @@ -19093,7 +19249,7 @@ 13.1675 { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 13.1676 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} 13.1677 as_fn_error 77 "C compiler cannot create executables 13.1678 -See \`config.log' for more details" "$LINENO" 5; } 13.1679 +See \`config.log' for more details" "$LINENO" 5 ; } 13.1680 else 13.1681 { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 13.1682 $as_echo "yes" >&6; } 13.1683 @@ -19136,7 +19292,7 @@ 13.1684 { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 13.1685 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} 13.1686 as_fn_error $? "cannot compute suffix of executables: cannot compile and link 13.1687 -See \`config.log' for more details" "$LINENO" 5; } 13.1688 +See \`config.log' for more details" "$LINENO" 5 ; } 13.1689 fi 13.1690 rm -f conftest conftest$ac_cv_exeext 13.1691 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_exeext" >&5 13.1692 @@ -19195,7 +19351,7 @@ 13.1693 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} 13.1694 as_fn_error $? "cannot run C compiled programs. 13.1695 If you meant to cross compile, use \`--host'. 13.1696 -See \`config.log' for more details" "$LINENO" 5; } 13.1697 +See \`config.log' for more details" "$LINENO" 5 ; } 13.1698 fi 13.1699 fi 13.1700 fi 13.1701 @@ -19206,7 +19362,7 @@ 13.1702 ac_clean_files=$ac_clean_files_save 13.1703 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for suffix of object files" >&5 13.1704 $as_echo_n "checking for suffix of object files... " >&6; } 13.1705 -if ${ac_cv_objext+:} false; then : 13.1706 +if test "${ac_cv_objext+set}" = set; then : 13.1707 $as_echo_n "(cached) " >&6 13.1708 else 13.1709 cat confdefs.h - <<_ACEOF >conftest.$ac_ext 13.1710 @@ -19247,7 +19403,7 @@ 13.1711 { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 13.1712 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} 13.1713 as_fn_error $? "cannot compute suffix of object files: cannot compile 13.1714 -See \`config.log' for more details" "$LINENO" 5; } 13.1715 +See \`config.log' for more details" "$LINENO" 5 ; } 13.1716 fi 13.1717 rm -f conftest.$ac_cv_objext conftest.$ac_ext 13.1718 fi 13.1719 @@ -19257,7 +19413,7 @@ 13.1720 ac_objext=$OBJEXT 13.1721 { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are using the GNU C compiler" >&5 13.1722 $as_echo_n "checking whether we are using the GNU C compiler... " >&6; } 13.1723 -if ${ac_cv_c_compiler_gnu+:} false; then : 13.1724 +if test "${ac_cv_c_compiler_gnu+set}" = set; then : 13.1725 $as_echo_n "(cached) " >&6 13.1726 else 13.1727 cat confdefs.h - <<_ACEOF >conftest.$ac_ext 13.1728 @@ -19294,7 +19450,7 @@ 13.1729 ac_save_CFLAGS=$CFLAGS 13.1730 { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CC accepts -g" >&5 13.1731 $as_echo_n "checking whether $CC accepts -g... " >&6; } 13.1732 -if ${ac_cv_prog_cc_g+:} false; then : 13.1733 +if test "${ac_cv_prog_cc_g+set}" = set; then : 13.1734 $as_echo_n "(cached) " >&6 13.1735 else 13.1736 ac_save_c_werror_flag=$ac_c_werror_flag 13.1737 @@ -19372,7 +19528,7 @@ 13.1738 fi 13.1739 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $CC option to accept ISO C89" >&5 13.1740 $as_echo_n "checking for $CC option to accept ISO C89... " >&6; } 13.1741 -if ${ac_cv_prog_cc_c89+:} false; then : 13.1742 +if test "${ac_cv_prog_cc_c89+set}" = set; then : 13.1743 $as_echo_n "(cached) " >&6 13.1744 else 13.1745 ac_cv_prog_cc_c89=no 13.1746 @@ -19491,7 +19647,7 @@ 13.1747 set dummy $ac_prog; ac_word=$2 13.1748 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 13.1749 $as_echo_n "checking for $ac_word... " >&6; } 13.1750 -if ${ac_cv_path_TOOLS_DIR_CXX+:} false; then : 13.1751 +if test "${ac_cv_path_TOOLS_DIR_CXX+set}" = set; then : 13.1752 $as_echo_n "(cached) " >&6 13.1753 else 13.1754 case $TOOLS_DIR_CXX in 13.1755 @@ -19543,7 +19699,7 @@ 13.1756 set dummy $ac_prog; ac_word=$2 13.1757 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 13.1758 $as_echo_n "checking for $ac_word... " >&6; } 13.1759 -if ${ac_cv_path_POTENTIAL_CXX+:} false; then : 13.1760 +if test "${ac_cv_path_POTENTIAL_CXX+set}" = set; then : 13.1761 $as_echo_n "(cached) " >&6 13.1762 else 13.1763 case $POTENTIAL_CXX in 13.1764 @@ -19632,7 +19788,7 @@ 13.1765 # bat and cmd files are not always considered executable in cygwin causing which 13.1766 # to not find them 13.1767 if test "x$new_path" = x \ 13.1768 - && test "x`$ECHO \"$path\" | $GREP -e \"\\.bat$\" -e \"\\.cmd$\"`" != x \ 13.1769 + && test "x`$ECHO \"$path\" | $GREP -i -e \"\\.bat$\" -e \"\\.cmd$\"`" != x \ 13.1770 && test "x`$LS \"$path\" 2>/dev/null`" != x; then 13.1771 new_path=`$CYGPATH -u "$path"` 13.1772 fi 13.1773 @@ -19648,7 +19804,7 @@ 13.1774 # bat and cmd files are not always considered executable in cygwin causing which 13.1775 # to not find them 13.1776 if test "x$new_path" = x \ 13.1777 - && test "x`$ECHO \"$path\" | $GREP -e \"\\.bat$\" -e \"\\.cmd$\"`" != x \ 13.1778 + && test "x`$ECHO \"$path\" | $GREP -i -e \"\\.bat$\" -e \"\\.cmd$\"`" != x \ 13.1779 && test "x`$LS \"$path\" 2>/dev/null`" != x; then 13.1780 new_path=`$CYGPATH -u "$path"` 13.1781 fi 13.1782 @@ -19956,7 +20112,7 @@ 13.1783 set dummy $ac_tool_prefix$ac_prog; ac_word=$2 13.1784 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 13.1785 $as_echo_n "checking for $ac_word... " >&6; } 13.1786 -if ${ac_cv_prog_PROPER_COMPILER_CXX+:} false; then : 13.1787 +if test "${ac_cv_prog_PROPER_COMPILER_CXX+set}" = set; then : 13.1788 $as_echo_n "(cached) " >&6 13.1789 else 13.1790 if test -n "$PROPER_COMPILER_CXX"; then 13.1791 @@ -20000,7 +20156,7 @@ 13.1792 set dummy $ac_prog; ac_word=$2 13.1793 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 13.1794 $as_echo_n "checking for $ac_word... " >&6; } 13.1795 -if ${ac_cv_prog_ac_ct_PROPER_COMPILER_CXX+:} false; then : 13.1796 +if test "${ac_cv_prog_ac_ct_PROPER_COMPILER_CXX+set}" = set; then : 13.1797 $as_echo_n "(cached) " >&6 13.1798 else 13.1799 if test -n "$ac_ct_PROPER_COMPILER_CXX"; then 13.1800 @@ -20068,7 +20224,7 @@ 13.1801 # bat and cmd files are not always considered executable in cygwin causing which 13.1802 # to not find them 13.1803 if test "x$new_path" = x \ 13.1804 - && test "x`$ECHO \"$path\" | $GREP -e \"\\.bat$\" -e \"\\.cmd$\"`" != x \ 13.1805 + && test "x`$ECHO \"$path\" | $GREP -i -e \"\\.bat$\" -e \"\\.cmd$\"`" != x \ 13.1806 && test "x`$LS \"$path\" 2>/dev/null`" != x; then 13.1807 new_path=`$CYGPATH -u "$path"` 13.1808 fi 13.1809 @@ -20084,7 +20240,7 @@ 13.1810 # bat and cmd files are not always considered executable in cygwin causing which 13.1811 # to not find them 13.1812 if test "x$new_path" = x \ 13.1813 - && test "x`$ECHO \"$path\" | $GREP -e \"\\.bat$\" -e \"\\.cmd$\"`" != x \ 13.1814 + && test "x`$ECHO \"$path\" | $GREP -i -e \"\\.bat$\" -e \"\\.cmd$\"`" != x \ 13.1815 && test "x`$LS \"$path\" 2>/dev/null`" != x; then 13.1816 new_path=`$CYGPATH -u "$path"` 13.1817 fi 13.1818 @@ -20454,7 +20610,7 @@ 13.1819 set dummy $ac_tool_prefix$ac_prog; ac_word=$2 13.1820 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 13.1821 $as_echo_n "checking for $ac_word... " >&6; } 13.1822 -if ${ac_cv_prog_CXX+:} false; then : 13.1823 +if test "${ac_cv_prog_CXX+set}" = set; then : 13.1824 $as_echo_n "(cached) " >&6 13.1825 else 13.1826 if test -n "$CXX"; then 13.1827 @@ -20498,7 +20654,7 @@ 13.1828 set dummy $ac_prog; ac_word=$2 13.1829 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 13.1830 $as_echo_n "checking for $ac_word... " >&6; } 13.1831 -if ${ac_cv_prog_ac_ct_CXX+:} false; then : 13.1832 +if test "${ac_cv_prog_ac_ct_CXX+set}" = set; then : 13.1833 $as_echo_n "(cached) " >&6 13.1834 else 13.1835 if test -n "$ac_ct_CXX"; then 13.1836 @@ -20576,7 +20732,7 @@ 13.1837 13.1838 { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are using the GNU C++ compiler" >&5 13.1839 $as_echo_n "checking whether we are using the GNU C++ compiler... " >&6; } 13.1840 -if ${ac_cv_cxx_compiler_gnu+:} false; then : 13.1841 +if test "${ac_cv_cxx_compiler_gnu+set}" = set; then : 13.1842 $as_echo_n "(cached) " >&6 13.1843 else 13.1844 cat confdefs.h - <<_ACEOF >conftest.$ac_ext 13.1845 @@ -20613,7 +20769,7 @@ 13.1846 ac_save_CXXFLAGS=$CXXFLAGS 13.1847 { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CXX accepts -g" >&5 13.1848 $as_echo_n "checking whether $CXX accepts -g... " >&6; } 13.1849 -if ${ac_cv_prog_cxx_g+:} false; then : 13.1850 +if test "${ac_cv_prog_cxx_g+set}" = set; then : 13.1851 $as_echo_n "(cached) " >&6 13.1852 else 13.1853 ac_save_cxx_werror_flag=$ac_cxx_werror_flag 13.1854 @@ -20711,7 +20867,7 @@ 13.1855 set dummy $ac_tool_prefix$ac_prog; ac_word=$2 13.1856 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 13.1857 $as_echo_n "checking for $ac_word... " >&6; } 13.1858 -if ${ac_cv_prog_OBJC+:} false; then : 13.1859 +if test "${ac_cv_prog_OBJC+set}" = set; then : 13.1860 $as_echo_n "(cached) " >&6 13.1861 else 13.1862 if test -n "$OBJC"; then 13.1863 @@ -20755,7 +20911,7 @@ 13.1864 set dummy $ac_prog; ac_word=$2 13.1865 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 13.1866 $as_echo_n "checking for $ac_word... " >&6; } 13.1867 -if ${ac_cv_prog_ac_ct_OBJC+:} false; then : 13.1868 +if test "${ac_cv_prog_ac_ct_OBJC+set}" = set; then : 13.1869 $as_echo_n "(cached) " >&6 13.1870 else 13.1871 if test -n "$ac_ct_OBJC"; then 13.1872 @@ -20831,7 +20987,7 @@ 13.1873 13.1874 { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are using the GNU Objective C compiler" >&5 13.1875 $as_echo_n "checking whether we are using the GNU Objective C compiler... " >&6; } 13.1876 -if ${ac_cv_objc_compiler_gnu+:} false; then : 13.1877 +if test "${ac_cv_objc_compiler_gnu+set}" = set; then : 13.1878 $as_echo_n "(cached) " >&6 13.1879 else 13.1880 cat confdefs.h - <<_ACEOF >conftest.$ac_ext 13.1881 @@ -20868,7 +21024,7 @@ 13.1882 ac_save_OBJCFLAGS=$OBJCFLAGS 13.1883 { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $OBJC accepts -g" >&5 13.1884 $as_echo_n "checking whether $OBJC accepts -g... " >&6; } 13.1885 -if ${ac_cv_prog_objc_g+:} false; then : 13.1886 +if test "${ac_cv_prog_objc_g+set}" = set; then : 13.1887 $as_echo_n "(cached) " >&6 13.1888 else 13.1889 ac_save_objc_werror_flag=$ac_objc_werror_flag 13.1890 @@ -20969,7 +21125,7 @@ 13.1891 # bat and cmd files are not always considered executable in cygwin causing which 13.1892 # to not find them 13.1893 if test "x$new_path" = x \ 13.1894 - && test "x`$ECHO \"$path\" | $GREP -e \"\\.bat$\" -e \"\\.cmd$\"`" != x \ 13.1895 + && test "x`$ECHO \"$path\" | $GREP -i -e \"\\.bat$\" -e \"\\.cmd$\"`" != x \ 13.1896 && test "x`$LS \"$path\" 2>/dev/null`" != x; then 13.1897 new_path=`$CYGPATH -u "$path"` 13.1898 fi 13.1899 @@ -20985,7 +21141,7 @@ 13.1900 # bat and cmd files are not always considered executable in cygwin causing which 13.1901 # to not find them 13.1902 if test "x$new_path" = x \ 13.1903 - && test "x`$ECHO \"$path\" | $GREP -e \"\\.bat$\" -e \"\\.cmd$\"`" != x \ 13.1904 + && test "x`$ECHO \"$path\" | $GREP -i -e \"\\.bat$\" -e \"\\.cmd$\"`" != x \ 13.1905 && test "x`$LS \"$path\" 2>/dev/null`" != x; then 13.1906 new_path=`$CYGPATH -u "$path"` 13.1907 fi 13.1908 @@ -21244,7 +21400,7 @@ 13.1909 set dummy ${ac_tool_prefix}ar; ac_word=$2 13.1910 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 13.1911 $as_echo_n "checking for $ac_word... " >&6; } 13.1912 -if ${ac_cv_prog_AR+:} false; then : 13.1913 +if test "${ac_cv_prog_AR+set}" = set; then : 13.1914 $as_echo_n "(cached) " >&6 13.1915 else 13.1916 if test -n "$AR"; then 13.1917 @@ -21284,7 +21440,7 @@ 13.1918 set dummy ar; ac_word=$2 13.1919 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 13.1920 $as_echo_n "checking for $ac_word... " >&6; } 13.1921 -if ${ac_cv_prog_ac_ct_AR+:} false; then : 13.1922 +if test "${ac_cv_prog_ac_ct_AR+set}" = set; then : 13.1923 $as_echo_n "(cached) " >&6 13.1924 else 13.1925 if test -n "$ac_ct_AR"; then 13.1926 @@ -21350,7 +21506,7 @@ 13.1927 # bat and cmd files are not always considered executable in cygwin causing which 13.1928 # to not find them 13.1929 if test "x$new_path" = x \ 13.1930 - && test "x`$ECHO \"$path\" | $GREP -e \"\\.bat$\" -e \"\\.cmd$\"`" != x \ 13.1931 + && test "x`$ECHO \"$path\" | $GREP -i -e \"\\.bat$\" -e \"\\.cmd$\"`" != x \ 13.1932 && test "x`$LS \"$path\" 2>/dev/null`" != x; then 13.1933 new_path=`$CYGPATH -u "$path"` 13.1934 fi 13.1935 @@ -21366,7 +21522,7 @@ 13.1936 # bat and cmd files are not always considered executable in cygwin causing which 13.1937 # to not find them 13.1938 if test "x$new_path" = x \ 13.1939 - && test "x`$ECHO \"$path\" | $GREP -e \"\\.bat$\" -e \"\\.cmd$\"`" != x \ 13.1940 + && test "x`$ECHO \"$path\" | $GREP -i -e \"\\.bat$\" -e \"\\.cmd$\"`" != x \ 13.1941 && test "x`$LS \"$path\" 2>/dev/null`" != x; then 13.1942 new_path=`$CYGPATH -u "$path"` 13.1943 fi 13.1944 @@ -21626,7 +21782,7 @@ 13.1945 set dummy link; ac_word=$2 13.1946 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 13.1947 $as_echo_n "checking for $ac_word... " >&6; } 13.1948 -if ${ac_cv_prog_WINLD+:} false; then : 13.1949 +if test "${ac_cv_prog_WINLD+set}" = set; then : 13.1950 $as_echo_n "(cached) " >&6 13.1951 else 13.1952 if test -n "$WINLD"; then 13.1953 @@ -21697,7 +21853,7 @@ 13.1954 # bat and cmd files are not always considered executable in cygwin causing which 13.1955 # to not find them 13.1956 if test "x$new_path" = x \ 13.1957 - && test "x`$ECHO \"$path\" | $GREP -e \"\\.bat$\" -e \"\\.cmd$\"`" != x \ 13.1958 + && test "x`$ECHO \"$path\" | $GREP -i -e \"\\.bat$\" -e \"\\.cmd$\"`" != x \ 13.1959 && test "x`$LS \"$path\" 2>/dev/null`" != x; then 13.1960 new_path=`$CYGPATH -u "$path"` 13.1961 fi 13.1962 @@ -21713,7 +21869,7 @@ 13.1963 # bat and cmd files are not always considered executable in cygwin causing which 13.1964 # to not find them 13.1965 if test "x$new_path" = x \ 13.1966 - && test "x`$ECHO \"$path\" | $GREP -e \"\\.bat$\" -e \"\\.cmd$\"`" != x \ 13.1967 + && test "x`$ECHO \"$path\" | $GREP -i -e \"\\.bat$\" -e \"\\.cmd$\"`" != x \ 13.1968 && test "x`$LS \"$path\" 2>/dev/null`" != x; then 13.1969 new_path=`$CYGPATH -u "$path"` 13.1970 fi 13.1971 @@ -21965,7 +22121,7 @@ 13.1972 set dummy mt; ac_word=$2 13.1973 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 13.1974 $as_echo_n "checking for $ac_word... " >&6; } 13.1975 -if ${ac_cv_prog_MT+:} false; then : 13.1976 +if test "${ac_cv_prog_MT+set}" = set; then : 13.1977 $as_echo_n "(cached) " >&6 13.1978 else 13.1979 if test -n "$MT"; then 13.1980 @@ -22034,7 +22190,7 @@ 13.1981 # bat and cmd files are not always considered executable in cygwin causing which 13.1982 # to not find them 13.1983 if test "x$new_path" = x \ 13.1984 - && test "x`$ECHO \"$path\" | $GREP -e \"\\.bat$\" -e \"\\.cmd$\"`" != x \ 13.1985 + && test "x`$ECHO \"$path\" | $GREP -i -e \"\\.bat$\" -e \"\\.cmd$\"`" != x \ 13.1986 && test "x`$LS \"$path\" 2>/dev/null`" != x; then 13.1987 new_path=`$CYGPATH -u "$path"` 13.1988 fi 13.1989 @@ -22050,7 +22206,7 @@ 13.1990 # bat and cmd files are not always considered executable in cygwin causing which 13.1991 # to not find them 13.1992 if test "x$new_path" = x \ 13.1993 - && test "x`$ECHO \"$path\" | $GREP -e \"\\.bat$\" -e \"\\.cmd$\"`" != x \ 13.1994 + && test "x`$ECHO \"$path\" | $GREP -i -e \"\\.bat$\" -e \"\\.cmd$\"`" != x \ 13.1995 && test "x`$LS \"$path\" 2>/dev/null`" != x; then 13.1996 new_path=`$CYGPATH -u "$path"` 13.1997 fi 13.1998 @@ -22286,7 +22442,7 @@ 13.1999 set dummy rc; ac_word=$2 13.2000 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 13.2001 $as_echo_n "checking for $ac_word... " >&6; } 13.2002 -if ${ac_cv_prog_RC+:} false; then : 13.2003 +if test "${ac_cv_prog_RC+set}" = set; then : 13.2004 $as_echo_n "(cached) " >&6 13.2005 else 13.2006 if test -n "$RC"; then 13.2007 @@ -22355,7 +22511,7 @@ 13.2008 # bat and cmd files are not always considered executable in cygwin causing which 13.2009 # to not find them 13.2010 if test "x$new_path" = x \ 13.2011 - && test "x`$ECHO \"$path\" | $GREP -e \"\\.bat$\" -e \"\\.cmd$\"`" != x \ 13.2012 + && test "x`$ECHO \"$path\" | $GREP -i -e \"\\.bat$\" -e \"\\.cmd$\"`" != x \ 13.2013 && test "x`$LS \"$path\" 2>/dev/null`" != x; then 13.2014 new_path=`$CYGPATH -u "$path"` 13.2015 fi 13.2016 @@ -22371,7 +22527,7 @@ 13.2017 # bat and cmd files are not always considered executable in cygwin causing which 13.2018 # to not find them 13.2019 if test "x$new_path" = x \ 13.2020 - && test "x`$ECHO \"$path\" | $GREP -e \"\\.bat$\" -e \"\\.cmd$\"`" != x \ 13.2021 + && test "x`$ECHO \"$path\" | $GREP -i -e \"\\.bat$\" -e \"\\.cmd$\"`" != x \ 13.2022 && test "x`$LS \"$path\" 2>/dev/null`" != x; then 13.2023 new_path=`$CYGPATH -u "$path"` 13.2024 fi 13.2025 @@ -22677,7 +22833,7 @@ 13.2026 set dummy lib; ac_word=$2 13.2027 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 13.2028 $as_echo_n "checking for $ac_word... " >&6; } 13.2029 -if ${ac_cv_prog_WINAR+:} false; then : 13.2030 +if test "${ac_cv_prog_WINAR+set}" = set; then : 13.2031 $as_echo_n "(cached) " >&6 13.2032 else 13.2033 if test -n "$WINAR"; then 13.2034 @@ -22729,7 +22885,7 @@ 13.2035 # bat and cmd files are not always considered executable in cygwin causing which 13.2036 # to not find them 13.2037 if test "x$new_path" = x \ 13.2038 - && test "x`$ECHO \"$path\" | $GREP -e \"\\.bat$\" -e \"\\.cmd$\"`" != x \ 13.2039 + && test "x`$ECHO \"$path\" | $GREP -i -e \"\\.bat$\" -e \"\\.cmd$\"`" != x \ 13.2040 && test "x`$LS \"$path\" 2>/dev/null`" != x; then 13.2041 new_path=`$CYGPATH -u "$path"` 13.2042 fi 13.2043 @@ -22745,7 +22901,7 @@ 13.2044 # bat and cmd files are not always considered executable in cygwin causing which 13.2045 # to not find them 13.2046 if test "x$new_path" = x \ 13.2047 - && test "x`$ECHO \"$path\" | $GREP -e \"\\.bat$\" -e \"\\.cmd$\"`" != x \ 13.2048 + && test "x`$ECHO \"$path\" | $GREP -i -e \"\\.bat$\" -e \"\\.cmd$\"`" != x \ 13.2049 && test "x`$LS \"$path\" 2>/dev/null`" != x; then 13.2050 new_path=`$CYGPATH -u "$path"` 13.2051 fi 13.2052 @@ -22983,7 +23139,7 @@ 13.2053 set dummy dumpbin; ac_word=$2 13.2054 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 13.2055 $as_echo_n "checking for $ac_word... " >&6; } 13.2056 -if ${ac_cv_prog_DUMPBIN+:} false; then : 13.2057 +if test "${ac_cv_prog_DUMPBIN+set}" = set; then : 13.2058 $as_echo_n "(cached) " >&6 13.2059 else 13.2060 if test -n "$DUMPBIN"; then 13.2061 @@ -23035,7 +23191,7 @@ 13.2062 # bat and cmd files are not always considered executable in cygwin causing which 13.2063 # to not find them 13.2064 if test "x$new_path" = x \ 13.2065 - && test "x`$ECHO \"$path\" | $GREP -e \"\\.bat$\" -e \"\\.cmd$\"`" != x \ 13.2066 + && test "x`$ECHO \"$path\" | $GREP -i -e \"\\.bat$\" -e \"\\.cmd$\"`" != x \ 13.2067 && test "x`$LS \"$path\" 2>/dev/null`" != x; then 13.2068 new_path=`$CYGPATH -u "$path"` 13.2069 fi 13.2070 @@ -23051,7 +23207,7 @@ 13.2071 # bat and cmd files are not always considered executable in cygwin causing which 13.2072 # to not find them 13.2073 if test "x$new_path" = x \ 13.2074 - && test "x`$ECHO \"$path\" | $GREP -e \"\\.bat$\" -e \"\\.cmd$\"`" != x \ 13.2075 + && test "x`$ECHO \"$path\" | $GREP -i -e \"\\.bat$\" -e \"\\.cmd$\"`" != x \ 13.2076 && test "x`$LS \"$path\" 2>/dev/null`" != x; then 13.2077 new_path=`$CYGPATH -u "$path"` 13.2078 fi 13.2079 @@ -23302,7 +23458,7 @@ 13.2080 CPP= 13.2081 fi 13.2082 if test -z "$CPP"; then 13.2083 - if ${ac_cv_prog_CPP+:} false; then : 13.2084 + if test "${ac_cv_prog_CPP+set}" = set; then : 13.2085 $as_echo_n "(cached) " >&6 13.2086 else 13.2087 # Double quotes because CPP needs to be expanded 13.2088 @@ -23418,7 +23574,7 @@ 13.2089 { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 13.2090 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} 13.2091 as_fn_error $? "C preprocessor \"$CPP\" fails sanity check 13.2092 -See \`config.log' for more details" "$LINENO" 5; } 13.2093 +See \`config.log' for more details" "$LINENO" 5 ; } 13.2094 fi 13.2095 13.2096 ac_ext=cpp 13.2097 @@ -23446,7 +23602,7 @@ 13.2098 # bat and cmd files are not always considered executable in cygwin causing which 13.2099 # to not find them 13.2100 if test "x$new_path" = x \ 13.2101 - && test "x`$ECHO \"$path\" | $GREP -e \"\\.bat$\" -e \"\\.cmd$\"`" != x \ 13.2102 + && test "x`$ECHO \"$path\" | $GREP -i -e \"\\.bat$\" -e \"\\.cmd$\"`" != x \ 13.2103 && test "x`$LS \"$path\" 2>/dev/null`" != x; then 13.2104 new_path=`$CYGPATH -u "$path"` 13.2105 fi 13.2106 @@ -23462,7 +23618,7 @@ 13.2107 # bat and cmd files are not always considered executable in cygwin causing which 13.2108 # to not find them 13.2109 if test "x$new_path" = x \ 13.2110 - && test "x`$ECHO \"$path\" | $GREP -e \"\\.bat$\" -e \"\\.cmd$\"`" != x \ 13.2111 + && test "x`$ECHO \"$path\" | $GREP -i -e \"\\.bat$\" -e \"\\.cmd$\"`" != x \ 13.2112 && test "x`$LS \"$path\" 2>/dev/null`" != x; then 13.2113 new_path=`$CYGPATH -u "$path"` 13.2114 fi 13.2115 @@ -23702,7 +23858,7 @@ 13.2116 { $as_echo "$as_me:${as_lineno-$LINENO}: checking how to run the C++ preprocessor" >&5 13.2117 $as_echo_n "checking how to run the C++ preprocessor... " >&6; } 13.2118 if test -z "$CXXCPP"; then 13.2119 - if ${ac_cv_prog_CXXCPP+:} false; then : 13.2120 + if test "${ac_cv_prog_CXXCPP+set}" = set; then : 13.2121 $as_echo_n "(cached) " >&6 13.2122 else 13.2123 # Double quotes because CXXCPP needs to be expanded 13.2124 @@ -23818,7 +23974,7 @@ 13.2125 { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 13.2126 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} 13.2127 as_fn_error $? "C++ preprocessor \"$CXXCPP\" fails sanity check 13.2128 -See \`config.log' for more details" "$LINENO" 5; } 13.2129 +See \`config.log' for more details" "$LINENO" 5 ; } 13.2130 fi 13.2131 13.2132 ac_ext=cpp 13.2133 @@ -23846,7 +24002,7 @@ 13.2134 # bat and cmd files are not always considered executable in cygwin causing which 13.2135 # to not find them 13.2136 if test "x$new_path" = x \ 13.2137 - && test "x`$ECHO \"$path\" | $GREP -e \"\\.bat$\" -e \"\\.cmd$\"`" != x \ 13.2138 + && test "x`$ECHO \"$path\" | $GREP -i -e \"\\.bat$\" -e \"\\.cmd$\"`" != x \ 13.2139 && test "x`$LS \"$path\" 2>/dev/null`" != x; then 13.2140 new_path=`$CYGPATH -u "$path"` 13.2141 fi 13.2142 @@ -23862,7 +24018,7 @@ 13.2143 # bat and cmd files are not always considered executable in cygwin causing which 13.2144 # to not find them 13.2145 if test "x$new_path" = x \ 13.2146 - && test "x`$ECHO \"$path\" | $GREP -e \"\\.bat$\" -e \"\\.cmd$\"`" != x \ 13.2147 + && test "x`$ECHO \"$path\" | $GREP -i -e \"\\.bat$\" -e \"\\.cmd$\"`" != x \ 13.2148 && test "x`$LS \"$path\" 2>/dev/null`" != x; then 13.2149 new_path=`$CYGPATH -u "$path"` 13.2150 fi 13.2151 @@ -24120,7 +24276,7 @@ 13.2152 set dummy as; ac_word=$2 13.2153 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 13.2154 $as_echo_n "checking for $ac_word... " >&6; } 13.2155 -if ${ac_cv_path_AS+:} false; then : 13.2156 +if test "${ac_cv_path_AS+set}" = set; then : 13.2157 $as_echo_n "(cached) " >&6 13.2158 else 13.2159 case $AS in 13.2160 @@ -24175,7 +24331,7 @@ 13.2161 # bat and cmd files are not always considered executable in cygwin causing which 13.2162 # to not find them 13.2163 if test "x$new_path" = x \ 13.2164 - && test "x`$ECHO \"$path\" | $GREP -e \"\\.bat$\" -e \"\\.cmd$\"`" != x \ 13.2165 + && test "x`$ECHO \"$path\" | $GREP -i -e \"\\.bat$\" -e \"\\.cmd$\"`" != x \ 13.2166 && test "x`$LS \"$path\" 2>/dev/null`" != x; then 13.2167 new_path=`$CYGPATH -u "$path"` 13.2168 fi 13.2169 @@ -24191,7 +24347,7 @@ 13.2170 # bat and cmd files are not always considered executable in cygwin causing which 13.2171 # to not find them 13.2172 if test "x$new_path" = x \ 13.2173 - && test "x`$ECHO \"$path\" | $GREP -e \"\\.bat$\" -e \"\\.cmd$\"`" != x \ 13.2174 + && test "x`$ECHO \"$path\" | $GREP -i -e \"\\.bat$\" -e \"\\.cmd$\"`" != x \ 13.2175 && test "x`$LS \"$path\" 2>/dev/null`" != x; then 13.2176 new_path=`$CYGPATH -u "$path"` 13.2177 fi 13.2178 @@ -24434,7 +24590,7 @@ 13.2179 set dummy $ac_prog; ac_word=$2 13.2180 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 13.2181 $as_echo_n "checking for $ac_word... " >&6; } 13.2182 -if ${ac_cv_path_NM+:} false; then : 13.2183 +if test "${ac_cv_path_NM+set}" = set; then : 13.2184 $as_echo_n "(cached) " >&6 13.2185 else 13.2186 case $NM in 13.2187 @@ -24492,7 +24648,7 @@ 13.2188 # bat and cmd files are not always considered executable in cygwin causing which 13.2189 # to not find them 13.2190 if test "x$new_path" = x \ 13.2191 - && test "x`$ECHO \"$path\" | $GREP -e \"\\.bat$\" -e \"\\.cmd$\"`" != x \ 13.2192 + && test "x`$ECHO \"$path\" | $GREP -i -e \"\\.bat$\" -e \"\\.cmd$\"`" != x \ 13.2193 && test "x`$LS \"$path\" 2>/dev/null`" != x; then 13.2194 new_path=`$CYGPATH -u "$path"` 13.2195 fi 13.2196 @@ -24508,7 +24664,7 @@ 13.2197 # bat and cmd files are not always considered executable in cygwin causing which 13.2198 # to not find them 13.2199 if test "x$new_path" = x \ 13.2200 - && test "x`$ECHO \"$path\" | $GREP -e \"\\.bat$\" -e \"\\.cmd$\"`" != x \ 13.2201 + && test "x`$ECHO \"$path\" | $GREP -i -e \"\\.bat$\" -e \"\\.cmd$\"`" != x \ 13.2202 && test "x`$LS \"$path\" 2>/dev/null`" != x; then 13.2203 new_path=`$CYGPATH -u "$path"` 13.2204 fi 13.2205 @@ -24743,7 +24899,7 @@ 13.2206 set dummy strip; ac_word=$2 13.2207 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 13.2208 $as_echo_n "checking for $ac_word... " >&6; } 13.2209 -if ${ac_cv_path_STRIP+:} false; then : 13.2210 +if test "${ac_cv_path_STRIP+set}" = set; then : 13.2211 $as_echo_n "(cached) " >&6 13.2212 else 13.2213 case $STRIP in 13.2214 @@ -24798,7 +24954,7 @@ 13.2215 # bat and cmd files are not always considered executable in cygwin causing which 13.2216 # to not find them 13.2217 if test "x$new_path" = x \ 13.2218 - && test "x`$ECHO \"$path\" | $GREP -e \"\\.bat$\" -e \"\\.cmd$\"`" != x \ 13.2219 + && test "x`$ECHO \"$path\" | $GREP -i -e \"\\.bat$\" -e \"\\.cmd$\"`" != x \ 13.2220 && test "x`$LS \"$path\" 2>/dev/null`" != x; then 13.2221 new_path=`$CYGPATH -u "$path"` 13.2222 fi 13.2223 @@ -24814,7 +24970,7 @@ 13.2224 # bat and cmd files are not always considered executable in cygwin causing which 13.2225 # to not find them 13.2226 if test "x$new_path" = x \ 13.2227 - && test "x`$ECHO \"$path\" | $GREP -e \"\\.bat$\" -e \"\\.cmd$\"`" != x \ 13.2228 + && test "x`$ECHO \"$path\" | $GREP -i -e \"\\.bat$\" -e \"\\.cmd$\"`" != x \ 13.2229 && test "x`$LS \"$path\" 2>/dev/null`" != x; then 13.2230 new_path=`$CYGPATH -u "$path"` 13.2231 fi 13.2232 @@ -25049,7 +25205,7 @@ 13.2233 set dummy mcs; ac_word=$2 13.2234 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 13.2235 $as_echo_n "checking for $ac_word... " >&6; } 13.2236 -if ${ac_cv_path_MCS+:} false; then : 13.2237 +if test "${ac_cv_path_MCS+set}" = set; then : 13.2238 $as_echo_n "(cached) " >&6 13.2239 else 13.2240 case $MCS in 13.2241 @@ -25104,7 +25260,7 @@ 13.2242 # bat and cmd files are not always considered executable in cygwin causing which 13.2243 # to not find them 13.2244 if test "x$new_path" = x \ 13.2245 - && test "x`$ECHO \"$path\" | $GREP -e \"\\.bat$\" -e \"\\.cmd$\"`" != x \ 13.2246 + && test "x`$ECHO \"$path\" | $GREP -i -e \"\\.bat$\" -e \"\\.cmd$\"`" != x \ 13.2247 && test "x`$LS \"$path\" 2>/dev/null`" != x; then 13.2248 new_path=`$CYGPATH -u "$path"` 13.2249 fi 13.2250 @@ -25120,7 +25276,7 @@ 13.2251 # bat and cmd files are not always considered executable in cygwin causing which 13.2252 # to not find them 13.2253 if test "x$new_path" = x \ 13.2254 - && test "x`$ECHO \"$path\" | $GREP -e \"\\.bat$\" -e \"\\.cmd$\"`" != x \ 13.2255 + && test "x`$ECHO \"$path\" | $GREP -i -e \"\\.bat$\" -e \"\\.cmd$\"`" != x \ 13.2256 && test "x`$LS \"$path\" 2>/dev/null`" != x; then 13.2257 new_path=`$CYGPATH -u "$path"` 13.2258 fi 13.2259 @@ -25357,7 +25513,7 @@ 13.2260 set dummy ${ac_tool_prefix}nm; ac_word=$2 13.2261 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 13.2262 $as_echo_n "checking for $ac_word... " >&6; } 13.2263 -if ${ac_cv_prog_NM+:} false; then : 13.2264 +if test "${ac_cv_prog_NM+set}" = set; then : 13.2265 $as_echo_n "(cached) " >&6 13.2266 else 13.2267 if test -n "$NM"; then 13.2268 @@ -25397,7 +25553,7 @@ 13.2269 set dummy nm; ac_word=$2 13.2270 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 13.2271 $as_echo_n "checking for $ac_word... " >&6; } 13.2272 -if ${ac_cv_prog_ac_ct_NM+:} false; then : 13.2273 +if test "${ac_cv_prog_ac_ct_NM+set}" = set; then : 13.2274 $as_echo_n "(cached) " >&6 13.2275 else 13.2276 if test -n "$ac_ct_NM"; then 13.2277 @@ -25463,7 +25619,7 @@ 13.2278 # bat and cmd files are not always considered executable in cygwin causing which 13.2279 # to not find them 13.2280 if test "x$new_path" = x \ 13.2281 - && test "x`$ECHO \"$path\" | $GREP -e \"\\.bat$\" -e \"\\.cmd$\"`" != x \ 13.2282 + && test "x`$ECHO \"$path\" | $GREP -i -e \"\\.bat$\" -e \"\\.cmd$\"`" != x \ 13.2283 && test "x`$LS \"$path\" 2>/dev/null`" != x; then 13.2284 new_path=`$CYGPATH -u "$path"` 13.2285 fi 13.2286 @@ -25479,7 +25635,7 @@ 13.2287 # bat and cmd files are not always considered executable in cygwin causing which 13.2288 # to not find them 13.2289 if test "x$new_path" = x \ 13.2290 - && test "x`$ECHO \"$path\" | $GREP -e \"\\.bat$\" -e \"\\.cmd$\"`" != x \ 13.2291 + && test "x`$ECHO \"$path\" | $GREP -i -e \"\\.bat$\" -e \"\\.cmd$\"`" != x \ 13.2292 && test "x`$LS \"$path\" 2>/dev/null`" != x; then 13.2293 new_path=`$CYGPATH -u "$path"` 13.2294 fi 13.2295 @@ -25715,7 +25871,7 @@ 13.2296 set dummy ${ac_tool_prefix}strip; ac_word=$2 13.2297 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 13.2298 $as_echo_n "checking for $ac_word... " >&6; } 13.2299 -if ${ac_cv_prog_STRIP+:} false; then : 13.2300 +if test "${ac_cv_prog_STRIP+set}" = set; then : 13.2301 $as_echo_n "(cached) " >&6 13.2302 else 13.2303 if test -n "$STRIP"; then 13.2304 @@ -25755,7 +25911,7 @@ 13.2305 set dummy strip; ac_word=$2 13.2306 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 13.2307 $as_echo_n "checking for $ac_word... " >&6; } 13.2308 -if ${ac_cv_prog_ac_ct_STRIP+:} false; then : 13.2309 +if test "${ac_cv_prog_ac_ct_STRIP+set}" = set; then : 13.2310 $as_echo_n "(cached) " >&6 13.2311 else 13.2312 if test -n "$ac_ct_STRIP"; then 13.2313 @@ -25821,7 +25977,7 @@ 13.2314 # bat and cmd files are not always considered executable in cygwin causing which 13.2315 # to not find them 13.2316 if test "x$new_path" = x \ 13.2317 - && test "x`$ECHO \"$path\" | $GREP -e \"\\.bat$\" -e \"\\.cmd$\"`" != x \ 13.2318 + && test "x`$ECHO \"$path\" | $GREP -i -e \"\\.bat$\" -e \"\\.cmd$\"`" != x \ 13.2319 && test "x`$LS \"$path\" 2>/dev/null`" != x; then 13.2320 new_path=`$CYGPATH -u "$path"` 13.2321 fi 13.2322 @@ -25837,7 +25993,7 @@ 13.2323 # bat and cmd files are not always considered executable in cygwin causing which 13.2324 # to not find them 13.2325 if test "x$new_path" = x \ 13.2326 - && test "x`$ECHO \"$path\" | $GREP -e \"\\.bat$\" -e \"\\.cmd$\"`" != x \ 13.2327 + && test "x`$ECHO \"$path\" | $GREP -i -e \"\\.bat$\" -e \"\\.cmd$\"`" != x \ 13.2328 && test "x`$LS \"$path\" 2>/dev/null`" != x; then 13.2329 new_path=`$CYGPATH -u "$path"` 13.2330 fi 13.2331 @@ -26080,7 +26236,7 @@ 13.2332 set dummy $ac_tool_prefix$ac_prog; ac_word=$2 13.2333 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 13.2334 $as_echo_n "checking for $ac_word... " >&6; } 13.2335 -if ${ac_cv_prog_OBJCOPY+:} false; then : 13.2336 +if test "${ac_cv_prog_OBJCOPY+set}" = set; then : 13.2337 $as_echo_n "(cached) " >&6 13.2338 else 13.2339 if test -n "$OBJCOPY"; then 13.2340 @@ -26124,7 +26280,7 @@ 13.2341 set dummy $ac_prog; ac_word=$2 13.2342 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 13.2343 $as_echo_n "checking for $ac_word... " >&6; } 13.2344 -if ${ac_cv_prog_ac_ct_OBJCOPY+:} false; then : 13.2345 +if test "${ac_cv_prog_ac_ct_OBJCOPY+set}" = set; then : 13.2346 $as_echo_n "(cached) " >&6 13.2347 else 13.2348 if test -n "$ac_ct_OBJCOPY"; then 13.2349 @@ -26194,7 +26350,7 @@ 13.2350 # bat and cmd files are not always considered executable in cygwin causing which 13.2351 # to not find them 13.2352 if test "x$new_path" = x \ 13.2353 - && test "x`$ECHO \"$path\" | $GREP -e \"\\.bat$\" -e \"\\.cmd$\"`" != x \ 13.2354 + && test "x`$ECHO \"$path\" | $GREP -i -e \"\\.bat$\" -e \"\\.cmd$\"`" != x \ 13.2355 && test "x`$LS \"$path\" 2>/dev/null`" != x; then 13.2356 new_path=`$CYGPATH -u "$path"` 13.2357 fi 13.2358 @@ -26210,7 +26366,7 @@ 13.2359 # bat and cmd files are not always considered executable in cygwin causing which 13.2360 # to not find them 13.2361 if test "x$new_path" = x \ 13.2362 - && test "x`$ECHO \"$path\" | $GREP -e \"\\.bat$\" -e \"\\.cmd$\"`" != x \ 13.2363 + && test "x`$ECHO \"$path\" | $GREP -i -e \"\\.bat$\" -e \"\\.cmd$\"`" != x \ 13.2364 && test "x`$LS \"$path\" 2>/dev/null`" != x; then 13.2365 new_path=`$CYGPATH -u "$path"` 13.2366 fi 13.2367 @@ -26451,7 +26607,7 @@ 13.2368 set dummy $ac_tool_prefix$ac_prog; ac_word=$2 13.2369 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 13.2370 $as_echo_n "checking for $ac_word... " >&6; } 13.2371 -if ${ac_cv_prog_OBJDUMP+:} false; then : 13.2372 +if test "${ac_cv_prog_OBJDUMP+set}" = set; then : 13.2373 $as_echo_n "(cached) " >&6 13.2374 else 13.2375 if test -n "$OBJDUMP"; then 13.2376 @@ -26495,7 +26651,7 @@ 13.2377 set dummy $ac_prog; ac_word=$2 13.2378 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 13.2379 $as_echo_n "checking for $ac_word... " >&6; } 13.2380 -if ${ac_cv_prog_ac_ct_OBJDUMP+:} false; then : 13.2381 +if test "${ac_cv_prog_ac_ct_OBJDUMP+set}" = set; then : 13.2382 $as_echo_n "(cached) " >&6 13.2383 else 13.2384 if test -n "$ac_ct_OBJDUMP"; then 13.2385 @@ -26565,7 +26721,7 @@ 13.2386 # bat and cmd files are not always considered executable in cygwin causing which 13.2387 # to not find them 13.2388 if test "x$new_path" = x \ 13.2389 - && test "x`$ECHO \"$path\" | $GREP -e \"\\.bat$\" -e \"\\.cmd$\"`" != x \ 13.2390 + && test "x`$ECHO \"$path\" | $GREP -i -e \"\\.bat$\" -e \"\\.cmd$\"`" != x \ 13.2391 && test "x`$LS \"$path\" 2>/dev/null`" != x; then 13.2392 new_path=`$CYGPATH -u "$path"` 13.2393 fi 13.2394 @@ -26581,7 +26737,7 @@ 13.2395 # bat and cmd files are not always considered executable in cygwin causing which 13.2396 # to not find them 13.2397 if test "x$new_path" = x \ 13.2398 - && test "x`$ECHO \"$path\" | $GREP -e \"\\.bat$\" -e \"\\.cmd$\"`" != x \ 13.2399 + && test "x`$ECHO \"$path\" | $GREP -i -e \"\\.bat$\" -e \"\\.cmd$\"`" != x \ 13.2400 && test "x`$LS \"$path\" 2>/dev/null`" != x; then 13.2401 new_path=`$CYGPATH -u "$path"` 13.2402 fi 13.2403 @@ -26819,7 +26975,7 @@ 13.2404 set dummy lipo; ac_word=$2 13.2405 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 13.2406 $as_echo_n "checking for $ac_word... " >&6; } 13.2407 -if ${ac_cv_path_LIPO+:} false; then : 13.2408 +if test "${ac_cv_path_LIPO+set}" = set; then : 13.2409 $as_echo_n "(cached) " >&6 13.2410 else 13.2411 case $LIPO in 13.2412 @@ -26874,7 +27030,7 @@ 13.2413 # bat and cmd files are not always considered executable in cygwin causing which 13.2414 # to not find them 13.2415 if test "x$new_path" = x \ 13.2416 - && test "x`$ECHO \"$path\" | $GREP -e \"\\.bat$\" -e \"\\.cmd$\"`" != x \ 13.2417 + && test "x`$ECHO \"$path\" | $GREP -i -e \"\\.bat$\" -e \"\\.cmd$\"`" != x \ 13.2418 && test "x`$LS \"$path\" 2>/dev/null`" != x; then 13.2419 new_path=`$CYGPATH -u "$path"` 13.2420 fi 13.2421 @@ -26890,7 +27046,7 @@ 13.2422 # bat and cmd files are not always considered executable in cygwin causing which 13.2423 # to not find them 13.2424 if test "x$new_path" = x \ 13.2425 - && test "x`$ECHO \"$path\" | $GREP -e \"\\.bat$\" -e \"\\.cmd$\"`" != x \ 13.2426 + && test "x`$ECHO \"$path\" | $GREP -i -e \"\\.bat$\" -e \"\\.cmd$\"`" != x \ 13.2427 && test "x`$LS \"$path\" 2>/dev/null`" != x; then 13.2428 new_path=`$CYGPATH -u "$path"` 13.2429 fi 13.2430 @@ -27134,7 +27290,7 @@ 13.2431 13.2432 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ANSI C header files" >&5 13.2433 $as_echo_n "checking for ANSI C header files... " >&6; } 13.2434 -if ${ac_cv_header_stdc+:} false; then : 13.2435 +if test "${ac_cv_header_stdc+set}" = set; then : 13.2436 $as_echo_n "(cached) " >&6 13.2437 else 13.2438 cat confdefs.h - <<_ACEOF >conftest.$ac_ext 13.2439 @@ -27310,7 +27466,7 @@ 13.2440 for ac_header in stdio.h 13.2441 do : 13.2442 ac_fn_cxx_check_header_mongrel "$LINENO" "stdio.h" "ac_cv_header_stdio_h" "$ac_includes_default" 13.2443 -if test "x$ac_cv_header_stdio_h" = xyes; then : 13.2444 +if test "x$ac_cv_header_stdio_h" = x""yes; then : 13.2445 cat >>confdefs.h <<_ACEOF 13.2446 #define HAVE_STDIO_H 1 13.2447 _ACEOF 13.2448 @@ -27339,7 +27495,7 @@ 13.2449 # This bug is HP SR number 8606223364. 13.2450 { $as_echo "$as_me:${as_lineno-$LINENO}: checking size of int *" >&5 13.2451 $as_echo_n "checking size of int *... " >&6; } 13.2452 -if ${ac_cv_sizeof_int_p+:} false; then : 13.2453 +if test "${ac_cv_sizeof_int_p+set}" = set; then : 13.2454 $as_echo_n "(cached) " >&6 13.2455 else 13.2456 if ac_fn_cxx_compute_int "$LINENO" "(long int) (sizeof (int *))" "ac_cv_sizeof_int_p" "$ac_includes_default"; then : 13.2457 @@ -27349,7 +27505,7 @@ 13.2458 { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 13.2459 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} 13.2460 as_fn_error 77 "cannot compute sizeof (int *) 13.2461 -See \`config.log' for more details" "$LINENO" 5; } 13.2462 +See \`config.log' for more details" "$LINENO" 5 ; } 13.2463 else 13.2464 ac_cv_sizeof_int_p=0 13.2465 fi 13.2466 @@ -27396,7 +27552,7 @@ 13.2467 # 13.2468 { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether byte ordering is bigendian" >&5 13.2469 $as_echo_n "checking whether byte ordering is bigendian... " >&6; } 13.2470 -if ${ac_cv_c_bigendian+:} false; then : 13.2471 +if test "${ac_cv_c_bigendian+set}" = set; then : 13.2472 $as_echo_n "(cached) " >&6 13.2473 else 13.2474 ac_cv_c_bigendian=unknown 13.2475 @@ -28396,8 +28552,8 @@ 13.2476 have_x=disabled 13.2477 else 13.2478 case $x_includes,$x_libraries in #( 13.2479 - *\'*) as_fn_error $? "cannot use X directory names containing '" "$LINENO" 5;; #( 13.2480 - *,NONE | NONE,*) if ${ac_cv_have_x+:} false; then : 13.2481 + *\'*) as_fn_error $? "cannot use X directory names containing '" "$LINENO" 5 ;; #( 13.2482 + *,NONE | NONE,*) if test "${ac_cv_have_x+set}" = set; then : 13.2483 $as_echo_n "(cached) " >&6 13.2484 else 13.2485 # One or both of the vars are not set, and there is no cached value. 13.2486 @@ -28674,7 +28830,7 @@ 13.2487 else 13.2488 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dnet_ntoa in -ldnet" >&5 13.2489 $as_echo_n "checking for dnet_ntoa in -ldnet... " >&6; } 13.2490 -if ${ac_cv_lib_dnet_dnet_ntoa+:} false; then : 13.2491 +if test "${ac_cv_lib_dnet_dnet_ntoa+set}" = set; then : 13.2492 $as_echo_n "(cached) " >&6 13.2493 else 13.2494 ac_check_lib_save_LIBS=$LIBS 13.2495 @@ -28708,14 +28864,14 @@ 13.2496 fi 13.2497 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dnet_dnet_ntoa" >&5 13.2498 $as_echo "$ac_cv_lib_dnet_dnet_ntoa" >&6; } 13.2499 -if test "x$ac_cv_lib_dnet_dnet_ntoa" = xyes; then : 13.2500 +if test "x$ac_cv_lib_dnet_dnet_ntoa" = x""yes; then : 13.2501 X_EXTRA_LIBS="$X_EXTRA_LIBS -ldnet" 13.2502 fi 13.2503 13.2504 if test $ac_cv_lib_dnet_dnet_ntoa = no; then 13.2505 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dnet_ntoa in -ldnet_stub" >&5 13.2506 $as_echo_n "checking for dnet_ntoa in -ldnet_stub... " >&6; } 13.2507 -if ${ac_cv_lib_dnet_stub_dnet_ntoa+:} false; then : 13.2508 +if test "${ac_cv_lib_dnet_stub_dnet_ntoa+set}" = set; then : 13.2509 $as_echo_n "(cached) " >&6 13.2510 else 13.2511 ac_check_lib_save_LIBS=$LIBS 13.2512 @@ -28749,7 +28905,7 @@ 13.2513 fi 13.2514 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dnet_stub_dnet_ntoa" >&5 13.2515 $as_echo "$ac_cv_lib_dnet_stub_dnet_ntoa" >&6; } 13.2516 -if test "x$ac_cv_lib_dnet_stub_dnet_ntoa" = xyes; then : 13.2517 +if test "x$ac_cv_lib_dnet_stub_dnet_ntoa" = x""yes; then : 13.2518 X_EXTRA_LIBS="$X_EXTRA_LIBS -ldnet_stub" 13.2519 fi 13.2520 13.2521 @@ -28768,14 +28924,14 @@ 13.2522 # The functions gethostbyname, getservbyname, and inet_addr are 13.2523 # in -lbsd on LynxOS 3.0.1/i386, according to Lars Hecking. 13.2524 ac_fn_cxx_check_func "$LINENO" "gethostbyname" "ac_cv_func_gethostbyname" 13.2525 -if test "x$ac_cv_func_gethostbyname" = xyes; then : 13.2526 +if test "x$ac_cv_func_gethostbyname" = x""yes; then : 13.2527 13.2528 fi 13.2529 13.2530 if test $ac_cv_func_gethostbyname = no; then 13.2531 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for gethostbyname in -lnsl" >&5 13.2532 $as_echo_n "checking for gethostbyname in -lnsl... " >&6; } 13.2533 -if ${ac_cv_lib_nsl_gethostbyname+:} false; then : 13.2534 +if test "${ac_cv_lib_nsl_gethostbyname+set}" = set; then : 13.2535 $as_echo_n "(cached) " >&6 13.2536 else 13.2537 ac_check_lib_save_LIBS=$LIBS 13.2538 @@ -28809,14 +28965,14 @@ 13.2539 fi 13.2540 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_nsl_gethostbyname" >&5 13.2541 $as_echo "$ac_cv_lib_nsl_gethostbyname" >&6; } 13.2542 -if test "x$ac_cv_lib_nsl_gethostbyname" = xyes; then : 13.2543 +if test "x$ac_cv_lib_nsl_gethostbyname" = x""yes; then : 13.2544 X_EXTRA_LIBS="$X_EXTRA_LIBS -lnsl" 13.2545 fi 13.2546 13.2547 if test $ac_cv_lib_nsl_gethostbyname = no; then 13.2548 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for gethostbyname in -lbsd" >&5 13.2549 $as_echo_n "checking for gethostbyname in -lbsd... " >&6; } 13.2550 -if ${ac_cv_lib_bsd_gethostbyname+:} false; then : 13.2551 +if test "${ac_cv_lib_bsd_gethostbyname+set}" = set; then : 13.2552 $as_echo_n "(cached) " >&6 13.2553 else 13.2554 ac_check_lib_save_LIBS=$LIBS 13.2555 @@ -28850,7 +29006,7 @@ 13.2556 fi 13.2557 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_bsd_gethostbyname" >&5 13.2558 $as_echo "$ac_cv_lib_bsd_gethostbyname" >&6; } 13.2559 -if test "x$ac_cv_lib_bsd_gethostbyname" = xyes; then : 13.2560 +if test "x$ac_cv_lib_bsd_gethostbyname" = x""yes; then : 13.2561 X_EXTRA_LIBS="$X_EXTRA_LIBS -lbsd" 13.2562 fi 13.2563 13.2564 @@ -28865,14 +29021,14 @@ 13.2565 # must be given before -lnsl if both are needed. We assume that 13.2566 # if connect needs -lnsl, so does gethostbyname. 13.2567 ac_fn_cxx_check_func "$LINENO" "connect" "ac_cv_func_connect" 13.2568 -if test "x$ac_cv_func_connect" = xyes; then : 13.2569 +if test "x$ac_cv_func_connect" = x""yes; then : 13.2570 13.2571 fi 13.2572 13.2573 if test $ac_cv_func_connect = no; then 13.2574 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for connect in -lsocket" >&5 13.2575 $as_echo_n "checking for connect in -lsocket... " >&6; } 13.2576 -if ${ac_cv_lib_socket_connect+:} false; then : 13.2577 +if test "${ac_cv_lib_socket_connect+set}" = set; then : 13.2578 $as_echo_n "(cached) " >&6 13.2579 else 13.2580 ac_check_lib_save_LIBS=$LIBS 13.2581 @@ -28906,7 +29062,7 @@ 13.2582 fi 13.2583 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_socket_connect" >&5 13.2584 $as_echo "$ac_cv_lib_socket_connect" >&6; } 13.2585 -if test "x$ac_cv_lib_socket_connect" = xyes; then : 13.2586 +if test "x$ac_cv_lib_socket_connect" = x""yes; then : 13.2587 X_EXTRA_LIBS="-lsocket $X_EXTRA_LIBS" 13.2588 fi 13.2589 13.2590 @@ -28914,14 +29070,14 @@ 13.2591 13.2592 # Guillermo Gomez says -lposix is necessary on A/UX. 13.2593 ac_fn_cxx_check_func "$LINENO" "remove" "ac_cv_func_remove" 13.2594 -if test "x$ac_cv_func_remove" = xyes; then : 13.2595 +if test "x$ac_cv_func_remove" = x""yes; then : 13.2596 13.2597 fi 13.2598 13.2599 if test $ac_cv_func_remove = no; then 13.2600 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for remove in -lposix" >&5 13.2601 $as_echo_n "checking for remove in -lposix... " >&6; } 13.2602 -if ${ac_cv_lib_posix_remove+:} false; then : 13.2603 +if test "${ac_cv_lib_posix_remove+set}" = set; then : 13.2604 $as_echo_n "(cached) " >&6 13.2605 else 13.2606 ac_check_lib_save_LIBS=$LIBS 13.2607 @@ -28955,7 +29111,7 @@ 13.2608 fi 13.2609 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_posix_remove" >&5 13.2610 $as_echo "$ac_cv_lib_posix_remove" >&6; } 13.2611 -if test "x$ac_cv_lib_posix_remove" = xyes; then : 13.2612 +if test "x$ac_cv_lib_posix_remove" = x""yes; then : 13.2613 X_EXTRA_LIBS="$X_EXTRA_LIBS -lposix" 13.2614 fi 13.2615 13.2616 @@ -28963,14 +29119,14 @@ 13.2617 13.2618 # BSDI BSD/OS 2.1 needs -lipc for XOpenDisplay. 13.2619 ac_fn_cxx_check_func "$LINENO" "shmat" "ac_cv_func_shmat" 13.2620 -if test "x$ac_cv_func_shmat" = xyes; then : 13.2621 +if test "x$ac_cv_func_shmat" = x""yes; then : 13.2622 13.2623 fi 13.2624 13.2625 if test $ac_cv_func_shmat = no; then 13.2626 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for shmat in -lipc" >&5 13.2627 $as_echo_n "checking for shmat in -lipc... " >&6; } 13.2628 -if ${ac_cv_lib_ipc_shmat+:} false; then : 13.2629 +if test "${ac_cv_lib_ipc_shmat+set}" = set; then : 13.2630 $as_echo_n "(cached) " >&6 13.2631 else 13.2632 ac_check_lib_save_LIBS=$LIBS 13.2633 @@ -29004,7 +29160,7 @@ 13.2634 fi 13.2635 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_ipc_shmat" >&5 13.2636 $as_echo "$ac_cv_lib_ipc_shmat" >&6; } 13.2637 -if test "x$ac_cv_lib_ipc_shmat" = xyes; then : 13.2638 +if test "x$ac_cv_lib_ipc_shmat" = x""yes; then : 13.2639 X_EXTRA_LIBS="$X_EXTRA_LIBS -lipc" 13.2640 fi 13.2641 13.2642 @@ -29022,7 +29178,7 @@ 13.2643 # John Interrante, Karl Berry 13.2644 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for IceConnectionNumber in -lICE" >&5 13.2645 $as_echo_n "checking for IceConnectionNumber in -lICE... " >&6; } 13.2646 -if ${ac_cv_lib_ICE_IceConnectionNumber+:} false; then : 13.2647 +if test "${ac_cv_lib_ICE_IceConnectionNumber+set}" = set; then : 13.2648 $as_echo_n "(cached) " >&6 13.2649 else 13.2650 ac_check_lib_save_LIBS=$LIBS 13.2651 @@ -29056,7 +29212,7 @@ 13.2652 fi 13.2653 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_ICE_IceConnectionNumber" >&5 13.2654 $as_echo "$ac_cv_lib_ICE_IceConnectionNumber" >&6; } 13.2655 -if test "x$ac_cv_lib_ICE_IceConnectionNumber" = xyes; then : 13.2656 +if test "x$ac_cv_lib_ICE_IceConnectionNumber" = x""yes; then : 13.2657 X_PRE_LIBS="$X_PRE_LIBS -lSM -lICE" 13.2658 fi 13.2659 13.2660 @@ -30063,7 +30219,7 @@ 13.2661 LDFLAGS="$FREETYPE2_LIBS" 13.2662 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for FT_Init_FreeType in -lfreetype" >&5 13.2663 $as_echo_n "checking for FT_Init_FreeType in -lfreetype... " >&6; } 13.2664 -if ${ac_cv_lib_freetype_FT_Init_FreeType+:} false; then : 13.2665 +if test "${ac_cv_lib_freetype_FT_Init_FreeType+set}" = set; then : 13.2666 $as_echo_n "(cached) " >&6 13.2667 else 13.2668 ac_check_lib_save_LIBS=$LIBS 13.2669 @@ -30097,7 +30253,7 @@ 13.2670 fi 13.2671 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_freetype_FT_Init_FreeType" >&5 13.2672 $as_echo "$ac_cv_lib_freetype_FT_Init_FreeType" >&6; } 13.2673 -if test "x$ac_cv_lib_freetype_FT_Init_FreeType" = xyes; then : 13.2674 +if test "x$ac_cv_lib_freetype_FT_Init_FreeType" = x""yes; then : 13.2675 FREETYPE2_FOUND=true 13.2676 else 13.2677 as_fn_error $? "Could not find freetype2! $HELP_MSG " "$LINENO" 5 13.2678 @@ -30385,7 +30541,7 @@ 13.2679 for ac_header in alsa/asoundlib.h 13.2680 do : 13.2681 ac_fn_cxx_check_header_mongrel "$LINENO" "alsa/asoundlib.h" "ac_cv_header_alsa_asoundlib_h" "$ac_includes_default" 13.2682 -if test "x$ac_cv_header_alsa_asoundlib_h" = xyes; then : 13.2683 +if test "x$ac_cv_header_alsa_asoundlib_h" = x""yes; then : 13.2684 cat >>confdefs.h <<_ACEOF 13.2685 #define HAVE_ALSA_ASOUNDLIB_H 1 13.2686 _ACEOF 13.2687 @@ -30444,7 +30600,7 @@ 13.2688 USE_EXTERNAL_LIBJPEG=true 13.2689 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for main in -ljpeg" >&5 13.2690 $as_echo_n "checking for main in -ljpeg... " >&6; } 13.2691 -if ${ac_cv_lib_jpeg_main+:} false; then : 13.2692 +if test "${ac_cv_lib_jpeg_main+set}" = set; then : 13.2693 $as_echo_n "(cached) " >&6 13.2694 else 13.2695 ac_check_lib_save_LIBS=$LIBS 13.2696 @@ -30472,7 +30628,7 @@ 13.2697 fi 13.2698 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_jpeg_main" >&5 13.2699 $as_echo "$ac_cv_lib_jpeg_main" >&6; } 13.2700 -if test "x$ac_cv_lib_jpeg_main" = xyes; then : 13.2701 +if test "x$ac_cv_lib_jpeg_main" = x""yes; then : 13.2702 cat >>confdefs.h <<_ACEOF 13.2703 #define HAVE_LIBJPEG 1 13.2704 _ACEOF 13.2705 @@ -30496,7 +30652,7 @@ 13.2706 USE_EXTERNAL_LIBJPEG=true 13.2707 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for main in -lgif" >&5 13.2708 $as_echo_n "checking for main in -lgif... " >&6; } 13.2709 -if ${ac_cv_lib_gif_main+:} false; then : 13.2710 +if test "${ac_cv_lib_gif_main+set}" = set; then : 13.2711 $as_echo_n "(cached) " >&6 13.2712 else 13.2713 ac_check_lib_save_LIBS=$LIBS 13.2714 @@ -30524,7 +30680,7 @@ 13.2715 fi 13.2716 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_gif_main" >&5 13.2717 $as_echo "$ac_cv_lib_gif_main" >&6; } 13.2718 -if test "x$ac_cv_lib_gif_main" = xyes; then : 13.2719 +if test "x$ac_cv_lib_gif_main" = x""yes; then : 13.2720 cat >>confdefs.h <<_ACEOF 13.2721 #define HAVE_LIBGIF 1 13.2722 _ACEOF 13.2723 @@ -30554,7 +30710,7 @@ 13.2724 13.2725 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for compress in -lz" >&5 13.2726 $as_echo_n "checking for compress in -lz... " >&6; } 13.2727 -if ${ac_cv_lib_z_compress+:} false; then : 13.2728 +if test "${ac_cv_lib_z_compress+set}" = set; then : 13.2729 $as_echo_n "(cached) " >&6 13.2730 else 13.2731 ac_check_lib_save_LIBS=$LIBS 13.2732 @@ -30588,7 +30744,7 @@ 13.2733 fi 13.2734 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_z_compress" >&5 13.2735 $as_echo "$ac_cv_lib_z_compress" >&6; } 13.2736 -if test "x$ac_cv_lib_z_compress" = xyes; then : 13.2737 +if test "x$ac_cv_lib_z_compress" = x""yes; then : 13.2738 ZLIB_FOUND=yes 13.2739 else 13.2740 ZLIB_FOUND=no 13.2741 @@ -30681,7 +30837,7 @@ 13.2742 13.2743 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for cos in -lm" >&5 13.2744 $as_echo_n "checking for cos in -lm... " >&6; } 13.2745 -if ${ac_cv_lib_m_cos+:} false; then : 13.2746 +if test "${ac_cv_lib_m_cos+set}" = set; then : 13.2747 $as_echo_n "(cached) " >&6 13.2748 else 13.2749 ac_check_lib_save_LIBS=$LIBS 13.2750 @@ -30715,7 +30871,7 @@ 13.2751 fi 13.2752 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_m_cos" >&5 13.2753 $as_echo "$ac_cv_lib_m_cos" >&6; } 13.2754 -if test "x$ac_cv_lib_m_cos" = xyes; then : 13.2755 +if test "x$ac_cv_lib_m_cos" = x""yes; then : 13.2756 cat >>confdefs.h <<_ACEOF 13.2757 #define HAVE_LIBM 1 13.2758 _ACEOF 13.2759 @@ -30739,7 +30895,7 @@ 13.2760 LIBS="" 13.2761 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dlopen in -ldl" >&5 13.2762 $as_echo_n "checking for dlopen in -ldl... " >&6; } 13.2763 -if ${ac_cv_lib_dl_dlopen+:} false; then : 13.2764 +if test "${ac_cv_lib_dl_dlopen+set}" = set; then : 13.2765 $as_echo_n "(cached) " >&6 13.2766 else 13.2767 ac_check_lib_save_LIBS=$LIBS 13.2768 @@ -30773,7 +30929,7 @@ 13.2769 fi 13.2770 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dl_dlopen" >&5 13.2771 $as_echo "$ac_cv_lib_dl_dlopen" >&6; } 13.2772 -if test "x$ac_cv_lib_dl_dlopen" = xyes; then : 13.2773 +if test "x$ac_cv_lib_dl_dlopen" = x""yes; then : 13.2774 cat >>confdefs.h <<_ACEOF 13.2775 #define HAVE_LIBDL 1 13.2776 _ACEOF 13.2777 @@ -31010,7 +31166,7 @@ 13.2778 # The name of the Service Agent jar. 13.2779 SALIB_NAME="${LIBRARY_PREFIX}saproc${SHARED_LIBRARY_SUFFIX}" 13.2780 if test "x$OPENJDK_TARGET_OS" = "xwindows"; then 13.2781 - SALIB_NAME="${LIBRARY_PREFIX}sawindbg${SHARED_LIBRARY_SUFFIX}" 13.2782 + SALIB_NAME="${LIBRARY_PREFIX}sawindbg${SHARED_LIBRARY_SUFFIX}" 13.2783 fi 13.2784 13.2785 13.2786 @@ -31417,7 +31573,7 @@ 13.2787 set dummy ccache; ac_word=$2 13.2788 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 13.2789 $as_echo_n "checking for $ac_word... " >&6; } 13.2790 -if ${ac_cv_path_CCACHE+:} false; then : 13.2791 +if test "${ac_cv_path_CCACHE+set}" = set; then : 13.2792 $as_echo_n "(cached) " >&6 13.2793 else 13.2794 case $CCACHE in 13.2795 @@ -31546,6 +31702,14 @@ 13.2796 13.2797 # Check for some common pitfalls 13.2798 13.2799 + if test x"$OPENJDK_BUILD_OS" = xwindows; then 13.2800 + file_to_test="$SRC_ROOT/LICENSE" 13.2801 + if test `$STAT -c '%a' "$file_to_test"` -lt 400; then 13.2802 + 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 13.2803 + fi 13.2804 + fi 13.2805 + 13.2806 + 13.2807 13.2808 { $as_echo "$as_me:${as_lineno-$LINENO}: checking if build directory is on local disk" >&5 13.2809 $as_echo_n "checking if build directory is on local disk... " >&6; } 13.2810 @@ -31576,6 +31740,8 @@ 13.2811 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $OUTPUT_DIR_IS_LOCAL" >&5 13.2812 $as_echo "$OUTPUT_DIR_IS_LOCAL" >&6; } 13.2813 13.2814 + 13.2815 + 13.2816 # Check if the user has any old-style ALT_ variables set. 13.2817 FOUND_ALT_VARIABLES=`env | grep ^ALT_` 13.2818 13.2819 @@ -31668,21 +31834,10 @@ 13.2820 :end' >>confcache 13.2821 if diff "$cache_file" confcache >/dev/null 2>&1; then :; else 13.2822 if test -w "$cache_file"; then 13.2823 - if test "x$cache_file" != "x/dev/null"; then 13.2824 + test "x$cache_file" != "x/dev/null" && 13.2825 { $as_echo "$as_me:${as_lineno-$LINENO}: updating cache $cache_file" >&5 13.2826 $as_echo "$as_me: updating cache $cache_file" >&6;} 13.2827 - if test ! -f "$cache_file" || test -h "$cache_file"; then 13.2828 - cat confcache >"$cache_file" 13.2829 - else 13.2830 - case $cache_file in #( 13.2831 - */* | ?:*) 13.2832 - mv -f confcache "$cache_file"$$ && 13.2833 - mv -f "$cache_file"$$ "$cache_file" ;; #( 13.2834 - *) 13.2835 - mv -f confcache "$cache_file" ;; 13.2836 - esac 13.2837 - fi 13.2838 - fi 13.2839 + cat confcache >$cache_file 13.2840 else 13.2841 { $as_echo "$as_me:${as_lineno-$LINENO}: not updating unwritable cache $cache_file" >&5 13.2842 $as_echo "$as_me: not updating unwritable cache $cache_file" >&6;} 13.2843 @@ -31714,7 +31869,7 @@ 13.2844 13.2845 13.2846 13.2847 -: "${CONFIG_STATUS=./config.status}" 13.2848 +: ${CONFIG_STATUS=./config.status} 13.2849 ac_write_fail=0 13.2850 ac_clean_files_save=$ac_clean_files 13.2851 ac_clean_files="$ac_clean_files $CONFIG_STATUS" 13.2852 @@ -31815,7 +31970,6 @@ 13.2853 IFS=" "" $as_nl" 13.2854 13.2855 # Find who we are. Look in the path if we contain no directory separator. 13.2856 -as_myself= 13.2857 case $0 in #(( 13.2858 *[\\/]* ) as_myself=$0 ;; 13.2859 *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR 13.2860 @@ -32123,7 +32277,7 @@ 13.2861 # values after options handling. 13.2862 ac_log=" 13.2863 This file was extended by OpenJDK $as_me jdk8, which was 13.2864 -generated by GNU Autoconf 2.68. Invocation command line was 13.2865 +generated by GNU Autoconf 2.67. Invocation command line was 13.2866 13.2867 CONFIG_FILES = $CONFIG_FILES 13.2868 CONFIG_HEADERS = $CONFIG_HEADERS 13.2869 @@ -32186,7 +32340,7 @@ 13.2870 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" 13.2871 ac_cs_version="\\ 13.2872 OpenJDK config.status jdk8 13.2873 -configured by $0, generated by GNU Autoconf 2.68, 13.2874 +configured by $0, generated by GNU Autoconf 2.67, 13.2875 with options \\"\$ac_cs_config\\" 13.2876 13.2877 Copyright (C) 2010 Free Software Foundation, Inc. 13.2878 @@ -32315,7 +32469,7 @@ 13.2879 "$OUTPUT_ROOT/spec.sh") CONFIG_FILES="$CONFIG_FILES $OUTPUT_ROOT/spec.sh:$AUTOCONF_DIR/spec.sh.in" ;; 13.2880 "$OUTPUT_ROOT/Makefile") CONFIG_FILES="$CONFIG_FILES $OUTPUT_ROOT/Makefile:$AUTOCONF_DIR/Makefile.in" ;; 13.2881 13.2882 - *) as_fn_error $? "invalid argument: \`$ac_config_target'" "$LINENO" 5;; 13.2883 + *) as_fn_error $? "invalid argument: \`$ac_config_target'" "$LINENO" 5 ;; 13.2884 esac 13.2885 done 13.2886 13.2887 @@ -32337,10 +32491,9 @@ 13.2888 # after its creation but before its name has been assigned to `$tmp'. 13.2889 $debug || 13.2890 { 13.2891 - tmp= ac_tmp= 13.2892 + tmp= 13.2893 trap 'exit_status=$? 13.2894 - : "${ac_tmp:=$tmp}" 13.2895 - { test ! -d "$ac_tmp" || rm -fr "$ac_tmp"; } && exit $exit_status 13.2896 + { test -z "$tmp" || test ! -d "$tmp" || rm -fr "$tmp"; } && exit $exit_status 13.2897 ' 0 13.2898 trap 'as_fn_exit 1' 1 2 13 15 13.2899 } 13.2900 @@ -32348,13 +32501,12 @@ 13.2901 13.2902 { 13.2903 tmp=`(umask 077 && mktemp -d "./confXXXXXX") 2>/dev/null` && 13.2904 - test -d "$tmp" 13.2905 + test -n "$tmp" && test -d "$tmp" 13.2906 } || 13.2907 { 13.2908 tmp=./conf$$-$RANDOM 13.2909 (umask 077 && mkdir "$tmp") 13.2910 } || as_fn_error $? "cannot create a temporary directory in ." "$LINENO" 5 13.2911 -ac_tmp=$tmp 13.2912 13.2913 # Set up the scripts for CONFIG_FILES section. 13.2914 # No need to generate them if there are no CONFIG_FILES. 13.2915 @@ -32376,7 +32528,7 @@ 13.2916 ac_cs_awk_cr=$ac_cr 13.2917 fi 13.2918 13.2919 -echo 'BEGIN {' >"$ac_tmp/subs1.awk" && 13.2920 +echo 'BEGIN {' >"$tmp/subs1.awk" && 13.2921 _ACEOF 13.2922 13.2923 13.2924 @@ -32404,7 +32556,7 @@ 13.2925 rm -f conf$$subs.sh 13.2926 13.2927 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 13.2928 -cat >>"\$ac_tmp/subs1.awk" <<\\_ACAWK && 13.2929 +cat >>"\$tmp/subs1.awk" <<\\_ACAWK && 13.2930 _ACEOF 13.2931 sed -n ' 13.2932 h 13.2933 @@ -32452,7 +32604,7 @@ 13.2934 rm -f conf$$subs.awk 13.2935 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 13.2936 _ACAWK 13.2937 -cat >>"\$ac_tmp/subs1.awk" <<_ACAWK && 13.2938 +cat >>"\$tmp/subs1.awk" <<_ACAWK && 13.2939 for (key in S) S_is_set[key] = 1 13.2940 FS = "" 13.2941 13.2942 @@ -32484,7 +32636,7 @@ 13.2943 sed "s/$ac_cr\$//; s/$ac_cr/$ac_cs_awk_cr/g" 13.2944 else 13.2945 cat 13.2946 -fi < "$ac_tmp/subs1.awk" > "$ac_tmp/subs.awk" \ 13.2947 +fi < "$tmp/subs1.awk" > "$tmp/subs.awk" \ 13.2948 || as_fn_error $? "could not setup config files machinery" "$LINENO" 5 13.2949 _ACEOF 13.2950 13.2951 @@ -32518,7 +32670,7 @@ 13.2952 # No need to generate them if there are no CONFIG_HEADERS. 13.2953 # This happens for instance with `./config.status Makefile'. 13.2954 if test -n "$CONFIG_HEADERS"; then 13.2955 -cat >"$ac_tmp/defines.awk" <<\_ACAWK || 13.2956 +cat >"$tmp/defines.awk" <<\_ACAWK || 13.2957 BEGIN { 13.2958 _ACEOF 13.2959 13.2960 @@ -32530,8 +32682,8 @@ 13.2961 # handling of long lines. 13.2962 ac_delim='%!_!# ' 13.2963 for ac_last_try in false false :; do 13.2964 - ac_tt=`sed -n "/$ac_delim/p" confdefs.h` 13.2965 - if test -z "$ac_tt"; then 13.2966 + ac_t=`sed -n "/$ac_delim/p" confdefs.h` 13.2967 + if test -z "$ac_t"; then 13.2968 break 13.2969 elif $ac_last_try; then 13.2970 as_fn_error $? "could not make $CONFIG_HEADERS" "$LINENO" 5 13.2971 @@ -32632,7 +32784,7 @@ 13.2972 esac 13.2973 case $ac_mode$ac_tag in 13.2974 :[FHL]*:*);; 13.2975 - :L* | :C*:*) as_fn_error $? "invalid tag \`$ac_tag'" "$LINENO" 5;; 13.2976 + :L* | :C*:*) as_fn_error $? "invalid tag \`$ac_tag'" "$LINENO" 5 ;; 13.2977 :[FH]-) ac_tag=-:-;; 13.2978 :[FH]*) ac_tag=$ac_tag:$ac_tag.in;; 13.2979 esac 13.2980 @@ -32651,7 +32803,7 @@ 13.2981 for ac_f 13.2982 do 13.2983 case $ac_f in 13.2984 - -) ac_f="$ac_tmp/stdin";; 13.2985 + -) ac_f="$tmp/stdin";; 13.2986 *) # Look for the file first in the build tree, then in the source tree 13.2987 # (if the path is not absolute). The absolute path cannot be DOS-style, 13.2988 # because $ac_f cannot contain `:'. 13.2989 @@ -32660,7 +32812,7 @@ 13.2990 [\\/$]*) false;; 13.2991 *) test -f "$srcdir/$ac_f" && ac_f="$srcdir/$ac_f";; 13.2992 esac || 13.2993 - as_fn_error 1 "cannot find input file: \`$ac_f'" "$LINENO" 5;; 13.2994 + as_fn_error 1 "cannot find input file: \`$ac_f'" "$LINENO" 5 ;; 13.2995 esac 13.2996 case $ac_f in *\'*) ac_f=`$as_echo "$ac_f" | sed "s/'/'\\\\\\\\''/g"`;; esac 13.2997 as_fn_append ac_file_inputs " '$ac_f'" 13.2998 @@ -32686,8 +32838,8 @@ 13.2999 esac 13.3000 13.3001 case $ac_tag in 13.3002 - *:-:* | *:-) cat >"$ac_tmp/stdin" \ 13.3003 - || as_fn_error $? "could not create $ac_file" "$LINENO" 5 ;; 13.3004 + *:-:* | *:-) cat >"$tmp/stdin" \ 13.3005 + || as_fn_error $? "could not create $ac_file" "$LINENO" 5 ;; 13.3006 esac 13.3007 ;; 13.3008 esac 13.3009 @@ -32812,22 +32964,21 @@ 13.3010 s&@abs_top_builddir@&$ac_abs_top_builddir&;t t 13.3011 $ac_datarootdir_hack 13.3012 " 13.3013 -eval sed \"\$ac_sed_extra\" "$ac_file_inputs" | $AWK -f "$ac_tmp/subs.awk" \ 13.3014 - >$ac_tmp/out || as_fn_error $? "could not create $ac_file" "$LINENO" 5 13.3015 +eval sed \"\$ac_sed_extra\" "$ac_file_inputs" | $AWK -f "$tmp/subs.awk" >$tmp/out \ 13.3016 + || as_fn_error $? "could not create $ac_file" "$LINENO" 5 13.3017 13.3018 test -z "$ac_datarootdir_hack$ac_datarootdir_seen" && 13.3019 - { ac_out=`sed -n '/\${datarootdir}/p' "$ac_tmp/out"`; test -n "$ac_out"; } && 13.3020 - { ac_out=`sed -n '/^[ ]*datarootdir[ ]*:*=/p' \ 13.3021 - "$ac_tmp/out"`; test -z "$ac_out"; } && 13.3022 + { ac_out=`sed -n '/\${datarootdir}/p' "$tmp/out"`; test -n "$ac_out"; } && 13.3023 + { ac_out=`sed -n '/^[ ]*datarootdir[ ]*:*=/p' "$tmp/out"`; test -z "$ac_out"; } && 13.3024 { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $ac_file contains a reference to the variable \`datarootdir' 13.3025 which seems to be undefined. Please make sure it is defined" >&5 13.3026 $as_echo "$as_me: WARNING: $ac_file contains a reference to the variable \`datarootdir' 13.3027 which seems to be undefined. Please make sure it is defined" >&2;} 13.3028 13.3029 - rm -f "$ac_tmp/stdin" 13.3030 + rm -f "$tmp/stdin" 13.3031 case $ac_file in 13.3032 - -) cat "$ac_tmp/out" && rm -f "$ac_tmp/out";; 13.3033 - *) rm -f "$ac_file" && mv "$ac_tmp/out" "$ac_file";; 13.3034 + -) cat "$tmp/out" && rm -f "$tmp/out";; 13.3035 + *) rm -f "$ac_file" && mv "$tmp/out" "$ac_file";; 13.3036 esac \ 13.3037 || as_fn_error $? "could not create $ac_file" "$LINENO" 5 13.3038 ;; 13.3039 @@ -32838,20 +32989,20 @@ 13.3040 if test x"$ac_file" != x-; then 13.3041 { 13.3042 $as_echo "/* $configure_input */" \ 13.3043 - && eval '$AWK -f "$ac_tmp/defines.awk"' "$ac_file_inputs" 13.3044 - } >"$ac_tmp/config.h" \ 13.3045 + && eval '$AWK -f "$tmp/defines.awk"' "$ac_file_inputs" 13.3046 + } >"$tmp/config.h" \ 13.3047 || as_fn_error $? "could not create $ac_file" "$LINENO" 5 13.3048 - if diff "$ac_file" "$ac_tmp/config.h" >/dev/null 2>&1; then 13.3049 + if diff "$ac_file" "$tmp/config.h" >/dev/null 2>&1; then 13.3050 { $as_echo "$as_me:${as_lineno-$LINENO}: $ac_file is unchanged" >&5 13.3051 $as_echo "$as_me: $ac_file is unchanged" >&6;} 13.3052 else 13.3053 rm -f "$ac_file" 13.3054 - mv "$ac_tmp/config.h" "$ac_file" \ 13.3055 + mv "$tmp/config.h" "$ac_file" \ 13.3056 || as_fn_error $? "could not create $ac_file" "$LINENO" 5 13.3057 fi 13.3058 else 13.3059 $as_echo "/* $configure_input */" \ 13.3060 - && eval '$AWK -f "$ac_tmp/defines.awk"' "$ac_file_inputs" \ 13.3061 + && eval '$AWK -f "$tmp/defines.awk"' "$ac_file_inputs" \ 13.3062 || as_fn_error $? "could not create -" "$LINENO" 5 13.3063 fi 13.3064 ;;
14.1 --- a/common/autoconf/jdk-options.m4 Wed Jan 16 11:59:37 2013 -0800 14.2 +++ b/common/autoconf/jdk-options.m4 Wed Jan 16 22:16:51 2013 -0800 14.3 @@ -1,5 +1,5 @@ 14.4 # 14.5 -# Copyright (c) 2011, 2012, Oracle and/or its affiliates. All rights reserved. 14.6 +# Copyright (c) 2011, 2013, Oracle and/or its affiliates. All rights reserved. 14.7 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. 14.8 # 14.9 # This code is free software; you can redistribute it and/or modify it 14.10 @@ -235,7 +235,7 @@ 14.11 # from configure, but only server is valid anyway. Fix this 14.12 # when hotspot makefiles are rewritten. 14.13 if test "x$MACOSX_UNIVERSAL" = xtrue; then 14.14 - HOTSPOT_TARGET=universal_product 14.15 + HOTSPOT_TARGET=universal_${HOTSPOT_EXPORT} 14.16 fi 14.17 14.18 ##### 14.19 @@ -247,46 +247,50 @@ 14.20 AC_SUBST(BUILD_VARIANT_RELEASE) 14.21 ]) 14.22 14.23 -AC_DEFUN_ONCE([JDKOPT_SETUP_JDK_OPTIONS], 14.24 -[ 14.25 14.26 ############################################################################### 14.27 # 14.28 # Should we build only OpenJDK even if closed sources are present? 14.29 # 14.30 -AC_ARG_ENABLE([openjdk-only], [AS_HELP_STRING([--enable-openjdk-only], 14.31 - [supress building closed source even if present @<:@disabled@:>@])],,[enable_openjdk_only="no"]) 14.32 +AC_DEFUN_ONCE([JDKOPT_SETUP_OPEN_OR_CUSTOM], 14.33 +[ 14.34 + AC_ARG_ENABLE([openjdk-only], [AS_HELP_STRING([--enable-openjdk-only], 14.35 + [suppress building custom source even if present @<:@disabled@:>@])],,[enable_openjdk_only="no"]) 14.36 14.37 -AC_MSG_CHECKING([for presence of closed sources]) 14.38 -if test -d "$SRC_ROOT/jdk/src/closed"; then 14.39 + AC_MSG_CHECKING([for presence of closed sources]) 14.40 + if test -d "$SRC_ROOT/jdk/src/closed"; then 14.41 CLOSED_SOURCE_PRESENT=yes 14.42 -else 14.43 + else 14.44 CLOSED_SOURCE_PRESENT=no 14.45 -fi 14.46 -AC_MSG_RESULT([$CLOSED_SOURCE_PRESENT]) 14.47 + fi 14.48 + AC_MSG_RESULT([$CLOSED_SOURCE_PRESENT]) 14.49 14.50 -AC_MSG_CHECKING([if closed source is supressed (openjdk-only)]) 14.51 -SUPRESS_CLOSED_SOURCE="$enable_openjdk_only" 14.52 -AC_MSG_RESULT([$SUPRESS_CLOSED_SOURCE]) 14.53 + AC_MSG_CHECKING([if closed source is suppressed (openjdk-only)]) 14.54 + SUPPRESS_CLOSED_SOURCE="$enable_openjdk_only" 14.55 + AC_MSG_RESULT([$SUPPRESS_CLOSED_SOURCE]) 14.56 14.57 -if test "x$CLOSED_SOURCE_PRESENT" = xno; then 14.58 - OPENJDK=true 14.59 - if test "x$SUPRESS_CLOSED_SOURCE" = "xyes"; then 14.60 - AC_MSG_WARN([No closed source present, --enable-openjdk-only makes no sense]) 14.61 + if test "x$CLOSED_SOURCE_PRESENT" = xno; then 14.62 + OPENJDK=true 14.63 + if test "x$SUPPRESS_CLOSED_SOURCE" = "xyes"; then 14.64 + AC_MSG_WARN([No closed source present, --enable-openjdk-only makes no sense]) 14.65 + fi 14.66 + else 14.67 + if test "x$SUPPRESS_CLOSED_SOURCE" = "xyes"; then 14.68 + OPENJDK=true 14.69 + else 14.70 + OPENJDK=false 14.71 + fi 14.72 fi 14.73 -else 14.74 - if test "x$SUPRESS_CLOSED_SOURCE" = "xyes"; then 14.75 - OPENJDK=true 14.76 - else 14.77 - OPENJDK=false 14.78 + 14.79 + if test "x$OPENJDK" = "xtrue"; then 14.80 + SET_OPENJDK="OPENJDK=true" 14.81 fi 14.82 -fi 14.83 14.84 -if test "x$OPENJDK" = "xtrue"; then 14.85 - SET_OPENJDK="OPENJDK=true" 14.86 -fi 14.87 + AC_SUBST(SET_OPENJDK) 14.88 +]) 14.89 14.90 -AC_SUBST(SET_OPENJDK) 14.91 +AC_DEFUN_ONCE([JDKOPT_SETUP_JDK_OPTIONS], 14.92 +[ 14.93 14.94 ############################################################################### 14.95 # 14.96 @@ -369,13 +373,51 @@ 14.97 AC_SUBST(COMPRESS_JARS) 14.98 ]) 14.99 14.100 +############################################################################### 14.101 +# 14.102 +# Setup version numbers 14.103 +# 14.104 AC_DEFUN_ONCE([JDKOPT_SETUP_JDK_VERSION_NUMBERS], 14.105 [ 14.106 # Source the version numbers 14.107 -. $AUTOCONF_DIR/version.numbers 14.108 -if test "x$OPENJDK" = "xfalse"; then 14.109 - . $AUTOCONF_DIR/closed.version.numbers 14.110 +. $AUTOCONF_DIR/version-numbers 14.111 + 14.112 +# Get the settings from parameters 14.113 +AC_ARG_WITH(milestone, [AS_HELP_STRING([--with-milestone], 14.114 + [Set milestone value for build @<:@internal@:>@])]) 14.115 +if test "x$with_milestone" = xyes; then 14.116 + AC_MSG_ERROR([Milestone must have a value]) 14.117 +elif test "x$with_milestone" != x; then 14.118 + MILESTONE="$with_milestone" 14.119 +else 14.120 + MILESTONE=internal 14.121 fi 14.122 + 14.123 +AC_ARG_WITH(build-number, [AS_HELP_STRING([--with-build-number], 14.124 + [Set build number value for build @<:@b00@:>@])]) 14.125 +if test "x$with_build_number" = xyes; then 14.126 + AC_MSG_ERROR([Build number must have a value]) 14.127 +elif test "x$with_build_number" != x; then 14.128 + JDK_BUILD_NUMBER="$with_build_number" 14.129 +fi 14.130 +if test "x$JDK_BUILD_NUMBER" = x; then 14.131 + JDK_BUILD_NUMBER=b00 14.132 +fi 14.133 + 14.134 +AC_ARG_WITH(user-release-suffix, [AS_HELP_STRING([--with-user-release-suffix], 14.135 + [Add a custom string to the version string if build number isn't set.@<:@username_builddateb00@:>@])]) 14.136 +if test "x$with_user_release_suffix" = xyes; then 14.137 + AC_MSG_ERROR([Release suffix must have a value]) 14.138 +elif test "x$with_user_release_suffix" != x; then 14.139 + USER_RELEASE_SUFFIX="$with_user_release_suffix" 14.140 +else 14.141 + BUILD_DATE=`date '+%Y_%m_%d_%H_%M'` 14.142 + # Avoid [:alnum:] since it depends on the locale. 14.143 + CLEAN_USERNAME=`echo "$USER" | $TR -d -c 'abcdefghijklmnopqrstuvqxyz0123456789'` 14.144 + USER_RELEASE_SUFFIX=`echo "${CLEAN_USERNAME}_${BUILD_DATE}" | $TR 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'` 14.145 +fi 14.146 +AC_SUBST(USER_RELEASE_SUFFIX) 14.147 + 14.148 # Now set the JDK version, milestone, build number etc. 14.149 AC_SUBST(JDK_MAJOR_VERSION) 14.150 AC_SUBST(JDK_MINOR_VERSION) 14.151 @@ -394,34 +436,13 @@ 14.152 COPYRIGHT_YEAR=`date +'%Y'` 14.153 AC_SUBST(COPYRIGHT_YEAR) 14.154 14.155 -RUNTIME_NAME="$PRODUCT_NAME $PRODUCT_SUFFIX" 14.156 -AC_SUBST(RUNTIME_NAME) 14.157 - 14.158 if test "x$JDK_UPDATE_VERSION" != x; then 14.159 - JDK_VERSION="${JDK_MAJOR_VERSION}.${JDK_MINOR_VERSION}.${JDK_MICRO_VERSION}_${JDK_UPDATE_VERSION}" 14.160 + JDK_VERSION="${JDK_MAJOR_VERSION}.${JDK_MINOR_VERSION}.${JDK_MICRO_VERSION}_${JDK_UPDATE_VERSION}" 14.161 else 14.162 - JDK_VERSION="${JDK_MAJOR_VERSION}.${JDK_MINOR_VERSION}.${JDK_MICRO_VERSION}" 14.163 + JDK_VERSION="${JDK_MAJOR_VERSION}.${JDK_MINOR_VERSION}.${JDK_MICRO_VERSION}" 14.164 fi 14.165 AC_SUBST(JDK_VERSION) 14.166 14.167 -if test "x$MILESTONE" != x; then 14.168 - RELEASE="${JDK_VERSION}-${MILESTONE}${BUILD_VARIANT_RELEASE}" 14.169 -else 14.170 - RELEASE="${JDK_VERSION}${BUILD_VARIANT_RELEASE}" 14.171 -fi 14.172 -AC_SUBST(RELEASE) 14.173 - 14.174 -if test "x$JDK_BUILD_NUMBER" != x; then 14.175 - FULL_VERSION="${RELEASE}-${JDK_BUILD_NUMBER}" 14.176 -else 14.177 - JDK_BUILD_NUMBER=b00 14.178 - BUILD_DATE=`date '+%Y_%m_%d_%H_%M'` 14.179 - # Avoid [:alnum:] since it depends on the locale. 14.180 - CLEAN_USERNAME=`echo "$USER" | $TR -d -c 'abcdefghijklmnopqrstuvqxyz0123456789'` 14.181 - USER_RELEASE_SUFFIX=`echo "${CLEAN_USERNAME}_${BUILD_DATE}" | $TR 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'` 14.182 - FULL_VERSION="${RELEASE}-${USER_RELEASE_SUFFIX}-${JDK_BUILD_NUMBER}" 14.183 -fi 14.184 -AC_SUBST(FULL_VERSION) 14.185 COOKED_BUILD_NUMBER=`$ECHO $JDK_BUILD_NUMBER | $SED -e 's/^b//' -e 's/^0//'` 14.186 AC_SUBST(COOKED_BUILD_NUMBER) 14.187 ]) 14.188 @@ -434,7 +455,7 @@ 14.189 # The name of the Service Agent jar. 14.190 SALIB_NAME="${LIBRARY_PREFIX}saproc${SHARED_LIBRARY_SUFFIX}" 14.191 if test "x$OPENJDK_TARGET_OS" = "xwindows"; then 14.192 - SALIB_NAME="${LIBRARY_PREFIX}sawindbg${SHARED_LIBRARY_SUFFIX}" 14.193 + SALIB_NAME="${LIBRARY_PREFIX}sawindbg${SHARED_LIBRARY_SUFFIX}" 14.194 fi 14.195 AC_SUBST(SALIB_NAME) 14.196
15.1 --- a/common/autoconf/spec.gmk.in Wed Jan 16 11:59:37 2013 -0800 15.2 +++ b/common/autoconf/spec.gmk.in Wed Jan 16 22:16:51 2013 -0800 15.3 @@ -1,5 +1,5 @@ 15.4 # 15.5 -# Copyright (c) 2011, 2012, Oracle and/or its affiliates. All rights reserved. 15.6 +# Copyright (c) 2011, 2013, Oracle and/or its affiliates. All rights reserved. 15.7 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. 15.8 # 15.9 # This code is free software; you can redistribute it and/or modify it 15.10 @@ -163,11 +163,22 @@ 15.11 15.12 # Different version strings generated from the above information. 15.13 JDK_VERSION:=@JDK_VERSION@ 15.14 -RUNTIME_NAME:=@RUNTIME_NAME@ 15.15 -FULL_VERSION:=@FULL_VERSION@ 15.16 -JRE_RELEASE_VERSION:=@FULL_VERSION@ 15.17 -RELEASE:=@RELEASE@ 15.18 +RUNTIME_NAME=$(PRODUCT_NAME) $(PRODUCT_SUFFIX) 15.19 COOKED_BUILD_NUMBER:=@COOKED_BUILD_NUMBER@ 15.20 +# These variables need to be generated here so that MILESTONE and 15.21 +# JDK_BUILD_NUMBER can be overridden on the make command line. 15.22 +ifeq ($(MILESTONE),) 15.23 + RELEASE=$(JDK_VERSION)$(BUILD_VARIANT_RELEASE) 15.24 +else 15.25 + RELEASE=$(JDK_VERSION)-$(MILESTONE)$(BUILD_VARIANT_RELEASE) 15.26 +endif 15.27 +ifeq ($(JDK_BUILD_NUMBER),b00) 15.28 + USER_RELEASE_SUFFIX=@USER_RELEASE_SUFFIX@ 15.29 + FULL_VERSION=$(RELEASE)-$(USER_RELEASE_SUFFIX)-$(JDK_BUILD_NUMBER) 15.30 +else 15.31 + FULL_VERSION=$(RELEASE)-$(JDK_BUILD_NUMBER) 15.32 +endif 15.33 +JRE_RELEASE_VERSION:=$(FULL_VERSION) 15.34 15.35 # How to compile the code: release, fastdebug or slowdebug 15.36 DEBUG_LEVEL:=@DEBUG_LEVEL@ 15.37 @@ -220,6 +231,7 @@ 15.38 HOTSPOT_OUTPUTDIR=$(BUILD_OUTPUT)/hotspot 15.39 JDK_OUTPUTDIR=$(BUILD_OUTPUT)/jdk 15.40 IMAGES_OUTPUTDIR=$(BUILD_OUTPUT)/images 15.41 +JCE_OUTPUTDIR=$(BUILD_OUTPUT)/jce-release 15.42 15.43 LANGTOOLS_DIST=$(LANGTOOLS_OUTPUTDIR)/dist 15.44 CORBA_DIST=$(CORBA_OUTPUTDIR)/dist 15.45 @@ -420,6 +432,8 @@ 15.46 15.47 NATIVE2ASCII=@FIXPATH@ $(BOOT_JDK)/bin/native2ascii 15.48 15.49 +JARSIGNER=@FIXPATH@ $(BOOT_JDK)/bin/jarsigner 15.50 + 15.51 # Base flags for RC 15.52 # Guarding this against resetting value. Legacy make files include spec multiple 15.53 # times. 15.54 @@ -440,10 +454,13 @@ 15.55 # CD is going away, but remains to cater for legacy makefiles. 15.56 CD:=cd 15.57 CHMOD:=@CHMOD@ 15.58 +COMM:=@COMM@ 15.59 CP:=@CP@ 15.60 +CPIO:=@CPIO@ 15.61 CUT:=@CUT@ 15.62 DATE:=@DATE@ 15.63 DIFF:=@DIFF@ 15.64 +DIRNAME:=@DIRNAME@ 15.65 FIND:=@FIND@ 15.66 FIND_DELETE:=@FIND_DELETE@ 15.67 ECHO:=@ECHO@ 15.68 @@ -468,6 +485,7 @@ 15.69 TIME:=@TIME@ 15.70 TR:=@TR@ 15.71 TOUCH:=@TOUCH@ 15.72 +UNIQ:=@UNIQ@ 15.73 WC:=@WC@ 15.74 XARGS:=@XARGS@ 15.75 ZIPEXE:=@ZIP@ 15.76 @@ -600,5 +618,21 @@ 15.77 OS_VERSION_MINOR:=@OS_VERSION_MINOR@ 15.78 OS_VERSION_MICRO:=@OS_VERSION_MICRO@ 15.79 15.80 +# Images directory definitions 15.81 +JDK_IMAGE_SUBDIR:=j2sdk-image 15.82 +JRE_IMAGE_SUBDIR:=j2re-image 15.83 +JDK_OVERLAY_IMAGE_SUBDIR:=j2sdk-overlay-image 15.84 +JRE_OVERLAY_IMAGE_SUBDIR:=j2re-overlay-image 15.85 +JDK_IMAGE_DIR:=$(IMAGES_OUTPUTDIR)/$(JDK_IMAGE_SUBDIR) 15.86 +JRE_IMAGE_DIR:=$(IMAGES_OUTPUTDIR)/$(JRE_IMAGE_SUBDIR) 15.87 +JDK_OVERLAY_IMAGE_DIR:=$(IMAGES_OUTPUTDIR)/$(JDK_OVERLAY_IMAGE_SUBDIR) 15.88 +JRE_OVERLAY_IMAGE_DIR:=$(IMAGES_OUTPUTDIR)/$(JRE_OVERLAY_IMAGE_SUBDIR) 15.89 + 15.90 +# Macosx bundles directory definitions 15.91 +JDK_BUNDLE_SUBDIR:=j2sdk-bundle/jdk$(JDK_VERSION).jdk/Contents 15.92 +JRE_BUNDLE_SUBDIR:=j2re-bundle/jre$(JDK_VERSION).jre/Contents 15.93 +JDK_BUNDLE_DIR:=$(IMAGES_OUTPUTDIR)/$(JDK_BUNDLE_SUBDIR) 15.94 +JRE_BUNDLE_DIR:=$(IMAGES_OUTPUTDIR)/$(JRE_BUNDLE_SUBDIR) 15.95 + 15.96 # Include the custom-spec.gmk file if it exists 15.97 -include $(dir @SPEC@)/custom-spec.gmk
16.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 16.2 +++ b/common/autoconf/version-numbers Wed Jan 16 22:16:51 2013 -0800 16.3 @@ -0,0 +1,38 @@ 16.4 +# 16.5 +# Copyright (c) 2011, 2013, Oracle and/or its affiliates. All rights reserved. 16.6 +# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. 16.7 +# 16.8 +# This code is free software; you can redistribute it and/or modify it 16.9 +# under the terms of the GNU General Public License version 2 only, as 16.10 +# published by the Free Software Foundation. Oracle designates this 16.11 +# particular file as subject to the "Classpath" exception as provided 16.12 +# by Oracle in the LICENSE file that accompanied this code. 16.13 +# 16.14 +# This code is distributed in the hope that it will be useful, but WITHOUT 16.15 +# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or 16.16 +# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License 16.17 +# version 2 for more details (a copy is included in the LICENSE file that 16.18 +# accompanied this code). 16.19 +# 16.20 +# You should have received a copy of the GNU General Public License version 16.21 +# 2 along with this work; if not, write to the Free Software Foundation, 16.22 +# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. 16.23 +# 16.24 +# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA 16.25 +# or visit www.oracle.com if you need additional information or have any 16.26 +# questions. 16.27 +# 16.28 + 16.29 +JDK_MAJOR_VERSION=1 16.30 +JDK_MINOR_VERSION=8 16.31 +JDK_MICRO_VERSION=0 16.32 +JDK_UPDATE_VERSION= 16.33 +LAUNCHER_NAME=openjdk 16.34 +PRODUCT_NAME=OpenJDK 16.35 +PRODUCT_SUFFIX="Runtime Environment" 16.36 +JDK_RC_PLATFORM_NAME=Platform 16.37 +COMPANY_NAME=N/A 16.38 + 16.39 +# Might need better names for these 16.40 +MACOSX_BUNDLE_NAME_BASE="OpenJDK" 16.41 +MACOSX_BUNDLE_ID_BASE="net.java.openjdk"
17.1 --- a/common/autoconf/version.numbers Wed Jan 16 11:59:37 2013 -0800 17.2 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 17.3 @@ -1,40 +0,0 @@ 17.4 -# 17.5 -# Copyright (c) 2011, 2012, Oracle and/or its affiliates. All rights reserved. 17.6 -# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. 17.7 -# 17.8 -# This code is free software; you can redistribute it and/or modify it 17.9 -# under the terms of the GNU General Public License version 2 only, as 17.10 -# published by the Free Software Foundation. Oracle designates this 17.11 -# particular file as subject to the "Classpath" exception as provided 17.12 -# by Oracle in the LICENSE file that accompanied this code. 17.13 -# 17.14 -# This code is distributed in the hope that it will be useful, but WITHOUT 17.15 -# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or 17.16 -# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License 17.17 -# version 2 for more details (a copy is included in the LICENSE file that 17.18 -# accompanied this code). 17.19 -# 17.20 -# You should have received a copy of the GNU General Public License version 17.21 -# 2 along with this work; if not, write to the Free Software Foundation, 17.22 -# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. 17.23 -# 17.24 -# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA 17.25 -# or visit www.oracle.com if you need additional information or have any 17.26 -# questions. 17.27 -# 17.28 - 17.29 -JDK_MAJOR_VERSION=1 17.30 -JDK_MINOR_VERSION=8 17.31 -JDK_MICRO_VERSION=0 17.32 -JDK_UPDATE_VERSION= 17.33 -JDK_BUILD_NUMBER= 17.34 -MILESTONE=internal 17.35 -LAUNCHER_NAME=openjdk 17.36 -PRODUCT_NAME=OpenJDK 17.37 -PRODUCT_SUFFIX="Runtime Environment" 17.38 -JDK_RC_PLATFORM_NAME=Platform 17.39 -COMPANY_NAME=N/A 17.40 - 17.41 -# Might need better names for these 17.42 -MACOSX_BUNDLE_NAME_BASE="OpenJDK" 17.43 -MACOSX_BUNDLE_ID_BASE="net.java.openjdk"
18.1 --- a/common/bin/compare.sh Wed Jan 16 11:59:37 2013 -0800 18.2 +++ b/common/bin/compare.sh Wed Jan 16 22:16:51 2013 -0800 18.3 @@ -1,6 +1,6 @@ 18.4 #!/bin/bash 18.5 # 18.6 -# Copyright (c) 2012, Oracle and/or its affiliates. All rights reserved. 18.7 +# Copyright (c) 2012, 2013 Oracle and/or its affiliates. All rights reserved. 18.8 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. 18.9 # 18.10 # This code is free software; you can redistribute it and/or modify it 18.11 @@ -98,24 +98,30 @@ 18.12 if test "x$SUFFIX" = "xclass"; then 18.13 # To improve performance when large diffs are found, do a rough filtering of classes 18.14 # elibeble for these exceptions 18.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 18.16 + if $GREP -R -e '[0-9]\{4\}_[0-9]\{2\}_[0-9]\{2\}_[0-9]\{2\}_[0-9]\{2\}-b[0-9]\{2\}' \ 18.17 + -e '[0-9]\{2\}/[0-9]\{2\}/[0-9]\{4\}' \ 18.18 + -e thePoint -e aPoint -e setItemsPtr ${THIS_FILE} > /dev/null; then 18.19 $JAVAP -c -constants -l -p ${OTHER_FILE} > ${OTHER_FILE}.javap 18.20 $JAVAP -c -constants -l -p ${THIS_FILE} > ${THIS_FILE}.javap 18.21 TMP=$($DIFF ${OTHER_FILE}.javap ${THIS_FILE}.javap | \ 18.22 $GREP '^[<>]' | \ 18.23 $SED -e '/[<>].*[0-9]\{4\}_[0-9]\{2\}_[0-9]\{2\}_[0-9]\{2\}_[0-9]\{2\}-b[0-9]\{2\}.*/d' \ 18.24 + -e '/[0-9]\{2\}\/[0-9]\{2\}\/[0-9]\{4\}/d' \ 18.25 -e '/[<>].*Point Lcom\/apple\/jobjc\/foundation\/NSPoint;/d' \ 18.26 -e '/[<>].*public com\.apple\.jobjc\.Pointer<com\.apple\.jobjc\..*itemsPtr();/d' \ 18.27 -e '/[<>].*public void setItemsPtr(com\.apple\.jobjc\.Pointer<com\.apple\.jobjc\..*);/d') 18.28 fi 18.29 fi 18.30 if test "x$SUFFIX" = "xproperties"; then 18.31 - $CAT $OTHER_FILE | $SED -e 's/\([^\\]\):/\1\\:/g' -e 's/\([^\\]\)=/\1\\=/g' -e 's/#.*/#/g' \ 18.32 - | $SED -f "$SRC_ROOT/common/makefiles/support/unicode2x.sed" \ 18.33 - | $SED -e '/^#/d' -e '/^$/d' \ 18.34 - -e :a -e '/\\$/N; s/\\\n//; ta' \ 18.35 - -e 's/^[ \t]*//;s/[ \t]*$//' \ 18.36 - -e 's/\\=/=/' | LANG=C $SORT > $OTHER_FILE.cleaned 18.37 + # Run through nawk to add possibly missing newline at end of file. 18.38 + $CAT $OTHER_FILE | $NAWK '{ print }' > $OTHER_FILE.cleaned 18.39 +# Disable this exception since we aren't changing the properties cleaning method yet. 18.40 +# $CAT $OTHER_FILE | $SED -e 's/\([^\\]\):/\1\\:/g' -e 's/\([^\\]\)=/\1\\=/g' -e 's/#.*/#/g' \ 18.41 +# | $SED -f "$SRC_ROOT/common/makefiles/support/unicode2x.sed" \ 18.42 +# | $SED -e '/^#/d' -e '/^$/d' \ 18.43 +# -e :a -e '/\\$/N; s/\\\n//; ta' \ 18.44 +# -e 's/^[ \t]*//;s/[ \t]*$//' \ 18.45 +# -e 's/\\=/=/' | LANG=C $SORT > $OTHER_FILE.cleaned 18.46 TMP=$(LANG=C $DIFF $OTHER_FILE.cleaned $THIS_FILE) 18.47 fi 18.48 if test -n "$TMP"; then 18.49 @@ -305,14 +311,17 @@ 18.50 THIS_FILE=$WORK_DIR/$f.this 18.51 $MKDIR -p $(dirname $OTHER_FILE) 18.52 $MKDIR -p $(dirname $THIS_FILE) 18.53 + #Note that | doesn't work on mac sed. 18.54 $CAT $OTHER_DIR/$f | $SED -e 's/\(-- Generated by javadoc \).*\( --\)/\1(removed)\2/' \ 18.55 -e 's/\(<meta name="date" content="\).*\(">\)/\1(removed)\2/' \ 18.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)/' \ 18.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)/' \ 18.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)/' \ 18.59 -e 's/^\( from \).*\(\.idl\)$/\1(removed)\2/' \ 18.60 > $OTHER_FILE 18.61 $CAT $THIS_DIR/$f | $SED -e 's/\(-- Generated by javadoc \).*\( --\)/\1(removed)\2/' \ 18.62 -e 's/\(<meta name="date" content="\).*\(">\)/\1(removed)\2/' \ 18.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)/' \ 18.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)/' \ 18.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)/' \ 18.66 -e 's/^\( from \).*\(\.idl\)$/\1(removed)\2/' \ 18.67 > $THIS_FILE 18.68 else 18.69 @@ -370,14 +379,14 @@ 18.70 (cd $OTHER_UNZIPDIR && $UNARCHIVE $OTHER_ZIP) 18.71 18.72 # Find all archives inside and unzip them as well to compare the contents rather than 18.73 - # the archives. 18.74 - EXCEPTIONS="" 18.75 - for pack in $($FIND $THIS_UNZIPDIR -name "*.pack" -o -name "*.pack.gz"); do 18.76 + # the archives. pie.jar.pack.gz i app3.war is corrupt, skip it. 18.77 + EXCEPTIONS="pie.jar.pack.gz" 18.78 + for pack in $($FIND $THIS_UNZIPDIR \( -name "*.pack" -o -name "*.pack.gz" \) -a ! -name pie.jar.pack.gz); do 18.79 ($UNPACK200 $pack $pack.jar) 18.80 # Filter out the unzipped archives from the diff below. 18.81 EXCEPTIONS="$EXCEPTIONS $pack $pack.jar" 18.82 done 18.83 - for pack in $($FIND $OTHER_UNZIPDIR -name "*.pack" -o -name "*.pack.gz"); do 18.84 + for pack in $($FIND $OTHER_UNZIPDIR \( -name "*.pack" -o -name "*.pack.gz" \) -a ! -name pie.jar.pack.gz); do 18.85 ($UNPACK200 $pack $pack.jar) 18.86 EXCEPTIONS="$EXCEPTIONS $pack $pack.jar" 18.87 done 18.88 @@ -1073,7 +1082,11 @@ 18.89 18.90 18.91 # Figure out the layout of the this build. Which kinds of images have been produced 18.92 -if [ -d "$THIS/deploy/j2sdk-image" ]; then 18.93 +if [ -d "$THIS/install/j2sdk-image" ]; then 18.94 + THIS_J2SDK="$THIS/install/j2sdk-image" 18.95 + THIS_J2RE="$THIS/install/j2re-image" 18.96 + echo "Comparing install images" 18.97 +elif [ -d "$THIS/deploy/j2sdk-image" ]; then 18.98 THIS_J2SDK="$THIS/deploy/j2sdk-image" 18.99 THIS_J2RE="$THIS/deploy/j2re-image" 18.100 echo "Comparing deploy images" 18.101 @@ -1081,9 +1094,16 @@ 18.102 THIS_J2SDK="$THIS/images/j2sdk-image" 18.103 THIS_J2RE="$THIS/images/j2re-image" 18.104 fi 18.105 + 18.106 if [ -d "$THIS/images/j2sdk-overlay-image" ]; then 18.107 - THIS_J2SDK_OVERLAY="$THIS/images/j2sdk-overlay-image" 18.108 - THIS_J2RE_OVERLAY="$THIS/images/j2re-overlay-image" 18.109 + if [ -d "$THIS/install/j2sdk-image" ]; then 18.110 + # If there is an install image, prefer that, it's also overlay 18.111 + THIS_J2SDK_OVERLAY="$THIS/install/j2sdk-image" 18.112 + THIS_J2RE_OVERLAY="$THIS/install/j2re-image" 18.113 + else 18.114 + THIS_J2SDK_OVERLAY="$THIS/images/j2sdk-overlay-image" 18.115 + THIS_J2RE_OVERLAY="$THIS/images/j2re-overlay-image" 18.116 + fi 18.117 fi 18.118 18.119 if [ -d "$THIS/images/j2sdk-bundle" ]; then 18.120 @@ -1100,7 +1120,9 @@ 18.121 OTHER_J2SDK_OVERLAY="$OTHER/j2sdk-image" 18.122 OTHER_J2RE_OVERLAY="$OTHER/j2re-image" 18.123 fi 18.124 - 18.125 +elif [ -d "$OTHER/images/j2sdk-image" ]; then 18.126 + OTHER_J2SDK="$OTHER/images/j2sdk-image" 18.127 + OTHER_J2RE="$OTHER/images/j2re-image" 18.128 fi 18.129 18.130 if [ -d "$OTHER/j2sdk-bundle" ]; then 18.131 @@ -1144,6 +1166,26 @@ 18.132 echo "WARNING! Other build doesn't contain docs, skipping doc compare." 18.133 fi 18.134 18.135 +if [ -d "$OTHER/images" ]; then 18.136 + OTHER_SEC_DIR="$OTHER/images" 18.137 +else 18.138 + OTHER_SEC_DIR="$OTHER/tmp" 18.139 +fi 18.140 +OTHER_SEC_BIN="$OTHER_SEC_DIR/sec-bin.zip" 18.141 +THIS_SEC_DIR="$THIS/images" 18.142 +THIS_SEC_BIN="$THIS_SEC_DIR/sec-bin.zip" 18.143 +if [ "$OPENJDK_TARGET_OS" = "windows" ]; then 18.144 + if [ "$OPENJDK_TARGET_CPU" = "x86_64" ]; then 18.145 + JGSS_WINDOWS_BIN="jgss-windows-x64-bin.zip" 18.146 + else 18.147 + JGSS_WINDOWS_BIN="jgss-windows-i586-bin.zip" 18.148 + fi 18.149 + OTHER_SEC_WINDOWS_BIN="$OTHER_SEC_DIR/sec-windows-bin.zip" 18.150 + OTHER_JGSS_WINDOWS_BIN="$OTHER_SEC_DIR/$JGSS_WINDOWS_BIN" 18.151 + THIS_SEC_WINDOWS_BIN="$THIS_SEC_DIR/sec-windows-bin.zip" 18.152 + THIS_JGSS_WINDOWS_BIN="$THIS_SEC_DIR/$JGSS_WINDOWS_BIN" 18.153 +fi 18.154 + 18.155 ########################################################################################## 18.156 # Do the work 18.157 18.158 @@ -1260,6 +1302,24 @@ 18.159 if [ -n "$THIS_J2SDK" ] && [ -n "$OTHER_J2SDK" ]; then 18.160 compare_all_zip_files $THIS_J2SDK $OTHER_J2SDK $COMPARE_ROOT/j2sdk 18.161 fi 18.162 + if [ -n "$THIS_SEC_BIN" ] && [ -n "$OTHER_SEC_BIN" ]; then 18.163 + if [ -n "$(echo $THIS_SEC_BIN | $FILTER)" ]; then 18.164 + echo "sec-bin.zip..." 18.165 + compare_zip_file $THIS_SEC_DIR $OTHER_SEC_DIR $COMPARE_ROOT/sec-bin sec-bin.zip 18.166 + fi 18.167 + fi 18.168 + if [ -n "$THIS_SEC_WINDOWS_BIN" ] && [ -n "$OTHER_SEC_WINDOWS_BIN" ]; then 18.169 + if [ -n "$(echo $THIS_SEC_WINDOWS_BIN | $FILTER)" ]; then 18.170 + echo "sec-windows-bin.zip..." 18.171 + compare_zip_file $THIS_SEC_DIR $OTHER_SEC_DIR $COMPARE_ROOT/sec-bin sec-windows-bin.zip 18.172 + fi 18.173 + fi 18.174 + if [ -n "$THIS_JGSS_WINDOWS_BIN" ] && [ -n "$OTHER_JGSS_WINDOWS_BIN" ]; then 18.175 + if [ -n "$(echo $THIS_JGSS_WINDOWS_BIN | $FILTER)" ]; then 18.176 + echo "$JGSS_WINDOWS_BIN..." 18.177 + compare_zip_file $THIS_SEC_DIR $OTHER_SEC_DIR $COMPARE_ROOT/sec-bin $JGSS_WINDOWS_BIN 18.178 + fi 18.179 + fi 18.180 fi 18.181 18.182 if [ "$CMP_JARS" = "true" ]; then
19.1 --- a/common/bin/compare_exceptions.sh.incl Wed Jan 16 11:59:37 2013 -0800 19.2 +++ b/common/bin/compare_exceptions.sh.incl Wed Jan 16 22:16:51 2013 -0800 19.3 @@ -813,6 +813,10 @@ 19.4 19.5 if [ "$OPENJDK_TARGET_OS" = "windows" ]; then 19.6 19.7 +ACCEPTED_JARZIP_CONTENTS=" 19.8 +/bin/w2k_lsa_auth.dll 19.9 +" 19.10 + 19.11 # Probably should add all libs here 19.12 ACCEPTED_SMALL_SIZE_DIFF=" 19.13 ./demo/jvmti/gctest/lib/gctest.dll 19.14 @@ -821,6 +825,7 @@ 19.15 ./jre/bin/attach.dll 19.16 ./jre/bin/java_crw_demo.dll 19.17 ./jre/bin/jsoundds.dll 19.18 +./jre/bin/server/jvm.dll 19.19 ./bin/appletviewer.exe 19.20 ./bin/extcheck.exe 19.21 ./bin/idlj.exe
20.1 --- a/common/makefiles/IdlCompilation.gmk Wed Jan 16 11:59:37 2013 -0800 20.2 +++ b/common/makefiles/IdlCompilation.gmk Wed Jan 16 22:16:51 2013 -0800 20.3 @@ -87,7 +87,7 @@ 20.4 $1_SRC := $$(abspath $$($1_SRC)) 20.5 $1_BIN := $$(abspath $$($1_BIN)) 20.6 # Find all existing java files and existing class files. 20.7 -$$(shell $(MKDIR) -p $$($1_SRC) $$($1_BIN)) 20.8 +$$(eval $$(call MakeDir,$$($1_BIN))) 20.9 $1_SRCS := $$(shell find $$($1_SRC) -name "*.idl") 20.10 $1_BINS := $$(shell find $$($1_BIN) -name "*.java") 20.11 # Prepend the source/bin path to the filter expressions.
21.1 --- a/common/makefiles/JavaCompilation.gmk Wed Jan 16 11:59:37 2013 -0800 21.2 +++ b/common/makefiles/JavaCompilation.gmk Wed Jan 16 22:16:51 2013 -0800 21.3 @@ -111,9 +111,9 @@ 21.4 ifeq ($$(word 20,$$($1_GREP_INCLUDE_PATTERNS)),) 21.5 $1_GREP_INCLUDES:=| $(GREP) $$(patsubst %,$(SPACE)-e$(SPACE)$(DQUOTE)%$(DQUOTE),$$($1_GREP_INCLUDE_PATTERNS)) 21.6 else 21.7 - $$(shell $(MKDIR) -p $$($1_BIN) && $(RM) $$($1_BIN)/_the.$$($1_JARNAME)_include) 21.8 - $$(eval $$(call ListPathsSafelyNow,$1_GREP_INCLUDE_PATTERNS,\n, \ 21.9 - >> $$($1_BIN)/_the.$$($1_JARNAME)_include)) 21.10 + $1_GREP_INCLUDE_OUTPUT:=$(RM) $$($1_BIN)/_the.$$($1_JARNAME)_include && \ 21.11 + $$(strip $$(call ListPathsSafely,$1_GREP_INCLUDE_PATTERNS,\n, \ 21.12 + >> $$($1_BIN)/_the.$$($1_JARNAME)_include)) 21.13 $1_GREP_INCLUDES:=| $(GREP) -f $$($1_BIN)/_the.$$($1_JARNAME)_include 21.14 endif 21.15 endif 21.16 @@ -124,9 +124,9 @@ 21.17 ifeq ($$(word 20,$$($1_GREP_EXCLUDE_PATTERNS)),) 21.18 $1_GREP_EXCLUDES:=| $(GREP) -v $$(patsubst %,$(SPACE)-e$(SPACE)$(DQUOTE)%$(DQUOTE),$$($1_GREP_EXCLUDE_PATTERNS)) 21.19 else 21.20 - $$(shell $(MKDIR) -p $$($1_BIN) && $(RM) $$($1_BIN)/_the.$$($1_JARNAME)_exclude) 21.21 - $$(eval $$(call ListPathsSafelyNow,$1_GREP_EXCLUDE_PATTERNS,\n, \ 21.22 - >> $$($1_BIN)/_the.$$($1_JARNAME)_exclude)) 21.23 + $1_GREP_EXCLUDE_OUTPUT=$(RM) $$($1_BIN)/_the.$$($1_JARNAME)_exclude && \ 21.24 + $$(strip $$(call ListPathsSafely,$1_GREP_EXCLUDE_PATTERNS,\n, \ 21.25 + >> $$($1_BIN)/_the.$$($1_JARNAME)_exclude)) 21.26 $1_GREP_EXCLUDES:=| $(GREP) -v -f $$($1_BIN)/_the.$$($1_JARNAME)_exclude 21.27 endif 21.28 endif 21.29 @@ -137,19 +137,25 @@ 21.30 else 21.31 $1_JARINDEX = true 21.32 endif 21.33 - # When this macro is run in the same makefile as the java compilation, dependencies are transfered 21.34 - # in make variables. When the macro is run in a different makefile than the java compilation, the 21.35 - # dependencies need to be found in the filesystem. 21.36 + # When this macro is run in the same makefile as the java compilation, dependencies are 21.37 + # transfered in make variables. When the macro is run in a different makefile than the 21.38 + # java compilation, the dependencies need to be found in the filesystem. 21.39 ifneq (,$2) 21.40 $1_DEPS:=$2 21.41 else 21.42 + $1_DEPS:=$$(filter $$(addprefix %,$$($1_FIND_PATTERNS)),\ 21.43 + $$(call CacheFind $$($1_SRCS))) 21.44 + ifneq (,$$($1_GREP_INCLUDE_PATTERNS)) 21.45 + $1_DEPS:=$$(filter $$(addsuffix %,$$($1_GREP_INCLUDE_PATTERNS)),$$($1_DEPS)) 21.46 + endif 21.47 + ifneq (,$$($1_GREP_EXCLUDE_PATTERNS)) 21.48 + $1_DEPS:=$$(filter-out $$(addsuffix %,$$($1_GREP_EXCLUDE_PATTERNS)),$$($1_DEPS)) 21.49 + endif 21.50 # The subst of \ is needed because $ has to be escaped with \ in EXTRA_FILES for the command 21.51 # lines, but not here for use in make dependencies. 21.52 - $1_DEPS:=$$(shell $(FIND) $$($1_SRCS) -type f -a \( $$($1_FIND_PATTERNS) \) \ 21.53 - $$($1_GREP_INCLUDES) $$($1_GREP_EXCLUDES)) \ 21.54 - $$(subst \,,$$(foreach src,$$($1_SRCS),$$(addprefix $$(src)/,$$($1_EXTRA_FILES)))) 21.55 + $1_DEPS+=$$(subst \,,$$(foreach src,$$($1_SRCS),$$(addprefix $$(src)/,$$($1_EXTRA_FILES)))) 21.56 ifeq (,$$($1_SKIP_METAINF)) 21.57 - $1_DEPS+=$$(shell $(FIND) $$(addsuffix /META-INF,$$($1_SRCS)) -type f 2> /dev/null) 21.58 + $1_DEPS+=$$(call CacheFind $$(wildcard $$(addsuffix /META-INF,$$($1_SRCS)))) 21.59 endif 21.60 endif 21.61 21.62 @@ -210,6 +216,8 @@ 21.63 # Here is the rule that creates/updates the jar file. 21.64 $$($1_JAR) : $$($1_DEPS) 21.65 $(MKDIR) -p $$($1_BIN) 21.66 + $$($1_GREP_INCLUDE_OUTPUT) 21.67 + $$($1_GREP_EXCLUDE_OUTPUT) 21.68 $$(if $$($1_MANIFEST),\ 21.69 $(SED) -e "s#@@RELEASE@@#$(RELEASE)#" \ 21.70 -e "s#@@COMPANY_NAME@@#$(COMPANY_NAME)#" $$($1_MANIFEST) > $$($1_MANIFEST_FILE) \ 21.71 @@ -242,14 +250,14 @@ 21.72 define SetupZipArchive 21.73 # param 1 is for example ZIP_MYSOURCE 21.74 # param 2,3,4,5,6,7,8,9 are named args. 21.75 - # SRC,ZIP,INCLUDES,EXCLUDES,EXCLUDE_FILES,SUFFIXES,EXTRA_DEPS 21.76 + # SRC,ZIP,INCLUDES,INCLUDE_FILES,EXCLUDES,EXCLUDE_FILES,SUFFIXES,EXTRA_DEPS 21.77 $(foreach i,2 3 4 5 6 7 8 9 10 11 12 13 14 15, $(if $($i),$1_$(strip $($i)))$(NEWLINE)) 21.78 $(call LogSetupMacroEntry,SetupZipArchive($1),$2,$3,$4,$5,$6,$7,$8,$9,$(10),$(11),$(12),$(13),$(14),$(15)) 21.79 $(if $(16),$(error Internal makefile error: Too many arguments to SetupZipArchive, please update JavaCompilation.gmk)) 21.80 21.81 # Find all files in the source tree. 21.82 - $1_SUFFIX_FILTER := $$(patsubst %,-o -name $(DQUOTE)*%$(DQUOTE),$$($1_SUFFIXES)) 21.83 - $1_ALL_SRCS := $$(foreach i,$$($1_SRC), $$(shell $(FIND) $$i -type f -a ! -name "_the.*" \( -name FALSE_DUMMY $$($1_SUFFIX_FILTER) \) )) 21.84 + $1_ALL_SRCS := $$(call not-containing,_the.,\ 21.85 + $$(filter $$(addprefix %,$$($1_SUFFIXES)),$$(call CacheFind $$($1_SRC)))) 21.86 21.87 ifneq ($$($1_INCLUDES),) 21.88 $1_SRC_INCLUDES := $$(foreach i,$$($1_SRC),$$(addprefix $$i/,$$(addsuffix /%,$$($1_INCLUDES)))) 21.89 @@ -259,6 +267,12 @@ 21.90 else 21.91 $1_ZIP_INCLUDES := $$(addprefix -i$(SPACE)$(DQUOTE),$$(addsuffix /*$(DQUOTE),$$($1_INCLUDES))) 21.92 endif 21.93 + endif 21.94 + ifneq ($$($1_INCLUDE_FILES),) 21.95 + $1_SRC_INCLUDES += $$(foreach i,$$($1_SRC),$$(addprefix $$i/,$$($1_INCLUDE_FILES))) 21.96 + $1_ZIP_INCLUDES += $$(addprefix -i$(SPACE),$$($1_INCLUDE_FILES)) 21.97 + endif 21.98 + ifneq ($$($1_SRC_INCLUDES),) 21.99 $1_ALL_SRCS := $$(filter $$($1_SRC_INCLUDES),$$($1_ALL_SRCS)) 21.100 endif 21.101 ifneq ($$($1_EXCLUDES),) 21.102 @@ -376,7 +390,7 @@ 21.103 $$(foreach d,$$($1_SRC), $$(if $$(wildcard $$d),,$$(error SRC specified to SetupJavaCompilation $1 contains missing directory $$d))) 21.104 $$(eval $$(call MakeDir,$$($1_BIN))) 21.105 # Find all files in the source trees. 21.106 - $1_ALL_SRCS := $$(filter-out $(OVR_SRCS),$$(shell $(FIND) $$($1_SRC) -type f)) 21.107 + $1_ALL_SRCS += $$(filter-out $(OVR_SRCS),$$(call CacheFind,$$($1_SRC))) 21.108 # Extract the java files. 21.109 ifneq ($$($1_EXCLUDE_FILES),) 21.110 $1_EXCLUDE_FILES_PATTERN:=$$(addprefix %,$$($1_EXCLUDE_FILES)) 21.111 @@ -408,8 +422,6 @@ 21.112 21.113 # Find all files to be copied from source to bin. 21.114 ifneq (,$$($1_COPY)) 21.115 - # Rewrite list of patterns into a find statement. 21.116 - $1_COPY_PATTERN:=$(FALSE_FIND_PATTERN) $$(patsubst %,$(SPACE)-o$(SPACE)-name$(SPACE)$(DQUOTE)*%$(DQUOTE),$$($1_COPY)) 21.117 # Search for all files to be copied. 21.118 $1_ALL_COPIES := $$(filter $$(addprefix %,$$($1_COPY)),$$($1_ALL_SRCS)) 21.119 # Copy these explicitly 21.120 @@ -436,8 +448,6 @@ 21.121 21.122 # Find all property files to be copied and cleaned from source to bin. 21.123 ifneq (,$$($1_CLEAN)) 21.124 - # Rewrite list of patterns into a find statement. 21.125 - $1_CLEAN_PATTERN:=$(FALSE_FIND_PATTERN) $$(patsubst %,$(SPACE)-o$(SPACE)-name$(SPACE)$(DQUOTE)*%$(DQUOTE),$$($1_CLEAN)) 21.126 # Search for all files to be copied. 21.127 $1_ALL_CLEANS := $$(filter $$(addprefix %,$$($1_CLEAN)),$$($1_ALL_SRCS)) 21.128 # Copy and clean must also respect filters.
22.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 22.2 +++ b/common/makefiles/Jprt.gmk Wed Jan 16 22:16:51 2013 -0800 22.3 @@ -0,0 +1,199 @@ 22.4 +# 22.5 +# Copyright (c) 2012, Oracle and/or its affiliates. All rights reserved. 22.6 +# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. 22.7 +# 22.8 +# This code is free software; you can redistribute it and/or modify it 22.9 +# under the terms of the GNU General Public License version 2 only, as 22.10 +# published by the Free Software Foundation. Oracle designates this 22.11 +# particular file as subject to the "Classpath" exception as provided 22.12 +# by Oracle in the LICENSE file that accompanied this code. 22.13 +# 22.14 +# This code is distributed in the hope that it will be useful, but WITHOUT 22.15 +# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or 22.16 +# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License 22.17 +# version 2 for more details (a copy is included in the LICENSE file that 22.18 +# accompanied this code). 22.19 +# 22.20 +# You should have received a copy of the GNU General Public License version 22.21 +# 2 along with this work; if not, write to the Free Software Foundation, 22.22 +# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. 22.23 +# 22.24 +# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA 22.25 +# or visit www.oracle.com if you need additional information or have any 22.26 +# questions. 22.27 +# 22.28 + 22.29 +# This file is included by the root NewerMakefile and contains targets 22.30 +# and utilities needed by JPRT. 22.31 + 22.32 +# Utilities used in this Makefile. Most of this makefile executes without 22.33 +# the context of a spec file from configure. 22.34 +CAT=cat 22.35 +CMP=cmp 22.36 +CP=cp 22.37 +ECHO=echo 22.38 +MKDIR=mkdir 22.39 +PRINTF=printf 22.40 +PWD=pwd 22.41 +# Insure we have a path that looks like it came from pwd 22.42 +# (This is mostly for Windows sake and drive letters) 22.43 +define UnixPath # path 22.44 +$(shell (cd "$1" && $(PWD))) 22.45 +endef 22.46 + 22.47 +BUILD_DIR_ROOT:=$(root_dir)/build 22.48 + 22.49 +# Appears to be an open build 22.50 +OPEN_BUILD := \ 22.51 +$(shell \ 22.52 + if [ -d $(root_dir)/jdk/src/closed \ 22.53 + -o -d $(root_dir)/jdk/make/closed \ 22.54 + -o -d $(root_dir)/jdk/test/closed \ 22.55 + -o -d $(root_dir)/hotspot/src/closed \ 22.56 + -o -d $(root_dir)/hotspot/make/closed \ 22.57 + -o -d $(root_dir)/hotspot/test/closed ] ; then \ 22.58 + echo "false"; \ 22.59 + else \ 22.60 + echo "true"; \ 22.61 + fi \ 22.62 + ) 22.63 +ifdef OPENJDK 22.64 + OPEN_BUILD=true 22.65 +endif 22.66 + 22.67 +########################################################################### 22.68 +# To help in adoption of the new configure&&make build process, a bridge 22.69 +# build will use the old settings to run configure and do the build. 22.70 + 22.71 +# Build with the configure bridge. After running configure, restart make 22.72 +# to parse the new spec file. 22.73 +BRIDGE_TARGETS := all 22.74 +bridgeBuild: bridge2configure 22.75 + @cd $(root_dir) && $(MAKE) -f NewMakefile.gmk $(BRIDGE_TARGETS) 22.76 + 22.77 +# Bridge from old Makefile ALT settings to configure options 22.78 +bridge2configure: $(BUILD_DIR_ROOT)/.bridge2configureOpts 22.79 + bash ./configure $(strip $(shell $(CAT) $<)) 22.80 + 22.81 +# Create a file with configure options created from old Makefile mechanisms. 22.82 +$(BUILD_DIR_ROOT)/.bridge2configureOpts: $(BUILD_DIR_ROOT)/.bridge2configureOptsLatest 22.83 + $(RM) $@ 22.84 + $(CP) $< $@ 22.85 + 22.86 +# Use this file to only change when obvious things have changed 22.87 +$(BUILD_DIR_ROOT)/.bridge2configureOptsLatest: FRC 22.88 + $(RM) $@.tmp 22.89 + $(MKDIR) -p $(BUILD_DIR_ROOT) 22.90 + @$(ECHO) " --with-debug-level=$(if $(DEBUG_LEVEL),$(DEBUG_LEVEL),release) " >> $@.tmp 22.91 +ifdef ARCH_DATA_MODEL 22.92 + @$(ECHO) " --with-target-bits=$(ARCH_DATA_MODEL) " >> $@.tmp 22.93 +endif 22.94 +ifeq ($(ARCH_DATA_MODEL),32) 22.95 + @$(ECHO) " --with-jvm-variants=client,server " >> $@.tmp 22.96 +endif 22.97 +ifdef ALT_PARALLEL_COMPILE_JOBS 22.98 + @$(ECHO) " --with-num-cores=$(ALT_PARALLEL_COMPILE_JOBS) " >> $@.tmp 22.99 +endif 22.100 +ifdef ALT_BOOTDIR 22.101 + @$(ECHO) " --with-boot-jdk=$(call UnixPath,$(ALT_BOOTDIR)) " >> $@.tmp 22.102 +endif 22.103 +ifdef ALT_CUPS_HEADERS_PATH 22.104 + @$(ECHO) " --with-cups-include=$(call UnixPath,$(ALT_CUPS_HEADERS_PATH)) " >> $@.tmp 22.105 +endif 22.106 +ifdef ALT_FREETYPE_HEADERS_PATH 22.107 + @$(ECHO) " --with-freetype=$(call UnixPath,$(ALT_FREETYPE_HEADERS_PATH)/..) " >> $@.tmp 22.108 +endif 22.109 +ifeq ($(OPEN_BUILD),true) 22.110 + @$(ECHO) " --enable-openjdk-only " >> $@.tmp 22.111 +else 22.112 + # Todo: move to closed? 22.113 + ifdef ALT_MOZILLA_HEADERS_PATH 22.114 + @$(ECHO) " --with-mozilla-headers=$(call UnixPath,$(ALT_MOZILLA_HEADERS_PATH)) " >> $@.tmp 22.115 + endif 22.116 + ifdef ALT_JUNIT_DIR 22.117 + @$(ECHO) " --with-junit-dir=$(call UnixPath,$(ALT_JUNIT_DIR)) " >> $@.tmp 22.118 + endif 22.119 + ifdef ANT_HOME 22.120 + @$(ECHO) " --with-ant-home=$(call UnixPath,$(ANT_HOME)) " >> $@.tmp 22.121 + endif 22.122 + ifdef ALT_JAVAFX_ZIP_DIR 22.123 + @$(ECHO) " --with-javafx-zip-dir=$(call UnixPath,$(ALT_JAVAFX_ZIP_DIR)) " >> $@.tmp 22.124 + endif 22.125 + ifdef ALT_WIXDIR 22.126 + @$(ECHO) " --with-wix=$(call UnixPath,$(ALT_WIXDIR)) " >> $@.tmp 22.127 + endif 22.128 + ifdef ALT_CCSS_SIGNING_DIR 22.129 + @$(ECHO) " --with-ccss-signing=$(call UnixPath,$(ALT_CCSS_SIGNING_DIR)) " >> $@.tmp 22.130 + endif 22.131 + ifdef ALT_SLASH_JAVA 22.132 + @$(ECHO) " --with-java-devtools=$(call UnixPath,$(ALT_SLASH_JAVA)/devtools) " >> $@.tmp 22.133 + endif 22.134 +endif 22.135 + @if [ -f $@ ] ; then \ 22.136 + if ! $(CMP) $@ $@.tmp > /dev/null ; then \ 22.137 + $(CP) $@.tmp $@ ; \ 22.138 + fi ; \ 22.139 + else \ 22.140 + $(CP) $@.tmp $@ ; \ 22.141 + fi 22.142 + $(RM) $@.tmp 22.143 + 22.144 +PHONY_LIST += bridge2configure bridgeBuild 22.145 + 22.146 +########################################################################### 22.147 +# JPRT targets 22.148 + 22.149 +ifndef JPRT_ARCHIVE_BUNDLE 22.150 + JPRT_ARCHIVE_BUNDLE=/tmp/jprt_bundles/j2sdk-image.zip 22.151 +endif 22.152 + 22.153 +# These targets execute in a SPEC free context, before calling bridgeBuild 22.154 +# to generate the SPEC. 22.155 +jprt_build_product: DEBUG_LEVEL=release 22.156 +jprt_build_product: BUILD_DIRNAME=*-release 22.157 +jprt_build_product: jprt_build_generic 22.158 + 22.159 +jprt_build_fastdebug: DEBUG_LEVEL=fastdebug 22.160 +jprt_build_fastdebug: BUILD_DIRNAME=*-fastdebug 22.161 +jprt_build_fastdebug: jprt_build_generic 22.162 + 22.163 +jprt_build_debug: DEBUG_LEVEL=slowdebug 22.164 +jprt_build_debug: BUILD_DIRNAME=*-debug 22.165 +jprt_build_debug: jprt_build_generic 22.166 + 22.167 +jprt_build_generic: BRIDGE_TARGETS+=jprt_bundle 22.168 +jprt_build_generic: bridgeBuild 22.169 + 22.170 +# This target must be called in the context of a SPEC file 22.171 +jprt_bundle: $(JPRT_ARCHIVE_BUNDLE) 22.172 + @$(call CheckIfMakeAtEnd) 22.173 + 22.174 +# This target must be called in the context of a SPEC file 22.175 +$(JPRT_ARCHIVE_BUNDLE): bundles 22.176 + $(MKDIR) -p $(@D) 22.177 + $(RM) $@ 22.178 + $(CP) $(BUILD_OUTPUT)/bundles/j2sdk-image.zip $@ 22.179 + 22.180 +# This target must be called in the context of a SPEC file 22.181 +bundles: all 22.182 + @$(call TargetEnter) 22.183 + $(MKDIR) -p $(BUILD_OUTPUT)/bundles 22.184 +ifeq ($(OPENJDK_TARGET_OS)-$(OPENJDK_TARGET_CPU_BITS),solaris-64) 22.185 + $(CD) $(JDK_OVERLAY_IMAGE_DIR) && $(ZIP) -q -r $(BUILD_OUTPUT)/bundles/j2sdk-image.zip . 22.186 + $(CD) $(JRE_OVERLAY_IMAGE_DIR) && $(ZIP) -q -r $(BUILD_OUTPUT)/bundles/j2re-image.zip . 22.187 +else 22.188 + $(CD) $(JDK_IMAGE_DIR) && $(ZIP) -q -r $(BUILD_OUTPUT)/bundles/j2sdk-image.zip . 22.189 + $(CD) $(JRE_IMAGE_DIR) && $(ZIP) -q -r $(BUILD_OUTPUT)/bundles/j2re-image.zip . 22.190 +endif 22.191 + @$(call TargetExit) 22.192 + 22.193 +# Keep track of phony targets 22.194 +PHONY_LIST += jprt_build_product jprt_build_fastdebug jprt_build_debug \ 22.195 + jprt_build_generic bundles jprt_bundle 22.196 + 22.197 +########################################################################### 22.198 +# Phony targets 22.199 +.PHONY: $(PHONY_LIST) 22.200 + 22.201 +# Force target 22.202 +FRC:
23.1 --- a/common/makefiles/Main.gmk Wed Jan 16 11:59:37 2013 -0800 23.2 +++ b/common/makefiles/Main.gmk Wed Jan 16 22:16:51 2013 -0800 23.3 @@ -65,7 +65,15 @@ 23.4 23.5 ### Main targets 23.6 23.7 -all: jdk 23.8 +default: jdk 23.9 + @$(call CheckIfMakeAtEnd) 23.10 + 23.11 +all: images docs 23.12 + @$(call CheckIfMakeAtEnd) 23.13 + 23.14 +ifeq ($(OPENJDK_TARGET_OS)-$(OPENJDK_TARGET_CPU_BITS),solaris-64) 23.15 + all: overlay-images 23.16 +endif 23.17 23.18 start-make: 23.19 @$(call AtMakeStart) 23.20 @@ -126,12 +134,6 @@ 23.21 @($(CD) $(JDK_TOPDIR)/makefiles && $(BUILD_LOG_WRAPPER) $(MAKE) $(MAKE_ARGS) -f BuildJdk.gmk overlay-images) 23.22 @$(call TargetExit) 23.23 23.24 -bundles: images bundles-only 23.25 -bundles-only: start-make 23.26 - @$(call TargetEnter) 23.27 - @($(CD) $(JDK_TOPDIR)/makefiles && $(BUILD_LOG_WRAPPER) $(MAKE) $(MAKE_ARGS) -f BuildJdk.gmk bundles) 23.28 - @$(call TargetExit) 23.29 - 23.30 install: images install-only 23.31 install-only: start-make 23.32 @$(call TargetEnter) 23.33 @@ -144,6 +146,12 @@ 23.34 @($(CD) $(SRC_ROOT)/common/makefiles/javadoc && $(BUILD_LOG_WRAPPER) $(MAKE) $(MAKE_ARGS) -f Javadoc.gmk docs) 23.35 @$(call TargetExit) 23.36 23.37 +sign-jars: jdk sign-jars-only 23.38 +sign-jars-only: start-make 23.39 + @$(call TargetEnter) 23.40 + @($(CD) $(JDK_TOPDIR)/makefiles && $(BUILD_LOG_WRAPPER) $(MAKE) $(MAKE_ARGS) -f BuildJdk.gmk sign-jars) 23.41 + @$(call TargetExit) 23.42 + 23.43 bootcycle-images: 23.44 @$(ECHO) Boot cycle build step 1: Building the JDK image normally 23.45 @($(CD) $(SRC_ROOT)/common/makefiles && $(BUILD_LOG_WRAPPER) $(MAKE) SPEC=$(SPEC) images)
24.1 --- a/common/makefiles/MakeBase.gmk Wed Jan 16 11:59:37 2013 -0800 24.2 +++ b/common/makefiles/MakeBase.gmk Wed Jan 16 22:16:51 2013 -0800 24.3 @@ -391,4 +391,46 @@ 24.4 endef 24.5 endif 24.6 24.7 +# Convenience functions for working around make's limitations with $(filter ). 24.8 +containing = $(foreach v,$2,$(if $(findstring $1,$v),$v)) 24.9 +not-containing = $(foreach v,$2,$(if $(findstring $1,$v),,$v)) 24.10 + 24.11 +################################################################################ 24.12 +# In Cygwin, finds are very costly, both because of expensive forks and because 24.13 +# of bad file system caching. Find is used extensively in $(shell) commands to 24.14 +# find source files. This makes rerunning make with no or few changes rather 24.15 +# expensive. To speed this up, these two macros are used to cache the results 24.16 +# of simple find commands for reuse. 24.17 +# 24.18 +# Runs a find and stores both the directories where it was run and the results. 24.19 +# This macro can be called multiple times to add to the cache. Only finds files 24.20 +# with no filters. 24.21 +# 24.22 +# Needs to be called with $(eval ) 24.23 +# 24.24 +# Param 1 - Dir to find in 24.25 +ifeq ($(OPENJDK_BUILD_OS),windows) 24.26 +define FillCacheFind 24.27 + FIND_CACHE_DIR += $1 24.28 + FIND_CACHE := $$(sort $$(FIND_CACHE) $$(shell $(FIND) $1 -type f -o -type l)) 24.29 +endef 24.30 +else 24.31 +define FillCacheFind 24.32 +endef 24.33 +endif 24.34 + 24.35 +# Mimics find by looking in the cache if all of the directories have been cached. 24.36 +# Otherwise reverts to shell find. This is safe to call on all platforms, even if 24.37 +# cache is deactivated. 24.38 +# 24.39 +# The extra - is needed when FIND_CACHE_DIR is empty but should be harmless. 24.40 +# Param 1 - Dirs to find in 24.41 +define CacheFind 24.42 + $(if $(filter-out $(addsuffix %,- $(FIND_CACHE_DIR)),$1),\ 24.43 + $(shell $(FIND) $1 -type f -o -type l),\ 24.44 + $(filter $(addsuffix %,$1),$(FIND_CACHE))) 24.45 +endef 24.46 + 24.47 +################################################################################ 24.48 + 24.49 endif # _MAKEBASE_GMK
25.1 --- a/common/makefiles/MakeHelpers.gmk Wed Jan 16 11:59:37 2013 -0800 25.2 +++ b/common/makefiles/MakeHelpers.gmk Wed Jan 16 22:16:51 2013 -0800 25.3 @@ -50,7 +50,7 @@ 25.4 25.5 # Global targets are possible to run either with or without a SPEC. The prototypical 25.6 # global target is "help". 25.7 -global_targets=help configure 25.8 +global_targets=help jprt% bridgeBuild 25.9 25.10 ############################## 25.11 # Functions 25.12 @@ -112,7 +112,7 @@ 25.13 25.14 # Do not indent this function, this will add whitespace at the start which the caller won't handle 25.15 define GetRealTarget 25.16 -$(strip $(if $(MAKECMDGOALS),$(MAKECMDGOALS),all)) 25.17 +$(strip $(if $(MAKECMDGOALS),$(MAKECMDGOALS),default)) 25.18 endef 25.19 25.20 # Do not indent this function, this will add whitespace at the start which the caller won't handle 25.21 @@ -126,10 +126,7 @@ 25.22 # Check if the current target is the last goal 25.23 $(if $(filter $@,$(call LastGoal)),$(call AtMakeEnd)) 25.24 # If the target is 'foo-only', check if our goal was stated as 'foo' 25.25 - $(if $(filter $(patsubst %-only,%,$@),$(call LastGoal)),$(call AtMakeEnd)) 25.26 - # If no goal is given, 'all' is default, but the last target executed for all is 'jdk-only'. Check for that, too. 25.27 - # At most one of the tests can be true. 25.28 - $(if $(subst all,,$(call LastGoal)),,$(if $(filter $@,jdk-only),$(call AtMakeEnd))) 25.29 + $(if $(filter $@,$(call LastGoal)-only),$(call AtMakeEnd)) 25.30 endef 25.31 25.32 # Hook to be called when starting to execute a top-level target
26.1 --- a/common/makefiles/Makefile Wed Jan 16 11:59:37 2013 -0800 26.2 +++ b/common/makefiles/Makefile Wed Jan 16 22:16:51 2013 -0800 26.3 @@ -23,109 +23,4 @@ 26.4 # questions. 26.5 # 26.6 26.7 -# This must be the first rule 26.8 -all: 26.9 - 26.10 -# Inclusion of this pseudo-target will cause make to execute this file 26.11 -# serially, regardless of -j. Recursively called makefiles will not be 26.12 -# affected, however. This is required for correct dependency management. 26.13 -.NOTPARALLEL: 26.14 - 26.15 -# The shell code below will be executed on /usr/ccs/bin/make on Solaris, but not in GNU make. 26.16 -# /usr/ccs/bin/make lacks basically every other flow control mechanism. 26.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 26.18 - 26.19 -# Assume we have GNU make, but check version. 26.20 -ifeq (,$(findstring 3.81,$(MAKE_VERSION))) 26.21 - ifeq (,$(findstring 3.82,$(MAKE_VERSION))) 26.22 - $(error This version of GNU Make is too low ($(MAKE_VERSION)). Check your path, or upgrade to 3.81 or newer.) 26.23 - endif 26.24 -endif 26.25 - 26.26 -# Locate this Makefile 26.27 -ifeq ($(filter /%,$(lastword $(MAKEFILE_LIST))),) 26.28 - makefile_path:=$(CURDIR)/$(lastword $(MAKEFILE_LIST)) 26.29 -else 26.30 - makefile_path:=$(lastword $(MAKEFILE_LIST)) 26.31 -endif 26.32 -root_dir:=$(patsubst %/common/makefiles/Makefile,%,$(makefile_path)) 26.33 - 26.34 -# ... and then we can include our helper functions 26.35 -include $(dir $(makefile_path))/MakeHelpers.gmk 26.36 - 26.37 -$(eval $(call ParseLogLevel)) 26.38 -$(eval $(call ParseConfAndSpec)) 26.39 - 26.40 -# Now determine if we have zero, one or several configurations to build. 26.41 -ifeq ($(SPEC),) 26.42 - # Since we got past ParseConfAndSpec, we must be building a global target. Do nothing. 26.43 -else 26.44 - ifeq ($(words $(SPEC)),1) 26.45 - # We are building a single configuration. This is the normal case. Execute the Main.gmk file. 26.46 - include $(dir $(makefile_path))/Main.gmk 26.47 - else 26.48 - # We are building multiple configurations. 26.49 - # First, find out the valid targets 26.50 - # Run the makefile with an arbitraty SPEC using -p -q (quiet dry-run and dump rules) to find 26.51 - # available PHONY targets. Use this list as valid targets to pass on to the repeated calls. 26.52 - all_phony_targets=$(filter-out $(global_targets), $(strip $(shell \ 26.53 - $(MAKE) -p -q -f $(makefile_path) SPEC=$(firstword $(SPEC)) | \ 26.54 - grep ^.PHONY: | head -n 1 | cut -d " " -f 2-))) 26.55 - 26.56 -$(all_phony_targets): 26.57 - @$(foreach spec,$(SPEC),($(MAKE) -f $(makefile_path) SPEC=$(spec) $(VERBOSE) VERBOSE=$(VERBOSE) $@) &&) true 26.58 - 26.59 - endif 26.60 -endif 26.61 - 26.62 -# Here are "global" targets, i.e. targets that can be executed without specifying a single configuration. 26.63 -# If you addd more global targets, please update the variable global_targets in MakeHelpers. 26.64 - 26.65 -help: 26.66 - $(info ) 26.67 - $(info OpenJDK Makefile help) 26.68 - $(info =====================) 26.69 - $(info ) 26.70 - $(info Common make targets) 26.71 - $(info . make [all] # Compile all code but do not create images) 26.72 - $(info . make images # Create complete j2sdk and j2re images) 26.73 - $(info . make overlay-images # Create limited images for sparc 64 bit platforms) 26.74 - $(info . make bootcycle-images # Build images twice, second time with newly build JDK) 26.75 - $(info . make install # Install the generated images locally) 26.76 - $(info . make clean # Remove all files generated by make, but not those) 26.77 - $(info . # generated by configure) 26.78 - $(info . make dist-clean # Remove all files, including configuration) 26.79 - $(info . make help # Give some help on using make) 26.80 - $(info . make test # Run tests, default is all tests (see TEST below)) 26.81 - $(info ) 26.82 - $(info Targets for specific components) 26.83 - $(info (Component is any of langtools, corba, jaxp, jaxws, hotspot, jdk, images or overlay-images)) 26.84 - $(info . make <component> # Build <component> and everything it depends on. ) 26.85 - $(info . make <component>-only # Build <component> only, without dependencies. This) 26.86 - $(info . # is faster but can result in incorrect build results!) 26.87 - $(info . make clean-<component> # Remove files generated by make for <component>) 26.88 - $(info ) 26.89 - $(info Useful make variables) 26.90 - $(info . make CONF= # Build all configurations (note, assignment is empty)) 26.91 - $(info . make CONF=<substring> # Build the configuration(s) with a name matching) 26.92 - $(info . # <substring>) 26.93 - $(info ) 26.94 - $(info . make LOG=<loglevel> # Change the log level from warn to <loglevel>) 26.95 - $(info . # Available log levels are:) 26.96 - $(info . # 'warn' (default), 'info', 'debug' and 'trace') 26.97 - $(info . # To see executed command lines, use LOG=debug) 26.98 - $(info ) 26.99 - $(info . make JOBS=<n> # Run <n> parallel make jobs) 26.100 - $(info . # Note that -jN does not work as expected!) 26.101 - $(info ) 26.102 - $(info . make test TEST=<test> # Only run the given test or tests, e.g.) 26.103 - $(info . # make test TEST="jdk_lang jdk_net") 26.104 - $(info ) 26.105 - 26.106 -configure: 26.107 - @$(SHELL) $(root_dir)/configure $(CONFIGURE_ARGS) 26.108 - @echo ==================================================== 26.109 - @echo "Note: This is a non-recommended way of running configure." 26.110 - @echo "Instead, run 'sh configure' in the top-level directory" 26.111 - 26.112 -.PHONY: help configure 26.113 +include ../../NewMakefile.gmk
27.1 --- a/common/makefiles/NativeCompilation.gmk Wed Jan 16 11:59:37 2013 -0800 27.2 +++ b/common/makefiles/NativeCompilation.gmk Wed Jan 16 22:16:51 2013 -0800 27.3 @@ -236,7 +236,7 @@ 27.4 $$(foreach d,$$($1_SRC), $$(if $$(wildcard $$d),,$$(error SRC specified to SetupNativeCompilation $1 contains missing directory $$d))) 27.5 27.6 # Find all files in the source trees. Sort to remove duplicates. 27.7 - $1_ALL_SRCS := $$(sort $$(shell $(FIND) $$($1_SRC) -type f)) 27.8 + $1_ALL_SRCS := $$(sort $$(call CacheFind,$$($1_SRC))) 27.9 # Extract the C/C++ files. 27.10 $1_EXCLUDE_FILES:=$$(foreach i,$$($1_SRC),$$(addprefix $$i/,$$($1_EXCLUDE_FILES))) 27.11 $1_INCLUDE_FILES:=$$(foreach i,$$($1_SRC),$$(addprefix $$i/,$$($1_INCLUDE_FILES)))
28.1 --- a/common/makefiles/javadoc/Javadoc.gmk Wed Jan 16 11:59:37 2013 -0800 28.2 +++ b/common/makefiles/javadoc/Javadoc.gmk Wed Jan 16 22:16:51 2013 -0800 28.3 @@ -32,8 +32,6 @@ 28.4 # Definitions for $(DOCSDIR), $(MKDIR), $(BINDIR), etc. 28.5 # 28.6 28.7 -CLASSPATH_SEPARATOR = : 28.8 - 28.9 DOCSDIR=$(OUTPUT_ROOT)/docs 28.10 TEMPDIR=$(OUTPUT_ROOT)/docstemp 28.11 28.12 @@ -137,7 +135,7 @@ 28.13 # List of all possible directories for javadoc to look for sources 28.14 # NOTE: Quotes are required around sourcepath argument only on Windows. 28.15 # Otherwise, you get "No packages or classes specified." due 28.16 -# to $(CLASSPATH_SEPARATOR) being interpreted as an end of 28.17 +# to $(PATH_SEP) being interpreted as an end of 28.18 # command (newline or shell ; character) 28.19 ALL_SOURCE_DIRS = $(JDK_SHARE_CLASSES) \ 28.20 $(JDK_IMPSRC) \ 28.21 @@ -154,7 +152,7 @@ 28.22 EMPTY:= 28.23 SPACE:= $(EMPTY) $(EMPTY) 28.24 RELEASEDOCS_SOURCEPATH = \ 28.25 - $(subst $(SPACE),$(CLASSPATH_SEPARATOR),$(strip $(ALL_SOURCE_DIRS))) 28.26 + $(subst $(SPACE),$(PATH_SEP),$(strip $(ALL_SOURCE_DIRS))) 28.27 28.28 define prep-target 28.29 $(MKDIR) -p $(@D)
29.1 --- a/common/src/fixpath.c Wed Jan 16 11:59:37 2013 -0800 29.2 +++ b/common/src/fixpath.c Wed Jan 16 22:16:51 2013 -0800 29.3 @@ -29,6 +29,29 @@ 29.4 #include <string.h> 29.5 #include <malloc.h> 29.6 29.7 +void report_error() 29.8 +{ 29.9 + LPVOID lpMsgBuf; 29.10 + DWORD dw = GetLastError(); 29.11 + 29.12 + FormatMessage( 29.13 + FORMAT_MESSAGE_ALLOCATE_BUFFER | 29.14 + FORMAT_MESSAGE_FROM_SYSTEM | 29.15 + FORMAT_MESSAGE_IGNORE_INSERTS, 29.16 + NULL, 29.17 + dw, 29.18 + MAKELANGID(LANG_NEUTRAL, SUBLANG_DEFAULT), 29.19 + (LPTSTR) &lpMsgBuf, 29.20 + 0, 29.21 + NULL); 29.22 + 29.23 + fprintf(stderr, 29.24 + "Could not start process! Failed with error %d: %s\n", 29.25 + dw, lpMsgBuf); 29.26 + 29.27 + LocalFree(lpMsgBuf); 29.28 +} 29.29 + 29.30 /* 29.31 * Test if pos points to /cygdrive/_/ where _ can 29.32 * be any character. 29.33 @@ -256,7 +279,7 @@ 29.34 DWORD exitCode; 29.35 29.36 if (argc<3 || argv[1][0] != '-' || (argv[1][1] != 'c' && argv[1][1] != 'm')) { 29.37 - fprintf(stderr, "Usage: fixpath -c|m<path@path@...> /cygdrive/c/WINDOWS/notepad.exe /cygdrive/c/x/test.txt"); 29.38 + fprintf(stderr, "Usage: fixpath -c|m<path@path@...> /cygdrive/c/WINDOWS/notepad.exe /cygdrive/c/x/test.txt\n"); 29.39 exit(0); 29.40 } 29.41 29.42 @@ -308,11 +331,10 @@ 29.43 0, 29.44 &si, 29.45 &pi); 29.46 - if(!rc) 29.47 - { 29.48 - //Could not start process; 29.49 - fprintf(stderr, "Could not start process!\n"); 29.50 - exit(-1); 29.51 + if(!rc) { 29.52 + // Could not start process for some reason. Try to report why: 29.53 + report_error(); 29.54 + exit(rc); 29.55 } 29.56 29.57 WaitForSingleObject(pi.hProcess,INFINITE);
30.1 --- a/make/jprt.properties Wed Jan 16 11:59:37 2013 -0800 30.2 +++ b/make/jprt.properties Wed Jan 16 22:16:51 2013 -0800 30.3 @@ -28,6 +28,9 @@ 30.4 # Locked down to jdk8 30.5 jprt.tools.default.release=jdk8 30.6 30.7 +# Unix toolkit to use for building on windows 30.8 +jprt.windows.jdk8.build.unix.toolkit=cygwin 30.9 + 30.10 # The different build flavors we want, we override here so we just get these 2 30.11 jprt.build.flavors=product,fastdebug 30.12
