Ignore:
Timestamp:
Mar 26, 2011, 8:39:20 PM (14 years ago)
Author:
dmik
Message:

trunk: Merged in openjdk6 b22 from branches/vendor/oracle.

Location:
trunk/openjdk
Files:
15 edited
1 copied

Legend:

Unmodified
Added
Removed

  • trunk/openjdk

  • trunk/openjdk/jdk/make/common/shared/Compiler-gcc.gmk

    r268 r278  
    11#
    2 # Copyright 2005 Sun Microsystems, Inc.  All Rights Reserved.
     2# Copyright (c) 2005, Oracle and/or its affiliates. All rights reserved.
    33# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
    44#
    55# This code is free software; you can redistribute it and/or modify it
    66# under the terms of the GNU General Public License version 2 only, as
    7 # published by the Free Software Foundation.  Sun designates this
     7# published by the Free Software Foundation.  Oracle designates this
    88# particular file as subject to the "Classpath" exception as provided
    9 # by Sun in the LICENSE file that accompanied this code.
     9# by Oracle in the LICENSE file that accompanied this code.
    1010#
    1111# This code is distributed in the hope that it will be useful, but WITHOUT
    … …  
    1919# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
    2020#
    21 # Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
    22 # CA 95054 USA or visit www.sun.com if you need additional information or
    23 # have any questions.
     21# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
     22# or visit www.oracle.com if you need additional information or have any
     23# questions.
    2424#
    2525

  • trunk/openjdk/jdk/make/common/shared/Compiler-msvc.gmk

    r2 r278  
    11#
    2 # Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
     2# Copyright (c) 2005, 2006, Oracle and/or its affiliates. All rights reserved.
    33# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
    44#
    55# This code is free software; you can redistribute it and/or modify it
    66# under the terms of the GNU General Public License version 2 only, as
    7 # published by the Free Software Foundation.  Sun designates this
     7# published by the Free Software Foundation.  Oracle designates this
    88# particular file as subject to the "Classpath" exception as provided
    9 # by Sun in the LICENSE file that accompanied this code.
     9# by Oracle in the LICENSE file that accompanied this code.
    1010#
    1111# This code is distributed in the hope that it will be useful, but WITHOUT
    … …  
    1919# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
    2020#
    21 # Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
    22 # CA 95054 USA or visit www.sun.com if you need additional information or
    23 # have any questions.
     21# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
     22# or visit www.oracle.com if you need additional information or have any
     23# questions.
    2424#
    2525

  • trunk/openjdk/jdk/make/common/shared/Compiler-sun.gmk

    r2 r278  
    11#
    2 # Copyright 2005 Sun Microsystems, Inc.  All Rights Reserved.
     2# Copyright (c) 2005, Oracle and/or its affiliates. All rights reserved.
    33# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
    44#
    55# This code is free software; you can redistribute it and/or modify it
    66# under the terms of the GNU General Public License version 2 only, as
    7 # published by the Free Software Foundation.  Sun designates this
     7# published by the Free Software Foundation.  Oracle designates this
    88# particular file as subject to the "Classpath" exception as provided
    9 # by Sun in the LICENSE file that accompanied this code.
     9# by Oracle in the LICENSE file that accompanied this code.
    1010#
    1111# This code is distributed in the hope that it will be useful, but WITHOUT
    … …  
    1919# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
    2020#
    21 # Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
    22 # CA 95054 USA or visit www.sun.com if you need additional information or
    23 # have any questions.
     21# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
     22# or visit www.oracle.com if you need additional information or have any
     23# questions.
    2424#
    2525

  • trunk/openjdk/jdk/make/common/shared/Compiler.gmk

    r7 r278  
    11#
    2 # Copyright 2005 Sun Microsystems, Inc.  All Rights Reserved.
     2# Copyright (c) 2005, Oracle and/or its affiliates. All rights reserved.
    33# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
    44#
    55# This code is free software; you can redistribute it and/or modify it
    66# under the terms of the GNU General Public License version 2 only, as
    7 # published by the Free Software Foundation.  Sun designates this
     7# published by the Free Software Foundation.  Oracle designates this
    88# particular file as subject to the "Classpath" exception as provided
    9 # by Sun in the LICENSE file that accompanied this code.
     9# by Oracle in the LICENSE file that accompanied this code.
    1010#
    1111# This code is distributed in the hope that it will be useful, but WITHOUT
    … …  
    1919# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
    2020#
    21 # Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
    22 # CA 95054 USA or visit www.sun.com if you need additional information or
    23 # have any questions.
     21# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
     22# or visit www.oracle.com if you need additional information or have any
     23# questions.
    2424#
    2525

  • trunk/openjdk/jdk/make/common/shared/Defs-control.gmk

    r2 r278  
    11#
    2 # Copyright 1995-2007 Sun Microsystems, Inc.  All Rights Reserved.
     2# Copyright (c) 1995, 2010, Oracle and/or its affiliates. All rights reserved.
    33# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
    44#
    55# This code is free software; you can redistribute it and/or modify it
    66# under the terms of the GNU General Public License version 2 only, as
    7 # published by the Free Software Foundation.  Sun designates this
     7# published by the Free Software Foundation.  Oracle designates this
    88# particular file as subject to the "Classpath" exception as provided
    9 # by Sun in the LICENSE file that accompanied this code.
     9# by Oracle in the LICENSE file that accompanied this code.
    1010#
    1111# This code is distributed in the hope that it will be useful, but WITHOUT
    … …  
    1919# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
    2020#
    21 # Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
    22 # CA 95054 USA or visit www.sun.com if you need additional information or
    23 # have any questions.
     21# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
     22# or visit www.oracle.com if you need additional information or have any
     23# questions.
    2424#
    2525
    … …  
    3636endif
    3737
    38 ifndef CONTROL_TOPDIR
    39   CONTROL_TOPDIR=$(TOPDIR)/control
    40 endif
    4138ifndef HOTSPOT_TOPDIR
    4239  HOTSPOT_TOPDIR=$(TOPDIR)/hotspot
    … …  
    5754  JDK_TOPDIR=$(TOPDIR)/jdk
    5855endif
    59 ifndef INSTALL_TOPDIR
    60   INSTALL_TOPDIR=$(TOPDIR)/install
    61 endif
    62 ifndef SPONSORS_TOPDIR
    63   SPONSORS_TOPDIR=$(TOPDIR)/sponsors
    64 endif
    65 ifndef DEPLOY_TOPDIR
    66   DEPLOY_TOPDIR=$(TOPDIR)/deploy
    67 endif
    6856
    6957# Get shared platform settings
    … …  
    7159
    7260# Default output directory
    73 _OUTPUTDIR=$(CONTROL_TOPDIR)/build/$(PLATFORM)-$(ARCH)
     61_OUTPUTDIR=$(TOPDIR)/build/$(PLATFORM)-$(ARCH)
    7462
    7563# Get platform specific settings

  • trunk/openjdk/jdk/make/common/shared/Defs-java.gmk

    r152 r278  
    11#
    2 # Copyright 2007 Sun Microsystems, Inc.  All Rights Reserved.
     2# Copyright (c) 2007, 2010, Oracle and/or its affiliates. All rights reserved.
    33# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
    44#
    55# This code is free software; you can redistribute it and/or modify it
    66# under the terms of the GNU General Public License version 2 only, as
    7 # published by the Free Software Foundation.  Sun designates this
     7# published by the Free Software Foundation.  Oracle designates this
    88# particular file as subject to the "Classpath" exception as provided
    9 # by Sun in the LICENSE file that accompanied this code.
     9# by Oracle in the LICENSE file that accompanied this code.
    1010#
    1111# This code is distributed in the hope that it will be useful, but WITHOUT
    … …  
    1919# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
    2020#
    21 # Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
    22 # CA 95054 USA or visit www.sun.com if you need additional information or
    23 # have any questions.
     21# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
     22# or visit www.oracle.com if you need additional information or have any
     23# questions.
    2424#
    2525

  • trunk/openjdk/jdk/make/common/shared/Defs-linux.gmk

    r2 r278  
    11#
    2 # Copyright 2005-2007 Sun Microsystems, Inc.  All Rights Reserved.
     2# Copyright (c) 2005, 2007, Oracle and/or its affiliates. All rights reserved.
    33# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
    44#
    55# This code is free software; you can redistribute it and/or modify it
    66# under the terms of the GNU General Public License version 2 only, as
    7 # published by the Free Software Foundation.  Sun designates this
     7# published by the Free Software Foundation.  Oracle designates this
    88# particular file as subject to the "Classpath" exception as provided
    9 # by Sun in the LICENSE file that accompanied this code.
     9# by Oracle in the LICENSE file that accompanied this code.
    1010#
    1111# This code is distributed in the hope that it will be useful, but WITHOUT
    … …  
    1919# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
    2020#
    21 # Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
    22 # CA 95054 USA or visit www.sun.com if you need additional information or
    23 # have any questions.
     21# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
     22# or visit www.oracle.com if you need additional information or have any
     23# questions.
    2424#
    2525

  • trunk/openjdk/jdk/make/common/shared/Defs-solaris.gmk

    r2 r278  
    11#
    2 # Copyright 2005-2007 Sun Microsystems, Inc.  All Rights Reserved.
     2# Copyright (c) 2005, 2007, Oracle and/or its affiliates. All rights reserved.
    33# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
    44#
    55# This code is free software; you can redistribute it and/or modify it
    66# under the terms of the GNU General Public License version 2 only, as
    7 # published by the Free Software Foundation.  Sun designates this
     7# published by the Free Software Foundation.  Oracle designates this
    88# particular file as subject to the "Classpath" exception as provided
    9 # by Sun in the LICENSE file that accompanied this code.
     9# by Oracle in the LICENSE file that accompanied this code.
    1010#
    1111# This code is distributed in the hope that it will be useful, but WITHOUT
    … …  
    1919# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
    2020#
    21 # Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
    22 # CA 95054 USA or visit www.sun.com if you need additional information or
    23 # have any questions.
     21# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
     22# or visit www.oracle.com if you need additional information or have any
     23# questions.
    2424#
    2525

  • trunk/openjdk/jdk/make/common/shared/Defs-utils.gmk

    r18 r278  
    11#
    2 # Copyright 2005-2007 Sun Microsystems, Inc.  All Rights Reserved.
     2# Copyright (c) 2005, 2007, Oracle and/or its affiliates. All rights reserved.
    33# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
    44#
    55# This code is free software; you can redistribute it and/or modify it
    66# under the terms of the GNU General Public License version 2 only, as
    7 # published by the Free Software Foundation.  Sun designates this
     7# published by the Free Software Foundation.  Oracle designates this
    88# particular file as subject to the "Classpath" exception as provided
    9 # by Sun in the LICENSE file that accompanied this code.
     9# by Oracle in the LICENSE file that accompanied this code.
    1010#
    1111# This code is distributed in the hope that it will be useful, but WITHOUT
    … …  
    1919# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
    2020#
    21 # Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
    22 # CA 95054 USA or visit www.sun.com if you need additional information or
    23 # have any questions.
     21# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
     22# or visit www.oracle.com if you need additional information or have any
     23# questions.
    2424#
    2525

  • trunk/openjdk/jdk/make/common/shared/Defs-windows.gmk

    r2 r278  
    11#
    2 # Copyright 2005-2007 Sun Microsystems, Inc.  All Rights Reserved.
     2# Copyright (c) 2005, 2010, Oracle and/or its affiliates. All rights reserved.
    33# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
    44#
    55# This code is free software; you can redistribute it and/or modify it
    66# under the terms of the GNU General Public License version 2 only, as
    7 # published by the Free Software Foundation.  Sun designates this
     7# published by the Free Software Foundation.  Oracle designates this
    88# particular file as subject to the "Classpath" exception as provided
    9 # by Sun in the LICENSE file that accompanied this code.
     9# by Oracle in the LICENSE file that accompanied this code.
    1010#
    1111# This code is distributed in the hope that it will be useful, but WITHOUT
    … …  
    1919# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
    2020#
    21 # Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
    22 # CA 95054 USA or visit www.sun.com if you need additional information or
    23 # have any questions.
     21# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
     22# or visit www.oracle.com if you need additional information or have any
     23# questions.
    2424#
    2525
    … …  
    503503endif
    504504
    505 # DEPLOY_MSSDK: Microsoft SDK for this platform (for deploy)
    506 ifdef ALT_DEPLOY_MSSDK
    507   xALT_DEPLOY_MSSDK :="$(subst \,/,$(ALT_DEPLOY_MSSDK))"
    508   DEPLOY_MSSDK      :=$(call FullPath,$(xALT_DEPLOY_MSSDK))
    509 else
    510   DEPLOY_MSSDK      :=$(_ms_sdk)
    511 endif
    512 DEPLOY_MSSDK:=$(call AltCheckSpaces,DEPLOY_MSSDK)
    513 
    514 # INSTALL_MSSDK: Microsoft Installer SDK for this platform (for install)
    515 ifdef ALT_INSTALL_MSSDK
    516   xALT_INSTALL_MSSDK :="$(subst \,/,$(ALT_INSTALL_MSSDK))"
    517   INSTALL_MSSDK      :=$(call FullPath,$(xALT_INSTALL_MSSDK))
    518 else
    519   INSTALL_MSSDK      :=$(_psdk)
    520 endif
    521 INSTALL_MSSDK:=$(call AltCheckSpaces,INSTALL_MSSDK)
    522 
    523 # INSTALL_MSIVAL2: Installation of MsiVal2 for this platform (for install)
    524 ifdef ALT_INSTALL_MSIVAL2
    525   xALT_INSTALL_MSIVAL2 :="$(subst \,/,$(ALT_INSTALL_MSIVAL2))"
    526   INSTALL_MSIVAL2      :=$(call FullPath,$(xALT_INSTALL_MSIVAL2))
    527 else
    528   INSTALL_MSIVAL2      :=$(_program_files)/MsiVal2
    529 endif
    530 INSTALL_MSIVAL2:=$(call AltCheckSpaces,INSTALL_MSIVAL2)
    531 
    532505# Windows 32bit only
    533506ifeq ($(ARCH_DATA_MODEL), 32)
    534  
     507
    535508  # UNICOWS_DLL_PATH: path to Microsoft Layer for Unicode DLL library
    536509  ifdef ALT_UNICOWS_DLL_PATH
    … …  
    545518  UNICOWS_DLL_PATH:=$(call AltCheckSpaces,UNICOWS_DLL_PATH)
    546519  UNICOWS_DLL_PATH:=$(call AltCheckValue,UNICOWS_DLL_PATH)
    547  
     520
    548521  # UNICOWS_LIB_PATH: path to Microsoft Layer for Unicode LIB library
    549522  ifdef ALT_UNICOWS_LIB_PATH
    … …  
    561534endif
    562535
    563 # WSCRIPT: path to wscript.exe (used in creating install bundles)
    564 ifdef ALT_WSCRIPT
    565   xALT_WSCRIPT :="$(subst \,/,$(ALT_WSCRIPT))"
    566   WSCRIPT  =$(xALT_WSCRIPT)
    567 else
    568   _WSCRIPT1 :=$(_system_root)/system32/wscript.exe
    569   _WSCRIPT2 :=$(DEVTOOLS_PATH)wscript.exe
    570   WSCRIPT  :=$(call FileExists,$(_WSCRIPT1),$(_WSCRIPT2))
    571 endif
    572 WSCRIPT:=$(call AltCheckSpaces,WSCRIPT)
    573 
    574 # CSCRIPT: path to cscript.exe (used in creating install bundles)
    575 ifdef ALT_CSCRIPT
    576   xALT_CSCRIPT :="$(subst \,/,$(ALT_CSCRIPT))"
    577   CSCRIPT  =$(xALT_CSCRIPT)
    578 else
    579   _CSCRIPT1 :=$(_system_root)/system32/cscript.exe
    580   _CSCRIPT2 :=$(DEVTOOLS_PATH)cscript.exe
    581   CSCRIPT  :=$(call FileExists,$(_CSCRIPT1),$(_CSCRIPT2))
    582 endif
    583 CSCRIPT:=$(call AltCheckSpaces,CSCRIPT)
    584 
    585 # MSIVAL2: path to msival2.exe (used in validating install msi files)
    586 ifdef ALT_MSIVAL2
    587   xALT_MSIVAL2 :="$(subst \,/,$(ALT_MSIVAL2))"
    588   MSIVAL2  =$(xALT_MSIVAL2)
    589 else
    590   _MSIVAL2_1 :=$(INSTALL_MSIVAL2)/msival2.exe
    591   _MSIVAL2_2 :=$(DEVTOOLS_PATH)msival2.exe
    592   MSIVAL2    :=$(call FileExists,$(_MSIVAL2_1),$(_MSIVAL2_2))
    593 endif
    594 MSIVAL2:=$(call AltCheckSpaces,MSIVAL2)
    595 
    596 # LOGOCUB: path to cub file for (used in validating install msi files)
    597 ifdef ALT_LOGOCUB
    598   xALT_LOGOCUB :="$(subst \,/,$(ALT_LOGOCUB))"
    599   LOGOCUB  =$(xALT_LOGOCUB)
    600 else
    601   _LOGOCUB1 :=$(INSTALL_MSIVAL2)/logo.cub
    602   _LOGOCUB2 :=$(DEVTOOLS_PATH)logo.cub
    603   LOGOCUB   :=$(call FileExists,$(_LOGOCUB1),$(_LOGOCUB2))
    604 endif
    605 LOGOCUB:=$(call AltCheckSpaces,LOGOCUB)
    606 
    607 # MSITRAN: path to msitran.exe (used in creating install bundles and sponsors)
    608 ifdef ALT_MSITRAN
    609   xALT_MSITRAN :="$(subst \,/,$(ALT_MSITRAN))"
    610   MSITRAN  =$(xALT_MSITRAN)
    611 else
    612   _MSITRAN1 :=$(INSTALL_MSSDK)/Bin/msitran.exe
    613   _MSITRAN2 :=$(DEVTOOLS_PATH)msitran.exe
    614   MSITRAN   :=$(call FileExists,$(_MSITRAN1),$(_MSITRAN2))
    615 endif
    616 MSITRAN:=$(call AltCheckSpaces,MSITRAN)
    617 
    618 # MSICERT: path to msicert.exe (used in creating install bundles)
    619 ifdef ALT_MSICERT
    620   xALT_MSICERT :="$(subst \,/,$(ALT_MSICERT))"
    621   MSICERT  =$(xALT_MSICERT)
    622 else
    623   _MSICERT1 :=$(INSTALL_MSSDK)/Bin/msicert.exe
    624   _MSICERT2 :=$(DEVTOOLS_PATH)msicert.exe
    625   MSICERT   :=$(call FileExists,$(_MSICERT1),$(_MSICERT2))
    626 endif
    627 MSICERT:=$(call AltCheckSpaces,MSICERT)
    628 
    629536# Import JDK images allow for partial builds, components not built are
    630537#    imported (or copied from) these import areas when needed.

  • trunk/openjdk/jdk/make/common/shared/Defs.gmk

    r9 r278  
    11#
    2 # Copyright 2005-2007 Sun Microsystems, Inc.  All Rights Reserved.
     2# Copyright (c) 2005, 2007, Oracle and/or its affiliates. All rights reserved.
    33# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
    44#
    55# This code is free software; you can redistribute it and/or modify it
    66# under the terms of the GNU General Public License version 2 only, as
    7 # published by the Free Software Foundation.  Sun designates this
     7# published by the Free Software Foundation.  Oracle designates this
    88# particular file as subject to the "Classpath" exception as provided
    9 # by Sun in the LICENSE file that accompanied this code.
     9# by Oracle in the LICENSE file that accompanied this code.
    1010#
    1111# This code is distributed in the hope that it will be useful, but WITHOUT
    … …  
    1919# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
    2020#
    21 # Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
    22 # CA 95054 USA or visit www.sun.com if you need additional information or
    23 # have any questions.
     21# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
     22# or visit www.oracle.com if you need additional information or have any
     23# questions.
    2424#
    2525
    … …  
    205205  PRODUCT_SUFFIX = SE Runtime Environment
    206206  JDK_RC_PLATFORM_NAME = Platform SE
    207   COMPANY_NAME = Sun Microsystems, Inc.
     207  COMPANY_NAME = Oracle
    208208endif
    209209

  • trunk/openjdk/jdk/make/common/shared/Platform.gmk

    r261 r278  
    11#
    2 # Copyright 1997-2007 Sun Microsystems, Inc.  All Rights Reserved.
     2# Copyright (c) 1997, 2010, Oracle and/or its affiliates. All rights reserved.
    33# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
    44#
    55# This code is free software; you can redistribute it and/or modify it
    66# under the terms of the GNU General Public License version 2 only, as
    7 # published by the Free Software Foundation.  Sun designates this
     7# published by the Free Software Foundation.  Oracle designates this
    88# particular file as subject to the "Classpath" exception as provided
    9 # by Sun in the LICENSE file that accompanied this code.
     9# by Oracle in the LICENSE file that accompanied this code.
    1010#
    1111# This code is distributed in the hope that it will be useful, but WITHOUT
    … …  
    1919# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
    2020#
    21 # Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
    22 # CA 95054 USA or visit www.sun.com if you need additional information or
    23 # have any questions.
     21# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
     22# or visit www.oracle.com if you need additional information or have any
     23# questions.
    2424#
    2525
    … …  
    5454#     OS_NAME                     solaris, linux, or nt
    5555#     OS_VERSION                  specific version of os, 5.10, 2.4.9-e.3, etc.
    56 #     OS_VENDOR                   company name
    5756#     TEMP_DISK                   /tmp or C:/temp
    5857#     ARCH_DATA_MODEL             32 or 64
    … …  
    167166  # Suffix for file bundles used in previous release
    168167  BUNDLE_FILE_SUFFIX=.tar
    169   OS_VENDOR = Sun Microsystems
    170168  # Required Solaris version
    171169  ifeq ($(ARCH), amd64)
    … …  
    254252  REQUIRED_FREE_SPACE=1460000
    255253  LINUX_VERSION_INFO = /etc/redhat-release
    256   OS_VENDOR = Red Hat
    257254  ifeq ($(ARCH_DATA_MODEL), 32)
    258255    REQUIRED_LINUX_VER = Advanced Server
    … …  
    262259    ifeq ($(ARCH), amd64)
    263260      LINUX_VERSION_INFO = /etc/SuSE-release
    264       OS_VENDOR = SuSE Enterprise
    265261      REQUIRED_LINUX_VER = 8.1
    266262      REQUIRED_LINUX_FULLVER = $(REQUIRED_LINUX_VER) SLSE AMD64
    … …  
    342338  ARCH_FAMILY = $(ARCH)
    343339  # Where is unwanted output to be delivered?
    344   DEV_NULL = NUL
     340  ifeq ($(USING_CYGWIN),true)
     341    DEV_NULL = /dev/null
     342  else
     343    DEV_NULL = NUL
     344  endif
    345345  export DEV_NULL
    346346  # Classpath separator
    … …  
    379379  ISHIELD_TEMP_MIN=250000
    380380  REQUIRED_DXSDK_VER = 0x0700
    381   OS_VENDOR = Microsoft
    382381  # How much RAM does this machine have:
    383382  MB_OF_MEMORY := $(shell \

  • trunk/openjdk/jdk/make/common/shared/Sanity-Settings.gmk

    r27 r278  
    11#
    2 # Copyright 2005-2007 Sun Microsystems, Inc.  All Rights Reserved.
     2# Copyright (c) 2005, 2010, Oracle and/or its affiliates. All rights reserved.
    33# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
    44#
    55# This code is free software; you can redistribute it and/or modify it
    66# under the terms of the GNU General Public License version 2 only, as
    7 # published by the Free Software Foundation.  Sun designates this
     7# published by the Free Software Foundation.  Oracle designates this
    88# particular file as subject to the "Classpath" exception as provided
    9 # by Sun in the LICENSE file that accompanied this code.
     9# by Oracle in the LICENSE file that accompanied this code.
    1010#
    1111# This code is distributed in the hope that it will be useful, but WITHOUT
    … …  
    1919# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
    2020#
    21 # Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
    22 # CA 95054 USA or visit www.sun.com if you need additional information or
    23 # have any questions.
     21# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
     22# or visit www.oracle.com if you need additional information or have any
     23# questions.
    2424#
    2525
    … …  
    234234  ALL_SETTINGS+=$(call addAltSetting,DXSDK_INCLUDE_PATH)
    235235  ALL_SETTINGS+=$(call addAltSetting,DXSDK_LIB_PATH)
    236   ifeq ($(ARCH_DATA_MODEL), 32)
    237     ALL_SETTINGS+=$(call addAltSetting,UNICOWS_DLL_PATH)
    238     ALL_SETTINGS+=$(call addAltSetting,UNICOWS_LIB_PATH)
    239   endif
    240   ifndef OPENJDK
    241     ALL_SETTINGS+=$(call addAltSetting,DEPLOY_MSSDK)
    242     ALL_SETTINGS+=$(call addAltSetting,INSTALL_MSSDK)
    243     ALL_SETTINGS+=$(call addAltSetting,WSCRIPT)
    244     ALL_SETTINGS+=$(call addAltSetting,MSICERT)
    245     ALL_SETTINGS+=$(call addAltSetting,MSITRAN)
    246     ALL_SETTINGS+=$(call addAltSetting,MSIVAL2)
    247   endif
    248236endif
    249237ifeq ($(PLATFORM),os2)
    … …  
    262250  ALL_SETTINGS+=$(call addAltSetting,FREETYPE_HEADERS_PATH)
    263251  ALL_SETTINGS+=$(call addAltSetting,FREETYPE_LIB_PATH)
    264   ALL_SETTINGS+=$(call addHeading,OPENJDK Import Binary Plug Settings)
    265   ALL_SETTINGS+=$(call addAltSetting,BINARY_PLUGS_JARFILE)
    266   ALL_SETTINGS+=$(call addAltSetting,BINARY_PLUGS_PATH)
    267   ALL_SETTINGS+=$(call addAltSetting,BUILD_BINARY_PLUGS_PATH)
    268 else
    269   ALL_SETTINGS+=$(call addHeading,OPENJDK Export Binary Plug Settings)
    270   ALL_SETTINGS+=$(call addOptionalSetting,PLUG_EXPORT_DIRNAME)
    271252endif
    272253ALL_SETTINGS+=$(call addOptionalSetting,PLUG_LIBRARY_NAMES)

  • trunk/openjdk/jdk/make/common/shared/Sanity.gmk

    r27 r278  
    11#
    2 # Copyright 2005-2010 Sun Microsystems, Inc.  All Rights Reserved.
     2# Copyright (c) 2005, 2010, Oracle and/or its affiliates. All rights reserved.
    33# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
    44#
    55# This code is free software; you can redistribute it and/or modify it
    66# under the terms of the GNU General Public License version 2 only, as
    7 # published by the Free Software Foundation.  Sun designates this
     7# published by the Free Software Foundation.  Oracle designates this
    88# particular file as subject to the "Classpath" exception as provided
    9 # by Sun in the LICENSE file that accompanied this code.
     9# by Oracle in the LICENSE file that accompanied this code.
    1010#
    1111# This code is distributed in the hope that it will be useful, but WITHOUT
    … …  
    1919# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
    2020#
    21 # Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
    22 # CA 95054 USA or visit www.sun.com if you need additional information or
    23 # have any questions.
     21# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
     22# or visit www.oracle.com if you need additional information or have any
     23# questions.
    2424#
    2525
    … …  
    144144        sane-java_home \
    145145        sane-fonts \
    146         sane-binary-plugs \
    147146        sane-variant \
    148147        sane-ld_library_path \
    … …  
    474473
    475474######################################################
    476 # If building OPENJDK check pre-built binaries are
    477 # available for binary plug source components.
    478 ######################################################
    479 ifdef OPENJDK
    480 sane-binary-plugs:
    481 ifeq ($(IMPORT_BINARY_PLUGS),true)
    482         @if [ ! -d "$(BINARY_PLUGS_PATH)" ]; then \
    483           $(ECHO) "ERROR: Can't locate pre-built libraries. \n" \
    484             "      Please check your access to \n" \
    485             "          $(BINARY_PLUGS_PATH) \n" \
    486             "      and/or check your value of ALT_BINARY_PLUGS_PATH. \n" \
    487            "" >> $(ERROR_FILE); \
    488         fi
    489 endif
    490 endif
    491 
    492 ######################################################
    493475# VARIANT must be set to DBG or OPT
    494476######################################################
    … …  
    14871469
    14881470######################################################
    1489 # Check for existence of DEPLOY_MSSDK on windows
    1490 ######################################################
    1491 sane-mssdk_path:
    1492 ifeq ($(PLATFORM), windows)
    1493         @if [ -z "$(DEPLOY_MSSDK)" ]; then \
    1494           $(ECHO) "WARNING: Your DEPLOY_MSSDK setting is empty.\n" \
    1495             "        It is recommended to set ALT_DEPLOY_MSSDK.\n" \
    1496             "" >> $(WARNING_FILE) ; \
    1497         fi
    1498         @if [ ! -r "$(DEPLOY_MSSDK)" ]; then \
    1499           $(ECHO) "ERROR: You do not have a valid DEPLOY_MSSDK setting. \n" \
    1500             "      Please check your access to \n" \
    1501             "          $(DEPLOY_MSSDK) \n" \
    1502             "      and/or check your value of ALT_DEPLOY_MSSDK. \n" \
    1503             "" >> $(ERROR_FILE) ; \
    1504         fi
    1505 endif
    1506 
    1507 ######################################################
    1508 # Check for existence of INSTALL_MSSDK on windows
    1509 ######################################################
    1510 sane-install-mssdk_path:
    1511 ifeq ($(PLATFORM), windows)
    1512         @if [ -z "$(INSTALL_MSSDK)" ]; then \
    1513           $(ECHO) "WARNING: Your INSTALL_MSSDK setting is empty.\n" \
    1514             "        It is recommended to set ALT_INSTALL_MSSDK.\n" \
    1515             "" >> $(WARNING_FILE) ; \
    1516         fi
    1517         @if [ ! -r "$(INSTALL_MSSDK)" ]; then \
    1518           $(ECHO) "ERROR: You do not have a valid INSTALL_MSSDK setting. \n" \
    1519             "      Please check your access to \n" \
    1520             "          $(INSTALL_MSSDK) \n" \
    1521             "      and/or check your value of ALT_INSTALL_MSSDK. \n" \
    1522             "" >> $(ERROR_FILE) ; \
    1523         fi
    1524 endif
    1525 
    1526 ######################################################
    1527 # Check for existence of INSTALL_MSIVAL2 on windows
    1528 ######################################################
    1529 sane-install-msival2_path:
    1530 ifeq ($(PLATFORM), windows)
    1531         @if [ -z "$(INSTALL_MSIVAL2)" ]; then \
    1532           $(ECHO) "WARNING: Your INSTALL_MSIVAL2 setting is empty.\n" \
    1533             "        It is recommended to set ALT_INSTALL_MSIVAL2.\n" \
    1534             "" >> $(WARNING_FILE) ; \
    1535         fi
    1536         @if [ ! -r "$(INSTALL_MSIVAL2)" ]; then \
    1537           $(ECHO) "ERROR: You do not have a valid INSTALL_MSIVAL2 setting. \n" \
    1538             "      Please check your access to \n" \
    1539             "          $(INSTALL_MSIVAL2) \n" \
    1540             "      and/or check your value of ALT_INSTALL_MSIVAL2. \n" \
    1541             "" >> $(ERROR_FILE) ; \
    1542         fi
    1543 endif
    1544 
    1545 ######################################################
    15461471# Check the Solaris GNU c++ compiler for solaris plugin
    15471472######################################################
Note: See TracChangeset for help on using the changeset viewer.