X-Git-Url: https://git.proxmox.com/?p=mirror_edk2.git;a=blobdiff_plain;f=edksetup.bat;h=97e2330e8c68956a166f0a7d7f0ade073fe9c19a;hp=b69bd26857f573bc37c9e05437d6adb513bd0380;hb=fc504fdea7fe92bfa88e15f50e64b4d76d4f75fd;hpb=5d9cd24ede010b95b4e7ca891de1c9c10a0faa2e
diff --git a/edksetup.bat b/edksetup.bat
index b69bd26857..97e2330e8c 100755
--- a/edksetup.bat
+++ b/edksetup.bat
@@ -1,7 +1,8 @@
@REM @file
@REM Windows batch file to setup a WORKSPACE environment
@REM
-@REM Copyright (c) 2006 - 2015, Intel Corporation. All rights reserved.
+@REM Copyright (c) 2006 - 2016, Intel Corporation. All rights reserved.
+@REM (C) Copyright 2016 Hewlett Packard Enterprise Development LP
@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
@@ -13,10 +14,10 @@
@REM set CYGWIN_HOME=C:\cygwin
-@REM usage:
+@REM usage:
@REM edksetup.bat [--nt32] [AntBuild] [Rebuild] [ForceRebuild] [Reconfig]
@REM if the argument, skip is present, only the paths and the
-@REM test and set of environment settings are performed.
+@REM test and set of environment settings are performed.
@REM ##############################################################
@REM # You should not have to modify anything below this line
@@ -56,73 +57,47 @@ if /I "%1"=="/h" goto Usage
if /I "%1"=="/?" goto Usage
if /I "%1"=="/help" goto Usage
-if /I not "%1"=="--nt32" goto no_nt32
-
-@REM Flag, --nt32 is set
-@REM The Nt32 Emluation Platform requires Microsoft Libraries
-@REM and headers to interface with Windows.
-
-if not defined VCINSTALLDIR (
- if defined VS140COMNTOOLS (
- call "%VS140COMNTOOLS%\vsvars32.bat"
+if /I "%1"=="NewBuild" shift
+if not defined EDK_TOOLS_PATH (
+ if exist %WORKSPACE%\BaseTools (
+ set EDK_TOOLS_PATH=%WORKSPACE%\BaseTools
) else (
- if defined VS120COMNTOOLS (
- call "%VS120COMNTOOLS%\vsvars32.bat"
- ) else (
- if defined VS110COMNTOOLS (
- call "%VS110COMNTOOLS%\vsvars32.bat"
- ) else (
- 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 !!! WARNING !!! Cannot find Visual Studio !!!
- echo.
- )
- )
- )
+ if defined PACKAGES_PATH (
+ for %%i IN (%PACKAGES_PATH%) DO (
+ if exist %%~fi\BaseTools (
+ set EDK_TOOLS_PATH=%%~fi\BaseTools
+ goto checkNt32Flag
)
)
+ ) else (
+ echo.
+ echo !!! ERROR !!! Cannot find BaseTools !!!
+ echo.
+ goto BadBaseTools
)
)
)
-shift
-:no_nt32
+:checkNt32Flag
+if exist %EDK_TOOLS_PATH%\Source set BASE_TOOLS_PATH=%EDK_TOOLS_PATH%
-if /I "%1"=="NewBuild" shift
-if exist %WORKSPACE%\BaseTools (
- set EDK_TOOLS_PATH=%WORKSPACE%\BaseTools
-) else (
- if defined PACKAGES_PATH (
- for %%i IN (%PACKAGES_PATH%) DO (
- if exist %%~fi\BaseTools (
- set EDK_TOOLS_PATH=%%~fi\BaseTools
- goto checkBaseTools
- )
- )
+@REM The Nt32 Emluation Platform requires Microsoft Libraries
+@REM and headers to interface with Windows.
+if /I "%1"=="--nt32" (
+ if /I "%2"=="X64" (
+ shift
+ call "%BASE_TOOLS_PATH%\Scripts\SetVisualStudio.bat"
) else (
- echo.
- echo !!! ERROR !!! Cannot find BaseTools !!!
- echo.
- goto BadBaseTools
+ call "%BASE_TOOLS_PATH%\get_vsvars.bat"
)
+ shift
)
-if exist %EDK_TOOLS_PATH%\Source set BASE_TOOLS_PATH=%EDK_TOOLS_PATH%
:checkBaseTools
IF NOT EXIST "%EDK_TOOLS_PATH%\toolsetup.bat" goto BadBaseTools
call %EDK_TOOLS_PATH%\toolsetup.bat %*
if /I "%1"=="Reconfig" shift
+goto check_NASM
goto check_cygwin
:BadBaseTools
@@ -139,6 +114,15 @@ goto check_cygwin
@echo.
goto end
+:check_NASM
+if not defined NASM_PREFIX (
+ @echo.
+ @echo !!! WARNING !!! NASM_PREFIX environment variable is not set
+ @if exist "C:\nasm\nasm.exe" @set "NASM_PREFIX=C:\nasm\"
+ @if exist "C:\nasm\nasm.exe" @echo Found nasm.exe, setting the environment variable to C:\nasm\
+ @if not exist "C:\nasm\nasm.exe" echo Attempting to build modules that require NASM will fail.
+)
+
:check_cygwin
if defined CYGWIN_HOME (
if not exist "%CYGWIN_HOME%" (
@@ -157,14 +141,26 @@ if defined CYGWIN_HOME (
)
:cygwin_done
+if /I "%1"=="Rebuild" shift
+if /I "%1"=="ForceRebuild" shift
if "%1"=="" goto end
:Usage
@echo.
- @echo Usage: "%0 [-h | -help | --help | /h | /help | /?] [--nt32] [Reconfig]"
- @echo --nt32 Call vsvars32.bat for NT32 platform build.
+ @echo Usage: "%0 [-h | -help | --help | /h | /help | /?] [--nt32 [X64]] [Reconfig] [Rebuild] [ForceRebuild]"
+ @echo --nt32 [X64] If a compiler tool chain is not available in the
+ @echo environment, call a script to attempt to set one up.
+ @echo This flag is only required if building the
+ @echo Nt32Pkg/Nt32Pkg.dsc system emulator.
+ @echo If the X64 argument is set, and a compiler tool chain is
+ @echo not available, attempt to set up a tool chain that will
+ @echo create X64 binaries. Setting these two options have the
+ @echo potential side effect of changing tool chains used for a
+ @echo rebuild.
@echo.
@echo Reconfig Reinstall target.txt, tools_def.txt and build_rule.txt.
+ @echo Rebuild Perform incremental rebuild of BaseTools binaries.
+ @echo ForceRebuild Force a full rebuild of BaseTools binaries.
@echo.
@echo Note that target.template, tools_def.template and build_rules.template
@echo will only be copied to target.txt, tools_def.txt and build_rule.txt
@@ -174,4 +170,3 @@ if "%1"=="" goto end
:end
popd
-