Merge

.hgtags

@@ -97,3 +97,5 @@ a12a9e78df8a9d534da0b4a244ed68f0de0bd58e jdk7-b118
 366ff0b6d2151595629806b033e2e1497e3a55d4 jdk7-b120
 2c2d4f88637b488014c37e1a2eb401f68bca8838 jdk7-b121
 f1591eed71f64f6eba79fb7426f5616cc4dfea73 jdk7-b122
+ed6950da30cf1e8904b4bdb034d471647942271f jdk7-b123
+024a6755895bf91b5a3c98984c89ee018efbf538 jdk7-b124

Makefile

@@ -156,12 +156,6 @@ ifeq ($(BUILD_DEPLOY), true)
   clobber:: deploy-clobber
 endif
 
-ifeq ($(BUILD_JDK), true)
-  ifeq ($(BUNDLE_RULES_AVAILABLE), true)
-    generic_build_repo_series:: openjdk-binary-plugs-bundles
-  endif
-endif
-
 # The debug build, fastdebug or debug. Needs special handling.
 #  Note that debug builds do NOT do INSTALL steps, but must be done
 #  after the product build and before the INSTALL step of the product build.
@@ -301,7 +295,6 @@ ifneq ($(SKIP_OPENJDK_BUILD), true)
   ifeq ($(BUILD_JDK), true)
     ifeq ($(BUNDLE_RULES_AVAILABLE), true)
 
-OPENJDK_PLUGS=$(ABS_OUTPUTDIR)/$(OPENJDK_BINARY_PLUGS_INAME)
 OPENJDK_OUTPUTDIR=$(ABS_OUTPUTDIR)/open-output
 OPENJDK_BUILD_NAME \
   = openjdk-$(JDK_MINOR_VERSION)-$(BUILD_NUMBER)-$(PLATFORM)-$(ARCH)-$(BUNDLE_DATE)
@@ -330,7 +323,6 @@ openjdk_build:
 	  GENERATE_DOCS=false \
 	  ALT_JDK_DEVTOOLS_DIR=$(JDK_DEVTOOLS_DIR) \
 	  ALT_OUTPUTDIR=$(OPENJDK_OUTPUTDIR) \
-	  ALT_BINARY_PLUGS_PATH=$(OPENJDK_PLUGS) \
 	  ALT_BOOTDIR=$(OPENJDK_BOOTDIR) \
 	  ALT_JDK_IMPORT_PATH=$(OPENJDK_IMPORTJDK) \
 		product_build )
@@ -456,7 +448,6 @@ CACERTS_FILE.desc          = Location of certificates file
 DEVTOOLS_PATH.desc         = Directory containing zip and gnumake
 CUPS_HEADERS_PATH.desc     = Include directory location for CUPS header files
 DXSDK_PATH.desc            = Root directory of DirectX SDK
-MSDEVTOOLS_PATH.desc       = Root directory of VC++ tools (e.g. rc.exe)
 MSVCRT_DLL_PATH.desc       = Directory containing mscvrt.dll
 
 # Make variables to print out (description and value)
@@ -487,12 +478,10 @@ ifeq ($(PLATFORM), windows)
 
 VARIABLE_PRINTVAL_LIST +=       \
     DXSDK_PATH                  \
-    MSDEVTOOLS_PATH             \
     MSVCRT_DLL_PATH
 
 VARIABLE_CHECKDIR_LIST +=       \
     DXSDK_PATH                  \
-    MSDEVTOOLS_PATH             \
     MSVCRT_DLL_PATH
 
 endif
@@ -548,7 +537,7 @@ examples_help:
 "
 
 ################################################################
-# Source and binary plug bundling
+# Source bundling
 ################################################################
 ifeq ($(BUNDLE_RULES_AVAILABLE), true)
   include $(BUNDLE_RULES)

README

 README:
-  This file should be located at the top of the OpenJDK Mercurial repository
-  forest. This top or enclosing repository will include a "make" directory,
-  and a Makefile at the very top of the repository.
-  It should also include the 6 repositories: "jdk", "hotspot", "langtools",
-  "corba", "jaxws"  and "jaxp".
+  This file should be located at the top of the OpenJDK Mercurial root
+  repository. This root repository will include a "make" directory,
+  and a Makefile for building the entire OpenJDK.
+  A full OpenJDK repository set (forest) should also include the following
+  6 nested repositories:
+    "jdk", "hotspot", "langtools", "corba", "jaxws"  and "jaxp".
+  There are also several source downloads for the jax* repositories that
+  will be needed.
+
+  This one root repository can be obtained with something like:
+    hg clone http://hg.openjdk.java.net/jdk7/jdk7 openjdk7
+  To make sure you have all the nested repositories, you can run:
+    cd openjdk7 && sh ./get_source.sh
+  (This is identical to using the Mercurial Forest Extension command 
+   'hg fclone http://hg.openjdk.java.net/jdk7/jdk7 openjdk7').
+  People unfamiliar with Mercurial should read the first few chapters of
+  the Mercurial book: http://hgbook.red-bean.com/read/
 
   See http://openjdk.java.net/ for more information about the OpenJDK.
 
 Simple Build Instructions:
