Differential D15976 Diff 42952 app/windows/kdevelop-msvc.bat

Changeset View

Standalone View

View Options

app/windows/kdevelop-msvc.bat

1setlocal EnableDelayedExpansion 1​setlocal EnableDelayedExpansion
2setlocal enableextensions 2​setlocal enableextensions
3 3​
4if DEFINED VS140COMNTOOLS ( 4​Rem Check for newest VS (2017) too
5​if DEFINED VS150COMNTOOLS (
6​ SET "base=%VS150COMNTOOLS%"
7​) else ( IF DEFINED VS140COMNTOOLS (
5 SET "base=%VS140COMNTOOLS%" 8​ SET "base=%VS140COMNTOOLS%"
6) else ( IF DEFINED VS120COMNTOOLS ( 9​) else ( IF DEFINED VS120COMNTOOLS (
7 SET "base=%VS120COMNTOOLS%" 10​ SET "base=%VS120COMNTOOLS%"
Context not available.
11 SET "base=%VS100COMNTOOLS%" 14​ SET "base=%VS100COMNTOOLS%"
12) else ( 15​) else (
13 START CMD /C "The Microsoft Visual C++ compiler was not found on your system, you might not be able to compile programs. && PAUSE" 16​ START CMD /C "The Microsoft Visual C++ compiler was not found on your system, you might not be able to compile programs. && PAUSE"
14) ))) 17​) ))))
15 18​
16SET script="!base!\..\..\VC\vcvarsall.bat" 19​
20​Rem VS 2017 changed the layout of the folders and force x64
21​if DEFINED VS150COMNTOOLS (
22​ SET script="%base%..\..\VC\Auxiliary\Build\vcvarsall.bat" x64
arrowdUnsubmitted
Not Done

Not sure about x64 part. What if user wants x32 project? Or that is arch of the toolchain itself?

arrowd: Not sure about `x64` part. What if user wants `x32` project? Or that is arch of the toolchain…
kfunkAuthorUnsubmitted
Not Done

I think this can be simplified quite a bit: I would move this whole block before line 3 (but do not call vcvarsall.bat yet, so we can reuse most of the logic from line 20ff.

I'll try to work on it later the day, probably easier if I just show the patch I have in mind.

kfunk: I think this can be simplified quite a bit: I would move this whole block before line 3 (but do…
23​) else (
24​ SET script="!base!\..\..\VC\vcvarsall.bat"
25​)
17CALL %script% 26​CALL %script%
18 27​
19FOR /F "usebackq tokens=3*" %%A IN (`REG QUERY "HKEY_LOCAL_MACHINE\Software\KDE\KDevelop" /v Install_Dir`) DO ( 28​FOR /F "usebackq tokens=3*" %%A IN (`REG QUERY "HKEY_LOCAL_MACHINE\Software\KDE\KDevelop" /v Install_Dir`) DO (
Context not available.