edk2-buildtools-commits

SF.net SVN: edk2-buildtools:[2582] trunk/BaseTools/toolsetup.bat

[<lg...@us...>]

Revision: 2582
          http://edk2-buildtools.svn.sourceforge.net/edk2-buildtools/?rev=2582&view=rev
Author:   lgao4
Date:     2013-05-22 02:15:34 +0000 (Wed, 22 May 2013)
Log Message:
-----------
Correct the incorrect License in EDKII source files.
Signed-off-by: Liming Gao <lim...@in...>
Reviewed-by: Hess Chen (hes...@in...)

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

Modified: trunk/BaseTools/toolsetup.bat
===================================================================
--- trunk/BaseTools/toolsetup.bat	2013-05-07 15:21:51 UTC (rev 2581)
+++ trunk/BaseTools/toolsetup.bat	2013-05-22 02:15:34 UTC (rev 2582)
@@ -3,10 +3,10 @@
 @REM   however it may be executed directly from the BaseTools project folder
 @REM   if the file is not executed within a WORKSPACE\BaseTools folder.
 @REM
-@REM Copyright (c) 2006 - 2012, Intel Corporation. All rights reserved.<BR>
+@REM Copyright (c) 2006 - 2013, Intel Corporation. All rights reserved.<BR>
 @REM
 @REM This program and the accompanying materials are licensed and made available
-@REM under the terms and conditions of the BSD Licensewhich accompanies this 
+@REM under the terms and conditions of the BSD License which accompanies this 
 @REM distribution.  The full text of the license may be found at:
 @REM   http://opensource.org/licenses/bsd-license.php
 @REM

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

SF.net SVN: edk2-buildtools:[2652] trunk/BaseTools/toolsetup.bat

[<oli...@us...>]

Revision: 2652
          http://sourceforge.net/p/edk2-buildtools/code/2652
Author:   oliviermartin
Date:     2014-02-24 14:07:06 +0000 (Mon, 24 Feb 2014)
Log Message:
-----------
BaseTools: Rectify use of @ in .BAT files.

Tracing of the .BAT files is obscured by use of the @ prefix
and is confused by the "echo on" at the end of toolsetup.bat.

Silent all the 'echo' with '@'. And remove '@' from the non
'echo' line to make easier to trace the batch files when 'echo on'.

Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: Olivier Martin <oli...@ar...>
Reviewed-by Yingke Liu <yin...@in...>

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

Modified: trunk/BaseTools/toolsetup.bat
===================================================================
--- trunk/BaseTools/toolsetup.bat	2014-02-24 12:41:11 UTC (rev 2651)
+++ trunk/BaseTools/toolsetup.bat	2014-02-24 14:07:06 UTC (rev 2652)
@@ -22,32 +22,32 @@
 @REM # You should not have to modify anything below this line
 @REM #
 
-@if /I "%1"=="-h" goto Usage
-@if /I "%1"=="-help" goto Usage
-@if /I "%1"=="--help" goto Usage
-@if /I "%1"=="/h" goto Usage
-@if /I "%1"=="/help" goto Usage
-@if /I "%1"=="/?" goto Usage
+if /I "%1"=="-h" goto Usage
+if /I "%1"=="-help" goto Usage
+if /I "%1"=="--help" goto Usage
+if /I "%1"=="/h" goto Usage
+if /I "%1"=="/help" goto Usage
+if /I "%1"=="/?" goto Usage
 
 
 :loop
