8005347: build-infra: Verify 'gnumake source' at the top level works ok

Wed, 02 Jan 2013 11:29:29 +0100

author
erikj
date
Wed, 02 Jan 2013 11:29:29 +0100
changeset 562
14d7ebe42c8d
parent 561
abc8078e070b
child 563
348a881c6da0

8005347: build-infra: Verify 'gnumake source' at the top level works ok
Reviewed-by: tbell, ohair, dholmes

common/autoconf/basics.m4 file | annotate | diff | comparison | revisions
common/autoconf/closed.version.numbers file | annotate | diff | comparison | revisions
common/autoconf/generated-configure.sh file | annotate | diff | comparison | revisions
common/autoconf/jdk-options.m4 file | annotate | diff | comparison | revisions
common/autoconf/spec.gmk.in file | annotate | diff | comparison | revisions
common/autoconf/version-numbers file | annotate | diff | comparison | revisions
common/autoconf/version.numbers file | annotate | diff | comparison | revisions
     1.1 --- a/common/autoconf/basics.m4	Tue Jan 01 14:13:18 2013 +0100
     1.2 +++ b/common/autoconf/basics.m4	Wed Jan 02 11:29:29 2013 +0100
     1.3 @@ -1,5 +1,5 @@
     1.4  #
     1.5 -# Copyright (c) 2011, 2012, Oracle and/or its affiliates. All rights reserved.
     1.6 +# Copyright (c) 2011, 2013, Oracle and/or its affiliates. All rights reserved.
     1.7  # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
     1.8  #
     1.9  # This code is free software; you can redistribute it and/or modify it
    1.10 @@ -234,7 +234,9 @@
    1.11  BASIC_REQUIRE_PROG(CAT, cat)
    1.12  BASIC_REQUIRE_PROG(CHMOD, chmod)
    1.13  BASIC_REQUIRE_PROG(CMP, cmp)
    1.14 +BASIC_REQUIRE_PROG(COMM, comm)
    1.15  BASIC_REQUIRE_PROG(CP, cp)
    1.16 +BASIC_REQUIRE_PROG(CPIO, cpio)
    1.17  BASIC_REQUIRE_PROG(CUT, cut)
    1.18  BASIC_REQUIRE_PROG(DATE, date)
    1.19  BASIC_REQUIRE_PROG(DIFF, [gdiff diff])
     2.1 --- a/common/autoconf/closed.version.numbers	Tue Jan 01 14:13:18 2013 +0100
     2.2 +++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
     2.3 @@ -1,32 +0,0 @@
     2.4 -#
     2.5 -# Copyright (c) 2012, Oracle and/or its affiliates. All rights reserved.
     2.6 -# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
     2.7 -#
     2.8 -# This code is free software; you can redistribute it and/or modify it
     2.9 -# under the terms of the GNU General Public License version 2 only, as
    2.10 -# published by the Free Software Foundation.
    2.11 -#
    2.12 -# This code is distributed in the hope that it will be useful, but WITHOUT
    2.13 -# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
    2.14 -# FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
    2.15 -# version 2 for more details (a copy is included in the LICENSE file that
    2.16 -# accompanied this code).
    2.17 -#
    2.18 -# You should have received a copy of the GNU General Public License version
    2.19 -# 2 along with this work; if not, write to the Free Software Foundation,
    2.20 -# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
    2.21 -#
    2.22 -# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
    2.23 -# or visit www.oracle.com if you need additional information or have any
    2.24 -# questions.
    2.25 -#
    2.26 -
    2.27 -LAUNCHER_NAME=java
    2.28 -PRODUCT_NAME="Java(TM)"
    2.29 -PRODUCT_SUFFIX="SE Runtime Environment"
    2.30 -JDK_RC_PLATFORM_NAME="Platform SE"
    2.31 -COMPANY_NAME="Oracle Corporation"
    2.32 -
    2.33 -# Might need better names for these
    2.34 -MACOSX_BUNDLE_NAME_BASE="Java SE"
    2.35 -MACOSX_BUNDLE_ID_BASE="com.oracle.java"
     3.1 --- a/common/autoconf/generated-configure.sh	Tue Jan 01 14:13:18 2013 +0100
     3.2 +++ b/common/autoconf/generated-configure.sh	Wed Jan 02 11:29:29 2013 +0100
     3.3 @@ -754,7 +754,6 @@
     3.4  COOKED_BUILD_NUMBER
     3.5  USER_RELEASE_SUFFIX
     3.6  JDK_VERSION
     3.7 -RUNTIME_NAME
     3.8  COPYRIGHT_YEAR
     3.9  MACOSX_BUNDLE_ID_BASE
    3.10  MACOSX_BUNDLE_NAME_BASE
    3.11 @@ -783,7 +782,6 @@
    3.12  OS_VERSION_MINOR
    3.13  OS_VERSION_MAJOR
    3.14  PKG_CONFIG
    3.15 -COMM
    3.16  TIME
    3.17  STAT
    3.18  HG
    3.19 @@ -899,7 +897,9 @@
    3.20  DIFF
    3.21  DATE
    3.22  CUT
    3.23 +CPIO
    3.24  CP
    3.25 +COMM
    3.26  CMP
    3.27  CHMOD
    3.28  CAT
    3.29 @@ -2986,7 +2986,7 @@
    3.30  
    3.31  # Include these first...
    3.32  #
    3.33 -# Copyright (c) 2011, 2012, Oracle and/or its affiliates. All rights reserved.
    3.34 +# Copyright (c) 2011, 2013, Oracle and/or its affiliates. All rights reserved.
    3.35  # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
    3.36  #
    3.37  # This code is free software; you can redistribute it and/or modify it
    3.38 @@ -3401,7 +3401,7 @@
    3.39  
    3.40  
    3.41  #
    3.42 -# Copyright (c) 2011, 2012, Oracle and/or its affiliates. All rights reserved.
    3.43 +# Copyright (c) 2011, 2013, Oracle and/or its affiliates. All rights reserved.
    3.44  # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
    3.45  #
    3.46  # This code is free software; you can redistribute it and/or modify it
    3.47 @@ -3433,6 +3433,10 @@
    3.48  
    3.49  
    3.50  
    3.51 +###############################################################################
    3.52 +#
    3.53 +# Setup version numbers
    3.54 +#
    3.55  
    3.56  
    3.57  
    3.58 @@ -3682,7 +3686,7 @@
    3.59  #CUSTOM_AUTOCONF_INCLUDE
    3.60  
    3.61  # Do not change or remove the following line, it is needed for consistency checks:
    3.62 -DATE_WHEN_GENERATED=1357045896
    3.63 +DATE_WHEN_GENERATED=1357120071
    3.64  
    3.65  ###############################################################################
    3.66  #
    3.67 @@ -4009,6 +4013,65 @@
    3.68  
    3.69  
    3.70  
    3.71 +    for ac_prog in comm
    3.72 +do
    3.73 +  # Extract the first word of "$ac_prog", so it can be a program name with args.
    3.74 +set dummy $ac_prog; ac_word=$2
    3.75 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
    3.76 +$as_echo_n "checking for $ac_word... " >&6; }
    3.77 +if test "${ac_cv_path_COMM+set}" = set; then :
    3.78 +  $as_echo_n "(cached) " >&6
    3.79 +else
    3.80 +  case $COMM in
    3.81 +  [\\/]* | ?:[\\/]*)
    3.82 +  ac_cv_path_COMM="$COMM" # Let the user override the test with a path.
    3.83 +  ;;
    3.84 +  *)
    3.85 +  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
    3.86 +for as_dir in $PATH
    3.87 +do
    3.88 +  IFS=$as_save_IFS
    3.89 +  test -z "$as_dir" && as_dir=.
    3.90 +    for ac_exec_ext in '' $ac_executable_extensions; do
    3.91 +  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
    3.92 +    ac_cv_path_COMM="$as_dir/$ac_word$ac_exec_ext"
    3.93 +    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
    3.94 +    break 2
    3.95 +  fi
    3.96 +done
    3.97 +  done
    3.98 +IFS=$as_save_IFS
    3.99 +
   3.100 +  ;;
   3.101 +esac
   3.102 +fi
   3.103 +COMM=$ac_cv_path_COMM
   3.104 +if test -n "$COMM"; then
   3.105 +  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $COMM" >&5
   3.106 +$as_echo "$COMM" >&6; }
   3.107 +else
   3.108 +  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
   3.109 +$as_echo "no" >&6; }
   3.110 +fi
   3.111 +
   3.112 +
   3.113 +  test -n "$COMM" && break
   3.114 +done
   3.115 +
   3.116 +
   3.117 +    if test "x$COMM" = x; then
   3.118 +        if test "xcomm" = x; then
   3.119 +          PROG_NAME=comm
   3.120 +        else
   3.121 +          PROG_NAME=comm
   3.122 +        fi
   3.123 +        { $as_echo "$as_me:${as_lineno-$LINENO}: Could not find $PROG_NAME!" >&5
   3.124 +$as_echo "$as_me: Could not find $PROG_NAME!" >&6;}
   3.125 +        as_fn_error $? "Cannot continue" "$LINENO" 5
   3.126 +    fi
   3.127 +
   3.128 +
   3.129 +
   3.130      for ac_prog in cp
   3.131  do
   3.132    # Extract the first word of "$ac_prog", so it can be a program name with args.
   3.133 @@ -4068,6 +4131,65 @@
   3.134  
   3.135  
   3.136  
   3.137 +    for ac_prog in cpio
   3.138 +do
   3.139 +  # Extract the first word of "$ac_prog", so it can be a program name with args.
   3.140 +set dummy $ac_prog; ac_word=$2
   3.141 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
   3.142 +$as_echo_n "checking for $ac_word... " >&6; }
   3.143 +if test "${ac_cv_path_CPIO+set}" = set; then :
   3.144 +  $as_echo_n "(cached) " >&6
   3.145 +else
   3.146 +  case $CPIO in
   3.147 +  [\\/]* | ?:[\\/]*)
   3.148 +  ac_cv_path_CPIO="$CPIO" # Let the user override the test with a path.
   3.149 +  ;;
   3.150 +  *)
   3.151 +  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
   3.152 +for as_dir in $PATH
   3.153 +do
   3.154 +  IFS=$as_save_IFS
   3.155 +  test -z "$as_dir" && as_dir=.
   3.156 +    for ac_exec_ext in '' $ac_executable_extensions; do
   3.157 +  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
   3.158 +    ac_cv_path_CPIO="$as_dir/$ac_word$ac_exec_ext"
   3.159 +    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
   3.160 +    break 2
   3.161 +  fi
   3.162 +done
   3.163 +  done
   3.164 +IFS=$as_save_IFS
   3.165 +
   3.166 +  ;;
   3.167 +esac
   3.168 +fi
   3.169 +CPIO=$ac_cv_path_CPIO
   3.170 +if test -n "$CPIO"; then
   3.171 +  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CPIO" >&5
   3.172 +$as_echo "$CPIO" >&6; }
   3.173 +else
   3.174 +  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
   3.175 +$as_echo "no" >&6; }
   3.176 +fi
   3.177 +
   3.178 +
   3.179 +  test -n "$CPIO" && break
   3.180 +done
   3.181 +
   3.182 +
   3.183 +    if test "x$CPIO" = x; then
   3.184 +        if test "xcpio" = x; then
   3.185 +          PROG_NAME=cpio
   3.186 +        else
   3.187 +          PROG_NAME=cpio
   3.188 +        fi
   3.189 +        { $as_echo "$as_me:${as_lineno-$LINENO}: Could not find $PROG_NAME!" >&5
   3.190 +$as_echo "$as_me: Could not find $PROG_NAME!" >&6;}
   3.191 +        as_fn_error $? "Cannot continue" "$LINENO" 5
   3.192 +    fi
   3.193 +
   3.194 +
   3.195 +
   3.196      for ac_prog in cut
   3.197  do
   3.198    # Extract the first word of "$ac_prog", so it can be a program name with args.
   3.199 @@ -10607,11 +10729,9 @@
   3.200  
   3.201  
   3.202  # Source the version numbers
   3.203 -. $AUTOCONF_DIR/version.numbers
   3.204 -if test "x$OPENJDK" = "xfalse"; then
   3.205 -    . $AUTOCONF_DIR/closed.version.numbers
   3.206 -fi
   3.207 -
   3.208 +. $AUTOCONF_DIR/version-numbers
   3.209 +
   3.210 +# Get the settings from parameters
   3.211  
   3.212  # Check whether --with-milestone was given.
   3.213  if test "${with_milestone+set}" = set; then :
   3.214 @@ -10637,6 +10757,9 @@
   3.215  elif test "x$with_build_number" != x; then
   3.216      JDK_BUILD_NUMBER="$with_build_number"
   3.217  fi
   3.218 +if test "x$JDK_BUILD_NUMBER" = x; then
   3.219 +    JDK_BUILD_NUMBER=b00
   3.220 +fi
   3.221  
   3.222  # Now set the JDK version, milestone, build number etc.
   3.223  
   3.224 @@ -10656,9 +10779,6 @@
   3.225  COPYRIGHT_YEAR=`date +'%Y'`
   3.226  
   3.227  
   3.228 -RUNTIME_NAME="$PRODUCT_NAME $PRODUCT_SUFFIX"
   3.229 -
   3.230 -
   3.231  if test "x$JDK_UPDATE_VERSION" != x; then
   3.232      JDK_VERSION="${JDK_MAJOR_VERSION}.${JDK_MINOR_VERSION}.${JDK_MICRO_VERSION}_${JDK_UPDATE_VERSION}"
   3.233  else
     4.1 --- a/common/autoconf/jdk-options.m4	Tue Jan 01 14:13:18 2013 +0100
     4.2 +++ b/common/autoconf/jdk-options.m4	Wed Jan 02 11:29:29 2013 +0100
     4.3 @@ -1,5 +1,5 @@
     4.4  #
     4.5 -# Copyright (c) 2011, 2012, Oracle and/or its affiliates. All rights reserved.
     4.6 +# Copyright (c) 2011, 2013, Oracle and/or its affiliates. All rights reserved.
     4.7  # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
     4.8  #
     4.9  # This code is free software; you can redistribute it and/or modify it
    4.10 @@ -369,14 +369,16 @@
    4.11  AC_SUBST(COMPRESS_JARS)
    4.12  ])
    4.13  
    4.14 +###############################################################################
    4.15 +#
    4.16 +# Setup version numbers
    4.17 +#
    4.18  AC_DEFUN_ONCE([JDKOPT_SETUP_JDK_VERSION_NUMBERS],
    4.19  [
    4.20  # Source the version numbers
    4.21 -. $AUTOCONF_DIR/version.numbers
    4.22 -if test "x$OPENJDK" = "xfalse"; then
    4.23 -    . $AUTOCONF_DIR/closed.version.numbers
    4.24 -fi
    4.25 +. $AUTOCONF_DIR/version-numbers
    4.26  
    4.27 +# Get the settings from parameters
    4.28  AC_ARG_WITH(milestone, [AS_HELP_STRING([--with-milestone], 
    4.29                         [Set milestone value for build @<:@internal@:>@])])
    4.30  if test "x$with_milestone" = xyes; then
    4.31 @@ -394,6 +396,9 @@
    4.32  elif test "x$with_build_number" != x; then
    4.33      JDK_BUILD_NUMBER="$with_build_number"
    4.34  fi
    4.35 +if test "x$JDK_BUILD_NUMBER" = x; then
    4.36 +    JDK_BUILD_NUMBER=b00
    4.37 +fi
    4.38  
    4.39  # Now set the JDK version, milestone, build number etc.
    4.40  AC_SUBST(JDK_MAJOR_VERSION)
    4.41 @@ -413,9 +418,6 @@
    4.42  COPYRIGHT_YEAR=`date +'%Y'`
    4.43  AC_SUBST(COPYRIGHT_YEAR)
    4.44  
    4.45 -RUNTIME_NAME="$PRODUCT_NAME $PRODUCT_SUFFIX"
    4.46 -AC_SUBST(RUNTIME_NAME)
    4.47 -
    4.48  if test "x$JDK_UPDATE_VERSION" != x; then
    4.49      JDK_VERSION="${JDK_MAJOR_VERSION}.${JDK_MINOR_VERSION}.${JDK_MICRO_VERSION}_${JDK_UPDATE_VERSION}"
    4.50  else
     5.1 --- a/common/autoconf/spec.gmk.in	Tue Jan 01 14:13:18 2013 +0100
     5.2 +++ b/common/autoconf/spec.gmk.in	Wed Jan 02 11:29:29 2013 +0100
     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 @@ -163,8 +163,7 @@
    5.11  
    5.12  # Different version strings generated from the above information.
    5.13  JDK_VERSION:=@JDK_VERSION@
    5.14 -RUNTIME_NAME:=@RUNTIME_NAME@
    5.15 -JRE_RELEASE_VERSION:=@FULL_VERSION@
    5.16 +RUNTIME_NAME=$(PRODUCT_NAME) $(PRODUCT_SUFFIX)
    5.17  COOKED_BUILD_NUMBER:=@COOKED_BUILD_NUMBER@
    5.18  # These variables need to be generated here so that MILESTONE and
    5.19  # JDK_BUILD_NUMBER can be overridden on the make command line.
    5.20 @@ -179,6 +178,7 @@
    5.21  else
    5.22    FULL_VERSION=$(RELEASE)-$(JDK_BUILD_NUMBER)
    5.23  endif
    5.24 +JRE_RELEASE_VERSION:=$(FULL_VERSION)
    5.25  
    5.26  # How to compile the code: release, fastdebug or slowdebug
    5.27  DEBUG_LEVEL:=@DEBUG_LEVEL@
    5.28 @@ -451,10 +451,13 @@
    5.29  # CD is going away, but remains to cater for legacy makefiles.
    5.30  CD:=cd
    5.31  CHMOD:=@CHMOD@
    5.32 +COMM:=@COMM@
    5.33  CP:=@CP@
    5.34 +CPIO:=@CPIO@
    5.35  CUT:=@CUT@
    5.36  DATE:=@DATE@
    5.37  DIFF:=@DIFF@
    5.38 +DIRNAME:=@DIRNAME@
    5.39  FIND:=@FIND@
    5.40  FIND_DELETE:=@FIND_DELETE@
    5.41  ECHO:=@ECHO@
    5.42 @@ -479,6 +482,7 @@
    5.43  TIME:=@TIME@
    5.44  TR:=@TR@
    5.45  TOUCH:=@TOUCH@
    5.46 +UNIQ:=@UNIQ@
    5.47  WC:=@WC@
    5.48  XARGS:=@XARGS@
    5.49  ZIPEXE:=@ZIP@
     6.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
     6.2 +++ b/common/autoconf/version-numbers	Wed Jan 02 11:29:29 2013 +0100
     6.3 @@ -0,0 +1,38 @@
     6.4 +#
     6.5 +# Copyright (c) 2011, 2013, Oracle and/or its affiliates. All rights reserved.
     6.6 +# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
     6.7 +#
     6.8 +# This code is free software; you can redistribute it and/or modify it
     6.9 +# under the terms of the GNU General Public License version 2 only, as
    6.10 +# published by the Free Software Foundation.  Oracle designates this
    6.11 +# particular file as subject to the "Classpath" exception as provided
    6.12 +# by Oracle in the LICENSE file that accompanied this code.
    6.13 +#
    6.14 +# This code is distributed in the hope that it will be useful, but WITHOUT
    6.15 +# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
    6.16 +# FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
    6.17 +# version 2 for more details (a copy is included in the LICENSE file that
    6.18 +# accompanied this code).
    6.19 +#
    6.20 +# You should have received a copy of the GNU General Public License version
    6.21 +# 2 along with this work; if not, write to the Free Software Foundation,
    6.22 +# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
    6.23 +#
    6.24 +# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
    6.25 +# or visit www.oracle.com if you need additional information or have any
    6.26 +# questions.
    6.27 +#
    6.28 +
    6.29 +JDK_MAJOR_VERSION=1
    6.30 +JDK_MINOR_VERSION=8
    6.31 +JDK_MICRO_VERSION=0
    6.32 +JDK_UPDATE_VERSION=
    6.33 +LAUNCHER_NAME=openjdk
    6.34 +PRODUCT_NAME=OpenJDK
    6.35 +PRODUCT_SUFFIX="Runtime Environment"
    6.36 +JDK_RC_PLATFORM_NAME=Platform
    6.37 +COMPANY_NAME=N/A
    6.38 +
    6.39 +# Might need better names for these
    6.40 +MACOSX_BUNDLE_NAME_BASE="OpenJDK"
    6.41 +MACOSX_BUNDLE_ID_BASE="net.java.openjdk"
     7.1 --- a/common/autoconf/version.numbers	Tue Jan 01 14:13:18 2013 +0100
     7.2 +++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
     7.3 @@ -1,38 +0,0 @@
     7.4 -#
     7.5 -# Copyright (c) 2011, 2012, Oracle and/or its affiliates. All rights reserved.
     7.6 -# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
     7.7 -#
     7.8 -# This code is free software; you can redistribute it and/or modify it
     7.9 -# under the terms of the GNU General Public License version 2 only, as
    7.10 -# published by the Free Software Foundation.  Oracle designates this
    7.11 -# particular file as subject to the "Classpath" exception as provided
    7.12 -# by Oracle in the LICENSE file that accompanied this code.
    7.13 -#
    7.14 -# This code is distributed in the hope that it will be useful, but WITHOUT
    7.15 -# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
    7.16 -# FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
    7.17 -# version 2 for more details (a copy is included in the LICENSE file that
    7.18 -# accompanied this code).
    7.19 -#
    7.20 -# You should have received a copy of the GNU General Public License version
    7.21 -# 2 along with this work; if not, write to the Free Software Foundation,
    7.22 -# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
    7.23 -#
    7.24 -# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
    7.25 -# or visit www.oracle.com if you need additional information or have any
    7.26 -# questions.
    7.27 -#
    7.28 -
    7.29 -JDK_MAJOR_VERSION=1
    7.30 -JDK_MINOR_VERSION=8
    7.31 -JDK_MICRO_VERSION=0
    7.32 -JDK_UPDATE_VERSION=
    7.33 -LAUNCHER_NAME=openjdk
    7.34 -PRODUCT_NAME=OpenJDK
    7.35 -PRODUCT_SUFFIX="Runtime Environment"
    7.36 -JDK_RC_PLATFORM_NAME=Platform
    7.37 -COMPANY_NAME=N/A
    7.38 -
    7.39 -# Might need better names for these
    7.40 -MACOSX_BUNDLE_NAME_BASE="OpenJDK"
    7.41 -MACOSX_BUNDLE_ID_BASE="net.java.openjdk"

mercurial