* [Patch 1/2] BaseTools toolsetup.bat: Set env when the binary tools are missing
2016-12-29 2:51 [Patch 0/2] Update toolsetup.bat to easily compile BaseTools source Liming Gao
@ 2016-12-29 2:52 ` Liming Gao
2016-12-29 2:52 ` [Patch 2/2] BaseTools toolsetup.bat: set PATH to include Bin Win32 directory Liming Gao
2016-12-29 5:01 ` [Patch 0/2] Update toolsetup.bat to easily compile BaseTools source Zhu, Yonghong
2 siblings, 0 replies; 4+ messages in thread
From: Liming Gao @ 2016-12-29 2:52 UTC (permalink / raw)
To: edk2-devel
BASE_TOOLS_PATH is required to be set when the binary tools are missing.
Cc: Yonghong Zhu <yonghong.zhu@intel.com>
Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: Liming Gao <liming.gao@intel.com>
---
BaseTools/toolsetup.bat | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/BaseTools/toolsetup.bat b/BaseTools/toolsetup.bat
index 8905214..88bb29e 100755
--- a/BaseTools/toolsetup.bat
+++ b/BaseTools/toolsetup.bat
@@ -126,7 +126,7 @@ if /I "%1"=="/?" goto Usage
echo Please check the directory %EDK_TOOLS_PATH%\Bin\Win32
echo Or configure EDK_TOOLS_BIN env to point Win32 directory.
echo.
- goto end
+ goto check_build_environment
)
)
set PATH=%EDK_TOOLS_BIN%;%PATH%
@@ -144,7 +144,7 @@ if /I "%1"=="/?" goto Usage
echo Please check the directory %EDK_TOOLS_PATH%\Bin\Win32
echo Or configure EDK_TOOLS_BIN env to point Win32 directory.
echo.
- goto end
+ goto check_build_environment
)
)
set PATH=%EDK_TOOLS_BIN%;%PATH%
@@ -280,7 +280,7 @@ goto check_python_tools
echo.
echo !!! ERROR !!! Binary C tools are missing. They are requried to be built from BaseTools Source.
echo.
- goto end
+ goto check_build_environment
:check_python_tools
IF NOT EXIST "%EDK_TOOLS_BIN%\build.exe" goto check_build_environment
@@ -307,7 +307,7 @@ goto end
set PYTHON_HOME=%PYTHONHOME%
) else (
echo.
- echo !!! ERROR !!! Binary python tools are missing. PYTHON_HOME environment variable is not set.
+ echo !!! ERROR !!! Binary python tools are missing. PYTHON_HOME environment variable is not set.
echo PYTHON_HOME is required to build or execute the python tools.
echo.
goto end
--
2.8.0.windows.1
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [Patch 2/2] BaseTools toolsetup.bat: set PATH to include Bin Win32 directory
2016-12-29 2:51 [Patch 0/2] Update toolsetup.bat to easily compile BaseTools source Liming Gao
2016-12-29 2:52 ` [Patch 1/2] BaseTools toolsetup.bat: Set env when the binary tools are missing Liming Gao
@ 2016-12-29 2:52 ` Liming Gao
2016-12-29 5:01 ` [Patch 0/2] Update toolsetup.bat to easily compile BaseTools source Zhu, Yonghong
2 siblings, 0 replies; 4+ messages in thread
From: Liming Gao @ 2016-12-29 2:52 UTC (permalink / raw)
To: edk2-devel
Bin Win32 directory includes antlr.exe. This tool is used when compile
BaseTools source code. So, set it into PATH first.
Cc: Yonghong Zhu <yonghong.zhu@intel.com>
Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: Liming Gao <liming.gao@intel.com>
---
BaseTools/toolsetup.bat | 2 ++
1 file changed, 2 insertions(+)
diff --git a/BaseTools/toolsetup.bat b/BaseTools/toolsetup.bat
index 88bb29e..65d9149 100755
--- a/BaseTools/toolsetup.bat
+++ b/BaseTools/toolsetup.bat
@@ -121,6 +121,7 @@ if /I "%1"=="/?" goto Usage
if exist %EDK_TOOLS_PATH%\Bin\Win32 (
set EDK_TOOLS_BIN=%EDK_TOOLS_PATH%\Bin\Win32
) else (
+ set "PATH=%EDK_TOOLS_PATH%\Bin\Win32;%PATH%"
echo.
echo !!! ERROR !!! Cannot find BaseTools Bin Win32!!!
echo Please check the directory %EDK_TOOLS_PATH%\Bin\Win32
@@ -139,6 +140,7 @@ if /I "%1"=="/?" goto Usage
if exist %EDK_TOOLS_PATH%\Bin\Win32 (
set EDK_TOOLS_BIN=%EDK_TOOLS_PATH%\Bin\Win32
) else (
+ set "PATH=%EDK_TOOLS_PATH%\Bin\Win32;%PATH%"
echo.
echo !!! ERROR !!! Cannot find BaseTools Bin Win32!!!
echo Please check the directory %EDK_TOOLS_PATH%\Bin\Win32
--
2.8.0.windows.1
^ permalink raw reply related [flat|nested] 4+ messages in thread
* Re: [Patch 0/2] Update toolsetup.bat to easily compile BaseTools source
2016-12-29 2:51 [Patch 0/2] Update toolsetup.bat to easily compile BaseTools source Liming Gao
2016-12-29 2:52 ` [Patch 1/2] BaseTools toolsetup.bat: Set env when the binary tools are missing Liming Gao
2016-12-29 2:52 ` [Patch 2/2] BaseTools toolsetup.bat: set PATH to include Bin Win32 directory Liming Gao
@ 2016-12-29 5:01 ` Zhu, Yonghong
2 siblings, 0 replies; 4+ messages in thread
From: Zhu, Yonghong @ 2016-12-29 5:01 UTC (permalink / raw)
To: Gao, Liming, edk2-devel@lists.01.org
Reviewed-by: Yonghong Zhu <yonghong.zhu@intel.com>
Best Regards,
Zhu Yonghong
-----Original Message-----
From: edk2-devel [mailto:edk2-devel-bounces@lists.01.org] On Behalf Of Liming Gao
Sent: Thursday, December 29, 2016 10:52 AM
To: edk2-devel@lists.01.org
Subject: [edk2] [Patch 0/2] Update toolsetup.bat to easily compile BaseTools source
https://bugzilla.tianocore.org/show_bug.cgi?id=314
Liming Gao (2):
BaseTools toolsetup.bat: Set env when the binary tools are missing
BaseTools toolsetup.bat: set PATH to include Bin Win32 directory
BaseTools/toolsetup.bat | 10 ++++++----
1 file changed, 6 insertions(+), 4 deletions(-)
--
2.8.0.windows.1
_______________________________________________
edk2-devel mailing list
edk2-devel@lists.01.org
https://lists.01.org/mailman/listinfo/edk2-devel
^ permalink raw reply [flat|nested] 4+ messages in thread