Merge pull request #1049 from microsoft/develop

Merge develop into master for CMake Tools #1.3.0 release.
microsoft · Feb 6, 2020 · 6dd1767 · 6dd1767
2 parents a29f188 + 1f64f5d
commit 6dd1767
Show file tree

Hide file tree

Showing 271 changed files with 7,108 additions and 2,976 deletions.
diff --git a/.gitignore b/.gitignore
@@ -15,3 +15,4 @@ package-lock.json
 **/nls.*.json
 **/*.nls.json
 **/*.nls.*.json
+test.txt
diff --git a/.vscode/launch.json b/.vscode/launch.json
@@ -45,7 +45,6 @@
                 "HasVs": "true"
             },
             "preLaunchTask": "build-tests-with-tsc-watch"
-            // "smartStep": true
         },
         {
             "name": "Launch Extension Tests (without-cmakelist-file)",
@@ -81,7 +80,6 @@
                     "HasVs": "false"
                 }
             }
-            // "smartStep": true
         },
         {
             "name": "Launch Extension Tests (successful-build)",
@@ -124,7 +122,90 @@
                     "HasVs": "false"
                 }
             }
-            // "smartStep": true
+        },
+        {
+            "name": "Launch Extension Tests (single-root-UI)",
+            "type": "extensionHost",
+            "request": "launch",
+            "runtimeExecutable": "${execPath}",
+            "args": [
+                "${workspaceFolder}/test/extension-tests/single-root-UI/project-folder",
+                "--extensionDevelopmentPath=${workspaceFolder}",
+                "--extensionTestsPath=${workspaceFolder}/out/test/extension-tests/single-root-UI"
+            ],
+            "stopOnEntry": false,
+            "sourceMaps": true,
+            "outFiles": [
+                "${workspaceFolder}/out/*",
+                "${workspaceFolder}/out/src/*",
+                "${workspaceFolder}/out/test/*",
+                "${workspaceFolder}/out/test/extension-tests/single-root-UI/*",
+                "${workspaceFolder}/out/test/extension-tests/single-root-UI/test/*"
+            ],
+            "preLaunchTask": "build-tests-with-tsc-watch",
+            "windows": {
+                "env": {
+                    "CMT_TESTING": "1",
+                    "CMT_QUIET_CONSOLE": "1",
+                    "HasVs": "true"
+                }
+            },
+            "linux": {
+                "env": {
+                    "CMT_TESTING": "1",
+                    "CMT_QUIET_CONSOLE": "1",
+                    "HasVs": "false"
+                }
+            },
+            "osx": {
+                "env": {
+                    "CMT_TESTING": "1",
+                    "CMT_QUIET_CONSOLE": "1",
+                    "HasVs": "false"
+                }
+            }
+        },
+        {
+            "name": "Launch Extension Tests (multi-root-UI)",
+            "type": "extensionHost",
+            "request": "launch",
+            "runtimeExecutable": "${execPath}",
+            "args": [
+                "${workspaceFolder}/test/extension-tests/multi-root-UI/project-workspace.code-workspace",
+                "--extensionDevelopmentPath=${workspaceFolder}",
+                "--extensionTestsPath=${workspaceFolder}/out/test/extension-tests/multi-root-UI"
+            ],
+            "stopOnEntry": false,
+            "sourceMaps": true,
+            "outFiles": [
+                "${workspaceFolder}/out/*",
+                "${workspaceFolder}/out/src/*",
+                "${workspaceFolder}/out/test/*",
+                "${workspaceFolder}/out/test/extension-tests/multi-root-UI/*",
+                "${workspaceFolder}/out/test/extension-tests/multi-root-UI/test/*"
+            ],
+            "preLaunchTask": "build-tests-with-tsc-watch",
+            "windows": {
+                "env": {
+                    "CMT_TESTING": "1",
+                    "CMT_QUIET_CONSOLE": "1",
+                    "HasVs": "true"
+                }
+            },
+            "linux": {
+                "env": {
+                    "CMT_TESTING": "1",
+                    "CMT_QUIET_CONSOLE": "1",
+                    "HasVs": "false"
+                }
+            },
+            "osx": {
+                "env": {
+                    "CMT_TESTING": "1",
+                    "CMT_QUIET_CONSOLE": "1",
+                    "HasVs": "false"
+                }
+            }
         },
         {
             "name": "Launch Extension Tests (vs-preferred-gen)",
@@ -160,7 +241,6 @@
                     "HasVs": "false"
                 }
             }
