Mercurial > jdk8-mips64-public / changeset

     1.1 --- a/common/autoconf/generated-configure.sh	Wed Jan 23 08:50:19 2013 -0500
     1.2 +++ b/common/autoconf/generated-configure.sh	Wed Jan 23 15:40:21 2013 -0800
     1.3 @@ -2927,6 +2927,32 @@
     1.4  
     1.5  
     1.6  # pkg.m4 - Macros to locate and utilise pkg-config.            -*- Autoconf -*-
     1.7 +
     1.8 +#
     1.9 +# Copyright (c) 2012, 2013, Oracle and/or its affiliates. All rights reserved.
    1.10 +# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
    1.11 +#
    1.12 +# This code is free software; you can redistribute it and/or modify it
    1.13 +# under the terms of the GNU General Public License version 2 only, as
    1.14 +# published by the Free Software Foundation.  Oracle designates this
    1.15 +# particular file as subject to the "Classpath" exception as provided
    1.16 +# by Oracle in the LICENSE file that accompanied this code.
    1.17 +#
    1.18 +# This code is distributed in the hope that it will be useful, but WITHOUT
    1.19 +# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
    1.20 +# FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
    1.21 +# version 2 for more details (a copy is included in the LICENSE file that
    1.22 +# accompanied this code).
    1.23 +#
    1.24 +# You should have received a copy of the GNU General Public License version
    1.25 +# 2 along with this work; if not, write to the Free Software Foundation,
    1.26 +# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
    1.27 +#
    1.28 +# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
    1.29 +# or visit www.oracle.com if you need additional information or have any
    1.30 +# questions.
    1.31 +#
    1.32 +
    1.33  #
    1.34  # Copyright © 2004 Scott James Remnant <scott@netsplit.com>.
    1.35  #
    1.36 @@ -3697,7 +3723,7 @@
    1.37  #CUSTOM_AUTOCONF_INCLUDE
    1.38  
    1.39  # Do not change or remove the following line, it is needed for consistency checks:
    1.40 -DATE_WHEN_GENERATED=1358165331
    1.41 +DATE_WHEN_GENERATED=1358499442
    1.42  
    1.43  ###############################################################################
    1.44  #

     2.1 --- a/common/makefiles/Jprt.gmk	Wed Jan 23 08:50:19 2013 -0500
     2.2 +++ b/common/makefiles/Jprt.gmk	Wed Jan 23 15:40:21 2013 -0800
     2.3 @@ -43,24 +43,20 @@
     2.4  
     2.5  BUILD_DIR_ROOT:=$(root_dir)/build
     2.6  
     2.7 -# Appears to be an open build
     2.8 -OPEN_BUILD := \
     2.9 -$(shell \
    2.10 -  if [    -d $(root_dir)/jdk/src/closed      \
    2.11 -       -o -d $(root_dir)/jdk/make/closed     \
    2.12 -       -o -d $(root_dir)/jdk/test/closed     \
    2.13 -       -o -d $(root_dir)/hotspot/src/closed  \
    2.14 -       -o -d $(root_dir)/hotspot/make/closed \
    2.15 -       -o -d $(root_dir)/hotspot/test/closed ] ; then \
    2.16 -    echo "false"; \
    2.17 -  else \
    2.18 -    echo "true"; \
    2.19 -  fi \
    2.20 - )
    2.21  ifdef OPENJDK
    2.22    OPEN_BUILD=true
    2.23 +else
    2.24 +  OPEN_BUILD := $(if $(or $(wildcard $(root_dir)/jdk/src/closed), \
    2.25 +                          $(wildcard $(root_dir)/jdk/make/closed), \
    2.26 +                          $(wildcard $(root_dir)/jdk/test/closed), \
    2.27 +                          $(wildcard $(root_dir)/hotspot/src/closed), \
    2.28 +                          $(wildcard $(root_dir)/hotspot/make/closed), \
    2.29 +                          $(wildcard $(root_dir)/hotspot/test/closed)), \
    2.30 +                     false,true)
    2.31  endif
    2.32  
    2.33 +HOTSPOT_AVAILABLE := $(if $(wildcard $(root_dir)/hotspot),true,false)
    2.34 +
    2.35  ###########################################################################
    2.36  # To help in adoption of the new configure&&make build process, a bridge
    2.37  #   build will use the old settings to run configure and do the build.
    2.38 @@ -103,6 +99,11 @@
    2.39  ifdef ALT_FREETYPE_HEADERS_PATH
    2.40  	@$(ECHO) " --with-freetype=$(call UnixPath,$(ALT_FREETYPE_HEADERS_PATH)/..) " >> $@.tmp
    2.41  endif
    2.42 +ifeq ($(HOTSPOT_AVAILABLE),false)
    2.43 +  ifdef ALT_JDK_IMPORT_PATH
    2.44 +	@$(ECHO) " --with-import-hotspot=$(call UnixPath,$(ALT_JDK_IMPORT_PATH)) " >> $@.tmp
    2.45 +  endif
    2.46 +endif
    2.47  ifeq ($(OPEN_BUILD),true)
    2.48  	@$(ECHO) " --enable-openjdk-only " >> $@.tmp
    2.49  else
    2.50 @@ -128,6 +129,9 @@
    2.51    ifdef ALT_SLASH_JAVA
    2.52  	@$(ECHO) " --with-java-devtools=$(call UnixPath,$(ALT_SLASH_JAVA)/devtools) " >> $@.tmp
    2.53    endif
    2.54 +  ifdef ALT_SPARKLE_FRAMEWORK_DIR
    2.55 +	@$(ECHO) " --with-sparkle-framework=$(call UnixPath,$(ALT_SPARKLE_FRAMEWORK_DIR)) " >> $@.tmp
    2.56 +  endif 
    2.57  endif
    2.58  	@if [ -f $@ ] ; then \
    2.59            if ! $(CMP) $@ $@.tmp > /dev/null ; then \
    2.60 @@ -146,6 +150,9 @@
    2.61  ifndef JPRT_ARCHIVE_BUNDLE
    2.62    JPRT_ARCHIVE_BUNDLE=/tmp/jprt_bundles/j2sdk-image.zip
    2.63  endif
    2.64 +ifndef JPRT_ARCHIVE_INSTALL_BUNDLE
    2.65 +    JPRT_ARCHIVE_INSTALL_BUNDLE=/tmp/jprt_bundles/product-install.zip
    2.66 +endif
    2.67  
    2.68  # These targets execute in a SPEC free context, before calling bridgeBuild
    2.69  # to generate the SPEC.
    2.70 @@ -184,6 +191,9 @@
    2.71  else
    2.72  	$(CD) $(JDK_IMAGE_DIR) && $(ZIP) -q -r $(BUILD_OUTPUT)/bundles/j2sdk-image.zip .
    2.73  	$(CD) $(JRE_IMAGE_DIR) && $(ZIP) -q -r $(BUILD_OUTPUT)/bundles/j2re-image.zip .
    2.74 +	if [ -d  $(BUILD_OUTPUT)/install/bundles ] ; then \
    2.75 +           $(CD) $(BUILD_OUTPUT)/install/bundles && $(ZIP) -q -r $(JPRT_ARCHIVE_INSTALL_BUNDLE) . ; \
    2.76 +        fi
    2.77  endif
    2.78  	@$(call TargetExit)
    2.79