SF.net SVN: edk2-buildtools:[2654] trunk/BaseTools

[<oli...@us...>]

Revision: 2654
          http://sourceforge.net/p/edk2-buildtools/code/2654
Author:   oliviermartin
Date:     2014-02-24 14:18:37 +0000 (Mon, 24 Feb 2014)
Log Message:
-----------
BaseTools: Add the latests versions of Visual Studio to build

Both edksetup.bat and BaseTools/toolsetup.bat had chunks of code to
identify the version of Visual Studio from the environment.
They both needed updating to allow for more recent versions.
To simplify future maintenance a common .bat file is added and
used by both.

Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: Olivier Martin <oli...@ar...>
Reviewed-by Yingke Liu <yin...@in...>

Modified Paths:
--------------
    trunk/BaseTools/toolsetup.bat

Added Paths:
-----------
    trunk/BaseTools/get_vsvars.bat

Added: trunk/BaseTools/get_vsvars.bat
===================================================================
--- trunk/BaseTools/get_vsvars.bat	                        (rev 0)
+++ trunk/BaseTools/get_vsvars.bat	2014-02-24 14:18:37 UTC (rev 2654)
@@ -0,0 +1,46 @@
+@REM @file
+@REM   Windows batch file to find the Visual Studio set up script
+@REM
+@REM Copyright (c) 2013-2014, ARM Limited. All rights reserved.
+
+@REM This program and the accompanying materials
+@REM are licensed and made available under the terms and conditions of the BSD License
+@REM which accompanies this distribution.  The full text of the license may be found at
+@REM http://opensource.org/licenses/bsd-license.php
+@REM
+@REM THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
+@REM WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+@REM
+
+
+@echo off
+goto  :main
+
+:read_vsvars
+@rem Do nothing if already found, otherwise call vsvars32.bat if there
+if defined VCINSTALLDIR goto :EOF
+  set GET_VSVARS_BAT_CHECK_DIR=%*
+  set GET_VSVARS_BAT_CHECK_DIR=%GET_VSVARS_BAT_CHECK_DIR:"=%
+  if exist  "%GET_VSVARS_BAT_CHECK_DIR%\vsvars32.bat"  call "%GET_VSVARS_BAT_CHECK_DIR%\vsvars32.bat"
+:vsvars_done
+goto :EOF
+
+
+REM NOTE: This file will find the most recent Visual Studio installation
+REM       apparent from the environment.
+REM       To use an older version, modify your environment set up.
+REM       (Or invoke the relevant vsvars32 file beforehand).
+
+:main
+if defined VCINSTALLDIR goto :done
+  if defined VS140COMNTOOLS  call :read_vsvars  "%VS140COMNTOOLS%"
+  if defined VS130COMNTOOLS  call :read_vsvars  "%VS130COMNTOOLS%"
+  if defined VS120COMNTOOLS  call :read_vsvars  "%VS120COMNTOOLS%"
+  if defined VS110COMNTOOLS  call :read_vsvars  "%VS110COMNTOOLS%"
+  if defined VS100COMNTOOLS  call :read_vsvars  "%VS100COMNTOOLS%"
+  if defined VS90COMNTOOLS   call :read_vsvars  "%VS90COMNTOOLS%"
+  if defined VS80COMNTOOLS   call :read_vsvars  "%VS80COMNTOOLS%"
+  if defined VS71COMNTOOLS   call :read_vsvars  "%VS71COMNTOOLS%"
+
+:done
+set GET_VSVARS_BAT_CHECK_DIR=

Modified: trunk/BaseTools/toolsetup.bat
===================================================================
--- trunk/BaseTools/toolsetup.bat	2014-02-24 14:16:30 UTC (rev 2653)
+++ trunk/BaseTools/toolsetup.bat	2014-02-24 14:18:37 UTC (rev 2654)
@@ -292,31 +292,16 @@
   echo PYTHON_FREEZER_PATH = %PYTHON_FREEZER_PATH%
   echo.
 
-  if defined VCINSTALLDIR goto VisualStudioAvailable
-  if defined VS100COMNTOOLS (
-    call "%VS100COMNTOOLS%\vsvars32.bat"
-  ) else (
-    if defined VS90COMNTOOLS (
-      call "%VS90COMNTOOLS%\vsvars32.bat"
-    ) else (
-      if defined VS80COMNTOOLS (
-        call "%VS80COMNTOOLS%\vsvars32.bat"
-      ) else (
-        if defined VS71COMNTOOLS (
-          call "%VS71COMNTOOLS%\vsvars32.bat"
-        ) else (
-          echo.
-          echo !!! ERROR !!!! Cannot find Visual Studio, required to build C tools !!!
-          echo.
-          goto end
-        )
-      )
-    )
+  call "%EDK_TOOLS_PATH%\get_vsvars.bat"
+  if not defined VCINSTALLDIR (
+    @echo.
+    @echo !!! ERROR !!!! Cannot find Visual Studio, required to build C tools !!!
+    @echo.
+    goto end
   )
 
 :VisualStudioAvailable
-  if defined FORCE_REBUILD goto CleanAndBuild
-  goto IncrementalBuild
+  if not defined FORCE_REBUILD goto IncrementalBuild
 
 :CleanAndBuild
   pushd .

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.