This revision was automatically updated to reflect the committed changes. Closed by commit rL289909: clang-format-vsix: add a date stamp to the VSIX version number to ensureā¦ (authored by amaiorano).
Changed prior to commit: https://reviews.llvm.org/D27438?vs=80527&id=81696#toc Repository: rL LLVM https://reviews.llvm.org/D27438 Files: cfe/trunk/tools/clang-format-vs/CMakeLists.txt Index: cfe/trunk/tools/clang-format-vs/CMakeLists.txt =================================================================== --- cfe/trunk/tools/clang-format-vs/CMakeLists.txt +++ cfe/trunk/tools/clang-format-vs/CMakeLists.txt @@ -11,8 +11,11 @@ "${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) + if (NOT CLANG_FORMAT_VS_VERSION) - set(CLANG_FORMAT_VS_VERSION "${LLVM_VERSION_MAJOR}.${LLVM_VERSION_MINOR}.${LLVM_VERSION_PATCH}") + set(CLANG_FORMAT_VS_VERSION "${LLVM_VERSION_MAJOR}.${LLVM_VERSION_MINOR}.${LLVM_VERSION_PATCH}.${CLANG_FORMAT_VSIX_BUILD}") endif() configure_file("source.extension.vsixmanifest.in"
Index: cfe/trunk/tools/clang-format-vs/CMakeLists.txt =================================================================== --- cfe/trunk/tools/clang-format-vs/CMakeLists.txt +++ cfe/trunk/tools/clang-format-vs/CMakeLists.txt @@ -11,8 +11,11 @@ "${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) + if (NOT CLANG_FORMAT_VS_VERSION) - set(CLANG_FORMAT_VS_VERSION "${LLVM_VERSION_MAJOR}.${LLVM_VERSION_MINOR}.${LLVM_VERSION_PATCH}") + set(CLANG_FORMAT_VS_VERSION "${LLVM_VERSION_MAJOR}.${LLVM_VERSION_MINOR}.${LLVM_VERSION_PATCH}.${CLANG_FORMAT_VSIX_BUILD}") endif() configure_file("source.extension.vsixmanifest.in"
_______________________________________________ cfe-commits mailing list cfe-commits@lists.llvm.org http://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits