Skip to content

Commit

Permalink
Revert BaseTools: PYTHON3 migration
Browse files Browse the repository at this point in the history
This reverts commit 6693f35..
678f851.

Python3 migration is the fundamental change. It requires every developer
to install Python3. Before this migration, the well communication and wide
verification must be done. But now, most people is not aware of this change,
and not try it. So, Python3 migration is reverted and be moved to edk2-staging
Python3 branch for the edk2 user evaluation.

Contributed-under: TianoCore Contribution Agreement 1.1
Signed-off-by: Liming Gao <liming.gao@intel.com>
  • Loading branch information
lgao4 committed Oct 15, 2018
1 parent 678f851 commit 1ccc4d8
Show file tree
Hide file tree
Showing 182 changed files with 46,682 additions and 13,732 deletions.
6 changes: 3 additions & 3 deletions BaseTools/Bin/CYGWIN_NT-5.1-i686/Ecc
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
#!/usr/bin/env bash
#python `dirname $0`/RunToolFromSource.py `basename $0` $*

# If a $PYTHON3 command is available, use it in preference to python
if command -v $PYTHON3 >/dev/null 2>&1; then
python_exe=$PYTHON3
# If a python2 command is available, use it in preference to python
if command -v python2 >/dev/null 2>&1; then
python_exe=python2
fi

full_cmd=${BASH_SOURCE:-$0} # see http://mywiki.wooledge.org/BashFAQ/028 for a discussion of why $0 is not a good choice here
Expand Down
6 changes: 3 additions & 3 deletions BaseTools/Bin/CYGWIN_NT-5.1-i686/GenDepex
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
#!/usr/bin/env bash
#python `dirname $0`/RunToolFromSource.py `basename $0` $*

# If a $PYTHON3 command is available, use it in preference to python
if command -v $PYTHON3 >/dev/null 2>&1; then
python_exe=$PYTHON3
# If a python2 command is available, use it in preference to python
if command -v python2 >/dev/null 2>&1; then
python_exe=python2
fi

full_cmd=${BASH_SOURCE:-$0} # see http://mywiki.wooledge.org/BashFAQ/028 for a discussion of why $0 is not a good choice here
Expand Down
6 changes: 3 additions & 3 deletions BaseTools/Bin/CYGWIN_NT-5.1-i686/GenFds
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
#!/usr/bin/env bash
#python `dirname $0`/RunToolFromSource.py `basename $0` $*

# If a $PYTHON3 command is available, use it in preference to python
if command -v $PYTHON3 >/dev/null 2>&1; then
python_exe=$PYTHON3
# If a python2 command is available, use it in preference to python
if command -v python2 >/dev/null 2>&1; then
python_exe=python2
fi

full_cmd=${BASH_SOURCE:-$0} # see http://mywiki.wooledge.org/BashFAQ/028 for a discussion of why $0 is not a good choice here
Expand Down
6 changes: 3 additions & 3 deletions BaseTools/Bin/CYGWIN_NT-5.1-i686/TargetTool
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
#!/usr/bin/env bash
#python `dirname $0`/RunToolFromSource.py `basename $0` $*

# If a $PYTHON3 command is available, use it in preference to python
if command -v $PYTHON3 >/dev/null 2>&1; then
python_exe=$PYTHON3
# If a python2 command is available, use it in preference to python
if command -v python2 >/dev/null 2>&1; then
python_exe=python2
fi

full_cmd=${BASH_SOURCE:-$0} # see http://mywiki.wooledge.org/BashFAQ/028 for a discussion of why $0 is not a good choice here
Expand Down
6 changes: 3 additions & 3 deletions BaseTools/Bin/CYGWIN_NT-5.1-i686/Trim
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
#!/usr/bin/env bash
#python `dirname $0`/RunToolFromSource.py `basename $0` $*

# If a $PYTHON3 command is available, use it in preference to python
if command -v $PYTHON3 >/dev/null 2>&1; then
python_exe=$PYTHON3
# If a python2 command is available, use it in preference to python
if command -v python2 >/dev/null 2>&1; then
python_exe=python2
fi

