X-Git-Url: https://git.proxmox.com/?a=blobdiff_plain;f=edksetup.bat;h=25a5a6e8d7e37f11ab7f0ffd8c4f332c6e16514e;hb=1abfa4ce4835639c66ae82cc0d72cffcf3f28b6b;hp=6e526cdd03c6c12b4cd85177a23358bcd527b1d6;hpb=7ef23d9c2c2fe8e295f85d44591dd9f0d1fbc0bc;p=mirror_edk2.git
diff --git a/edksetup.bat b/edksetup.bat
index 6e526cdd03..25a5a6e8d7 100755
--- a/edksetup.bat
+++ b/edksetup.bat
@@ -1,7 +1,7 @@
@REM @file
@REM Windows batch file to setup a WORKSPACE environment
@REM
-@REM Copyright (c) 2006 - 2013, Intel Corporation. All rights reserved.
+@REM Copyright (c) 2006 - 2014, Intel Corporation. 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
@@ -61,24 +61,28 @@ if /I not "%1"=="--nt32" goto no_nt32
@REM and headers to interface with Windows.
if not defined VCINSTALLDIR (
- if defined VS110COMNTOOLS (
- call "%VS110COMNTOOLS%\vsvars32.bat"
+ if defined VS120COMNTOOLS (
+ call "%VS120COMNTOOLS%\vsvars32.bat"
) else (
- if defined VS100COMNTOOLS (
- call "%VS100COMNTOOLS%\vsvars32.bat"
+ if defined VS110COMNTOOLS (
+ call "%VS110COMNTOOLS%\vsvars32.bat"
) else (
- if defined VS90COMNTOOLS (
- call "%VS90COMNTOOLS%\vsvars32.bat"
+ if defined VS100COMNTOOLS (
+ call "%VS100COMNTOOLS%\vsvars32.bat"
) else (
- if defined VS80COMNTOOLS (
- call "%VS80COMNTOOLS%\vsvars32.bat"
+ if defined VS90COMNTOOLS (
+ call "%VS90COMNTOOLS%\vsvars32.bat"
) else (
- if defined VS71COMNTOOLS (
- call "%VS71COMNTOOLS%\vsvars32.bat"
+ if defined VS80COMNTOOLS (
+ call "%VS80COMNTOOLS%\vsvars32.bat"
) else (
- echo.
- echo !!! WARNING !!! Cannot find Visual Studio !!!
- echo.
+ if defined VS71COMNTOOLS (
+ call "%VS71COMNTOOLS%\vsvars32.bat"
+ ) else (
+ echo.
+ echo !!! WARNING !!! Cannot find Visual Studio !!!
+ echo.
+ )
)
)
)
@@ -89,7 +93,7 @@ shift
:no_nt32
if /I "%1"=="NewBuild" shift
-if not defined EDK_TOOLS_PATH set EDK_TOOLS_PATH=%WORKSPACE%\BaseTools
+set EDK_TOOLS_PATH=%WORKSPACE%\BaseTools
IF NOT EXIST "%EDK_TOOLS_PATH%\toolsetup.bat" goto BadBaseTools
call %EDK_TOOLS_PATH%\toolsetup.bat %*
if /I "%1"=="Reconfig" shift
@@ -110,6 +114,13 @@ goto check_cygwin
goto end
:check_cygwin
+if defined CYGWIN_HOME (
+ if not exist "%CYGWIN_HOME%" (
+ @echo.
+ @echo !!! WARNING !!! CYGWIN_HOME not found, gcc build may not be used !!!
+ @echo.
+ )
+) else (
if exist c:\cygwin (
set CYGWIN_HOME=c:\cygwin
) else (
@@ -117,9 +128,10 @@ goto check_cygwin
@echo !!! WARNING !!! No CYGWIN_HOME set, gcc build may not be used !!!
@echo.
)
+)
-if NOT "%1"=="" goto Usage
-goto end
+:cygwin_done
+if "%1"=="" goto end
:Usage
@echo.
@@ -129,8 +141,8 @@ goto end
@echo Reconfig Reinstall target.txt, tools_def.txt and build_rule.txt.
@echo.
@echo Note that target.template, tools_def.template and build_rules.template
- @echo will be only copied to target.txt, tools_def.txt and build_rule.txt
- @echo respectively if they do not exist. Using option [Reconfig] to force the copy.
+ @echo will only be copied to target.txt, tools_def.txt and build_rule.txt
+ @echo respectively if they do not exist. Use option [Reconfig] to force the copy.
@echo.
goto end