Differential D15976 Diff 43248 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. These variables are defined if the script is run from Developer Command Prompt
5​echo off
6​if DEFINED VS150COMNTOOLS (
7​ SET "base=%VS150COMNTOOLS%"
8​ SET script="!base!..\..\VC\Auxiliary\Build\vcvarsall.bat" x64
9​ REM Avoid all the other if - else and go directly to fire up the script.
10​ goto call_script
11​) else ( IF NOT DEFINED VS150COMNTOOLS (
12​ for /f "usebackq tokens=3*" %%a in (`reg query "HKEY_LOCAL_MACHINE\SOFTWARE\Wow6432Node\Microsoft\VisualStudio\SxS\VS7" /s`) do (
13​ set _vs15_path=%%a %%b
14​ ) ))
15​ if /i "!_vs15_path:2017=!"=="!_vs15_path!" (
16​ echo "It seems you haven't installed Visual Studio 2017"
17​ ) else (
18​ if exist "!_vs15_path!Common7\Tools\VsDevCmd.bat" (
19​ REM Choosing architecture interactively and fire up.
20​ echo "Possible architectures are:"
21​ echo "x86_amd64 or x64"
22​ echo "Refer to !_vs15_path!VC\Auxiliary\Build\vcvarsall.bat for more"
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​ set /p "arch= Type an arch and press enter...: "
24​ call "!_vs15_path!Common7\Tools\VsDevCmd.bat"
25​ call "!_vs15_path!VC\Auxiliary\Build\vcvarsall.bat" !arch!
26​ ) else (
27​ echo "Oh no! %~n0%~x0 couldn't locate !_vs15_path!Common7\Tools\VsDevCmd.bat"
28​ )
29​ )
30​) else ( IF DEFINED VS140COMNTOOLS (
5 SET "base=%VS140COMNTOOLS%" 31​ SET "base=%VS140COMNTOOLS%"
6) else ( IF DEFINED VS120COMNTOOLS ( 32​) else ( IF DEFINED VS120COMNTOOLS (
7 SET "base=%VS120COMNTOOLS%" 33​ SET "base=%VS120COMNTOOLS%"
Context not available.
11 SET "base=%VS100COMNTOOLS%" 37​ SET "base=%VS100COMNTOOLS%"
12) else ( 38​) 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" 39​ START CMD /C "The Microsoft Visual C++ compiler was not found on your system, you might not be able to compile programs. && PAUSE"
14) ))) 40​) ))))
15 41​
16SET script="!base!\..\..\VC\vcvarsall.bat" 42​:call_script
17CALL %script% 43​echo on
44​REM Code for versions older than 2017 or if kdevelop-msvc.bat for VS2017 was ran from Developer Command Prompt
45​if NOT DEFINED _vs15_path (
46​ if NOT DEFINED VS150COMNTOOLS (
47​ SET script="!base!\..\..\VC\vcvarsall.bat"
48​ )
49​ CALL !script!
50​)
18 51​
19FOR /F "usebackq tokens=3*" %%A IN (`REG QUERY "HKEY_LOCAL_MACHINE\Software\KDE\KDevelop" /v Install_Dir`) DO ( 52​FOR /F "usebackq tokens=3*" %%A IN (`REG QUERY "HKEY_LOCAL_MACHINE\Software\KDE\KDevelop" /v Install_Dir`) DO (
20 set appdir=%%A %%B 53​ set appdir=%%A %%B
Context not available.
26 ) 59​ )
27) 60​)
28 61​
29START "" "%appdir%\bin\kdevelop.exe" 62​START "" "%appdir%\bin\kdevelop.exe"
63​No newline at end of file
Context not available.