Revision: 19368
          http://sourceforge.net/p/edk2/code/19368
Author:   vanjeff
Date:     2015-12-18 06:41:38 +0000 (Fri, 18 Dec 2015)
Log Message:
-----------
BaseTools/toolsetup.bat: fixed the error when the path contains space

We have a new simple and effective method to resolve the original issue
that the PATH env's update error when the path contains space, so this
patch remove the last check in and use the new method to fix the original
issue.

(Sync patch r19028 from main trunk.)

Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: Yonghong Zhu <[email protected]>
Reviewed-by: Liming Gao <[email protected]>

Revision Links:
--------------
    http://sourceforge.net/p/edk2/code/19028

Modified Paths:
--------------
    branches/UDK2015/BaseTools/toolsetup.bat

Modified: branches/UDK2015/BaseTools/toolsetup.bat
===================================================================
--- branches/UDK2015/BaseTools/toolsetup.bat    2015-12-18 06:31:31 UTC (rev 
19367)
+++ branches/UDK2015/BaseTools/toolsetup.bat    2015-12-18 06:41:38 UTC (rev 
19368)
@@ -322,24 +322,13 @@
       echo !!! WARNING !!! Will not be able to compile Python programs to .exe
       echo Will setup environment to run Python scripts directly.
       echo.
-      goto UpdatePATH
+      set "PATH=%BASETOOLS_PYTHON_SOURCE%\Trim;%PATH%"
+      set "PATH=%BASETOOLS_PYTHON_SOURCE%\GenFds;%PATH%"
+      set "PATH=%BASETOOLS_PYTHON_SOURCE%\build;%PATH%"
+      set PATHEXT=%PATHEXT%;.py
     )
-    else (
-      goto UpdateEnv
-    )
   )
-  else (
-    goto UpdateEnv
-  )
- 
-:UpdatePATH
-  set PATH=%BASETOOLS_PYTHON_SOURCE%\Trim;%PATH%
-  set PATH=%BASETOOLS_PYTHON_SOURCE%\GenFds;%PATH%
-  set PATH=%BASETOOLS_PYTHON_SOURCE%\build;%PATH%
-  set PATHEXT=%PATHEXT%;.py
-  goto UpdateEnv
- 
-:UpdateEnv
+  
   echo BASE_TOOLS_PATH     = %BASE_TOOLS_PATH%
   echo     PYTHON_PATH     = %PYTHON_PATH%
   echo PYTHON_FREEZER_PATH = %PYTHON_FREEZER_PATH%


------------------------------------------------------------------------------
_______________________________________________
edk2-commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/edk2-commits

Reply via email to