@@ -40,7 +40,7 @@ def rebuild_basetools ():
40
40
41
41
if not check_files_exist (exe_list , os .path .join (edk_dir , 'BaseTools' , 'Bin' , 'Win32' ), '.exe' ):
42
42
print ("Could not find pre-built BaseTools binaries, try to rebuild BaseTools ..." )
43
- ret = run_process (['BaseTools/ toolsetup.bat' , 'forcerebuild' ])
43
+ ret = run_process (['BaseTools\\ toolsetup.bat' , 'forcerebuild' ])
44
44
45
45
if ret :
46
46
print ("Build BaseTools failed, please check required build environment and utilities !" )
@@ -69,7 +69,7 @@ def prep_env (edk2_dir, toolchain_preferred = ''):
69
69
os .environ ['PATH' ] = os .environ ['PATH' ] + ';' + os .path .join (edk2_dir , 'BaseTools' , 'Bin' , 'Win32' )
70
70
os .environ ['PATH' ] = os .environ ['PATH' ] + ';' + os .path .join (edk2_dir , 'BaseTools' , 'BinWrappers' , 'WindowsLike' )
71
71
os .environ ['PYTHONPATH' ] = os .path .join (edk2_dir , 'BaseTools' , 'Source' , 'Python' )
72
- os .environ ['WINSDK_PATH_FOR_RC_EXE' ] = r'C:\Program Files (x86)\Windows Kits\8.1 \bin\x86'
72
+ os .environ ['WINSDK_PATH_FOR_RC_EXE' ] = r'C:\Program Files (x86)\Windows Kits\10 \bin\x86'
73
73
else :
74
74
os .environ ['PATH' ] = os .environ ['PATH' ] + ':' + os .path .join (edk2_dir , 'BaseTools' , 'BinWrappers' , 'PosixLike' )
75
75
os .environ ['EDK_TOOLS_PATH' ] = os .path .join (edk2_dir , 'BaseTools' )
@@ -85,10 +85,9 @@ def main():
85
85
86
86
ap = argparse .ArgumentParser ()
87
87
sp = ap .add_subparsers (help = 'command' )
88
- edk2_dir = os .getcwd () + '/Edk2'
88
+ edk2_dir = os .path . abspath ( os . getcwd () + '/Edk2' )
89
89
branch = 'edk2-stable202102'
90
90
91
-
92
91
def cmd_build_dsc (args ):
93
92
if not os .path .exists (edk2_dir ):
94
93
clone_repo (edk2_dir , 'http://github.com/tianocore/edk2.git' , branch )
0 commit comments