hotspot/make/jprt.config

rev 599 : 6830815: jprt.config not setting proper compiler version for use in 6u14
Summary: Add the 6u14 option to the jprt.config file in workspace
Reviewed-by: ohair

*** 1,8 ****
  #!echo "This is not a shell script"
  #
! # Copyright 2006 Sun Microsystems, Inc.  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.
--- 1,8 ----
  #!echo "This is not a shell script"
  #
! # Copyright 2006-2008 Sun Microsystems, Inc.  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.
*** 66,77 ****
          solaris_arch=sparc
      else
          solaris_arch=i386
      fi
  
!     # Get the SS11 compilers into path (make sure it matches ALT setting)
!     compiler_path=${slashjava}/devtools/${solaris_arch}/SUNWspro/SS11/bin
      dirMustExist "${compiler_path}" COMPILER_PATH
      path4sdk=${compiler_path}
  
      # Add basic solaris system paths
      path4sdk=${path4sdk}:/usr/ccs/bin:/usr/ccs/lib:/usr/bin:/bin:/usr/sfw/bin
--- 66,91 ----
          solaris_arch=sparc
      else
          solaris_arch=i386
      fi
  
!     if [ "${JPRT_SOLARIS_COMPILER_NAME}" != "" ] ; then
!         compiler_name=${JPRT_SOLARIS_COMPILER_NAME}
!     else
!         if [ "${JPRT_JOB_PRODUCT_RELEASE}" = "jdk6"      -o \
!              "${JPRT_JOB_PRODUCT_RELEASE}" = "jdk6u10"   -o \
!              "${JPRT_JOB_PRODUCT_RELEASE}" = "jdk6u14"   -o \
!              "${JPRT_JOB_PRODUCT_RELEASE}" = "jdk6perf" ] ; then
!             # All jdk6 builds use SS11
!             compiler_name=SS11
!         else
!             compiler_name=SS12
!         fi
!     fi
!     
!     # Get into path (make sure it matches ALT setting)
!     compiler_path=${slashjava}/devtools/${solaris_arch}/SUNWspro/${compiler_name}/bin
      dirMustExist "${compiler_path}" COMPILER_PATH
      path4sdk=${compiler_path}
  
      # Add basic solaris system paths
      path4sdk=${path4sdk}:/usr/ccs/bin:/usr/ccs/lib:/usr/bin:/bin:/usr/sfw/bin