full_cmd=${BASH_SOURCE:-$0} # see http://mywiki.wooledge.org/BashFAQ/028 for a discussion of why $0 is not a good choice here
Expand Down
6 changes: 3 additions & 3 deletions BaseTools/Bin/CYGWIN_NT-5.1-i686/build
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
#!/usr/bin/env bash
#python `dirname $0`/RunToolFromSource.py `basename $0` $*

# If a $PYTHON3 command is available, use it in preference to python
if command -v $PYTHON3 >/dev/null 2>&1; then
python_exe=$PYTHON3
# If a python2 command is available, use it in preference to python
if command -v python2 >/dev/null 2>&1; then
python_exe=python2
fi

full_cmd=${BASH_SOURCE:-$0} # see http://mywiki.wooledge.org/BashFAQ/028 for a discussion of why $0 is not a good choice here
Expand Down
6 changes: 3 additions & 3 deletions BaseTools/BinWrappers/PosixLike/BPDG
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
#!/usr/bin/env bash
#python `dirname $0`/RunToolFromSource.py `basename $0` $*

# If a PYTHON3 command is available, use it in preference to python
if command -v $PYTHON3 >/dev/null 2>&1; then
python_exe=$PYTHON3
# If a python2 command is available, use it in preference to python
if command -v python2 >/dev/null 2>&1; then
python_exe=python2
fi

full_cmd=${BASH_SOURCE:-$0} # see http://mywiki.wooledge.org/BashFAQ/028 for a discussion of why $0 is not a good choice here
Expand Down
6 changes: 3 additions & 3 deletions BaseTools/BinWrappers/PosixLike/Ecc
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
#!/usr/bin/env bash
#python `dirname $0`/RunToolFromSource.py `basename $0` $*

# If a PYTHON3 command is available, use it in preference to python
if command -v $PYTHON3 >/dev/null 2>&1; then
python_exe=$PYTHON3
# If a python2 command is available, use it in preference to python
if command -v python2 >/dev/null 2>&1; then
python_exe=python2
fi

full_cmd=${BASH_SOURCE:-$0} # see http://mywiki.wooledge.org/BashFAQ/028 for a discussion of why $0 is not a good choice here
Expand Down
6 changes: 3 additions & 3 deletions BaseTools/BinWrappers/PosixLike/GenDepex
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
#!/usr/bin/env bash
#python `dirname $0`/RunToolFromSource.py `basename $0` $*

# If a PYTHON3 command is available, use it in preference to python
if command -v $PYTHON3 >/dev/null 2>&1; then
python_exe=$PYTHON3
# If a python2 command is available, use it in preference to python
if command -v python2 >/dev/null 2>&1; then
python_exe=python2
fi

full_cmd=${BASH_SOURCE:-$0} # see http://mywiki.wooledge.org/BashFAQ/028 for a discussion of why $0 is not a good choice here
Expand Down
6 changes: 3 additions & 3 deletions BaseTools/BinWrappers/PosixLike/GenFds
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
#!/usr/bin/env bash
#python `dirname $0`/RunToolFromSource.py `basename $0` $*

# If a PYTHON3 command is available, use it in preference to python
if command -v $PYTHON3 >/dev/null 2>&1; then
python_exe=$PYTHON3
# If a python2 command is available, use it in preference to python
if command -v python2 >/dev/null 2>&1; then
python_exe=python2
fi

full_cmd=${BASH_SOURCE:-$0} # see http://mywiki.wooledge.org/BashFAQ/028 for a discussion of why $0 is not a good choice here
Expand Down
6 changes: 3 additions & 3 deletions BaseTools/BinWrappers/PosixLike/GenPatchPcdTable
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
#!/usr/bin/env bash
#python `dirname $0`/RunToolFromSource.py `basename $0` $*

# If a PYTHON3 command is available, use it in preference to python
if command -v $PYTHON3 >/dev/null 2>&1; then
python_exe=$PYTHON3
# If a python2 command is available, use it in preference to python
if command -v python2 >/dev/null 2>&1; then
python_exe=python2
fi

full_cmd=${BASH_SOURCE:-$0} # see http://mywiki.wooledge.org/BashFAQ/028 for a discussion of why $0 is not a good choice here
Expand Down
6 changes: 3 additions & 3 deletions BaseTools/BinWrappers/PosixLike/GenerateCapsule
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
#!/usr/bin/env bash
#python `dirname $0`/RunToolFromSource.py `basename $0` $*

# If a PYTHON3 command is available, use it in preference to python
if command -v $PYTHON3 >/dev/null 2>&1; then
python_exe=$PYTHON3
# If a python2 command is available, use it in preference to python
if command -v python2 >/dev/null 2>&1; then
python_exe=python2
fi

full_cmd=${BASH_SOURCE:-$0} # see http://mywiki.wooledge.org/BashFAQ/028 for a discussion of why $0 is not a good choice here
Expand Down
6 changes: 3 additions & 3 deletions BaseTools/BinWrappers/PosixLike/PatchPcdValue
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
#!/usr/bin/env bash
#python `dirname $0`/RunToolFromSource.py `basename $0` $*

# If a PYTHON3 command is available, use it in preference to python
if command -v $PYTHON3 >/dev/null 2>&1; then
python_exe=$PYTHON3
# If a python2 command is available, use it in preference to python
if command -v python2 >/dev/null 2>&1; then
python_exe=python2
fi

full_cmd=${BASH_SOURCE:-$0} # see http://mywiki.wooledge.org/BashFAQ/028 for a discussion of why $0 is not a good choice here
Expand Down
6 changes: 3 additions & 3 deletions BaseTools/BinWrappers/PosixLike/Pkcs7Sign
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
#!/usr/bin/env bash
#python `dirname $0`/RunToolFromSource.py `basename $0` $*

# If a PYTHON3 command is available, use it in preference to python
if command -v $PYTHON3 >/dev/null 2>&1; then
python_exe=$PYTHON3
# If a python2 command is available, use it in preference to python
if command -v python2 >/dev/null 2>&1; then
python_exe=python2
fi

full_cmd=${BASH_SOURCE:-$0} # see http://mywiki.wooledge.org/BashFAQ/028 for a discussion of why $0 is not a good choice here
Expand Down
6 changes: 3 additions & 3 deletions BaseTools/BinWrappers/PosixLike/Rsa2048Sha256GenerateKeys
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
#!/usr/bin/env bash
#python `dirname $0`/RunToolFromSource.py `basename $0` $*

# If a PYTHON3 command is available, use it in preference to python
if command -v $PYTHON3 >/dev/null 2>&1; then
python_exe=$PYTHON3
# If a python2 command is available, use it in preference to python
if command -v python2 >/dev/null 2>&1; then
python_exe=python2
fi

full_cmd=${BASH_SOURCE:-$0} # see http://mywiki.wooledge.org/BashFAQ/028 for a discussion of why $0 is not a good choice here
Expand Down
6 changes: 3 additions & 3 deletions BaseTools/BinWrappers/PosixLike/Rsa2048Sha256Sign
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
#!/usr/bin/env bash
#python `dirname $0`/RunToolFromSource.py `basename $0` $*

# If a PYTHON3 command is available, use it in preference to python
if command -v $PYTHON3 >/dev/null 2>&1; then
python_exe=$PYTHON3
# If a python2 command is available, use it in preference to python
if command -v python2 >/dev/null 2>&1; then
python_exe=python2
fi

full_cmd=${BASH_SOURCE:-$0} # see http://mywiki.wooledge.org/BashFAQ/028 for a discussion of why $0 is not a good choice here
Expand Down
6 changes: 3 additions & 3 deletions BaseTools/BinWrappers/PosixLike/TargetTool
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
#!/usr/bin/env bash
#python `dirname $0`/RunToolFromSource.py `basename $0` $*

# If a PYTHON3 command is available, use it in preference to python
if command -v $PYTHON3 >/dev/null 2>&1; then
python_exe=$PYTHON3
# If a python2 command is available, use it in preference to python
if command -v python2 >/dev/null 2>&1; then
python_exe=python2
fi

full_cmd=${BASH_SOURCE:-$0} # see http://mywiki.wooledge.org/BashFAQ/028 for a discussion of why $0 is not a good choice here
Expand Down
6 changes: 3 additions & 3 deletions BaseTools/BinWrappers/PosixLike/Trim
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
#!/usr/bin/env bash
#python `dirname $0`/RunToolFromSource.py `basename $0` $*

# If a PYTHON3 command is available, use it in preference to python
if command -v $PYTHON3 >/dev/null 2>&1; then
python_exe=$PYTHON3
# If a python2 command is available, use it in preference to python
if command -v python2 >/dev/null 2>&1; then
python_exe=python2
fi

