Skip to content

Commit

Permalink
Update friendly name for Platform Toolsets in the property pages, add…
Browse files Browse the repository at this point in the history 
… "LLVM_" prefix.
  • Loading branch information
@zufuliu
zufuliu committed Dec 31, 2018
1 parent e1d61a2 commit 7c822d6
Show file tree
Hide file tree
Showing 4 changed files with 68 additions and 15 deletions.
20 changes: 10 additions & 10 deletions VS2017/LLVM/LLVM.Common.props
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,16 +22,16 @@
<_PlatformToolsetShortNameFor_LLVM_v90>LLVM v90</_PlatformToolsetShortNameFor_LLVM_v90>

<!-- Friendly names added to the PlatformToolset in the property pages. -->
<_PlatformToolsetFriendlyNameFor_LLVM_v141>LLVM for Visual Studio 2017 (v141)</_PlatformToolsetFriendlyNameFor_LLVM_v141>
<_PlatformToolsetFriendlyNameFor_LLVM_v141_xp>LLVM for Visual Studio 2017 - Windows XP (v141_xp)</_PlatformToolsetFriendlyNameFor_LLVM_v141_xp>
<_PlatformToolsetFriendlyNameFor_LLVM_v140>LLVM for Visual Studio 2015 (v140)</_PlatformToolsetFriendlyNameFor_LLVM_v140>
<_PlatformToolsetFriendlyNameFor_LLVM_v140_xp>LLVM for Visual Studio 2015 - Windows XP (v140_xp)</_PlatformToolsetFriendlyNameFor_LLVM_v140_xp>
<_PlatformToolsetFriendlyNameFor_LLVM_v120>LLVM for Visual Studio 2013 (v120)</_PlatformToolsetFriendlyNameFor_LLVM_v120>
<_PlatformToolsetFriendlyNameFor_LLVM_v120_xp>LLVM for Visual Studio 2013 - Windows XP (v120_xp)</_PlatformToolsetFriendlyNameFor_LLVM_v120_xp>
<_PlatformToolsetFriendlyNameFor_LLVM_v110>LLVM for Visual Studio 2012 (v110)</_PlatformToolsetFriendlyNameFor_LLVM_v110>
<_PlatformToolsetFriendlyNameFor_LLVM_v110_xp>LLVM for Visual Studio 2012 - Windows XP (v110_xp)</_PlatformToolsetFriendlyNameFor_LLVM_v110_xp>
<_PlatformToolsetFriendlyNameFor_LLVM_v100>LLVM for Visual Studio 2010 (v100)</_PlatformToolsetFriendlyNameFor_LLVM_v100>
<_PlatformToolsetFriendlyNameFor_LLVM_v90>LLVM for Visual Studio 2008 (v90)</_PlatformToolsetFriendlyNameFor_LLVM_v90>
<_PlatformToolsetFriendlyNameFor_LLVM_v141>LLVM for Visual Studio 2017 (LLVM_v141)</_PlatformToolsetFriendlyNameFor_LLVM_v141>
<_PlatformToolsetFriendlyNameFor_LLVM_v141_xp>LLVM for Visual Studio 2017 - Windows XP (LLVM_v141_xp)</_PlatformToolsetFriendlyNameFor_LLVM_v141_xp>
<_PlatformToolsetFriendlyNameFor_LLVM_v140>LLVM for Visual Studio 2015 (LLVM_v140)</_PlatformToolsetFriendlyNameFor_LLVM_v140>
<_PlatformToolsetFriendlyNameFor_LLVM_v140_xp>LLVM for Visual Studio 2015 - Windows XP (LLVM_v140_xp)</_PlatformToolsetFriendlyNameFor_LLVM_v140_xp>
<_PlatformToolsetFriendlyNameFor_LLVM_v120>LLVM for Visual Studio 2013 (LLVM_v120)</_PlatformToolsetFriendlyNameFor_LLVM_v120>
<_PlatformToolsetFriendlyNameFor_LLVM_v120_xp>LLVM for Visual Studio 2013 - Windows XP (LLVM_v120_xp)</_PlatformToolsetFriendlyNameFor_LLVM_v120_xp>
<_PlatformToolsetFriendlyNameFor_LLVM_v110>LLVM for Visual Studio 2012 (LLVM_v110)</_PlatformToolsetFriendlyNameFor_LLVM_v110>
<_PlatformToolsetFriendlyNameFor_LLVM_v110_xp>LLVM for Visual Studio 2012 - Windows XP (LLVM_v110_xp)</_PlatformToolsetFriendlyNameFor_LLVM_v110_xp>
<_PlatformToolsetFriendlyNameFor_LLVM_v100>LLVM for Visual Studio 2010 (LLVM_v100)</_PlatformToolsetFriendlyNameFor_LLVM_v100>
<_PlatformToolsetFriendlyNameFor_LLVM_v90>LLVM for Visual Studio 2008 (LLVM_v90)</_PlatformToolsetFriendlyNameFor_LLVM_v90>
</PropertyGroup>

