cfbe3c3500
BaseTools: change hex parsing to use built in
...
use <char> in string.hexdigits instead of custom functions.
Cc: Yonghong Zhu <yonghong.zhu@intel.com >
Cc: Liming Gao <liming.gao@intel.com >
Contributed-under: TianoCore Contribution Agreement 1.1
Signed-off-by: Jaben Carsey <jaben.carsey@intel.com >
Reviewed-by: Yonghong Zhu <yonghong.zhu@intel.com >
2018-04-03 17:37:33 +08:00
147a656b34
BaseTools: use new RegEx from FdfParserLite
...
FdfParser has identical one. import and share.
Cc: Liming Gao <liming.gao@intel.com >
Cc: Yonghong Zhu <yonghong.zhu@intel.com >
Contributed-under: TianoCore Contribution Agreement 1.1
Signed-off-by: Jaben Carsey <jaben.carsey@intel.com >
Reviewed-by: Yonghong Zhu <yonghong.zhu@intel.com >
2018-04-03 17:36:15 +08:00
4f9e71e1f7
BaseTools: use single RegExp for token matching
...
same pattern was compiled 3 places in the file. just compile once and share.
Cc: Liming Gao <liming.gao@intel.com >
Cc: Yonghong Zhu <yonghong.zhu@intel.com >
Contributed-under: TianoCore Contribution Agreement 1.1
Signed-off-by: Jaben Carsey <jaben.carsey@intel.com >
Reviewed-by: Yonghong Zhu <yonghong.zhu@intel.com >
2018-04-03 17:35:31 +08:00
0b560b980c
BaseTools: cleanup class heirarchy
...
remove totally empty classes from class heirarchy
Cc: Liming Gao <liming.gao@intel.com >
Cc: Yonghong Zhu <yonghong.zhu@intel.com >
Contributed-under: TianoCore Contribution Agreement 1.1
Signed-off-by: Jaben Carsey <jaben.carsey@intel.com >
Reviewed-by: Yonghong Zhu <yonghong.zhu@intel.com >
2018-03-30 09:17:30 +08:00
5fbb0f9908
BaseTools: remove loop and variables.
...
this loop does nothing. none of Key, Item, nor DevicePathList
are ever used.
Cc: Yonghong Zhu <yonghong.zhu@intel.com >
Cc: Liming Gao <liming.gao@intel.com >
Contributed-under: TianoCore Contribution Agreement 1.1
Signed-off-by: Jaben Carsey <jaben.carsey@intel.com >
Reviewed-by: Yonghong Zhu <yonghong.zhu@intel.com >
2018-03-30 09:17:09 +08:00
0a014fba41
BaseTools: use in to compare single chars
...
instead if 3 Startswith for single chars, just use in with a list of chars
Cc: Yonghong Zhu <yonghong.zhu@intel.com >
Cc: Liming Gao <liming.gao@intel.com >
Contributed-under: TianoCore Contribution Agreement 1.1
Signed-off-by: Jaben Carsey <jaben.carsey@intel.com >
Reviewed-by: Yonghong Zhu <yonghong.zhu@intel.com >
2018-03-30 09:16:27 +08:00
0944818a19
BaseTools: no need to do int() API work for it
...
int() with base=0 will already auto determine base from preceeding 0x/0X
Cc: Yonghong Zhu <yonghong.zhu@intel.com >
Cc: Liming Gao <liming.gao@intel.com >
Contributed-under: TianoCore Contribution Agreement 1.1
Signed-off-by: Jaben Carsey <jaben.carsey@intel.com >
Reviewed-by: Yonghong Zhu <yonghong.zhu@intel.com >
2018-03-30 09:16:01 +08:00
4231a8193e
BaseTools: Remove equality operator with None
...
replace "== None" with "is None" and "!= None" with "is not None"
Cc: Yonghong Zhu <yonghong.zhu@intel.com >
Cc: Liming Gao <liming.gao@intel.com >
Contributed-under: TianoCore Contribution Agreement 1.1
Signed-off-by: Jaben Carsey <jaben.carsey@intel.com >
Reviewed-by: Yonghong Zhu <yonghong.zhu@intel.com >
2018-03-30 08:25:13 +08:00
b1956b5d42
BaseTools: compare GUID value should not case-sensitive
...
build report error when the same Guid value in FDF file use lowercase,
in tools_def.txt file use uppercase.
The guid value's compare should not case-sensitive.
Cc: Liming Gao <liming.gao@intel.com >
Cc: Yonghong Zhu <yonghong.zhu@intel.com >
Contributed-under: TianoCore Contribution Agreement 1.1
Signed-off-by: Bin Wang <binx.a.wang@intel.com >
Reviewed-by: Yonghong Zhu <yonghong.zhu@intel.com >
2018-03-29 16:34:54 +08:00
cc0321f22a
BaseTools: refactor repeated RegExp when no special searching is needed.
...
use str.replace and try/except.
Cc: Liming Gao <liming.gao@intel.com >
Cc: Yonghong Zhu <yonghong.zhu@intel.com >
Contributed-under: TianoCore Contribution Agreement 1.1
Signed-off-by: Jaben Carsey <jaben.carsey@intel.com >
Reviewed-by: Yonghong Zhu <yonghong.zhu@intel.com >
2018-03-29 16:33:55 +08:00
e52aed0d85
BaseTools: dont use enumerate when un-needed
...
Since we only use the item from the list and not the numeric value,
dont bother with enumerate()
Cc: Liming Gao <liming.gao@intel.com >
Cc: Yonghong Zhu <yonghong.zhu@intel.com >
Contributed-under: TianoCore Contribution Agreement 1.1
Signed-off-by: Jaben Carsey <jaben.carsey@intel.com >
Reviewed-by: Yonghong Zhu <yonghong.zhu@intel.com >
2018-03-29 16:31:24 +08:00
38504ad3e3
BaseTools: move regular expression compile out of function call.
...
move to the root of the file and dont recompile.
Cc: Liming Gao <liming.gao@intel.com >
Cc: Yonghong Zhu <yonghong.zhu@intel.com >
Contributed-under: TianoCore Contribution Agreement 1.1
Signed-off-by: Jaben Carsey <jaben.carsey@intel.com >
Reviewed-by: Yonghong Zhu <yonghong.zhu@intel.com >
2018-03-29 16:28:43 +08:00
663b9e061e
BaseTools: expression can use single in instead of 3 API calls.
...
change 3 StartsWith() calls to a single 'in' operation.
Cc: Liming Gao <liming.gao@intel.com >
Cc: Yonghong Zhu <yonghong.zhu@intel.com >
Contributed-under: TianoCore Contribution Agreement 1.1
Signed-off-by: Jaben Carsey <jaben.carsey@intel.com >
Reviewed-by: Yonghong Zhu <yonghong.zhu@intel.com >
2018-03-29 16:28:11 +08:00
56326323e6
BaseTools: remove local hex number regular expression
...
Change to using the new shared hex number regular expression
Cc: Yonghong Zhu <yonghong.zhu@intel.com >
Cc: Liming Gao <liming.gao@intel.com >
Contributed-under: TianoCore Contribution Agreement 1.1
Signed-off-by: Jaben Carsey <jaben.carsey@intel.com >
Reviewed-by: Yonghong Zhu <yonghong.zhu@intel.com >
2018-03-29 16:26:38 +08:00
018f7b827f
BaseTools: Use precompiled RegExp
...
avoid recompiling the regular expression for each use in a while loop
Cc: Yonghong Zhu <yonghong.zhu@intel.com >
Cc: Liming Gao <liming.gao@intel.com >
Contributed-under: TianoCore Contribution Agreement 1.1
Signed-off-by: Jaben Carsey <jaben.carsey@intel.com >
Reviewed-by: Yonghong Zhu <yonghong.zhu@intel.com >
2018-03-29 16:20:22 +08:00
b1a9e404d4
BaseTools: use new shared GUID regular expressions
...
remove local variables that are GUID matching and replace with shared
expression.
Cc: Yonghong Zhu <yonghong.zhu@intel.com >
Cc: Liming Gao <liming.gao@intel.com >
Contributed-under: TianoCore Contribution Agreement 1.1
Signed-off-by: Jaben Carsey <jaben.carsey@intel.com >
Reviewed-by: Yonghong Zhu <yonghong.zhu@intel.com >
2018-03-29 16:18:29 +08:00
0760ed06a1
BaseTools: GlobalData Add a regular expression for a hex number
...
add a shared precompiled regular expression
Cc: Yonghong Zhu <yonghong.zhu@intel.com >
Cc: Liming Gao <liming.gao@intel.com >
Contributed-under: TianoCore Contribution Agreement 1.1
Signed-off-by: Jaben Carsey <jaben.carsey@intel.com >
Reviewed-by: Yonghong Zhu <yonghong.zhu@intel.com >
2018-03-29 10:17:46 +08:00
9e7790a352
BaseTools: Add new RegExp for future use
...
Add a precompiled RegExp for 4 hex chars.
v2: fixed incorrect numbers of {}
Cc: Yonghong Zhu <yonghong.zhu@intel.com >
Cc: Liming Gao <liming.gao@intel.com >
Contributed-under: TianoCore Contribution Agreement 1.1
Signed-off-by: Jaben Carsey <jaben.carsey@intel.com >
Reviewed-by: Yonghong Zhu <yonghong.zhu@intel.com >
2018-03-29 08:55:09 +08:00
256e2d885b
BaseTools: Regular Expressions refactor out the hex char for later reuse
...
move hex character info from GUID expressions into seperate variable to
facilitate reuse.
I had a type with insufficient {} in the first version.
Cc: Yonghong Zhu <yonghong.zhu@intel.com >
Cc: Liming Gao <liming.gao@intel.com >
Contributed-under: TianoCore Contribution Agreement 1.1
Signed-off-by: Jaben Carsey <jaben.carsey@intel.com >
Reviewed-by: Yonghong Zhu <yonghong.zhu@intel.com >
2018-03-29 08:54:35 +08:00
cd67d66484
BaseTools: add GUID pattern to global data
...
add a shared global regular expression for GUID matching
Cc: Yonghong Zhu <yonghong.zhu@intel.com >
Cc: Liming Gao <liming.gao@intel.com >
Contributed-under: TianoCore Contribution Agreement 1.1
Signed-off-by: Jaben Carsey <jaben.carsey@intel.com >
Reviewed-by: Yonghong Zhu <yonghong.zhu@intel.com >
2018-03-29 08:36:06 +08:00
0f17c9fef1
BaseTools: GlobalData share same MACRO name definition
...
use the same MACRO name definition across shared regular expression patterns.
Cc: Yonghong Zhu <yonghong.zhu@intel.com >
Cc: Liming Gao <liming.gao@intel.com >
Contributed-under: TianoCore Contribution Agreement 1.1
Signed-off-by: Jaben Carsey <jaben.carsey@intel.com >
Reviewed-by: Yonghong Zhu <yonghong.zhu@intel.com >
2018-03-29 08:35:17 +08:00
4d603daa3a
BaseTools: FdfParser and FdfParserLite share reg exp
...
FdfParser can share regular expression from FdfParserLite.
reduce overlap and reduce recompile of the same expression.
v2: fix missed replacement of Pattern with shared variable
Cc: Yonghong Zhu <yonghong.zhu@intel.com >
Cc: Liming Gao <liming.gao@intel.com >
Contributed-under: TianoCore Contribution Agreement 1.1
Signed-off-by: Jaben Carsey <jaben.carsey@intel.com >
Reviewed-by: Yonghong Zhu <yonghong.zhu@intel.com >
2018-03-29 08:34:09 +08:00
d1b777440b
BaseTools: Update Rsa2048Sha256Sign to use openssl dgst option
...
Contributed-under: TianoCore Contribution Agreement 1.1
Signed-off-by: Liming Gao <liming.gao@intel.com >
Cc: Yonghong Zhu <yonghong.zhu@intel.com >
Cc: Qin Long <qin.long@intel.com >
Reviewed-by: Qin Long <qin.long@intel.com >
2018-03-28 09:58:43 +08:00
1d574dfc15
BaseTools: Update Rsa2048Sha256Sign to use openssl standard options
...
sha256 is not the standard option. It should be replaced by sha -sha256.
Otherwise, it doesn't work in MAC OS.
In V2, update the option to sha1 -sha256.
In late openssl version >= 1.1, there is no sha option, but has sha1,sha256.
In previous openssl version < 1.1, there is no sha256, but has sha,sha1.
To work with all openssl version, use sha1 -sha256 for it.
Contributed-under: TianoCore Contribution Agreement 1.1
Signed-off-by: Liao Jui-peng <jui-pengx.liao@intel.com >
Signed-off-by: Liming Gao <liming.gao@intel.com >
Cc: Michael Kinney <michael.d.kinney@intel.com >
Cc: Yonghong Zhu <yonghong.zhu@intel.com >
Reviewed-by: Yonghong Zhu <yonghong.zhu@intel.com >
2018-03-27 16:11:00 +08:00
b24e99f7c4
BaseTools: Autogen - modify to use standard parent/child class relationships
...
use __new__ and __init__ to create/manage/initialize objects in standard flow.
Cc: Yonghong Zhu <yonghong.zhu@intel.com >
Cc: Liming Gao <liming.gao@intel.com >
Contributed-under: TianoCore Contribution Agreement 1.1
Signed-off-by: Jaben Carsey <jaben.carsey@intel.com >
Reviewed-by: Yonghong Zhu <yonghong.zhu@intel.com >
2018-03-27 09:02:30 +08:00
Carsey, Jaben
Bin Wang
Liming Gao