From f3d30c3b19ac39a9e6b6c9d5a0e3966e9b1b4ac1 Mon Sep 17 00:00:00 2001 From: Hans Wennborg Date: Thu, 13 Apr 2017 17:37:17 +0000 Subject: [PATCH] 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 --- clang/tools/clang-format-vs/.gitignore | 1 - clang/tools/clang-format-vs/CMakeLists.txt | 7 +--- .../tools/clang-format-vs/ClangFormat/license.txt | 39 ++++++++++++++++++++++ 3 files changed, 40 insertions(+), 7 deletions(-) create mode 100755 clang/tools/clang-format-vs/ClangFormat/license.txt diff --git a/clang/tools/clang-format-vs/.gitignore b/clang/tools/clang-format-vs/.gitignore index c9d25d9..270d840 100644 --- a/clang/tools/clang-format-vs/.gitignore +++ b/clang/tools/clang-format-vs/.gitignore @@ -7,6 +7,5 @@ # Generated and copied files /ClangFormat/Key.snk -/ClangFormat/license.txt /ClangFormat/clang-format.exe /ClangFormat/source.extension.vsixmanifest diff --git a/clang/tools/clang-format-vs/CMakeLists.txt b/clang/tools/clang-format-vs/CMakeLists.txt index d07a4f6..1d44a47 100644 --- a/clang/tools/clang-format-vs/CMakeLists.txt +++ b/clang/tools/clang-format-vs/CMakeLists.txt @@ -6,11 +6,6 @@ if (BUILD_CLANG_FORMAT_VS_PLUGIN) "${CMAKE_CURRENT_SOURCE_DIR}/ClangFormat/clang-format.exe" DEPENDS clang-format) - add_custom_target(clang_format_license - ${CMAKE_COMMAND} -E copy_if_different - "${CLANG_SOURCE_DIR}/LICENSE.TXT" - "${CMAKE_CURRENT_SOURCE_DIR}/ClangFormat/license.txt") - # Build number added to Clang version to ensure that new VSIX can be upgraded string(TIMESTAMP CLANG_FORMAT_VSIX_BUILD %y%m%d%H%M UTC) @@ -34,5 +29,5 @@ if (BUILD_CLANG_FORMAT_VS_PLUGIN) COMMAND ${CMAKE_COMMAND} -E copy_if_different "${CMAKE_CURRENT_SOURCE_DIR}/ClangFormat/bin/Release/ClangFormat.vsix" "${LLVM_TOOLS_BINARY_DIR}/ClangFormat.vsix" - DEPENDS clang_format_exe_for_vsix clang_format_license) + DEPENDS clang_format_exe_for_vsix) endif() diff --git a/clang/tools/clang-format-vs/ClangFormat/license.txt b/clang/tools/clang-format-vs/ClangFormat/license.txt new file mode 100755 index 0000000..9966c81 --- /dev/null +++ b/clang/tools/clang-format-vs/ClangFormat/license.txt @@ -0,0 +1,39 @@ +==================== +LLVM Release License +==================== +University of Illinois/NCSA +Open Source License + +Copyright (c) 2007-2017 University of Illinois at Urbana-Champaign. +All rights reserved. + +Developed by: + + LLVM Team + + University of Illinois at Urbana-Champaign + + http://llvm.org + +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: + + * Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimers. + + * 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. + + * 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. + +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. + +==================== +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 +to that code. + +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. + +The following pieces of software have additional or alternate copyrights, licenses, and/or restrictions: + +Program Directory +------- --------- + + -- 2.7.4