<ItemDefinitionGroup>
Expand Down
53 changes: 53 additions & 0 deletions dist/SelfTest.bat
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,53 @@
@ECHO OFF
ECHO DON'T run this script (which will overwrite Visual Studio 2013 and 2015 Platform Toolsets), it's for my test only.
PAUSE

CD "%~dp0\..\VS2015"

@rem Visual Studio 2015
SET VCT_PATH=%ProgramFiles(x86)%\MSBuild\Microsoft.Cpp\v4.0\V140\Platforms
ECHO VCTargetsPath for Visual Studio 2015: %VCT_PATH%
XCOPY /Q /Y "..\VS2017\LLVM" "%VCT_PATH%\..\LLVM\"
XCOPY /Q /Y "LLVM_v140" "%VCT_PATH%\x64\PlatformToolsets\LLVM_v140\"
XCOPY /Q /Y "LLVM_v140_xp" "%VCT_PATH%\x64\PlatformToolsets\LLVM_v140_xp\"
XCOPY /Q /Y "LLVM_v140" "%VCT_PATH%\Win32\PlatformToolsets\LLVM_v140\"
XCOPY /Q /Y "LLVM_v140_xp" "%VCT_PATH%\Win32\PlatformToolsets\LLVM_v140_xp\"
@rem Make fake Visual Studio 2015 Platform Toolsets
XCOPY /Q /Y "LLVM_v140" "%VCT_PATH%\x64\PlatformToolsets\v140\"
XCOPY /Q /Y "LLVM_v140_xp" "%VCT_PATH%\x64\PlatformToolsets\v140_xp\"
XCOPY /Q /Y "LLVM_v140" "%VCT_PATH%\Win32\PlatformToolsets\v140\"
XCOPY /Q /Y "LLVM_v140_xp" "%VCT_PATH%\Win32\PlatformToolsets\v140_xp\"

@rem Visual Studio 2013
SET VCT_PATH=%ProgramFiles(x86)%\MSBuild\Microsoft.Cpp\v4.0\V120\Platforms
XCOPY /Q /Y "..\VS2017\LLVM" "%VCT_PATH%\..\LLVM\"
XCOPY /Q /Y "LLVM_v120" "%VCT_PATH%\x64\PlatformToolsets\LLVM_v120\"
XCOPY /Q /Y "LLVM_v120_xp" "%VCT_PATH%\x64\PlatformToolsets\LLVM_v120_xp\"
XCOPY /Q /Y "LLVM_v120" "%VCT_PATH%\Win32\PlatformToolsets\LLVM_v120\"
XCOPY /Q /Y "LLVM_v120_xp" "%VCT_PATH%\Win32\PlatformToolsets\LLVM_v120_xp\"
@rem Make fake Visual Studio 2013 Platform Toolsets
XCOPY /Q /Y "LLVM_v120" "%VCT_PATH%\x64\PlatformToolsets\v120\"
XCOPY /Q /Y "LLVM_v120_xp" "%VCT_PATH%\x64\PlatformToolsets\v120_xp\"
XCOPY /Q /Y "LLVM_v120" "%VCT_PATH%\Win32\PlatformToolsets\v120\"
XCOPY /Q /Y "LLVM_v120_xp" "%VCT_PATH%\Win32\PlatformToolsets\v120_xp\"

@rem Visual Studio 2012
SET VCT_PATH=%ProgramFiles(x86)%\MSBuild\Microsoft.Cpp\v4.0\V110\Platforms
ECHO VCTargetsPath for Visual Studio 2012: %VCT_PATH%
XCOPY /Q /Y "..\VS2017\LLVM" "%VCT_PATH%\..\LLVM\"
XCOPY /Q /Y "x64\LLVM_v110" "%VCT_PATH%\x64\PlatformToolsets\LLVM_v110\"
XCOPY /Q /Y "x64\LLVM_v110_xp" "%VCT_PATH%\x64\PlatformToolsets\LLVM_v110_xp\"
XCOPY /Q /Y "Win32\LLVM_v110" "%VCT_PATH%\Win32\PlatformToolsets\LLVM_v110\"
XCOPY /Q /Y "Win32\LLVM_v110_xp" "%VCT_PATH%\Win32\PlatformToolsets\LLVM_v110_xp\"