-            // "smartStep": true
         },
         {
             "type": "node",

diff --git a/.vscode/settings.json b/.vscode/settings.json
@@ -8,5 +8,6 @@
     },
     "typescript.tsdk": "./node_modules/typescript/lib", // we want to use the TS server from our node_modules folder to control its version
     "files.trimTrailingWhitespace": true,
-    "clang-format.executable": "${workspaceFolder}/node_modules/.bin/clang-format"
+    "clang-format.executable": "${workspaceFolder}/node_modules/.bin/clang-format",
+    "editor.tabSize": 2
 }
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,30 @@
 # What's New?
 
+## 1.3.0
+Improvements:
+- Multi-root support. You can now open multiple folders in VS Code and CMake Tools will allow you to configure each of the projects in those folders.
+- Add support for `${command:cmake.buildKit}`. [#334](https://github.com/microsoft/vscode-cmake-tools/issues/334) [@xgdgsc](https://github.com/xgdgsc)
+- Add LLVM_ROOT and Visual Studio Clang locations to the search path for Kits. [#914](https://github.com/microsoft/vscode-cmake-tools/issues/914) [@Zingam](https://github.com/Zingam)
+- Support additional `intelliSenseModes` in the configuration provider. [#960](https://github.com/microsoft/vscode-cmake-tools/issues/960)
+- Detect bundled CMake in Visual Studio. [#610](https://github.com/microsoft/vscode-cmake-tools/issues/610) [@Zingam](https://github.com/Zingam)
+- Add "Scan for kits" option in kits QuickPick. [#864](https://github.com/microsoft/vscode-cmake-tools/issues/864) [@Zingam](https://github.com/Zingam)
+- Implement the CMake File API. [PR #720](https://github.com/microsoft/vscode-cmake-tools/pull/720) [@KoeMai](https://github.com/KoeMai)
+
+Bug Fixes:
+- Support temp folders not located on system drive. [PR #974](https://github.com/microsoft/vscode-cmake-tools/pull/974) [@Carsten87](https://github.com/Carsten87)
+- Add MinGW path to the environment. [PR #983](https://github.com/microsoft/vscode-cmake-tools/pull/983)
+- Don't do a clean build for utility targets. [#643](https://github.com/microsoft/vscode-cmake-tools/issues/643) [@rcxdude](https://github.com/rcxdude)
+- Visual Studio builds should support `cmake.parallelJobs` setting. [PR #975](https://github.com/microsoft/vscode-cmake-tools/pull/975) [@tonka3000](https://github.com/tonka3000)
+- Fix build cancellation. [#946](https://github.com/microsoft/vscode-cmake-tools/issues/946) [#781](https://github.com/microsoft/vscode-cmake-tools/issues/781) [#522](https://github.com/microsoft/vscode-cmake-tools/issues/522) [@KoeMai](https://github.com/KoeMai)
+- Normalize both absolute and relative paths. [PR #963](https://github.com/microsoft/vscode-cmake-tools/pull/963) [@GeorchW](https://github.com/GeorchW)
+- Filter out duplicate targets from the target selector. [#863](https://github.com/microsoft/vscode-cmake-tools/issues/863)
+- Fix a crash when `chcp` is not found on the machine. [#977](https://github.com/microsoft/vscode-cmake-tools/issues/977)
+- Don't fail if CMakeLists.txt was appended to sourceDirectory. [#1014](https://github.com/microsoft/vscode-cmake-tools/issues/1014)
+- Mark all tests as 'not run' in case of build failure when running CTest. [PR #980](https://github.com/microsoft/vscode-cmake-tools/pull/980) [@Morozov-5F](https://github.com/Morozov-5F)
+- Add command to hide launch/debug commands and debug button. [PR #1035](https://github.com/microsoft/vscode-cmake-tools/pull/1035)
+- Add support for `${workspaceFolderBasename}`. [#869](https://github.com/microsoft/vscode-cmake-tools/issues/869)
+- Fix exception thrown by debug/launch commands. [#1036](https://github.com/microsoft/vscode-cmake-tools/issues/1036)
+
 ## 1.2.3
 Bug fixes:
 - CTest status bar button text appears malformed. [#911](https://github.com/microsoft/vscode-cmake-tools/issues/911)

diff --git a/appveyor.yml b/appveyor.yml
@@ -3,7 +3,7 @@ image:
   - Visual Studio 2017
 
 install:
-  - ps: Install-Product node 8.9.3 x64
+  - ps: Install-Product node 8 x64
 build_script:
   - pwsh: ./scripts/ci.ps1
 

diff --git a/i18n/chs/package.i18n.json b/i18n/chs/package.i18n.json
@@ -9,32 +9,46 @@
 	"cmake-tools.command.cmake.scanForKits.title": "扫描工具包",
 	"cmake-tools.command.cmake.selectKit.title": "选择工具包",
 	"cmake-tools.command.cmake.setVariant.title": "选择变量",
+	"cmake-tools.command.cmake.setVariantAll.title": "为所有项目选择变量",
 	"cmake-tools.command.cmake.configure.title": "配置",
+	"cmake-tools.command.cmake.configureAll.title": "配置所有项目",
 	"cmake-tools.command.cmake.build.title": "生成",
+	"cmake-tools.command.cmake.buildAll.title": "生成所有项目",
 	"cmake-tools.command.cmake.buildNamedTarget.title": "(内部)按名称生成目标",
 	"cmake-tools.command.cmake.compileFile.title": "编译活动文件",
 	"cmake-tools.command.cmake.outline.compileFile.title": "编译文件",
 	"cmake-tools.command.cmake.install.title": "安装",
+	"cmake-tools.command.cmake.installAll.title": "安装所有项目",
 	"cmake-tools.command.cmake.buildWithTarget.title": "生成目标",
 	"cmake-tools.command.cmake.setDefaultTarget.title": "设置生成目标",
 	"cmake-tools.command.cmake.cleanConfigure.title": "删除缓存并重新配置",
+	"cmake-tools.command.cmake.cleanConfigureAll.title": "删除缓存并重新配置所有项目",
 	"cmake-tools.command.cmake.outline.cleanConfigure.title": "清除重新配置",
+	"cmake-tools.command.cmake.outline.cleanConfigureAll.title": "清理所有项目的重新配置",
 	"cmake-tools.command.cmake.clean.title": "清理",
+	"cmake-tools.command.cmake.cleanAll.title": "清理所有项目",
 	"cmake-tools.command.cmake.cleanRebuild.title": "清除重新生成",
+	"cmake-tools.command.cmake.cleanRebuildAll.title": "清理所有项目的重新生成",
 	"cmake-tools.command.cmake.ctest.title": "运行测试",
+	"cmake-tools.command.cmake.ctestAll.title": "为所有项目运行测试",
 	"cmake-tools.command.cmake.editCache.title": "编辑 CMake 缓存",
 	"cmake-tools.command.cmake.quickStart.title": "快速入门",
 	"cmake-tools.command.cmake.debugTarget.title": "调试",
+	"cmake-tools.command.cmake.debugTargetAll.title": "调试所有项目",
 	"cmake-tools.command.cmake.launchTarget.title": "运行而不调试",
+	"cmake-tools.command.cmake.launchTargetAll.title": "在不调试的情况下运行所有项目",
 	"cmake-tools.command.cmake.selectLaunchTarget.title": "设置调试目标",
 	"cmake-tools.command.cmake.stop.title": "取消生成",
+	"cmake-tools.command.cmake.stopAll.title": "取消所有项目的生成",
 	"cmake-tools.command.cmake.resetState.title": "重置 CMake Tools 扩展状态(用于故障排除)",
+	"cmake-tools.command.cmake.selectActiveFolder.title": "选择活动文件夹",
 	"cmake-tools.command.cmake.outline.runUtilityTarget.title": "运行实用工具",
 	"cmake-tools.command.cmake.outline.debugTarget.title": "调试",
 	"cmake-tools.command.cmake.outline.launchTarget.title": "在终端中运行",
 	"cmake-tools.command.cmake.outline.setDefaultTarget.title": "设置为生成目标",
 	"cmake-tools.command.cmake.outline.setLaunchTarget.title": "设置为启动/调试目标",
 	"cmake-tools.command.cmake.outline.revealInCMakeLists.title": "打开 CMakeLists.txt",
+	"cmake-tools.command.cmake.folders.setActiveFolder.title": "设置活动文件夹",
 	"cmake-tools.configuration.title": "CMake 工具配置",
 	"cmake-tools.configuration.cmake.cmakePath.description": "要使用的 CMake 可执行文件的名称/路径。",
 	"cmake-tools.configuration.cmake.buildDirectory.description": "CMake 生成文件将转到其中的目录。",
@@ -91,10 +105,12 @@
 	"cmake-tools.configuration.cmake.copyCompileCommands.description": "成功配置后将 compile_commands.json 复制到此位置。",
 	"cmake-tools.configuration.cmake.configureOnOpen.description": "在 CMake 项目目录打开时自动对其进行配置。",
 	"cmake-tools.configuration.cmake.useCMakeServer.description": "启用 CMake 服务器。",
+	"cmake-tools.configuration.cmake.cmakeCommunicationMode": "The protocol used to communicate between the extension and CMake",
 	"cmake-tools.configuration.cmake.ignoreKitEnv.description": "运行 CMake 命令时，请勿使用工具包环境变量。",
 	"cmake-tools.configuration.cmake.buildTask.description": "使用 tasks.json 生成，而非使用内部进程。",
 	"cmake-tools.configuration.cmake.outputLogEncoding.description": "来自外部命令的输出的编码(例如 cmake -- build)。",
 	"cmake-tools.configuration.cmake.enableTraceLogging.description": "对文件和控制台启用跟踪日志记录(噪音很大)。",
+	"cmake-tools.configuration.cmake.autoSelectActiveFolder.description": "自动选择活动文件夹",
 	"cmake-tools.configuration.views.cmake.folders.description": "文件夹",
 	"cmake-tools.configuration.views.cmake.outline.description": "项目大纲"
 }
diff --git a/i18n/chs/src/cmake-tools.i18n.json b/i18n/chs/src/cmake-tools.i18n.json
@@ -14,11 +14,10 @@
 	"no.source.directory.found": "没有打开的源目录",
 	"quickstart.cmake.project": "快速启动新的 CMake 项目",
 	"edit.setting": "编辑 \"cmake.sourceDirectory\" 设置",
-	"missing.cmakelists": "在工作区文件夹的根中找不到 CMakeLists.txt",
+	"missing.cmakelists": "在文件夹 \"{0}\" 的根中找不到 CMakeLists.txt",
 	"starting.cmake.driver": "正在启动 CMake 驱动程序",
 	"bad.cmake.executable": "CMake 可执行文件“{0}”不正确。",
-	"no.workspace.error": "在没有打开的工作区时，CMake 工具不可用",
-	"please.upgrade.cmake": "CMake 服务器不可用于当前的 CMake 可执行文件。请升级到 CMake {0} 或更高版本。",
+	"please.upgrade.cmake": "For the best experience, CMake server or file-api support is required. Please upgrade CMake to {0} or newer.",
 	"starting.cmake.driver.status": "正在启动 CMake 服务器...",
 	"ready.status": "就绪",
 	"unable.to.execute.cmake.command": "无法执行 cmake 命令，不存在有效的 cmake 驱动程序实例。",
@@ -45,7 +44,7 @@
 	"failed.to.copy": "无法将“{0}”复制到“{1}”: {2}",
 	"configuring.project": "正在配置项目",
 	"preparing.to.configure": "正在准备配置",
-	"run.configure": "运行配置",
+	"run.configure": "正在配置文件夹: {0}",
 	"unexpected.configure.type": "意外的配置类型",
 	"finishing.configure": "正在完成配置",
 	"configure.failed": "未能配置项目",
@@ -59,7 +58,7 @@
 	"waiting.on.variant": "正在等待变量选择",
 	"no.variant.abort": "未选择任何变量。中止配置",
 	"cmake.drive.died.during.tasksbuildcommend": "CMake 驱动程序在 tasksBuildCommand 期间终止",
-	"run.build": "运行生成",
+	"run.build": "正在生成文件夹: {0}",
 	"unable.to.configure": "生成失败: 无法配置项目",
 	"driver.died.after.successful.configure": "CMake 驱动程序在成功配置后立即终止",
 	"building.status": "生成",
@@ -75,6 +74,7 @@
 	"enter.target.name": "输入目标名称",
 	"target.to.build.description": "要生成的目标",
 	"driver.died.after.build.succeeded": "CMake 驱动程序在生成成功后立即终止。",
+	"select.a.launch.target": "为 {0} 选择新启动目标",
 	"no.executable.target.found.to.launch": "找不到可启动的可执行目标。请检查:",
 	"have.you.called.add_executable": "是否已在 CMake 项目中调用了 add_executable()?",
 	"have.you.configured": "是否执行了成功的 CMake 配置?",

diff --git a/i18n/chs/src/config.i18n.json b/i18n/chs/src/config.i18n.json
@@ -0,0 +1,8 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+// Do not edit this file. It is machine generated.
+{
+	"please.upgrade.configuration": "The setting 'useCMakeServer' is replaced by 'cmakeCommunicationMode'. Please upgrade your configuration."
+}
diff --git a/i18n/chs/src/cpptools.i18n.json b/i18n/chs/src/cpptools.i18n.json
@@ -5,6 +5,8 @@
 // Do not edit this file. It is machine generated.
 {
 	"unexpected.end.of.arguments": "分析命令行参数时意外终止",
+	"unknown.control.gflag.cpp": "C++ 标准控件标志未知: {0}",
+	"unknown.control.gflag.c": "C 标准控件标志未知: {0}",
 	"unknown.control.gflag": "未知标准控制标志: {0}",
 	"unknown language": "未知语言: {0}",
 	"method.not.implemented": "方法未实现。",

diff --git a/i18n/chs/src/drivers/cmakefileapi/api_helpers.i18n.json b/i18n/chs/src/drivers/cmakefileapi/api_helpers.i18n.json
@@ -0,0 +1,10 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+// Do not edit this file. It is machine generated.
+{
+	"cache.object.version": "Cache object version ({0}.{1}) of cmake-file-api is unexpected. Expecting ({2}.{3}). IntelliSense configuration may be incorrect.",
+	"cache.entry.unknowntype": "Unknown cache entry type: {0}.",
+	"code.model.version": "Code model version ({0}.{1}) of cmake-file-api is unexpected. Expecting ({2}.{3}). IntelliSense configuration may be incorrect."
+}
diff --git a/i18n/chs/src/drivers/driver.i18n.json b/i18n/chs/src/drivers/driver.i18n.json
@@ -12,6 +12,7 @@
 	"switching.to.kit": "正在切换到工具包: {0}",
 	"cmakedriver.kit.set.to": "CMakeDriver 工具包设置为 {0}",
 	"setting.new.variant": "正在设置新变量 {0}",
+	"sourcedirectory.not.a.directory": "\"sourceDirectory\" is not a directory",
 	"command.version.test.return.code": "命令版本测试返回代码 {0}",
 	"trying.to.detect.generator": "正在尝试检测系统支持的生成器",
 	"start.configure": "开始配置",