Mercurial > jdk8-mips64-public > corba / changeset

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

     2.1 --- a/make/jprt.properties	Thu Apr 23 21:29:53 2009 -0700
     2.2 +++ b/make/jprt.properties	Mon Apr 27 20:17:22 2009 -0700
     2.3 @@ -32,8 +32,8 @@
     2.4  solaris_sparcv9_5.10,\
     2.5  solaris_i586_5.10,\
     2.6  solaris_x64_5.10,\
     2.7 -linux_i586,\
     2.8 -linux_x64,\
     2.9 +linux_i586_2.6,\
    2.10 +linux_x64_2.6,\
    2.11  windows_i586,\
    2.12  windows_x64
    2.13