Revision: 19028
          http://sourceforge.net/p/edk2/code/19028
Author:   yzhu52
Date:     2015-11-30 03:43:25 +0000 (Mon, 30 Nov 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.

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

Modified Paths:
--------------
    trunk/edk2/BaseTools/toolsetup.bat

Modified: trunk/edk2/BaseTools/toolsetup.bat
===================================================================
--- trunk/edk2/BaseTools/toolsetup.bat  2015-11-30 03:40:37 UTC (rev 19027)
+++ trunk/edk2/BaseTools/toolsetup.bat  2015-11-30 03:43:25 UTC (rev 19028)
@@ -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%


------------------------------------------------------------------------------
Go from Idea to Many App Stores Faster with Intel(R) XDK
Give your users amazing mobile app experiences with Intel(R) XDK.
Use one codebase in this all-in-one HTML5 development environment.
Design, debug & build mobile apps & 2D/3D high-impact games for multiple OSs.
http://pubads.g.doubleclick.net/gampad/clk?id=254741551&iu=/4140
_______________________________________________
edk2-commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/edk2-commits

Reply via email to