Differential D17908 Diff 48498 app/windows/kdevelop-msvc.bat

Changeset View

Standalone View

View Options

app/windows/kdevelop-msvc.bat

Context not available.
5 5​
6REM Check for newest VS (2017) too. These variables are defined if the script is run from Developer Command Prompt 6​REM Check for newest VS (2017) too. These variables are defined if the script is run from Developer Command Prompt
7IF NOT DEFINED VS150COMNTOOLS ( 7​IF NOT DEFINED VS150COMNTOOLS (
8 REM load Visual Studio 2017 developer command prompt if VS150COMNTOOLS is not set. It's ugly and hardcoded too. 8​ REM load Visual Studio 2017 developer command prompt if VS150COMNTOOLS isn't set. Read Windows registry in case VS is not istalled on C:\
mwolffUnsubmitted
Done

could you please undo the whitespace changes and re-upload the minimal diff?

mwolff: could you please undo the whitespace changes and re-upload the minimal diff?
mwolffUnsubmitted
Not Done

is vs15 visual studio 2017? I'm always confused by the versioning scheme of visual studio :D

mwolff: is vs15 visual studio 2017? I'm always confused by the versioning scheme of visual studio :D
Petross404AuthorUnsubmitted
Not Done

Yeah, I know. VS 2017 = VS15 and VS 2015 = VS14.

Petross404: Yeah, I know. VS 2017 = VS15 and VS 2015 = VS14.
9 for %%n in (Enterprise Professional Community BuildTools) do ( 9​ for /f "usebackq tokens=3*" %%a in (`reg query "HKEY_LOCAL_MACHINE\SOFTWARE\Wow6432Node\Microsoft\VisualStudio\SxS\VS7" /s`) do (
10 set "p=%ProgramFiles(x86)%\Microsoft Visual Studio\2017\%%n\Common7\Tools\" 10​ set vs15_path=%%a %%b
11 if exist "!p!\VsDevCmd.bat" ( 11​ if exist "!vs15_path!Common7\Tools\VsDevCmd.bat" (
12 set "VS150COMNTOOLS=!p!" 12​ set "VS150COMNTOOLS=!vs15_path!Common7\Tools\"
13 goto :end 13​ goto :end
14 ) 14​ )
15 ) 15​ )
16) 16​)
17:end 17​:end
18 18​
19set base= 19​set base=
20if DEFINED VS150COMNTOOLS ( 20​if DEFINED VS150COMNTOOLS (
21 set "base=%VS150COMNTOOLS%" 21​ set "base=%VS150COMNTOOLS%"
22) else ( IF DEFINED VS140COMNTOOLS ( 22​) else ( IF DEFINED VS140COMNTOOLS (
23 set "base=%VS140COMNTOOLS%" 23​ set "base=%VS140COMNTOOLS%"
24) else ( IF DEFINED VS120COMNTOOLS ( 24​) else ( IF DEFINED VS120COMNTOOLS (
25 set "base=%VS120COMNTOOLS%" 25​ set "base=%VS120COMNTOOLS%"
26) else ( IF DEFINED VS110COMNTOOLS ( 26​) else ( IF DEFINED VS110COMNTOOLS (
27 set "base=%VS110COMNTOOLS%" 27​ set "base=%VS110COMNTOOLS%"
28) else ( IF DEFINED VS100COMNTOOLS ( 28​) else ( IF DEFINED VS100COMNTOOLS (
29 set "base=%VS100COMNTOOLS%" 29​ set "base=%VS100COMNTOOLS%"
30) )))) 30​) ))))
31 31​
32if NOT DEFINED base ( 32​if NOT DEFINED base (
33 START CMD /C "echo The Microsoft Visual C++ compiler was not found on your system, you might not be able to compile programs. && PAUSE" 33​ START CMD /C "echo The Microsoft Visual C++ compiler was not found on your system, you might not be able to compile programs. && PAUSE"
34) 34​)
35 35​
36echo Found VS Install: %base% 36​echo Found VS Install: %base%
37 37​
38if DEFINED VS150COMNTOOLS ( 38​if DEFINED VS150COMNTOOLS (
39 REM Note: VS2017 has a different directory layout compared to previous versions 39​ REM Note: VS2017 has a different directory layout compared to previous versions
40 set "vcvarsall=%base%..\..\VC\Auxiliary\Build\vcvarsall.bat" 40​ set "vcvarsall=%base%..\..\VC\Auxiliary\Build\vcvarsall.bat"
41 REM Choosing architecture 41​ REM Choosing architecture
42 echo Note: Refer to !vcvarsall! for more information 42​ echo Note: Refer to !vcvarsall! for more information
43 echo( 43​ echo(
44 echo Define which compiler for VS2017 to use. Possible architectures are: 44​ echo Define which compiler for VS2017 to use. Possible architectures are:
45 echo x86_amd64 45​ echo x86_amd64
46 echo x64 46​ echo x64
47 echo ... 47​ echo ...
48 set /p "arch= Type an arch and press enter...: " 48​ set /p "arch= Type an arch and press enter...: "
49 49​
50 set script="!vcvarsall!" !arch! 50​ set script="!vcvarsall!" !arch!
51) else ( IF DEFINED base ( 51​) else ( IF DEFINED base (
52 set script="!base!\..\..\VC\vcvarsall.bat" 52​ set script="!base!\..\..\VC\vcvarsall.bat"
53) ) 53​) )
54 54​
55if DEFINED script ( 55​if DEFINED script (
56 call %script% 56​ call %script%
57) 57​)
58 58​
59for /F "usebackq tokens=3*" %%A IN (`REG QUERY "HKEY_LOCAL_MACHINE\Software\KDE\KDevelop" /v Install_Dir 2^>nul`) DO ( 59​for /F "usebackq tokens=3*" %%A IN (`REG QUERY "HKEY_LOCAL_MACHINE\Software\KDE\KDevelop" /v Install_Dir 2^>nul`) DO (
60 set appdir=%%A %%B 60​ set appdir=%%A %%B
61) 61​)
62 62​
63if NOT DEFINED appdir ( 63​if NOT DEFINED appdir (
64 for /F "usebackq tokens=3*" %%A IN (`REG QUERY "HKEY_LOCAL_MACHINE\Software\Wow6432Node\KDE\KDevelop" /v Install_Dir 2^>nul`) DO ( 64​ for /F "usebackq tokens=3*" %%A IN (`REG QUERY "HKEY_LOCAL_MACHINE\Software\Wow6432Node\KDE\KDevelop" /v Install_Dir 2^>nul`) DO (
65 set appdir=%%A %%B 65​ set appdir=%%A %%B
66 ) 66​ )
67) 67​)
68 68​
Context not available.