Mercurial > jdk8-mips64-public / changeset

     1.1 --- a/make/scripts/vsvars.sh	Thu Oct 11 09:48:55 2012 -0700
     1.2 +++ b/make/scripts/vsvars.sh	Tue Oct 30 15:04:15 2012 +0400
     1.3 @@ -144,6 +144,16 @@
     1.4    fi
     1.5  fi
     1.6  
     1.7 +# VS2012 (VC11)
     1.8 +if [ "${VS110COMNTOOLS}" = "" ] ; then
     1.9 +  VS110COMNTOOLS="${progfiles32}/Microsoft Visual Studio 11.0/Common7/Tools/"
    1.10 +  export VS110COMNTOOLS
    1.11 +fi
    1.12 +vc11Bin32Dir=`envpath "${VS110COMNTOOLS}"`/../../VC/Bin
    1.13 +vc11Bin64Dir="${vc11Bin32Dir}"
    1.14 +vc11vars32Bat="vcvars32.bat"
    1.15 +vc11vars64Bat="vcvars64.bat"
    1.16 +
    1.17  # VS2010 (VC10)
    1.18  if [ "${VS100COMNTOOLS}" = "" ] ; then
    1.19    VS100COMNTOOLS="${progfiles32}/Microsoft Visual Studio 10.0/Common7/Tools/"
    1.20 @@ -188,7 +198,7 @@
    1.21  vcSelection=""
    1.22  
    1.23  # Parse options
    1.24 -usage="Usage: $0 [-help] [-debug] [-v] [-c] [-s] [-p] [-v10] [-v9] [-v8] [-v7] [-32] [-64]"
    1.25 +usage="Usage: $0 [-help] [-debug] [-v] [-c] [-s] [-p] [-v11] [-v10] [-v9] [-v8] [-v7] [-32] [-64]"
    1.26  while [ $# -gt 0 ] ; do
    1.27    if [ "$1" = "-help" ] ; then
    1.28      msg "${usage}"
    1.29 @@ -198,6 +208,7 @@
    1.30      msg "  -c       Print out csh style output"
    1.31      msg "  -s       Print out sh style output"
    1.32      msg "  -p       Print out properties style output"
    1.33 +    msg "  -v11     Use Visual Studio 11 VS2012"
    1.34      msg "  -v10     Use Visual Studio 10 VS2010"
    1.35      msg "  -v9      Use Visual Studio 9 VS2008"
    1.36      msg "  -v8      Use Visual Studio 8 VS2005"
    1.37 @@ -220,6 +231,13 @@
    1.38    elif [ "$1" = "-p" ] ; then
    1.39      shellStyle="props"
    1.40      shift
    1.41 +  elif [ "$1" = "-v11" ] ; then
    1.42 +    vcBin32Dir="${vc11Bin32Dir}"
    1.43 +    vcBin64Dir="${vc11Bin64Dir}"
    1.44 +    vcvars32Bat="${vc11vars32Bat}"
    1.45 +    vcvars64Bat="${vc11vars64Bat}"
    1.46 +    vcSelection="11"
    1.47 +    shift
    1.48    elif [ "$1" = "-v10" ] ; then
    1.49      vcBin32Dir="${vc10Bin32Dir}"
    1.50      vcBin64Dir="${vc10Bin64Dir}"
    1.51 @@ -398,6 +416,8 @@
    1.52  echo export VS_VS90COMNTOOLS
    1.53  echo VS_VS100COMNTOOLS="%VS100COMNTOOLS%"
    1.54  echo export VS_VS100COMNTOOLS
    1.55 +echo VS_VS110COMNTOOLS="%VS110COMNTOOLS%"
    1.56 +echo export VS_VS110COMNTOOLS
    1.57  echo VS_VCINSTALLDIR="%VCINSTALLDIR%"
    1.58  echo export VS_VCINSTALLDIR
    1.59  echo VS_VSINSTALLDIR="%VSINSTALLDIR%"
    1.60 @@ -521,7 +541,9 @@
    1.61  printEnv MSTOOLS       mstools       VS_MSTOOLS       "${VS_MSTOOLS}"
    1.62  printEnv DEVENVDIR     devenvdir     VS_DEVENVDIR     "${VS_DEVENVDIR}"
    1.63  printEnv WINDOWSSDKDIR windowssdkdir VS_WINDOWSSDKDIR "${VS_WINDOWSSDKDIR}"
    1.64 -if [ "${vcSelection}" = "10" ] ; then
    1.65 +if [ "${vcSelection}" = "11" ] ; then
    1.66 +  printEnv VS110COMNTOOLS vs110comntools VS_VS110COMNTOOLS "${VS_VS110COMNTOOLS}"
    1.67 +elif [ "${vcSelection}" = "10" ] ; then
    1.68    printEnv VS100COMNTOOLS vs100comntools VS_VS100COMNTOOLS "${VS_VS100COMNTOOLS}"
    1.69  elif [ "${vcSelection}" = "9" ] ; then
    1.70    printEnv VS90COMNTOOLS vs90comntools VS_VS90COMNTOOLS "${VS_VS90COMNTOOLS}"