full_cmd=${BASH_SOURCE:-$0} # see http://mywiki.wooledge.org/BashFAQ/028 for a discussion of why $0 is not a good choice here
Expand Down
6 changes: 3 additions & 3 deletions BaseTools/BinWrappers/PosixLike/UPT
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
#!/usr/bin/env bash
#python `dirname $0`/RunToolFromSource.py `basename $0` $*

# If a PYTHON3 command is available, use it in preference to python
if command -v $PYTHON3 >/dev/null 2>&1; then
python_exe=$PYTHON3
# If a python2 command is available, use it in preference to python
if command -v python2 >/dev/null 2>&1; then
python_exe=python2
fi

full_cmd=${BASH_SOURCE:-$0} # see http://mywiki.wooledge.org/BashFAQ/028 for a discussion of why $0 is not a good choice here
Expand Down
6 changes: 3 additions & 3 deletions BaseTools/BinWrappers/PosixLike/build
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
#!/usr/bin/env bash
#python `dirname $0`/RunToolFromSource.py `basename $0` $*

# If a PYTHON3 command is available, use it in preference to python
if command -v $PYTHON3 >/dev/null 2>&1; then
python_exe=$PYTHON3
# If a python2 command is available, use it in preference to python
if command -v python2 >/dev/null 2>&1; then
python_exe=python2
fi

