Skip to content

Commit f3d30c3

Browse files
committed
clang-format-vs: Use a separate license.txt copy
The regular file used to display very poorly in the VSIX installer due to long lines, wrapping etc. llvm-svn: 300223
1 parent 9745d24 commit f3d30c3

File tree

3 files changed

+40
-7
lines changed

3 files changed

+40
-7
lines changed

clang/tools/clang-format-vs/.gitignore

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,5 @@
77

88
# Generated and copied files
99
/ClangFormat/Key.snk
10-
/ClangFormat/license.txt
1110
/ClangFormat/clang-format.exe
1211
/ClangFormat/source.extension.vsixmanifest

clang/tools/clang-format-vs/CMakeLists.txt

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -6,11 +6,6 @@ if (BUILD_CLANG_FORMAT_VS_PLUGIN)
66
"${CMAKE_CURRENT_SOURCE_DIR}/ClangFormat/clang-format.exe"
77
DEPENDS clang-format)
88

9-
add_custom_target(clang_format_license
10-
${CMAKE_COMMAND} -E copy_if_different
11-
"${CLANG_SOURCE_DIR}/LICENSE.TXT"
12-
"${CMAKE_CURRENT_SOURCE_DIR}/ClangFormat/license.txt")
13-
149
# Build number added to Clang version to ensure that new VSIX can be upgraded
1510
string(TIMESTAMP CLANG_FORMAT_VSIX_BUILD %y%m%d%H%M UTC)
1611

@@ -34,5 +29,5 @@ if (BUILD_CLANG_FORMAT_VS_PLUGIN)
3429
COMMAND ${CMAKE_COMMAND} -E copy_if_different
3530
"${CMAKE_CURRENT_SOURCE_DIR}/ClangFormat/bin/Release/ClangFormat.vsix"
3631
"${LLVM_TOOLS_BINARY_DIR}/ClangFormat.vsix"
37-
DEPENDS clang_format_exe_for_vsix clang_format_license)
32+
DEPENDS clang_format_exe_for_vsix)
3833
endif()
Lines changed: 39 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,39 @@
1+
====================
2+
LLVM Release License
3+
====================
4+
University of Illinois/NCSA
5+
Open Source License
6+
7+
Copyright (c) 2007-2017 University of Illinois at Urbana-Champaign.
8+
All rights reserved.
9+
10+
Developed by:
11+
12+
LLVM Team
13+
14+
University of Illinois at Urbana-Champaign
15+
16+
http://llvm.org
17+
18+
Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal with the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
19+
20+
* Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimers.
21+
22+
* Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimers in the documentation and/or other materials provided with the distribution.
23+
24+
* Neither the names of the LLVM Team, University of Illinois at Urbana-Champaign, nor the names of its contributors may be used to endorse or promote products derived from this Software without specific prior written permission.
25+
26+
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE CONTRIBUTORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS WITH THE SOFTWARE.
27+
28+
====================
29+
The LLVM software contains code written by third parties. Such software will have its own individual LICENSE.TXT file in the directory in which it appears. This file will describe the copyrights, license, and restrictions which apply
30+
to that code.
31+
32+
The disclaimer of warranty in the University of Illinois Open Source License applies to all code in the LLVM Distribution, and nothing in any of the other licenses gives permission to use the names of the LLVM Team or the University of Illinois to endorse or promote products derived from this Software.
33+
34+
The following pieces of software have additional or alternate copyrights, licenses, and/or restrictions:
35+
36+
Program Directory
37+
------- ---------
38+
<none yet>
39+

0 commit comments

Comments
 (0)