Mercurial > jdk8-mips64-public > hotspot / changeset

     1.1 --- a/make/jprt.config	Mon Apr 27 12:55:28 2009 -0700
     1.2 +++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
     1.3 @@ -1,275 +0,0 @@
     1.4 -#!echo "This is not a shell script"
     1.5 -#
     1.6 -# Copyright 2006-2008 Sun Microsystems, Inc.  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 -# under the terms of the GNU General Public License version 2 only, as
    1.11 -# published by the Free Software Foundation.
    1.12 -#
    1.13 -# This code is distributed in the hope that it will be useful, but WITHOUT
    1.14 -# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
    1.15 -# FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
    1.16 -# version 2 for more details (a copy is included in the LICENSE file that
    1.17 -# accompanied this code).
    1.18 -#
    1.19 -# You should have received a copy of the GNU General Public License version
    1.20 -# 2 along with this work; if not, write to the Free Software Foundation,
    1.21 -# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
    1.22 -#
    1.23 -# Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
    1.24 -# CA 95054 USA or visit www.sun.com if you need additional information or
    1.25 -# have any questions.
    1.26 -#  
    1.27 -#
    1.28 -
    1.29 -#############################################################################
    1.30 -# Error
    1.31 -error() # message
    1.32 -{
    1.33 -  echo "ERROR: $1"
    1.34 -  exit 6
    1.35 -}
    1.36 -# Directory must exist
    1.37 -dirMustExist() # dir name
    1.38 -{
    1.39 -  if [ ! -d "$1" ] ; then
    1.40 -    error "Directory for $2 does not exist: $1"
    1.41 -  fi
    1.42 -}
    1.43 -# File must exist
    1.44 -fileMustExist() # dir name
    1.45 -{
    1.46 -  if [ ! -f "$1" ] ; then
    1.47 -    error "File for $2 does not exist: $1"
    1.48 -  fi
    1.49 -}
    1.50 -#############################################################################
    1.51 -
    1.52 -# Should be set by JPRT as the 3 basic inputs
    1.53 -bootdir="${ALT_BOOTDIR}"
    1.54 -slashjava="${ALT_SLASH_JAVA}"
    1.55 -jdk_import="${ALT_JDK_IMPORT_PATH}"
    1.56 -
    1.57 -# Check input
    1.58 -dirMustExist "${bootdir}"    ALT_BOOTDIR
    1.59 -dirMustExist "${slashjava}"  ALT_SLASH_JAVA
    1.60 -dirMustExist "${jdk_import}" ALT_JDK_IMPORT_PATH
    1.61 -
    1.62 -# Uses 'uname -s', but only expect SunOS or Linux, assume Windows otherwise.
    1.63 -osname=`uname -s`
    1.64 -if [ "${osname}" = SunOS ] ; then
    1.65 -   
    1.66 -    # SOLARIS: Sparc or X86
    1.67 -    osarch=`uname -p`
    1.68 -    if [ "${osarch}" = sparc ] ; then
    1.69 -	solaris_arch=sparc
    1.70 -    else
    1.71 -	solaris_arch=i386
    1.72 -    fi
    1.73 -
    1.74 -    if [ "${JPRT_SOLARIS_COMPILER_NAME}" != "" ] ; then
    1.75 -        compiler_name=${JPRT_SOLARIS_COMPILER_NAME}
    1.76 -    else
    1.77 -        if [ "${JPRT_JOB_PRODUCT_RELEASE}" = "jdk6"      -o \
    1.78 -             "${JPRT_JOB_PRODUCT_RELEASE}" = "jdk6u10"   -o \
    1.79 -             "${JPRT_JOB_PRODUCT_RELEASE}" = "jdk6u14"   -o \
    1.80 -             "${JPRT_JOB_PRODUCT_RELEASE}" = "jdk6perf" ] ; then
    1.81 -            # All jdk6 builds use SS11
    1.82 -            compiler_name=SS11
    1.83 -        else
    1.84 -	    compiler_name=SS12
    1.85 -        fi
    1.86 -    fi
    1.87 -    
    1.88 -    # Get into path (make sure it matches ALT setting)
    1.89 -    compiler_path=${slashjava}/devtools/${solaris_arch}/SUNWspro/${compiler_name}/bin
    1.90 -    dirMustExist "${compiler_path}" COMPILER_PATH
    1.91 -    path4sdk=${compiler_path}
    1.92 -
    1.93 -    # Add basic solaris system paths
    1.94 -    path4sdk=${path4sdk}:/usr/ccs/bin:/usr/ccs/lib:/usr/bin:/bin:/usr/sfw/bin
    1.95 -
    1.96 -    # Get the previous JDK to be used to bootstrap the build
    1.97 -    path4sdk=${bootdir}/bin:${path4sdk}
    1.98 -
    1.99 -    # Find GNU make
   1.100 -    make=/usr/sfw/bin/gmake
   1.101 -    if [ ! -f ${make} ] ; then
   1.102 -	make=/opt/sfw/bin/gmake
   1.103 -	if [ ! -f ${make} ] ; then
   1.104 -	    make=${slashjava}/devtools/${solaris_arch}/bin/gnumake
   1.105 -        fi 
   1.106 -    fi
   1.107 -    fileMustExist "${make}" make
   1.108 -
   1.109 -    # File creation mask
   1.110 -    umask 002
   1.111 -
   1.112 -elif [ "${osname}" = Linux ] ; then
   1.113 -   
   1.114 -    # LINUX: X86, AMD64
   1.115 -    osarch=`uname -m`
   1.116 -    if [ "${osarch}" = i686 ] ; then
   1.117 -	linux_arch=i586
   1.118 -    elif [ "${osarch}" = x86_64 ] ; then
   1.119 -	linux_arch=amd64
   1.120 -    fi
   1.121 -
   1.122 -    # Get the compilers into path (make sure it matches ALT setting)
   1.123 -    compiler_path=/usr/bin
   1.124 -    dirMustExist "${compiler_path}" COMPILER_PATH
   1.125 -    path4sdk=${compiler_path}
   1.126 -    
   1.127 -    # Add basic paths
   1.128 -    path4sdk=${path4sdk}:/usr/bin:/bin:/usr/sbin:/sbin
   1.129 -
   1.130 -    # Get the previous JDK to be used to bootstrap the build
   1.131 -    path4sdk=${bootdir}/bin:${path4sdk}
   1.132 -    
   1.133 -    # Find GNU make
   1.134 -    make=/usr/bin/make
   1.135 -    fileMustExist "${make}" make
   1.136 -
   1.137 -    umask 002
   1.138 -
   1.139 -else
   1.140 -
   1.141 -    # Windows: Differs on CYGWIN vs. MKS, and the compiler available.
   1.142 -    #   Also, blanks in pathnames gives GNU make headaches, so anything placed
   1.143 -    #   in any ALT_* variable should be the short windows dosname.
   1.144 -   
   1.145 -    # WINDOWS: Install and use MKS or CYGWIN (should have already been done)
   1.146 -    #   Assumption here is that you are in a shell window via MKS or cygwin.
   1.147 -    #   MKS install should have defined the environment variable ROOTDIR.
   1.148 -    #   We also need to figure out which one we have: X86, AMD64
   1.149 -    if [ "`echo ${PROCESSOR_IDENTIFIER} | fgrep AMD64`" != "" ] ; then
   1.150 -	windows_arch=amd64
   1.151 -    else
   1.152 -	windows_arch=i586
   1.153 -    fi
   1.154 -    
   1.155 -    # We need to determine if we are running a CYGWIN shell or an MKS shell
   1.156 -    #    (if uname isn't available, then it will be unix_toolset=unknown)
   1.157 -    unix_toolset=unknown
   1.158 -    if [ "`uname -a | fgrep Cygwin`" = "" -a -d "${ROOTDIR}" ] ; then
   1.159 -        # We kind of assume ROOTDIR is where MKS is and it's ok
   1.160 -        unix_toolset=MKS
   1.161 -        mkshome=`dosname -s "${ROOTDIR}"`
   1.162 -	# Utility to convert to short pathnames without spaces
   1.163 -	dosname="${mkshome}/mksnt/dosname -s"
   1.164 -        # Most unix utilities are in the mksnt directory of ROOTDIR
   1.165 -        unixcommand_path="${mkshome}/mksnt"
   1.166 -        path4sdk="${unixcommand_path}"
   1.167 -        dirMustExist "${unixcommand_path}" UNIXCOMMAND_PATH
   1.168 -	devtools_path="${slashjava}/devtools/win32/bin"
   1.169 -	path4sdk="${devtools_path};${path4sdk}"
   1.170 -        dirMustExist "${devtools_path}" DEVTOOLS_PATH
   1.171 -        # Find GNU make
   1.172 -        make="${devtools_path}/gnumake.exe"
   1.173 -        fileMustExist "${make}" make
   1.174 -    elif [ "`uname -a | fgrep Cygwin`" != "" -a -f /bin/cygpath ] ; then
   1.175 -        # For CYGWIN, uname will have "Cygwin" in it, and /bin/cygpath should exist
   1.176 -        unix_toolset=CYGWIN
   1.177 -	# Utility to convert to short pathnames without spaces
   1.178 -	dosname="/usr/bin/cygpath -a -m -s"
   1.179 -        # Most unix utilities are in the /usr/bin
   1.180 -        unixcommand_path="/usr/bin"
   1.181 -        path4sdk="${unixcommand_path}"
   1.182 -        dirMustExist "${unixcommand_path}" UNIXCOMMAND_PATH
   1.183 -        # Find GNU make
   1.184 -        make="${unixcommand_path}/make.exe"
   1.185 -        fileMustExist "${make}" make
   1.186 -    else
   1.187 -      echo "WARNING: Cannot figure out if this is MKS or CYGWIN"
   1.188 -    fi
   1.189 -
   1.190 -    # WINDOWS: Compiler setup (nasty part)
   1.191 -    #   NOTE: You can use vcvars32.bat to set PATH, LIB, and INCLUDE.
   1.192 -    #   NOTE: CYGWIN has a link.exe too, make sure the compilers are first
   1.193 -    if [ "${windows_arch}" = i586 ] ; then
   1.194 -        # 32bit Windows compiler settings
   1.195 -        # VisualStudio .NET 2003 VC++ 7.1 (VS71COMNTOOLS should be defined)
   1.196 -        vs_root=`${dosname} "${VS71COMNTOOLS}/../.."`
   1.197 -        # Fill in PATH, LIB, and INCLUDE (unset all others to make sure)
   1.198 -        vc7_root="${vs_root}/Vc7"
   1.199 -        compiler_path="${vc7_root}/bin"
   1.200 -        platform_sdk="${vc7_root}/PlatformSDK"
   1.201 -        # LIB and INCLUDE must use ; as a separator
   1.202 -        include4sdk="${vc7_root}/atlmfc/include"
   1.203 -        include4sdk="${include4sdk};${vc7_root}/include"
   1.204 -        include4sdk="${include4sdk};${platform_sdk}/include/prerelease"
   1.205 -        include4sdk="${include4sdk};${platform_sdk}/include"
   1.206 -        include4sdk="${include4sdk};${vs_root}/SDK/v1.1/include"
   1.207 -        lib4sdk="${vc7_root}/atlmfc/lib"
   1.208 -        lib4sdk="${lib4sdk};${vc7_root}/lib"
   1.209 -        lib4sdk="${lib4sdk};${platform_sdk}/lib/prerelease"
   1.210 -        lib4sdk="${lib4sdk};${platform_sdk}/lib"
   1.211 -        lib4sdk="${lib4sdk};${vs_root}/SDK/v1.1/lib"
   1.212 -        # Search path and DLL locating path
   1.213 -        #   WARNING: CYGWIN has a link.exe too, make sure compilers are first
   1.214 -        path4sdk="${vs_root}/Common7/Tools/bin;${path4sdk}"
   1.215 -	path4sdk="${vs_root}/SDK/v1.1/bin;${path4sdk}"
   1.216 -        path4sdk="${vs_root}/Common7/Tools;${path4sdk}"
   1.217 -	path4sdk="${vs_root}/Common7/Tools/bin/prerelease;${path4sdk}"
   1.218 -        path4sdk="${vs_root}/Common7/IDE;${path4sdk}"
   1.219 -	path4sdk="${compiler_path};${path4sdk}"
   1.220 -    elif [ "${windows_arch}" = amd64 ] ; then
   1.221 -        # AMD64 64bit Windows compiler settings
   1.222 -	if [ "${MSSDK}" != "" ] ; then
   1.223 -	    platform_sdk="${MSSDK}"
   1.224 -	else
   1.225 -	    platform_sdk=`${dosname} "C:/Program Files/Microsoft Platform SDK/"`
   1.226 -	fi
   1.227 -	compiler_path="${platform_sdk}/Bin/win64/x86/AMD64"
   1.228 -        # LIB and INCLUDE must use ; as a separator
   1.229 -        include4sdk="${platform_sdk}/Include"
   1.230 -	include4sdk="${include4sdk};${platform_sdk}/Include/crt/sys"
   1.231 -	include4sdk="${include4sdk};${platform_sdk}/Include/mfc"
   1.232 -	include4sdk="${include4sdk};${platform_sdk}/Include/atl"
   1.233 -	include4sdk="${include4sdk};${platform_sdk}/Include/crt"
   1.234 -        lib4sdk="${platform_sdk}/Lib/AMD64"
   1.235 -        lib4sdk="${lib4sdk};${platform_sdk}/Lib/AMD64/atlmfc"
   1.236 -        # Search path and DLL locating path
   1.237 -        #   WARNING: CYGWIN has a link.exe too, make sure compilers are first
   1.238 -        path4sdk="${platform_sdk}/bin;${path4sdk}"
   1.239 -        path4sdk="${compiler_path};${path4sdk}"
   1.240 -    fi
   1.241 -    # Export LIB and INCLUDE
   1.242 -    unset lib
   1.243 -    unset Lib
   1.244 -    LIB="${lib4sdk}"
   1.245 -    export LIB
   1.246 -    unset include
   1.247 -    unset Include
   1.248 -    INCLUDE="${include4sdk}"
   1.249 -    export INCLUDE
   1.250 -    # Set the ALT variable
   1.251 -    dirMustExist "${compiler_path}" COMPILER_PATH
   1.252 -    
   1.253 -    # WINDOWS: Get the previous JDK to be used to bootstrap the build
   1.254 -    path4sdk="${bootdir}/bin;${path4sdk}"
   1.255 -
   1.256 -    # Turn all \\ into /, remove duplicates and trailing /
   1.257 -    slash_path="`echo ${path4sdk} | sed -e 's@\\\\@/@g' -e 's@//@/@g' -e 's@/$@@' -e 's@/;@;@g'`"
   1.258 -    
   1.259 -    # For windows, it's hard to know where the system is, so we just add this
   1.260 -    #    to PATH.
   1.261 -    path4sdk="${slash_path};${PATH}"
   1.262 -    
   1.263 -    # Convert path4sdk to cygwin style
   1.264 -    if [ "${unix_toolset}" = CYGWIN ] ; then
   1.265 -	path4sdk="`/usr/bin/cygpath -p ${path4sdk}`"
   1.266 -    fi
   1.267 -
   1.268 -fi
   1.269 -
   1.270 -# Export PATH setting
   1.271 -PATH="${path4sdk}"
   1.272 -export PATH
   1.273 -
   1.274 -# Unset certain vars
   1.275 -unset LD_LIBRARY_PATH
   1.276 -unset LD_LIBRARY_PATH_32
   1.277 -unset LD_LIBRARY_PATH_64
   1.278 -

     2.1 --- a/make/jprt.properties	Mon Apr 27 12:55:28 2009 -0700
     2.2 +++ b/make/jprt.properties	Wed Apr 29 17:30:20 2009 -0700
     2.3 @@ -70,10 +70,33 @@
     2.4  jprt.my.solaris.x64.jdk6u14=solaris_x64_5.10
     2.5  jprt.my.solaris.x64=${jprt.my.solaris.x64.${jprt.tools.default.release}}
     2.6  
     2.7 -jprt.my.linux.i586=linux_i586
     2.8 -jprt.my.linux.x64=linux_x64
     2.9 -jprt.my.windows.i586=windows_i586
    2.10 -jprt.my.windows.x64=windows_x64
    2.11 +jprt.my.linux.i586.jdk7=linux_i586_2.6
    2.12 +jprt.my.linux.i586.jdk6=linux_i586_2.4
    2.13 +jprt.my.linux.i586.jdk6perf=linux_i586_2.4
    2.14 +jprt.my.linux.i586.jdk6u10=linux_i586_2.4
    2.15 +jprt.my.linux.i586.jdk6u14=linux_i586_2.4
    2.16 +jprt.my.linux.i586=${jprt.my.linux.i586.${jprt.tools.default.release}}
    2.17 +
    2.18 +jprt.my.linux.x64.jdk7=linux_x64_2.6
    2.19 +jprt.my.linux.x64.jdk6=linux_x64_2.4
    2.20 +jprt.my.linux.x64.jdk6perf=linux_x64_2.4
    2.21 +jprt.my.linux.x64.jdk6u10=linux_x64_2.4
    2.22 +jprt.my.linux.x64.jdk6u14=linux_x64_2.4
    2.23 +jprt.my.linux.x64=${jprt.my.linux.x64.${jprt.tools.default.release}}
    2.24 +
    2.25 +jprt.my.windows.i586.jdk7=windows_i586_5.0
    2.26 +jprt.my.windows.i586.jdk6=windows_i586_5.0
    2.27 +jprt.my.windows.i586.jdk6perf=windows_i586_5.0
    2.28 +jprt.my.windows.i586.jdk6u10=windows_i586_5.0
    2.29 +jprt.my.windows.i586.jdk6u14=windows_i586_5.0
    2.30 +jprt.my.windows.i586=${jprt.my.windows.i586.${jprt.tools.default.release}}
    2.31 +
    2.32 +jprt.my.windows.x64.jdk7=windows_x64_5.2
    2.33 +jprt.my.windows.x64.jdk6=windows_x64_5.2
    2.34 +jprt.my.windows.x64.jdk6perf=windows_x64_5.2
    2.35 +jprt.my.windows.x64.jdk6u10=windows_x64_5.2
    2.36 +jprt.my.windows.x64.jdk6u14=windows_x64_5.2
    2.37 +jprt.my.windows.x64=${jprt.my.windows.x64.${jprt.tools.default.release}}
    2.38  
    2.39  # Standard list of jprt build targets for this source tree
    2.40  
    2.41 @@ -199,12 +222,14 @@
    2.42      ${jprt.my.solaris.i586}-fastdebug-c2-jbb_G1, \
    2.43      ${jprt.my.solaris.i586}-fastdebug-c2-jbb_ParOldGC
    2.44  
    2.45 +# Removed 4/29/2009 due to Fedora 9 problem:
    2.46 +#   ${jprt.my.linux.i586}-fastdebug-c2-runThese_Xcomp
    2.47 +
    2.48  jprt.my.linux.i586.test.targets = \
    2.49      ${jprt.my.linux.i586}-{product|fastdebug}-{c1|c2}-jvm98, \
    2.50      ${jprt.my.linux.i586}-{product|fastdebug}-{c1|c2}-scimark, \
    2.51      ${jprt.my.linux.i586}-product-c1-runThese_Xcomp, \
    2.52      ${jprt.my.linux.i586}-fastdebug-c1-runThese_Xshare, \
    2.53 -    ${jprt.my.linux.i586}-fastdebug-c2-runThese_Xcomp, \
    2.54      ${jprt.my.linux.i586}-{product|fastdebug}-{c1|c2}-GCBasher_default, \
    2.55      ${jprt.my.linux.i586}-{product|fastdebug}-{c1|c2}-GCBasher_SerialGC, \
    2.56      ${jprt.my.linux.i586}-{product|fastdebug}-{c1|c2}-GCBasher_ParallelGC, \