@rem Visual Studio 2010
SET VCT_PATH=%ProgramFiles(x86)%\MSBuild\Microsoft.Cpp\v4.0\Platforms
ECHO VCTargetsPath for Visual Studio 2010: %VCT_PATH%
XCOPY /Q /Y "..\VS2017\LLVM" "%VCT_PATH%\..\LLVM\"
XCOPY /Q /Y "x64\LLVM_v100" "%VCT_PATH%\x64\PlatformToolsets\LLVM_v100\"
XCOPY /Q /Y "Win32\LLVM_v100" "%VCT_PATH%\Win32\PlatformToolsets\LLVM_v100\"
XCOPY /Q /Y "x64\LLVM_v90" "%VCT_PATH%\x64\PlatformToolsets\LLVM_v90\"
XCOPY /Q /Y "Win32\LLVM_v90" "%VCT_PATH%\Win32\PlatformToolsets\LLVM_v90\"

CD %~dp0
PAUSE
Binary file modified images/VS2017.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
10 changes: 5 additions & 5 deletions readme.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
[![Latest release](https://img.shields.io/github/release/zufuliu/llvm-utils.svg)](https://github.com/zufuliu/llvm-utils/releases).

## LLVM for Visual Studio 2017 and 2019
The Platform Toolset is "LLVM for Visual Studio 2017 (v141)" (`LLVM_v141`) and "LLVM for Visual Studio 2017 - Windows XP (v141_xp)" (`LLVM_v141_xp`).
The Platform Toolset is "LLVM for Visual Studio 2017 (`LLVM_v141`)" and "LLVM for Visual Studio 2017 - Windows XP (`LLVM_v141_xp`)".

### Installation
Please download and install LLVM from http://llvm.org/builds/ or http://releases.llvm.org/.
Expand All @@ -32,7 +32,7 @@ Assume `MB_PATH` is the MSBuild path for Visual C++ (e.g.: `C:\Program Files (x8
`VS2015\install.bat` (based on install script for [LLVM 6.0.1](http://releases.llvm.org/download.html#6.0.1)) can be used to install MSBuild script for Visual Studio 2010, 2012, 2013 and 2015.

### Visual Studio 2015
The Platform Toolset is "LLVM for Visual Studio 2015 (v140)" (`LLVM_v140`) and "LLVM for Visual Studio 2015 - Windows XP (v140_xp)" (`LLVM_v140_xp`).
The Platform Toolset is "LLVM for Visual Studio 2015 (`LLVM_v140`)" and "LLVM for Visual Studio 2015 - Windows XP (`LLVM_v140_xp`)".

| Folder | Target Path |
|------|-------------|
Expand All @@ -43,7 +43,7 @@ The Platform Toolset is "LLVM for Visual Studio 2015 (v140)" (`LLVM_v140`) and "
|`VS2015\LLVM_v140_xp` | `%MB_PATH%\V140\Platforms\Win32\PlatformToolsets\` |

### Visual Studio 2013
The Platform Toolset is "LLVM for Visual Studio 2013 (v120)" (`LLVM_v120`) and "LLVM for Visual Studio 2013 - Windows XP (v120_xp)" (`LLVM_v120_xp`).
The Platform Toolset is "LLVM for Visual Studio 2013 (`LLVM_v120`)" and "LLVM for Visual Studio 2013 - Windows XP (`LLVM_v120_xp`)".

| Folder | Target Path |
|------|-------------|
Expand All @@ -54,7 +54,7 @@ The Platform Toolset is "LLVM for Visual Studio 2013 (v120)" (`LLVM_v120`) and "
|`VS2015\LLVM_v120_xp` | `%MB_PATH%\v120\Platforms\Win32\PlatformToolsets\` |

### Visual Studio 2012
The Platform Toolset is "LLVM for Visual Studio 2012 (v110)" (`LLVM_v110`) and "LLVM for Visual Studio 2012 - Windows XP (v110_xp)" (`LLVM_v110_xp`).
The Platform Toolset is "LLVM for Visual Studio 2012 (`LLVM_v110`)" and "LLVM for Visual Studio 2012 - Windows XP (`LLVM_v110_xp`)".

| Folder | Target Path |
|------|-------------|
Expand All @@ -65,7 +65,7 @@ The Platform Toolset is "LLVM for Visual Studio 2012 (v110)" (`LLVM_v110`) and "
|`VS2015\Win32\LLVM_v110_xp` | `%MB_PATH%\v110\Platforms\Win32\PlatformToolsets\` |

### Visual Studio 2010
The Platform Toolset is "LLVM for Visual Studio 2010 (v100)" (`LLVM_v100`) and "LLVM for Visual Studio 2008 (v90)" (`LLVM_v90`).
The Platform Toolset is "LLVM for Visual Studio 2010 (`LLVM_v100`)" and "LLVM for Visual Studio 2008 (`LLVM_v90`)".

| Folder | Target Path |
|------|-------------|
Expand Down

0 comments on commit 7c822d6

Please sign in to comment.