Skip to content
This repository was archived by the owner on Nov 16, 2023. It is now read-only.

Fix latest Windows build issues. #105

Merged
merged 3 commits into from
May 27, 2019
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 5 additions & 1 deletion build.cmd
Original file line number Diff line number Diff line change
Expand Up @@ -195,8 +195,12 @@ echo "#################################"
:: Setting native code build environment
echo Setting native build environment ...
set _VSWHERE="%ProgramFiles(x86)%\Microsoft Visual Studio\Installer\vswhere.exe"
set vswhereOutputFile=vswhereOutput.tmp

if exist %_VSWHERE% (
for /f "usebackq tokens=*" %%i in (`%_VSWHERE% -latest -prerelease -property installationPath`) do set _VSCOMNTOOLS=%%i\Common7\Tools
%_VSWHERE% -version "[15.0,16.0)" -latest -prerelease -property installationPath > %vswhereOutputFile%
for /f "tokens=* delims=" %%i in (%vswhereOutputFile%) do set _VSCOMNTOOLS=%%i\Common7\Tools
del %vswhereOutputFile%
)
if not exist "%_VSCOMNTOOLS%" set _VSCOMNTOOLS=%VS140COMNTOOLS%
if not exist "%_VSCOMNTOOLS%" goto :MissingVersion
Expand Down
3 changes: 2 additions & 1 deletion src/python/tools/code_fixer.py
Original file line number Diff line number Diff line change
Expand Up @@ -310,5 +310,6 @@ def run_autoflake(filename):
args.expand_star_imports = None
args.remove_duplicate_keys = None
args.remove_unused_variables = None
args.ignore_init_module_imports = False
args.ignore_init_module_imports = None
args.check = None
autoflake.fix_file(filename, args=args, standard_out=sys.stdout)