full_cmd=${BASH_SOURCE:-$0} # see http://mywiki.wooledge.org/BashFAQ/028 for a discussion of why $0 is not a good choice here
Expand Down
2 changes: 1 addition & 1 deletion BaseTools/BinWrappers/WindowsLike/BPDG.bat
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
@setlocal
@set ToolName=%~n0%
@set PYTHONPATH=%PYTHONPATH%;%BASE_TOOLS_PATH%\Source\Python
@%PYTHON3% -m %ToolName%.%ToolName% %*
@%PYTHON_HOME%\python.exe -m %ToolName%.%ToolName% %*
2 changes: 1 addition & 1 deletion BaseTools/BinWrappers/WindowsLike/Ecc.bat
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
@setlocal
@set ToolName=%~n0%
@set PYTHONPATH=%PYTHONPATH%;%BASE_TOOLS_PATH%\Source\Python
@%PYTHON3% -m %ToolName%.EccMain %*
@%PYTHON_HOME%\python.exe -m %ToolName%.EccMain %*
2 changes: 1 addition & 1 deletion BaseTools/BinWrappers/WindowsLike/GenDepex.bat
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
@setlocal
@set ToolName=%~n0%
@%PYTHON3% %BASE_TOOLS_PATH%\Source\Python\AutoGen\%ToolName%.py %*
@%PYTHON_HOME%\python.exe %BASE_TOOLS_PATH%\Source\Python\AutoGen\%ToolName%.py %*
2 changes: 1 addition & 1 deletion BaseTools/BinWrappers/WindowsLike/GenFds.bat
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
@setlocal
@set ToolName=%~n0%
@set PYTHONPATH=%PYTHONPATH%;%BASE_TOOLS_PATH%\Source\Python
@%PYTHON3% -m %ToolName%.%ToolName% %*
@%PYTHON_HOME%\python.exe -m %ToolName%.%ToolName% %*
2 changes: 1 addition & 1 deletion BaseTools/BinWrappers/WindowsLike/GenPatchPcdTable.bat
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
@setlocal
@set ToolName=%~n0%
@%PYTHON3% %BASE_TOOLS_PATH%\Source\Python\%ToolName%\%ToolName%.py %*
@%PYTHON_HOME%\python.exe %BASE_TOOLS_PATH%\Source\Python\%ToolName%\%ToolName%.py %*
2 changes: 1 addition & 1 deletion BaseTools/BinWrappers/WindowsLike/GenerateCapsule.bat
Original file line number Diff line number Diff line change
@@ -1 +1 @@
@%PYTHON3% %BASE_TOOLS_PATH%\Source\Python\Capsule\GenerateCapsule.py %*
@%PYTHON_HOME%\python.exe %BASE_TOOLS_PATH%\Source\Python\Capsule\GenerateCapsule.py %*
2 changes: 1 addition & 1 deletion BaseTools/BinWrappers/WindowsLike/PatchPcdValue.bat
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
@setlocal
@set ToolName=%~n0%
@%PYTHON3% %BASE_TOOLS_PATH%\Source\Python\%ToolName%\%ToolName%.py %*
@%PYTHON_HOME%\python.exe %BASE_TOOLS_PATH%\Source\Python\%ToolName%\%ToolName%.py %*
2 changes: 1 addition & 1 deletion BaseTools/BinWrappers/WindowsLike/Pkcs7Sign.bat
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
@setlocal
@set ToolName=%~n0%
@%PYTHON3% %BASE_TOOLS_PATH%\Source\Python\%ToolName%\%ToolName%.py %*
@%PYTHON_HOME%\python.exe %BASE_TOOLS_PATH%\Source\Python\%ToolName%\%ToolName%.py %*
Original file line number Diff line number Diff line change
@@ -1 +1 @@
@%PYTHON3% %BASE_TOOLS_PATH%\Source\Python\Rsa2048Sha256Sign\Rsa2048Sha256GenerateKeys.py %*
@%PYTHON_HOME%\python.exe %BASE_TOOLS_PATH%\Source\Python\Rsa2048Sha256Sign\Rsa2048Sha256GenerateKeys.py %*
2 changes: 1 addition & 1 deletion BaseTools/BinWrappers/WindowsLike/Rsa2048Sha256Sign.bat
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
@setlocal
@set ToolName=%~n0%
@%PYTHON3% %BASE_TOOLS_PATH%\Source\Python\%ToolName%\%ToolName%.py %*
@%PYTHON_HOME%\python.exe %BASE_TOOLS_PATH%\Source\Python\%ToolName%\%ToolName%.py %*
2 changes: 1 addition & 1 deletion BaseTools/BinWrappers/WindowsLike/TargetTool.bat
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
@setlocal
@set ToolName=%~n0%
@%PYTHON3% %BASE_TOOLS_PATH%\Source\Python\%ToolName%\%ToolName%.py %*
@%PYTHON_HOME%\python.exe %BASE_TOOLS_PATH%\Source\Python\%ToolName%\%ToolName%.py %*
2 changes: 1 addition & 1 deletion BaseTools/BinWrappers/WindowsLike/Trim.bat
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
@setlocal
@set ToolName=%~n0%
@%PYTHON3% %BASE_TOOLS_PATH%\Source\Python\%ToolName%\%ToolName%.py %*
@%PYTHON_HOME%\python.exe %BASE_TOOLS_PATH%\Source\Python\%ToolName%\%ToolName%.py %*
2 changes: 1 addition & 1 deletion BaseTools/BinWrappers/WindowsLike/UPT.bat
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
@setlocal
@set ToolName=%~n0%
@%PYTHON3% %BASE_TOOLS_PATH%\Source\Python\%ToolName%\%ToolName%.py %*
@%PYTHON_HOME%\python.exe %BASE_TOOLS_PATH%\Source\Python\%ToolName%\%ToolName%.py %*
2 changes: 1 addition & 1 deletion BaseTools/BinWrappers/WindowsLike/build.bat
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
@setlocal
@set ToolName=%~n0%
@%PYTHON3% %BASE_TOOLS_PATH%\Source\Python\%ToolName%\%ToolName%.py %*
@%PYTHON_HOME%\python.exe %BASE_TOOLS_PATH%\Source\Python\%ToolName%\%ToolName%.py %*
14 changes: 7 additions & 7 deletions BaseTools/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -15,24 +15,24 @@
!ERROR "BASE_TOOLS_PATH is not set! Please run toolsetup.bat first!"
!ENDIF

SUBDIRS = $(BASE_TOOLS_PATH)\Source\C
SUBDIRS = $(BASE_TOOLS_PATH)\Source\C $(BASE_TOOLS_PATH)\Source\Python

all: c
all: c python

c :
@$(PYTHON3) $(BASE_TOOLS_PATH)\Source\C\Makefiles\NmakeSubdirs.py all $(BASE_TOOLS_PATH)\Source\C
@$(PYTHON_HOME)\python.exe $(BASE_TOOLS_PATH)\Source\C\Makefiles\NmakeSubdirs.py all $(BASE_TOOLS_PATH)\Source\C

