Changeset 278 for trunk/openjdk/make


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:
18 edited
2 copied

Legend:

Unmodified
Added
Removed

  • trunk/openjdk

  • trunk/openjdk/make/Defs-internal.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
    … …  
    2929#
    3030
     31# Always true
     32OPENJDK=true
     33
    3134# Define absolute paths to TOPDIRs
    32 ABS_CONTROL_TOPDIR:=$(call OptFullPath,"$(CONTROL_TOPDIR)")
    3335ABS_LANGTOOLS_TOPDIR:=$(call OptFullPath,"$(LANGTOOLS_TOPDIR)")
    3436ABS_CORBA_TOPDIR:=$(call OptFullPath,"$(CORBA_TOPDIR)")
    … …  
    3739ABS_JDK_TOPDIR:=$(call OptFullPath,"$(JDK_TOPDIR)")
    3840ABS_HOTSPOT_TOPDIR:=$(call OptFullPath,"$(HOTSPOT_TOPDIR)")
    39 ABS_INSTALL_TOPDIR:=$(call OptFullPath,"$(INSTALL_TOPDIR)")
    40 ABS_SPONSORS_TOPDIR:=$(call OptFullPath,"$(SPONSORS_TOPDIR)")
    41 ABS_DEPLOY_TOPDIR:=$(call OptFullPath,"$(DEPLOY_TOPDIR)")
    4241
    4342# Macro to return true or false if a file exists and is readable
    … …  
    9594  BUILD_JDK := $(JDK_SRC_AVAILABLE)
    9695endif
    97 ifeq ($(JDK_SRC_AVAILABLE),true)
    98   JDK_CLOSED_SRC_AVAILABLE := $(call MkExists,$(JDK_TOPDIR)/src/closed)
    99   ifndef OPENJDK
    100     ifeq ($(JDK_CLOSED_SRC_AVAILABLE),false)
    101       OPENJDK = true
    102     endif
    103   endif
     96
     97# These could be over-ridden on the command line or in environment
     98ifndef SKIP_PRODUCT_BUILD
     99  SKIP_PRODUCT_BUILD = false
    104100endif
    105 
    106 DEPLOY_SRC_AVAILABLE := $(call MkExists,$(DEPLOY_TOPDIR)/make/Makefile)
    107 ifndef BUILD_DEPLOY
    108   BUILD_DEPLOY := $(DEPLOY_SRC_AVAILABLE)
     101ifndef SKIP_FASTDEBUG_BUILD
     102  SKIP_FASTDEBUG_BUILD = true
    109103endif
    110 
    111 INSTALL_SRC_AVAILABLE := $(call MkExists,$(INSTALL_TOPDIR)/make/Makefile)
    112 ifndef BUILD_INSTALL
    113   ifdef DEV_ONLY
    114     BUILD_INSTALL := false
    115   else
    116     BUILD_INSTALL := $(INSTALL_SRC_AVAILABLE)
    117   endif
     104ifndef SKIP_DEBUG_BUILD
     105  SKIP_DEBUG_BUILD = true
    118106endif
    119 
    120 SPONSORS_SRC_AVAILABLE := $(call MkExists,$(SPONSORS_TOPDIR)/make/Makefile)
    121 ifndef BUILD_SPONSORS
    122   ifdef DEV_ONLY
    123     BUILD_SPONSORS := false
    124   else
    125     BUILD_SPONSORS := $(SPONSORS_SRC_AVAILABLE)
    126   endif
    127 endif
    128 
    129 
    130 # Do we build the source and openjdk binary plug bundles?
    131 BUNDLE_RULES = $(JDK_TOPDIR)/make/closed/bundles.gmk
    132 BUNDLE_RULES_AVAILABLE := $(call MkExists,$(BUNDLE_RULES))
    133 
    134 # Current things we do NOT build for OPENJDK
    135 ifdef OPENJDK
    136   BUILD_DEPLOY = false
    137   BUILD_INSTALL = false
    138   BUILD_SPONSORS = false
    139   BUNDLE_RULES_AVAILABLE := false
    140   # These could be over-ridden on the command line or in environment
    141   ifndef SKIP_FASTDEBUG_BUILD
    142     SKIP_FASTDEBUG_BUILD = true
    143   endif
    144   ifndef SKIP_DEBUG_BUILD
    145     SKIP_DEBUG_BUILD = true
    146   endif
    147   ifndef SKIP_COMPARE_IMAGES
    148     SKIP_COMPARE_IMAGES = true
    149   endif
    150   SKIP_OPENJDK_BUILD = true
    151 else
    152   ifndef SKIP_OPENJDK_BUILD
    153     SKIP_OPENJDK_BUILD = false
    154   endif
     107ifndef SKIP_COMPARE_IMAGES
     108  SKIP_COMPARE_IMAGES = true
    155109endif
    156110
    … …  
    160114    SKIP_COMPARE_IMAGES = true
    161115  endif
    162   ifeq ($(BUILD_DEPLOY), false)
    163     SKIP_COMPARE_IMAGES = true
    164   endif
    165   ifeq ($(BUILD_INSTALL), false)
    166     SKIP_COMPARE_IMAGES = true
    167   endif
    168116  ifdef DEV_ONLY
    169117    SKIP_COMPARE_IMAGES = true
    170118  endif
    171 endif
    172 
    173 # Select defaults if these are not set to true or false
    174 ifndef SKIP_DEBUG_BUILD
    175   SKIP_DEBUG_BUILD=true
    176 endif
    177 ifndef SKIP_FASTDEBUG_BUILD
    178   SKIP_FASTDEBUG_BUILD=false
    179119endif
    180120
    … …  
    241181endif
    242182
    243 ifdef FINDBUGS_HOME
    244   COMMON_BUILD_ARGUMENTS += FINDBUGS_HOME="$(FINDBUGS_HOME)"
    245 endif
    246 
    247 

  • trunk/openjdk/make/corba-rules.gmk

    r2 r278  
    11#
    2 # Copyright 2001-2007 Sun Microsystems, Inc.  All Rights Reserved.
     2# Copyright (c) 2001, 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/make/deploy-rules.gmk

    r2 r278  
    11#
    2 # Copyright 2002-2007 Sun Microsystems, Inc.  All Rights Reserved.
     2# Copyright (c) 2002, 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/make/hotspot-rules.gmk

    r2 r278  
    11#
    2 # Copyright 2001-2007 Sun Microsystems, Inc.  All Rights Reserved.
     2# Copyright (c) 2001, 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
    … …  
    7474
    7575ifeq ($(ZERO_BUILD), true)
    76   HOTSPOT_TARGET := $(HOTSPOT_TARGET)zero
     76  ifeq ($(SHARK_BUILD), true)
     77    HOTSPOT_TARGET := $(HOTSPOT_TARGET)shark
     78  else
     79    HOTSPOT_TARGET := $(HOTSPOT_TARGET)zero
     80  endif
    7781endif
    7882

  • trunk/openjdk/make/install-rules.gmk

    r2 r278  
    11#
    2 # Copyright 2002-2007 Sun Microsystems, Inc.  All Rights Reserved.
     2# Copyright (c) 2002, 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/make/jaxp-rules.gmk

    r2 r278  
    11#
    2 # Copyright 2001-2007 Sun Microsystems, Inc.  All Rights Reserved.
     2# Copyright (c) 2001, 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/make/jaxws-rules.gmk

    r2 r278  
    11#
    2 # Copyright 2001-2007 Sun Microsystems, Inc.  All Rights Reserved.
     2# Copyright (c) 2001, 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/make/jdk-rules.gmk

    r2 r278  
    11#
    2 # Copyright 2001-2007 Sun Microsystems, Inc.  All Rights Reserved.
     2# Copyright (c) 2001, 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/make/jprt.gmk

    r2 r278  
    11#
    2 # Copyright 2006-2007 Sun Microsystems, Inc.  All Rights Reserved.
     2# Copyright (c) 2006, 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
    … …  
    4646
    4747jprt_build_fastdebug: fastdebug_build
    48         ( $(CD) $(OUTPUTDIR)-fastdebug/j2sdk-image && \
     48        ( $(CD) $(OUTPUTDIR)/../$(PLATFORM)-$(ARCH)-fastdebug/j2sdk-image && \
    4949          $(ZIPEXE) -q -r $(JPRT_ARCHIVE_BUNDLE) . )
    5050
    5151jprt_build_debug: debug_build
    52         ( $(CD) $(OUTPUTDIR)-debug/j2sdk-image && \
     52        ( $(CD) $(OUTPUTDIR)/../$(PLATFORM)-$(ARCH)-debug/j2sdk-image && \
    5353          $(ZIPEXE) -q -r $(JPRT_ARCHIVE_BUNDLE) . )
    5454

  • trunk/openjdk/make/jprt.properties

    r2 r278  
    11#
    2 # Copyright 2006-2009 Sun Microsystems, Inc.  All Rights Reserved.
     2# Copyright (c) 2006, 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
    … …  
    2727jprt.tools.default.release=openjdk6
    2828
    29 # Specific platform list
     29# Specific platform list (For now, Solaris 10 sparc, Solaris 10 x86)
    3030jprt.build.platforms=\
    31 solaris_sparc_5.8,\
    32 solaris_sparcv9_5.8,\
    33 solaris_i586_5.8,\
     31solaris_sparc_5.10,\
     32solaris_sparcv9_5.10,\
     33solaris_i586_5.10,\
    3434solaris_x64_5.10,\
    3535linux_i586_2.6,\
    … …  
    4040# The different build flavors we want
    4141jprt.build.flavors=product,fastdebug
     42jprt.run.flavors=c1,c2
     43jprt.solaris_sparcv9.run.flavors=c2
     44jprt.solaris_x64.run.flavors=c2
     45jprt.windows_x64.run.flavors=c2
     46jprt.linux_x64.run.flavors=c2
     47jprt.run.flavor.c1.option=-client
     48jprt.run.flavor.c2.option=-server
    4249
    43 # Explicitly designate what the 32bit match is for the 64bit build
    44 jprt.solaris_sparcv9.build.platform.match32=solaris_sparc_5.8
    45 jprt.solaris_sparcv9_5.8.build.platform.match32=solaris_sparc_5.8
    46 jprt.solaris_sparcv9_5.10.build.platform.match32=solaris_sparc_5.8
    47 jprt.solaris_x64.build.platform.match32=solaris_i586_5.8
    48 jprt.solaris_x64_5.8.build.platform.match32=solaris_i586_5.8
    49 jprt.solaris_x64_5.10.build.platform.match32=solaris_i586_5.8
     50# Shortened list of vm tests
     51jprt.test.targets=              \
     52  *-product-*-jvm98,            \
     53  *-product-*-scimark,          \
     54  *-product-*-runThese,         \
     55  *-product-*-GCBasher_default, \
     56  *-product-*-GCOld_default,    \
     57  *-product-*-jbb_default
    5058
    51 # Standard list of jprt test targets for this workspace
    52 jprt.test.targets=*-*-*-jvm98
     59# Test targets in test/Makefile
     60#   Not ready yet:   *-product-*-langtools_jtreg
     61jprt.make.rule.test.targets=   \
     62  *-product-*-jdk_beans1,      \
     63  *-product-*-jdk_beans2,      \
     64  *-product-*-jdk_beans3,      \
     65  *-product-*-jdk_io,          \
     66  *-product-*-jdk_lang,        \
     67  *-product-*-jdk_management1, \
     68  *-product-*-jdk_management2, \
     69  *-product-*-jdk_math,        \
     70  *-product-*-jdk_misc,        \
     71  *-product-*-jdk_net,         \
     72  *-product-*-jdk_nio,         \
     73  *-product-*-jdk_security1,   \
     74  *-product-*-jdk_security2,   \
     75  *-product-*-jdk_security3,   \
     76  *-product-*-jdk_text,        \
     77  *-product-*-jdk_tools1,      \
     78  *-product-*-jdk_tools2,      \
     79  *-product-*-jdk_util
    5380
    54 # Directories needed to build
    55 jprt.bundle.exclude.src.dirs=build dist
     81# Not Ready Yet:
     82#   *-product-*-jdk_awt
     83#   *-product-*-jdk_rmi
     84#   *-product-*-jdk_swing
    5685
     86# Directories to be excluded from source bundles
     87jprt.bundle.exclude.src.dirs=build dist webrev
     88

  • trunk/openjdk/make/langtools-rules.gmk

    r2 r278  
    11#
    2 # Copyright 2001-2007 Sun Microsystems, Inc.  All Rights Reserved.
     2# Copyright (c) 2001, 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/make/motif-rules.gmk

    r2 r278  
    11#
    2 # Copyright 2001-2007 Sun Microsystems, Inc.  All Rights Reserved.
     2# Copyright (c) 2001, 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/make/sanity-rules.gmk

    r2 r278  
    11#
    2 # Copyright 2001-2007 Sun Microsystems, Inc.  All Rights Reserved.
     2# Copyright (c) 2001, 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
    … …  
    3434endif
    3535
    36 ifeq ($(BUILD_DEPLOY), true)
    37   sanity:: deploy-sanity
    38 endif
    39 
    4036ifeq ($(BUILD_JDK), true)
    4137  sanity:: jdk-sanity
    4238endif
    4339
    44 # Only need these sanity rules when not doing a debug build
    45 ifeq ($(DEBUG_NAME),)
    46 
    47   ifeq ($(BUILD_INSTALL), true)
    48     sanity:: install-sanity
    49   endif
    50 
    51   ifeq ($(BUILD_SPONSORS), true)
    52     sanity:: sponsors-sanity
    53   endif
    54 
    55 endif
    56 
    5740sanity:: post-sanity
    5841
    … …  
    6851
    6952# this should be the last rule in any target's sanity rule.
    70 post-sanity post-sanity-hotspot post-sanity-jdk post-sanity-motif post-sanity-install post-sanity-deploy:
     53post-sanity post-sanity-hotspot post-sanity-jdk:
    7154        @if [ -r $(MESSAGE_FILE) ]; then \
    7255          $(ECHO) "" ; \
    … …  
    191174  endif
    192175endif
    193 ifeq ($(DEPLOY_SRC_AVAILABLE), true)
    194   ifneq ($(BUILD_DEPLOY), true)
    195         @$(ECHO) "WARNING: You are not building the DEPLOY sources.\n" \
    196            "        This will result in a development-only\n" \
    197            "        build of the JDK, lacking the plugin and javaws binaries.\n" \
    198            "" >> $(WARNING_FILE)
    199   endif
    200 endif
    201 ifeq ($(INSTALL_SRC_AVAILABLE), true)
    202   ifneq ($(BUILD_INSTALL), true)
    203         @$(ECHO) "WARNING: You are not building the INSTALL sources.\n" \
    204            "        This will result in a development-only\n" \
    205            "        build of the JDK, lacking the installation bundles\n" \
    206            "" >> $(WARNING_FILE)
    207   endif
    208 endif
    209 ifeq ($(SPONSORS_SRC_AVAILABLE), true)
    210   ifneq ($(BUILD_SPONSORS), true)
    211         @$(ECHO) "WARNING: You are not building the SPONSORS sources.\n" \
    212            "" >> $(WARNING_FILE)
    213   endif
    214 endif
    215 ifndef OPENJDK
    216   ifdef NO_DOCS
     176ifdef NO_DOCS
    217177        @$(ECHO) "WARNING: Your build environment has the variable NO_DOCS\n" \
    218178           "        defined. This will result in a development-only\n" \
    … …  
    220180           "        build.\n" \
    221181           "" >> $(WARNING_FILE)
    222   endif
    223182endif
    224183ifdef NO_IMAGES
    … …  
    295254        @$(ECHO) "   CWD = `$(PWD)`" >> $(MESSAGE_FILE)
    296255        @$(ECHO) "   TOPDIR = $(TOPDIR)"  >> $(MESSAGE_FILE)
    297         @$(ECHO) "   CONTROL_TOPDIR = $(CONTROL_TOPDIR)"  >> $(MESSAGE_FILE)
    298256ifeq ($(LANGTOOLS_SRC_AVAILABLE), true)
    299257        @$(ECHO) "   LANGTOOLS_TOPDIR = $(LANGTOOLS_TOPDIR)"  >> $(MESSAGE_FILE)
    … …  
    316274ifeq ($(MOTIF_SRC_AVAILABLE), true)
    317275        @$(ECHO) "   MOTIF_TOPDIR = $(MOTIF_TOPDIR)"  >> $(MESSAGE_FILE)
    318 endif
    319 ifeq ($(DEPLOY_SRC_AVAILABLE), true)
    320         @$(ECHO) "   DEPLOY_TOPDIR = $(DEPLOY_TOPDIR)"  >> $(MESSAGE_FILE)
    321 endif
    322 ifeq ($(INSTALL_SRC_AVAILABLE), true)
    323         @$(ECHO) "   INSTALL_TOPDIR = $(INSTALL_TOPDIR)"  >> $(MESSAGE_FILE)
    324 endif
    325 ifeq ($(SPONSORS_SRC_AVAILABLE), true)
    326         @$(ECHO) "   SPONSORS_TOPDIR = $(SPONSORS_TOPDIR)"  >> $(MESSAGE_FILE)
    327276endif
    328277        @$(ECHO) "" >> $(MESSAGE_FILE)
    … …  
    352301        @$(ECHO) "   BUILD_JDK    = $(BUILD_JDK) " >> $(MESSAGE_FILE)
    353302endif
    354 ifeq ($(DEPLOY_SRC_AVAILABLE), true)
    355         @$(ECHO) "   BUILD_DEPLOY  = $(BUILD_DEPLOY) " >> $(MESSAGE_FILE)
    356 endif
    357 ifeq ($(INSTALL_SRC_AVAILABLE), true)
    358         @$(ECHO) "   BUILD_INSTALL = $(BUILD_INSTALL) " >> $(MESSAGE_FILE)
    359 endif
    360 ifeq ($(SPONSORS_SRC_AVAILABLE), true)
    361         @$(ECHO) "   BUILD_SPONSORS = $(BUILD_SPONSORS) " >> $(MESSAGE_FILE)
    362 endif
    363303        @$(ECHO) "   DEBUG_CLASSFILES = $(DEBUG_CLASSFILES) " >> $(MESSAGE_FILE)
    364304        @$(ECHO) "   DEBUG_BINARIES = $(DEBUG_BINARIES) " >> $(MESSAGE_FILE)
    … …  
    366306
    367307.PHONY: sanity settings pre-sanity insane \
    368         post-sanity post-sanity-hotspot post-sanity-jdk post-sanity-motif \
    369         post-sanity-install post-sanity-deploy \
     308        post-sanity post-sanity-hotspot post-sanity-jdk \
    370309        alt_bootdir bootdir

  • trunk/openjdk/make/sponsors-rules.gmk

    r2 r278  
    11#
    2 # Copyright 2006-2007 Sun Microsystems, Inc.  All Rights Reserved.
     2# Copyright (c) 2006, 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/make/templates/bsd-header

    r2 r278  
    1212    documentation and/or other materials provided with the distribution.
    1313
    14   - Neither the name of Sun Microsystems nor the names of its
     14  - Neither the name of Oracle nor the names of its
    1515    contributors may be used to endorse or promote products derived
    1616    from this software without specific prior written permission.

  • trunk/openjdk/make/templates/gpl-cp-header

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

  • trunk/openjdk/make/templates/gpl-header

    r2 r278  
    1 Copyright %YEARS% Sun Microsystems, Inc.  All Rights Reserved.
     1Copyright (c) %YEARS%, Oracle and/or its affiliates. All rights reserved.
    22DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
    33
    … …  
    1616Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
    1717
    18 Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
    19 CA 95054 USA or visit www.sun.com if you need additional information or
    20 have any questions.
     18Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
     19or visit www.oracle.com if you need additional information or have any
     20questions.
Note: See TracChangeset for help on using the changeset viewer.