Merge branch 'develop' into fix-mingw-gdb

README.md

@@ -1,24 +1,18 @@
 # CMake Tools
 
-[CMake Tools](https://marketplace.visualstudio.com/items?itemName=vector-of-bool.cmake-tools) provides the native developer a full-featured, convenient, and
-powerful workflow for CMake-based projects in Visual Studio Code.
+[CMake Tools](https://marketplace.visualstudio.com/items?itemName=ms-vscode.cmake-tools) provides the native developer a full-featured, convenient, and powerful workflow for CMake-based projects in Visual Studio Code.
 
-## Maintainer Changes (7/12/19)
+## Important doc links
 
-**vector-of-bool** has moved on to other things and Microsoft is now maintaining this extension. Thank you **vector-of-bool** for all of your hard work getting
-this extension to where it is today!
-
-# Important Links:
-
-- [Getting started](https://vector-of-bool.github.io/docs/vscode-cmake-tools/getting_started.html)
-- [Configuring a project](https://vector-of-bool.github.io/docs/vscode-cmake-tools/configuring.html)
-- [Building a project](https://vector-of-bool.github.io/docs/vscode-cmake-tools/building.html)
-- [Configuring CMake Tools](https://vector-of-bool.github.io/docs/vscode-cmake-tools/settings.html)
-- [How do I...?](https://vector-of-bool.github.io/docs/vscode-cmake-tools/how_do_i.html)
-- [FAQ](https://vector-of-bool.github.io/docs/vscode-cmake-tools/faq.html)
-- [Read the online documentation](https://vector-of-bool.github.io/docs/vscode-cmake-tools/index.html)
-- [Contributing](https://vector-of-bool.github.io/docs/vscode-cmake-tools/development.html)
-- [Read the changelog](https://vector-of-bool.github.io/docs/vscode-cmake-tools/changelog.html)
+- [CMake Tools quick start](https://code.visualstudio.com/docs/cpp/CMake-linux)
+- [Configure a project](docs/how-to.md#configure-a-project)
+- [Build a project](docs/how-to.md#build-a-project)
+- [Debug a project](docs/how-to.md#debug-a-project)
+- [Configure CMake Tools settings](docs/cmake-settings.md)
+- [How to](docs/how-to.md)
+- [FAQ](docs/faq.md)
+- [Read the online documentation](docs/readme.md)
+- [Contribute](docs/contribute.md)
 
 ## Issues? Questions? Feature requests?
 
@@ -35,3 +29,7 @@ This project has adopted the [Microsoft Open Source Code of Conduct](https://ope
 ### Data/Telemetry
 
 This extension collects usage data and sends it to Microsoft to help improve our products and services. Collection of telemetry is controlled via the same setting provided by Visual Studio Code: `"telemetry.enableTelemetry"`. Read our [privacy statement](https://privacy.microsoft.com/en-us/privacystatement) to learn more.
+
+### Credits
+
+This project was started by [@vector-of-bool](https://github.com/vector-of-bool) and is now currently maintained by Microsoft.

i18n/chs/package.i18n.json

@@ -104,13 +104,19 @@
 	"cmake-tools.configuration.cmake.emscriptenSearchDirs.description": "可在其中安装 Emscripten 的目录。",
 	"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.configureOnEdit.description": "保存 cmake.sourceDirectory 或 CMakeLists.txt 内容时，自动配置 CMake 项目目录。",
+	"cmake-tools.configuration.cmake.skipConfigureIfCachePresent.description": "如果存在缓存，则跳过配置进程。",
 	"cmake-tools.configuration.cmake.cmakeCommunicationMode": "用于在扩展和 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.cmake.statusbar.visibility.description": "配置扩展在状态栏中显示按钮的方式",
+	"cmake-tools.configuration.cmake.statusbar.advanced.description": "配置各个状态栏按钮的设置。这些设置将覆盖更常规的 \"cmake.statusbar.visibility\" 设置。",
+	"cmake-tools.configuration.cmake.statusbar.advanced.visibility.description": "配置扩展在状态栏中显示此按钮的方式",
+	"cmake-tools.configuration.cmake.statusbar.advanced.ctest.color.description": "根据测试结果启用此按钮的颜色更改",
+	"cmake-tools.configuration.cmake.statusbar.advanced.length.description": "配置可见文本在在“紧凑”模式下的最大长度。",
 	"cmake-tools.configuration.views.cmake.folders.description": "文件夹",
 	"cmake-tools.configuration.views.cmake.outline.description": "项目大纲"
 }

i18n/chs/schemas/kits-schema.json.i18n.json

@@ -12,6 +12,7 @@
 	"schemas/kits-schema.json.items.properties.toolchainFile": "工具链文件的路径",
 	"schemas/kits-schema.json.items.properties.visualStudio": "Visual Studio 产品的名称",
 	"schemas/kits-schema.json.items.properties.visualStudioArchitecture": "体系结构到目标",
+	"schemas/kits-schema.json.items.properties.environmentSetupScript": "用于修改工具包环境的脚本的绝对路径",
 	"schemas/kits-schema.json.items.properties.environmentVariables.patternProperties..*": "环境变量的值",
 	"schemas/kits-schema.json.items.properties.cmakeSettings.patternProperties..*": "CMake 设置的值",
 	"schemas/kits-schema.json.items.properties.preferredGenerator": "为此工具包设置首选的 CMake 生成器",

i18n/chs/src/cmake-tools.i18n.json

@@ -12,9 +12,12 @@
 	"configuration.already.in.progress": "配置已在进行中。",
 	"task.already.running": "CMake 任务已在运行。请先停止该任务然后再尝试运行新的 CMake 任务。",
 	"no.source.directory.found": "没有打开的源目录",
-	"quickstart.cmake.project": "快速启动新的 CMake 项目",
-	"edit.setting": "编辑 \"cmake.sourceDirectory\" 设置",
-	"missing.cmakelists": "在文件夹“{0}”的根中找不到 CMakeLists.txt",
+	"quickstart.cmake.project": "创建",
+	"edit.setting": "查找",
+	"ignore.activation": "不再显示",
+	"missing.cmakelists": "在文件夹“{0}”的根目录中找不到 CMakeLists.txt。你希望如何继续?",
+	"reload.window": "重载窗口",
+	"setting.sourceDirectory.failed.needs.reload.window": "更新 cmake.sourceDirectory 设置时出现问题。要使更改生效，请运行“重载窗口”命令。",
 	"starting.cmake.driver": "正在启动 CMake 驱动程序",
 	"bad.cmake.executable": "CMake 可执行文件“{0}”不正确。",
 	"switch.to.serverapi": "在低于 {0} 的版本中不支持 CMake 文件与 API (file-api)通信模式。正在切换到 CMake 服务器通信模式。",
@@ -26,6 +29,9 @@
 	"second.phase.init": "正在启动 CMakeTools 第二阶段初始化",
 	"active.build.variant.changed": "活动的生成变量已更改",
 	"changing.build.variant": "正在更改生成变量",
+	"cmakelists.save.trigger.reconfigure": "检测到正在保存 CMakeLists.txt，正在尝试自动重新配置…",
+	"cmakelists.save.could.not.reconfigure": "在 CMakeLists.txt 中检测到更改，但由于另一操作已在进行中，我们无法重新配置项目。",
+	"needs.reconfigure": "需要重新配置项目，以使 CMakeLists.txt 中保存的更改生效。",
 	"injecting.new.kit": "将新的工具包注入 CMake 驱动程序",
 	"reloading.status": "正在重新加载...",
 	"unable.to.set.kit": "无法设置工具包“{0}”。",
@@ -58,6 +64,7 @@
 	"cannot.configure.no.kit": "无法配置: 没有为此 CMake 工具激活任何工具包",
 	"waiting.on.variant": "正在等待变量选择",
 	"no.variant.abort": "未选择任何变量。中止配置",
+	"warn.skip.configure.when.cache.present": "扩展已确定目前需要配置，\\\n                          但由于 cmake.skipConfigureWhenCachePresent 设置已启用，我们将跳过配置。\\\n                          请确保 CMake 缓存与最新的配置更改同步。",
 	"cmake.drive.died.during.tasksbuildcommend": "CMake 驱动程序在 tasksBuildCommand 期间终止",
 	"run.build": "正在生成文件夹: {0}",
 	"unable.to.configure": "生成失败: 无法配置项目",

i18n/chs/src/cpptools.i18n.json

@@ -9,6 +9,5 @@
 	"unknown.control.gflag.c": "C 标准控件标志未知: {0}",
 	"unknown.control.gflag": "未知标准控制标志: {0}",
 	"unknown language": "未知语言: {0}",
-	"method.not.implemented": "方法未实现。",
 	"path.not.found.in.cmake.cache": "在 CMake 缓存中找不到适用于一个或多个源文件的编译器的路径。如果使用工具链文件，这可能意味着在设置 C 和/或 C++ 编译器路径时需要指定缓存选项"
 }

i18n/chs/src/drivers/cmakefileapi/api_helpers.i18n.json

@@ -4,6 +4,7 @@
  *--------------------------------------------------------------------------------------------*/
 // Do not edit this file. It is machine generated.
 {
+	"failed.writing.to.file": "未能写入文件 {0}",
 	"cache.object.version": "cmake-file-api 的缓存对象版本({0}.{1})不是预期版本。应为 ({2}.{3})。IntelliSense 配置可能不正确。",
 	"cache.entry.unknowntype": "未知的缓存条目类型: {0}。",
 	"code.model.version": "cmake-file-api 的代码模型版本({0}.{1})不是预期版本。应为 ({2}.{3})。IntelliSense 配置可能不正确。"

i18n/chs/src/drivers/cmfileapi-driver.i18n.json

@@ -0,0 +1,9 @@
+/*---------------------------------------------------------------------------------------------
+ *  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.
+{
+	"removing": "正在删除 {0}",
+	"cmakelists.save.trigger.reconfigure": "检测到 \"cmake.sourceDirectory\" 设置更新，正在尝试自动重新配置…"
+}

i18n/chs/src/drivers/cms-driver.i18n.json

@@ -10,5 +10,6 @@
 	"found.no.matching.code.model": "找不到适用于当前生成类型的匹配代码模型。这不应该发生",
 	"build.all.target": "用于生成所有可用目标的特殊目标",
 	"install.all.target": "用于安装所有可用目标的特殊目标",
-	"utility.target": "实用工具目标"
+	"utility.target": "实用工具目标",
+	"cmakelists.save.trigger.reconfigure": "检测到 \"cmake.sourceDirectory\" 设置更新，正在尝试自动重新配置…"
 }

i18n/chs/src/drivers/driver.i18n.json

@@ -17,6 +17,7 @@
 	"trying.to.detect.generator": "正在尝试检测系统支持的生成器",
 	"start.configure": "开始配置",
 	"cmake.flags.are": "CMake 标志为 {0}",
+	"configure.failed": "未能配置项目",
 	"no.kit.is.set": "未设置任何工具包!",
 	"using.compilers.in.for.configure": "正在使用 {0} 中的编译器进行配置",
 	"using.cmake.toolchain.for.configure": "正在使用 CMake 工具链 {0} 进行配置",

i18n/chs/src/extension.i18n.json

@@ -10,10 +10,14 @@
 	"yes.button": "是",
 	"not.now.button": "暂不处理",
 	"always.configure.on.open": "始终在打开时配置项目?",
-	"never.configure.on.open": "是否在打开时永不配置项目?",
-	"for.this.workspace.button": "对于此工作区",
+	"never.configure.on.open": "打开时配置项目?",
+	"no.button": "否",
+	"never.button": "从不",
+	"never.for.this.workspace.button": "不是此工作区",
 	"persist.config.on.open.setting": "保留“打开即配置”设置",
 	"configuring.workspace.on.open": "正在打开的 {0} 上配置工作区",
+	"configure.now.button": "立即配置",
+	"configure.recommended": "建议在升级到新的工具包定义后重新配置。",
 	"update.code.model.for.cpptools": "更新 cpptools 的代码模型",
 	"filed.to.open.cache.file.on.code.model.update": "未能在代码模型更新时打开 CMake 缓存文件",
 	"opening.text.editor.for": "正在打开适用于 {0} 的文本编辑器",

i18n/chs/src/kit.i18n.json

@@ -34,6 +34,7 @@
 	"scanning.for.kits": "正在扫描工具包",
 	"scanning.for.cmake.kits": "正在扫描 CMake 工具包...",
 	"found.kit": "已找到工具包: {0}",
+	"silent.kits.rescan": "检测到工具包定义版本已从 {0} 更改为 {1}。扫描工具包但不显示提示。",
 	"kit.for.toolchain.file": "适用于工具链文件 {0} 的工具包",
 	"using.compilers.for": "将编译器用于 {0} ({1} 体系结构)",
 	"using.compilers": "使用编译器: {0}",

i18n/chs/src/kitsController.i18n.json

@@ -11,12 +11,10 @@
 	"unsetting.kit": "正在取消设置工具包",
 	"loading.kit": "正在加载工具包 {0}",
 	"invalid.only.kit": "唯一的工具包无效。应找到“{0}”",
-	"scan.for.kits.button": "扫描工具包",
-	"do.not.use.kit.button": "请勿使用工具包",
-	"close.button": "关闭",
-	"no.kits.available": "没有可用的 CMake 工具包。你要执行什么操作?",
+	"already.checking.kits": "已检查工具包，请稍后再试。",
 	"start.selection.of.kits": "开始选择工具包。已找到 {0} 个工具包。",
 	"opening.kit.selection": "正在打开工具包选项快速选择",
+	"scan.for.kits.button": "扫描工具包",
 	"unspecified.kit.name": "未指定",
 	"select.a.kit.placeholder": "为 {0} 选择工具包",
 	"user.cancelled.kit.selection": "用户已取消工具包选择",

i18n/chs/src/status.i18n.json

@@ -4,22 +4,22 @@
  *--------------------------------------------------------------------------------------------*/
 // Do not edit this file. It is machine generated.
 {
-	"active.folder.auto.select.tooltip": "活动文件夹",
-	"active.folder.tooltip": "选择活动文件夹",
+	"click.to.select.workspace.tooltip": "单击可选择活动文件夹",
 	"unconfigured": "未配置",
-	"loading.status": "正在加载...",
 	"click.to.select.variant.tooltip": "单击可选择当前的生成变量",
+	"loading.status": "正在加载...",
 	"click.to.change.kit.tooltip": "单击可更改活动的工具包",
+	"no.active.kit": "无活动工具包",
+	"no.kit.selected": "未选择任何工具包",
 	"set.active.target.tooltip": "设置要生成的活动目标",
-	"run.ctest.tests.tooltip": "运行 CTest 测试",
-	"launch.debugger.tooltip": "启动所选目标的调试程序",
 	"select.target.tooltip": "选择要启动的目标",
-	"debug": "调试",
+	"launch.debugger.tooltip": "启动所选目标的调试程序",
+	"launch.tooltip": "在终端窗口中启动所选目标",
+	"run.ctest.tests.tooltip": "运行 CTest 测试",
 	"run.ctest": "运行 CTest",
 	"test.passing": "{0} 项测试通过/共 {1} 项",
 	"tests.passing": "{0} 项测试通过/共 {1} 项",
-	"stop": "停止",
+	"build.tooltip": "生成所选目标",
 	"build": "生成",
-	"no.kit.selected": "未选择任何工具包",
-	"no.active.kit": "无活动工具包"
+	"stop": "停止"
 }

i18n/chs/src/tree.i18n.json

@@ -14,6 +14,8 @@
 	"item.render.issue": "呈现此项目时出现问题。这是 bug",
 	"empty.project": "空项目",
 	"update.project.with.mismatch": "更新具有不匹配的名称属性的项目",
-	"error.update.code.model.on.nonexist.folder": "正在对尚未加载的文件夹更新代码模型",
+	"workspace.active": "活动工作区",
+	"workspace": "工作区",
+	"error.update.code.model.on.nonexist.folder": "正在对尚未加载的文件夹更新代码模型。",
 	"error.rendering.children.nodes": "呈现子节点时出错"
 }

i18n/cht/package.i18n.json

@@ -104,13 +104,19 @@
 	"cmake-tools.configuration.cmake.emscriptenSearchDirs.description": "安裝 Emscripten 的目錄。",
 	"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.configureOnEdit.description": "在儲存 cmake.sourceDirectory 或 CMakeLists.txt 內容後，自動設定 CMake 專案目錄。",
+	"cmake-tools.configuration.cmake.skipConfigureIfCachePresent.description": "如果有快取，則跳過設定流程。",
 	"cmake-tools.configuration.cmake.cmakeCommunicationMode": "用於在延伸模組與 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.cmake.statusbar.visibility.description": "設定延伸模組在狀態列中顯示按鈕的方式",
+	"cmake-tools.configuration.cmake.statusbar.advanced.description": "進行個別狀態列按鈕的設定。這些設定會覆寫更一般性的 'cmake.statusbar.visibility' 設定。",
+	"cmake-tools.configuration.cmake.statusbar.advanced.visibility.description": "設定延伸模組在狀態列中顯示此按鈕的方式",
+	"cmake-tools.configuration.cmake.statusbar.advanced.ctest.color.description": "可根據測試結果變更此按鈕的色彩",
+	"cmake-tools.configuration.cmake.statusbar.advanced.length.description": "在「精簡」模式中設定顯示文字的最大長度。",
 	"cmake-tools.configuration.views.cmake.folders.description": "資料夾",
 	"cmake-tools.configuration.views.cmake.outline.description": "專案大綱"
 }

i18n/cht/schemas/kits-schema.json.i18n.json

@@ -12,6 +12,7 @@
 	"schemas/kits-schema.json.items.properties.toolchainFile": "工具鏈檔案路徑",
 	"schemas/kits-schema.json.items.properties.visualStudio": "Visual Studio 產品名稱",
 	"schemas/kits-schema.json.items.properties.visualStudioArchitecture": "要設為目標的架構",
+	"schemas/kits-schema.json.items.properties.environmentSetupScript": "修改套件環境的指令碼絕對路徑",
 	"schemas/kits-schema.json.items.properties.environmentVariables.patternProperties..*": "環境變數的值",
 	"schemas/kits-schema.json.items.properties.cmakeSettings.patternProperties..*": "CMake 設定的值",
 	"schemas/kits-schema.json.items.properties.preferredGenerator": "設定此套件的慣用 CMake 產生器",