python:
@$(PYTHON3) $(BASE_TOOLS_PATH)\Source\C\Makefiles\NmakeSubdirs.py all $(BASE_TOOLS_PATH)\Source\Python
@$(PYTHON_HOME)\python.exe $(BASE_TOOLS_PATH)\Source\C\Makefiles\NmakeSubdirs.py all $(BASE_TOOLS_PATH)\Source\Python

subdirs: $(SUBDIRS)
@$(PYTHON3) $(BASE_TOOLS_PATH)\Source\C\Makefiles\NmakeSubdirs.py all $**
@$(PYTHON_HOME)\python.exe $(BASE_TOOLS_PATH)\Source\C\Makefiles\NmakeSubdirs.py all $**

.PHONY: clean
clean:
$(PYTHON3) $(BASE_TOOLS_PATH)\Source\C\Makefiles\NmakeSubdirs.py clean $(SUBDIRS)
$(PYTHON_HOME)\python.exe $(BASE_TOOLS_PATH)\Source\C\Makefiles\NmakeSubdirs.py clean $(SUBDIRS)

.PHONY: cleanall
cleanall:
$(PYTHON3) $(BASE_TOOLS_PATH)\Source\C\Makefiles\NmakeSubdirs.py cleanall $(SUBDIRS)
$(PYTHON_HOME)\python.exe $(BASE_TOOLS_PATH)\Source\C\Makefiles\NmakeSubdirs.py cleanall $(SUBDIRS)

4 changes: 2 additions & 2 deletions BaseTools/Scripts/PackageDocumentTools/Readme.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
Prerequisite Tools:
1. Install Python 3.6.6 from https://www.python.org/downloads/release/python-366/
2. Install wxPython 4.0.3 from https://pypi.org/project/wxPython/#files
1. Install Python 2.7.3 from https://www.python.org/download/releases/2.7.3/
2. Install wxPython 2.8.12.1 from https://sourceforge.net/projects/wxpython/files/wxPython/2.8.12.1/
generally the libraries will be installed at python's subfolder, for example in windows: c:\python27\Lib\site-packages\
3. Install DoxyGen 1.8.6 from https://sourceforge.net/projects/doxygen/files/rel-1.8.6/
4. (Windows only) Install Htmlhelp tool from https://msdn.microsoft.com/en-us/library/windows/desktop/ms669985(v=vs.85).aspx
Expand Down
7 changes: 4 additions & 3 deletions BaseTools/Scripts/PackageDocumentTools/packagedoc_cli.py
Original file line number Diff line number Diff line change
Expand Up @@ -12,11 +12,12 @@
# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
#

from __future__ import print_function
import os, sys, logging, traceback, subprocess
from optparse import OptionParser

from .plugins.EdkPlugins.edk2.model import baseobject
from .plugins.EdkPlugins.edk2.model import doxygengen
import plugins.EdkPlugins.edk2.model.baseobject as baseobject
import plugins.EdkPlugins.edk2.model.doxygengen as doxygengen

gArchMarcoDict = {'ALL' : 'MDE_CPU_IA32 MDE_CPU_X64 MDE_CPU_EBC MDE_CPU_IPF _MSC_EXTENSIONS __GNUC__ __INTEL_COMPILER',
'IA32_MSFT': 'MDE_CPU_IA32 _MSC_EXTENSIONS',
Expand All @@ -37,7 +38,7 @@ def parseCmdArgs():
help='Specify the absolute path of doxygen tools installation. For example: C:\\Program Files\\doxygen\bin\doxygen.exe')
parser.add_option('-o', '--output', action='store', dest='OutputPath',
help='Specify the document output path. For example: c:\\docoutput')
parser.add_option('-a', '--arch', action='store', dest='Arch', choices=list(gArchMarcoDict.keys()),
parser.add_option('-a', '--arch', action='store', dest='Arch', choices=gArchMarcoDict.keys(),
help='Specify the architecture used in preprocess package\'s source. For example: -a IA32_MSFT')
parser.add_option('-m', '--mode', action='store', dest='DocumentMode', choices=['CHM', 'HTML'],
help='Specify the document mode from : CHM or HTML')
Expand Down
Loading

0 comments on commit 1ccc4d8

Please sign in to comment.