VirtualBox

Ignore:
Timestamp:
Oct 29, 2015 4:30:44 AM (9 years ago)
Author:
vboxsync
Message:

EFI/Firmware: Merged in the svn:eol-style, svn:mime-type and trailing whitespace cleanup that was done after the initial UDK2014.SP1 import: svn merge /vendor/edk2/UDK2014.SP1 /vendor/edk2/current .

Location:
trunk/src/VBox/Devices/EFI/Firmware
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • trunk/src/VBox/Devices/EFI/Firmware

  • trunk/src/VBox/Devices/EFI/Firmware/Edk2Setup.bat

    r58464 r58466  
    1111@REM It will also create a Conf/target.txt, tools_def.txt and build_rule.txt files
    1212@REM if they do not exist
    13 @REM If the reset flag is set, all environment variables will be reset and 
     13@REM If the reset flag is set, all environment variables will be reset and
    1414@REM the Conf/target.txt, tools_def.txt and build_rule.txt files will be overwritten
    1515@REM
     
    1717@REM by this script.
    1818@REM SetVisualStudio.bat    - will set the Visual Studio environment based on the --vs* flags
    19 @REM                          it is also used to build the Win32 binaries, calling nmake 
     19@REM                          it is also used to build the Win32 binaries, calling nmake
    2020@REM                          using the WORKSPACE\BaseTools\Makefile
    2121@REM ShowEnvironment.bat    - will display the current EDK II Build environment
     
    3838@REM
    3939@REM usage:
    40 @REM   Edk2Setup.bat [--help | -h] [-v | --version] [-r | --reset] 
     40@REM   Edk2Setup.bat [--help | -h] [-v | --version] [-r | --reset]
    4141@REM                 [--reconfig] [--edk-tools-path DirName]
    4242@REM                 [--pull [Directory]| --rebuild [Directory]]
     
    178178        @set BUILD_TOOLS_WITH=Latest
    179179    )
    180     @REM This option will try to set the environment for building the Nt32Pkg/Nt32Pkg; on a 64-bit 
     180    @REM This option will try to set the environment for building the Nt32Pkg/Nt32Pkg; on a 64-bit
    181181    @REM Windows OS
    182182    @if /I "%2"=="X64" (
     
    195195@echo Copyright(c) 2014, Intel Corporation. All rights reserved.
    196196@echo.
    197 @echo The system environment variable, WORKSPACE, is always set to the current 
     197@echo The system environment variable, WORKSPACE, is always set to the current
    198198@echo working directory.
    199199@echo.
     
    204204@echo.
    205205@echo   --reset, -r         Reset the EDK_TOOLS_PATH and PATH system environment
    206 @echo                       variables. The EDK_TOOLS_PATH default is 
     206@echo                       variables. The EDK_TOOLS_PATH default is
    207207@echo                       WORKSPACE\BaseTools, however, it may be overridden by
    208208@echo                       arguments given to the --edk-tools-path, --pull and/or
     
    231231@pause
    232232@echo.
    233 @echo   --pull [DIRECTORY]  Get the EDK II BaseTools binaries from source control 
     233@echo   --pull [DIRECTORY]  Get the EDK II BaseTools binaries from source control
    234234@echo                       (must not be used with --rebuild).
    235235@echo                       If the optional DIRECTORY argument is specified, the tool
    236236@echo                       sets EDK_TOOLS_PATH to DIRECTORY.
    237237@echo                       If the DIRECTORY argument is not specified, the tools are
    238 @echo                       placed in the directory tree pointed to by the current 
     238@echo                       placed in the directory tree pointed to by the current
    239239@echo                       EDK_TOOLS_PATH environment variable. If the binaries
    240 @echo                       cannot be obtained from source control, the 
    241 @echo                       EDK_TOOLS_PATH will be set to the default, 
     240@echo                       cannot be obtained from source control, the
     241@echo                       EDK_TOOLS_PATH will be set to the default,
    242242@echo                       WORKSPACE\BaseTools directory.
    243243@echo.
     
    250250@echo                       If the optional DIRECTORY argument is specified, the tool
    251251@echo                       sets EDK_TOOLS_PATH to DIRECTORY. Tools binaries will be
    252 @echo                       placed in the appropriate subdirectory in the 
     252@echo                       placed in the appropriate subdirectory in the
    253253@echo                       EDK_TOOLS_PATH directory. If the build fails, the
    254254@echo                       EDK_TOOLS_PATH will be set to the default,
     
    273273@echo         command-prompt window. Rebuilding of the tools with this script is not
    274274@echo         possible.
    275 @echo         Refer to the BaseTools\BuildNotes.txt for directions for building 
     275@echo         Refer to the BaseTools\BuildNotes.txt for directions for building
    276276@echo         the BaseTools binaries.
    277277@echo.
     
    289289:BadPython
    290290@echo ERROR : Unable to rebuild the BaseTools binaries, python does not appear to be
    291 @echo         installed. 
     291@echo         installed.
    292292@echo         The python executable was not found in the PYTHONHOME: %PYTHONHOME%
    293 @echo         If python is installed, please set the environment variable, PYTHONHOME 
     293@echo         If python is installed, please set the environment variable, PYTHONHOME
    294294@echo         to the Path that contains python.exe, for example, if python.exe is
    295295@echo         located in the C:\Python27 directory, then:
     
    395395        @if errorlevel 1 (
    396396            @echo ERROR : The command-line svn tool is not available and the Win32 binaries do not exist
    397             @echo         Please re-run this script again with the --rebuild option to attempt to build 
     397            @echo         Please re-run this script again with the --rebuild option to attempt to build
    398398            @echo         the binaries
    399399            @echo.
Note: See TracChangeset for help on using the changeset viewer.

© 2024 Oracle Support Privacy / Do Not Sell My Info Terms of Use Trademark Policy Automated Access Etiquette