-  @if "%1"=="" goto setup_workspace
-  @if /I "%1"=="--nt32" (
+  if "%1"=="" goto setup_workspace
+  if /I "%1"=="--nt32" (
     @REM Ignore --nt32 flag
     shift
     goto loop
   )
-  @if /I "%1"=="Reconfig" (
+  if /I "%1"=="Reconfig" (
     shift
     set RECONFIG=TRUE
     goto loop
   )
-  @if /I "%1"=="Rebuild" (
+  if /I "%1"=="Rebuild" (
     shift
     set REBUILD=TRUE
     goto loop
   )
-  @if /I "%1"=="ForceRebuild" (
+  if /I "%1"=="ForceRebuild" (
     shift
     set FORCE_REBUILD=TRUE
     goto loop
@@ -352,17 +352,17 @@
   goto end
 
 :Usage
-  echo.
+  @echo.
   echo  Usage: "%0 [-h | -help | --help | /h | /help | /?] [ Rebuild | ForceRebuild ] [Reconfig] [base_tools_path [edk_tools_path]]"
-  echo.
-  echo         base_tools_path   BaseTools project path, BASE_TOOLS_PATH will be set to this path. 
-  echo         edk_tools_path    EDK_TOOLS_PATH will be set to this path.
-  echo         Rebuild           If sources are available perform an Incremental build, only 
-  echo                           build those updated tools.
-  echo         ForceRebuild      If sources are available, rebuild all tools regardless of 
-  echo                           whether they have been updated or not.
-  echo         Reconfig          Reinstall target.txt, tools_def.txt and build_rule.txt.
-echo.
+  @echo.
+  @echo         base_tools_path   BaseTools project path, BASE_TOOLS_PATH will be set to this path. 
+  @echo         edk_tools_path    EDK_TOOLS_PATH will be set to this path.
+  @echo         Rebuild           If sources are available perform an Incremental build, only 
+  @echo                           build those updated tools.
+  @echo         ForceRebuild      If sources are available, rebuild all tools regardless of 
+  @echo                           whether they have been updated or not.
+  @echo         Reconfig          Reinstall target.txt, tools_def.txt and build_rule.txt.
+  @echo.
 
 :end
 set REBUILD=
@@ -370,5 +370,3 @@
 set RECONFIG=
 popd
 
-@echo on
-

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

SF.net SVN: edk2-buildtools:[2653] trunk/BaseTools/toolsetup.bat

[<oli...@us...>]

Revision: 2653
          http://sourceforge.net/p/edk2-buildtools/code/2653
Author:   oliviermartin
Date:     2014-02-24 14:16:30 +0000 (Mon, 24 Feb 2014)
Log Message:
-----------
BaseTools/toolsetup.bat: Basetools corrupts PYTHONPATH

The PYTHONPATH variable is used globally by Python, but is corrupted by toolsetup.bat
that means that downstream invocation of python scripts may fail as they will
not be able to find library modules.
The basic fix is to use set PYTHONPATH=%BASETOOLS_PYTHON_SOURCE%;%PYTHONPATH%

Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: Olivier Martin <oli...@ar...>
Reviewed-by Yingke Liu <yin...@in...>

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

Modified: trunk/BaseTools/toolsetup.bat
===================================================================
--- trunk/BaseTools/toolsetup.bat	2014-02-24 14:07:06 UTC (rev 2652)
+++ trunk/BaseTools/toolsetup.bat	2014-02-24 14:16:30 UTC (rev 2653)
@@ -246,7 +246,8 @@
   )
   set PATH=%BASE_TOOLS_PATH%\Bin\Win32;%PATH%
 
-  set PYTHONPATH=%BASE_TOOLS_PATH%\Source\Python
+  set BASETOOLS_PYTHON_SOURCE=%BASE_TOOLS_PATH%\Source\Python
+  set PYTHONPATH=%BASETOOLS_PYTHON_SOURCE%;%PYTHONPATH%
 
   if not defined PYTHON_HOME (
     if defined PYTHONHOME (
@@ -279,8 +280,9 @@
       echo !!! WARNING !!! Will not be able to compile Python programs to .exe
       echo Will setup environment to run Python scripts directly.
       echo.
-      set PYTHONPATH=%BASE_TOOLS_PATH%\Source\Python
-      set PATH=%PYTHONPATH%\build;%PYTHONPATH%\GenFds;%PYTHONPATH%\Trim;%PATH%
+      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
     )
   )

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.