+  
+  0. Get the necessary system software/packages installed on your system, see
+     http://hg.openjdk.java.net/jdk7/build/raw-file/tip/README-builds.html
 
-  1. Download and install a JDK 6 from
+  1. If you don't have a jdk6 installed, download and install a JDK 6 from
      http://java.sun.com/javase/downloads/index.jsp
-     Set the environment variable ALT_BOOTDIR to the location of this JDK 6.
+     Set the environment variable ALT_BOOTDIR to the location of JDK 6.
 
-  2. Download and install the Binary Plugs for the most recent JDK7 from
-     http://download.java.net/openjdk/jdk7/
-     Set the environment variable ALT_BINARY_PLUGS_PATH to the location of
-     these binary plugs.
-     
-  3. Check the sanity of doing a build with the current machine:
+  2. Check the sanity of doing a build with your current system:
        gnumake sanity
      See README-builds.html if you run into problems.
   
-  4. Do a complete build of the jdk:
+  3. Do a complete build of the OpenJDK:
        gnumake all
      The resulting JDK image should be found in build/*/j2sdk-image
 

get_source.sh

+#!/bin/sh
+
+#
+# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved.
+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+#
+# This code is free software; you can redistribute it and/or modify it
+# under the terms of the GNU General Public License version 2 only, as
+# published by the Free Software Foundation.  Oracle designates this
+# particular file as subject to the "Classpath" exception as provided
+# by Oracle in the LICENSE file that accompanied this code.
+#
+# This code is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+# version 2 for more details (a copy is included in the LICENSE file that
+# accompanied this code).
+#
+# You should have received a copy of the GNU General Public License version
+# 2 along with this work; if not, write to the Free Software Foundation,
+# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+#
+# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+# or visit www.oracle.com if you need additional information or have any
+# questions.
+#
+
+# Get clones of all nested repositories
+sh ./make/scripts/hgforest.sh clone
+
+# Update all existing repositories to the latest sources
+sh ./make/scripts/hgforest.sh pull -u
+

make/Defs-internal.gmk

 #
-# Copyright (c) 1995, 2009, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 1995, 2010, Oracle and/or its affiliates. All rights reserved.
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
 # This code is free software; you can redistribute it and/or modify it

make/deploy-rules.gmk

 #
-# Copyright (c) 2002, 2009, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2002, 2010, Oracle and/or its affiliates. All rights reserved.
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
 # This code is free software; you can redistribute it and/or modify it

make/hotspot-rules.gmk

 #
-# Copyright (c) 2001, 2009, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2001, 2010, Oracle and/or its affiliates. All rights reserved.
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
 # This code is free software; you can redistribute it and/or modify it

make/install-rules.gmk

 #
-# Copyright (c) 2002, 2009, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2002, 2010, Oracle and/or its affiliates. All rights reserved.
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
 # This code is free software; you can redistribute it and/or modify it

make/jprt.gmk

 #
-# Copyright (c) 2006, 2009, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2006, 2010, Oracle and/or its affiliates. All rights reserved.
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
 # This code is free software; you can redistribute it and/or modify it

make/sanity-rules.gmk

 #
-# Copyright (c) 2001, 2009, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2001, 2010, Oracle and/or its affiliates. All rights reserved.
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
 # This code is free software; you can redistribute it and/or modify it

make/scripts/hgforest.sh

+#!/bin/sh
+
+#
+# Copyright (c) 2009, 2010, Oracle and/or its affiliates. All rights reserved.
+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+#
+# This code is free software; you can redistribute it and/or modify it
+# under the terms of the GNU General Public License version 2 only, as
+# published by the Free Software Foundation.
+#
+# This code is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+# version 2 for more details (a copy is included in the LICENSE file that
+# accompanied this code).
+#
+# You should have received a copy of the GNU General Public License version
+# 2 along with this work; if not, write to the Free Software Foundation,
+# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+#
+# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+# or visit www.oracle.com if you need additional information or have any
+# questions.
+#
+
+# Shell script for a fast parallel forest command
+
+tmp=/tmp/forest.$$
+rm -f -r ${tmp}
+mkdir -p ${tmp}
+
+# Remove tmp area on A. B. Normal termination
+trap 'rm -f -r ${tmp}' KILL
+trap 'rm -f -r ${tmp}' EXIT
+
+# Only look in specific locations for possible forests (avoids long searches)
+pull_default=""
+if [ "$1" = "clone" -o "$1" = "fclone" ] ; then
+  subrepos="corba jaxp jaxws langtools jdk hotspot"
+  if [ -f .hg/hgrc ] ; then
+    pull_default=`hg paths default`
+  fi
+  if [ "${pull_default}" = "" ] ; then
+    echo "ERROR: Need initial clone with 'hg paths default' defined"
+    exit 1
+  fi
+  repos=""
+  for i in ${subrepos} ; do
+    if [ ! -f ${i}/.hg/hgrc ] ; then
+      repos="${repos} ${i}"
+    fi
+  done
+  at_a_time=2
+else
+  hgdirs=`ls -d ./.hg ./*/.hg ./*/*/.hg ./*/*/*/.hg ./*/*/*/*/.hg 2>/dev/null`
+  # Derive repository names from the .hg directory locations
+  repos=""
+  for i in ${hgdirs} ; do
+    repos="${repos} `echo ${i} | sed -e 's@/.hg$@@'`"
+  done
+  at_a_time=8
+fi
+
+# Any repos to deal with?
+if [ "${repos}" = "" ] ; then
+  echo "No repositories to process."
+  exit
+fi
+
+# Echo out what repositories we will process
+echo "# Repos: ${repos}"
+
+# Run the supplied command on all repos in parallel, save output until end
+n=0
+for i in ${repos} ; do
+  echo "Starting on ${i}"
+  n=`expr ${n} '+' 1`
+  (
+    (
+      if [ "$1" = "clone" -o "$1" = "fclone" ] ; then
+        cline="hg $* ${pull_default}/${i} ${i}"
+        echo "# ${cline}"
+        ( eval "${cline}" )
+      else
+        cline="hg $*"
+        echo "# cd ${i} && ${cline}"
+        ( cd ${i} && eval "${cline}" )
+      fi
+      echo "# exit code $?"
+    ) > ${tmp}/repo.${n} 2>&1 ; cat ${tmp}/repo.${n} ) &
+  if [ `expr ${n} '%' ${at_a_time}` -eq 0 ] ; then
+    sleep 5
+  fi
+done
+
+# Wait for all hg commands to complete
+wait
+
+# Cleanup
+rm -f -r ${tmp}
+
+# Terminate with exit 0 all the time (hard to know when to say "failed")
+exit 0
+

make/scripts/update_copyright_year.sh

+#!/bin/sh -f
+
+#
+# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved.
+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+#
+# This code is free software; you can redistribute it and/or modify it
+# under the terms of the GNU General Public License version 2 only, as
+# published by the Free Software Foundation.
+#
+# This code is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+# version 2 for more details (a copy is included in the LICENSE file that
+# accompanied this code).
+#
+# You should have received a copy of the GNU General Public License version
+# 2 along with this work; if not, write to the Free Software Foundation,
+# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+#
+# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+# or visit www.oracle.com if you need additional information or have any
+# questions.
+#
+
+# Script to update the Copyright YEAR range in Mercurial sources.
+#  (Originally from xdono, Thanks!)
+
+if [ "`uname -s`" = "SunOS" ] ; then
+  awk=nawk
+else
+  awk=awk
+fi
+
+# Stop on any error
+set -e
+
+# Temp area
+tmp=/tmp/`basename $0`.${USER}.$$
+rm -f -r ${tmp}
+mkdir -p ${tmp}
+total=0
+
+# This year or supplied year
+if [ "$1" != "" ] ; then
+  year="$1"
+else
+  year=`date +%Y`
+fi
+
+# Return true if it makes sense to edit this file
+saneFileToCheck()
+{
+  if [ "$1" != "" -a -f $1 ] ; then
+    isText=`file "$1" | egrep -i '(text|source)' | cat`
+    hasCopyright=`grep 'Copyright' "$1" | cat`
+    lastLineCount=`tail -1 "$1" | wc -l`
+    if [ "${isText}" != ""  \
+         -a "${hasCopyright}" != "" \
+	 -a ${lastLineCount} -eq 1 ] ; then
+      echo "true"
+    else
+      echo "false"
+    fi
+  else
+    echo "false"
+  fi
+}
+
+# Update the copyright year on a file
+updateFile() # file
+{
+  changed="false"
+  if [ `saneFileToCheck "$1"` = "true" ] ; then
+    copyright="Copyright (c)"
+    company="Oracle"
+    rm -f $1.OLD
+    mv $1 $1.OLD
+    cat $1.OLD | \
+      sed -e "s@\(${copyright} [12][0-9][0-9][0-9],\) [12][0-9][0-9][0-9], ${company}@\1 ${year}, ${company}@" | \
+      sed -e "s@\(${copyright} [12][0-9][0-9][0-9],\) ${company}@\1 ${year}, ${company}@" | \
+      sed -e "s@${copyright} ${year}, ${year}, ${company}@${copyright} ${year}, ${company}@"  \
+      > $1
+    if ! diff -b -w $1.OLD $1 > /dev/null ; then \
+      changed="true"
+      rm -f $1.OLD
+    else
+      rm -f $1
+      mv $1.OLD $1
+    fi
+  fi
+  echo "${changed}"
+}
+
+# Update the copyright year on all files changed by this changeset
+updateChangesetFiles() # changeset
+{
+  count=0
+  files=${tmp}/files.$1
+  rm -f ${files}
+  hg log --rev $1 -v --template '{files}\n' | expand \
+    | ${awk} -F' ' '{for(i=1;i<=NF;i++)print $i}' \
+    > ${files}
+  if [ -f "${files}" -a -s "${files}" ] ; then
+    copyright="Copyright (c)"
+    company="Oracle"
+    fcount=`cat ${files}| wc -l`
+    for i in `cat ${files}` ; do
+      if [ `updateFile "${i}"` = "true" ] ; then
+        count=`expr ${count} '+' 1`
+      fi
+    done
+    if [ ${count} -gt 0 ] ; then
+      printf "  UPDATED year on %d of %d files.\n" ${count} ${fcount}
+      total=`expr ${total} '+' ${count}`
+    else
+      printf "  None of the %d files were changed.\n" ${fcount}
+    fi
+  else
+    printf "  ERROR: No files changed in the changeset? Must be a mistake.\n"
+    set -x
+    ls -al ${files}
+    hg log --rev $1 -v --template '{files}\n'
+    hg log --rev $1 -v --template '{files}\n' | expand \
+      | ${awk} -F' ' '{for(i=1;i<=NF;i++)print $i}'
+    set +x
+    exit 1
+  fi
+  rm -f ${files}
+}
+
+# Check if repository is clean
+previous=`hg status|wc -l`
+if [ ${previous} -ne 0 ] ; then
+  echo "WARNING: This repository contains previously edited working set files."
+  echo "  hg status | wc -l = `hg status | wc -l`"
+fi
+
+# Get all changesets this year
+all_changesets=${tmp}/all_changesets
+rm -f ${all_changesets}
+hg log --no-merges -v -d "${year}-01-01 to ${year}-12-31" --template '{node}\n' > ${all_changesets}
+
+# Check changeset to see if it is Copyright only changes, filter changesets
+if [ -s ${all_changesets} ] ; then
+  echo "Changesets made in ${year}: `cat ${all_changesets} | wc -l`"
+  index=0
+  cat ${all_changesets} | while read changeset ; do
+    index=`expr ${index} '+' 1`
+    desc=${tmp}/desc.${changeset}
+    rm -f ${desc}
+    echo "------------------------------------------------"
+    hg log --rev ${changeset} --template '{desc}\n' > ${desc}
+    printf "%d: %s\n%s\n" ${index} "${changeset}" "`cat ${desc}|head -1`"
+    if cat ${desc} | fgrep -i "Added tag" > /dev/null ; then
+      printf "  EXCLUDED tag changeset.\n"
+    elif cat ${desc} | fgrep -i rebrand > /dev/null ; then
+      printf "  EXCLUDED rebrand changeset.\n"
+    elif cat ${desc} | fgrep -i copyright > /dev/null ; then
+      printf "  EXCLUDED copyright changeset.\n"
+    else
+      updateChangesetFiles ${changeset}
+    fi
+    rm -f ${desc}
+  done
+fi
+
+if [ ${total} -gt 0 ] ; then
+   echo "---------------------------------------------"
+   echo "Updated the copyright year on a total of ${total} files."
+   if [ ${previous} -eq 0 ] ; then
+     echo "This count should match the count of modified files in the repository: hg status -m"
+   else
+     echo "WARNING: This repository contained previously edited working set files."
+   fi
+   echo "  hg status -m | wc -l = `hg status -m | wc -l`"
+else
+   echo "---------------------------------------------"
+   echo "No files were changed"
+   if [ ${previous} -ne 0 ] ; then
+     echo "WARNING: This repository contained previously edited working set files."
+   fi
+   echo "  hg status -m | wc -l = `hg status -m | wc -l`"
+fi
+
+# Cleanup
+rm -f -r ${tmp}
+exit 0
+