Merge pull request #872 from microsoft/develop

Merge develop -> master for 1.2.0

.gitignore

@@ -1,11 +1,17 @@
-out
-node_modules
-.browse.VC.db*
-*.old
+.vscode-test/
 build/
+dist/
+node_modules/
+out/
 test/fakebin/
-.vscode-test/
+vscode-extensions-localization-export/
+vscode-translations-import/
 .ci-build
-*.vsix
-npm-debug.log
 .DS_Store
+npm-debug.log
+package-lock.json
+*.db*
+*.vsix
+**/nls.*.json
+**/*.nls.json
+**/*.nls.*.json

.travis.yml

@@ -20,7 +20,7 @@ addons:
 
 before_install:
   - |
-    nvm install 8.9.3 || exit 2
+    nvm install 8.12.0 || exit 2
     if [ $TRAVIS_OS_NAME == "linux" ]; then
       export DISPLAY=:99.0
       sh -e /etc/init.d/xvfb start

.vscode/launch.json

@@ -8,19 +8,17 @@
             "request": "launch",
             "runtimeExecutable": "${execPath}",
             "args": [
-                "--extensionDevelopmentPath=${workspaceRoot}"
+                "--extensionDevelopmentPath=${workspaceFolder}"
             ],
             "stopOnEntry": false,
             "sourceMaps": true,
             "outFiles": [
-                "${workspaceRoot}/out/*",
-                "${workspaceRoot}/out/src/*",
-                "${workspaceRoot}/out/test/*"
+                "${workspaceFolder}/dist/**/*.js"
             ],
             "env": {
                 "CMT_DEVRUN": "1"
             },
-            "preLaunchTask": "npm",
+            "preLaunchTask": "build-with-webpack-watch",
             "smartStep": false
         },
         {
@@ -29,24 +27,24 @@
             "request": "launch",
             "runtimeExecutable": "${execPath}",
             "args": [
-                "${workspaceRoot}/test/unit-tests/test-project-without-cmakelists",
-                "--extensionDevelopmentPath=${workspaceRoot}",
-                "--extensionTestsPath=${workspaceRoot}/out/test/unit-tests"
+                "${workspaceFolder}/test/unit-tests/test-project-without-cmakelists",
+                "--extensionDevelopmentPath=${workspaceFolder}",
+                "--extensionTestsPath=${workspaceFolder}/out/test/unit-tests"
             ],
             "stopOnEntry": false,
             "sourceMaps": true,
             "outFiles": [
-                "${workspaceRoot}/out/*",
-                "${workspaceRoot}/out/src/*",
-                "${workspaceRoot}/out/test/*",
-                "${workspaceRoot}/out/test/unit-tests/*"
+                "${workspaceFolder}/out/*",
+                "${workspaceFolder}/out/src/*",
+                "${workspaceFolder}/out/test/*",
+                "${workspaceFolder}/out/test/unit-tests/*"
             ],
             "env": {
                 "CMT_TESTING": "1",
                 "CMT_QUIET_CONSOLE": "1",
                 "HasVs": "true"
             },
-            "preLaunchTask": "npm"
+            "preLaunchTask": "build-tests-with-tsc-watch"
             // "smartStep": true
         },
         {
@@ -55,20 +53,20 @@
             "request": "launch",
             "runtimeExecutable": "${execPath}",
             "args": [
-                "${workspaceRoot}/test/extension-tests/without-cmakelist-file/project-folder",
-                "--extensionDevelopmentPath=${workspaceRoot}",
-                "--extensionTestsPath=${workspaceRoot}/out/test/extension-tests/without-cmakelist-file"
+                "${workspaceFolder}/test/extension-tests/without-cmakelist-file/project-folder",
+                "--extensionDevelopmentPath=${workspaceFolder}",
+                "--extensionTestsPath=${workspaceFolder}/out/test/extension-tests/without-cmakelist-file"
             ],
             "stopOnEntry": false,
             "sourceMaps": true,
             "outFiles": [
-                "${workspaceRoot}/out/*",
-                "${workspaceRoot}/out/src/*",
-                "${workspaceRoot}/out/test/*",
-                "${workspaceRoot}/out/test/extension-tests/without-cmakelist-file/*",
-                "${workspaceRoot}/out/test/extension-tests/without-cmakelist-file/test/*"
+                "${workspaceFolder}/out/*",
+                "${workspaceFolder}/out/src/*",
+                "${workspaceFolder}/out/test/*",
+                "${workspaceFolder}/out/test/extension-tests/without-cmakelist-file/*",
+                "${workspaceFolder}/out/test/extension-tests/without-cmakelist-file/test/*"
             ],
-            "preLaunchTask": "npm",
+            "preLaunchTask": "build-tests-with-tsc-watch",
             "windows": {
                 "env": {
                     "CMT_TESTING": "1",
@@ -91,20 +89,20 @@
             "request": "launch",
             "runtimeExecutable": "${execPath}",
             "args": [
-                "${workspaceRoot}/test/extension-tests/successful-build/project-folder",
-                "--extensionDevelopmentPath=${workspaceRoot}",
-                "--extensionTestsPath=${workspaceRoot}/out/test/extension-tests/successful-build"
+                "${workspaceFolder}/test/extension-tests/successful-build/project-folder",
+                "--extensionDevelopmentPath=${workspaceFolder}",
+                "--extensionTestsPath=${workspaceFolder}/out/test/extension-tests/successful-build"
             ],
             "stopOnEntry": false,
             "sourceMaps": true,
             "outFiles": [
-                "${workspaceRoot}/out/*",
-                "${workspaceRoot}/out/src/*",
-                "${workspaceRoot}/out/test/*",
-                "${workspaceRoot}/out/test/extension-tests/successful-build/*",
-                "${workspaceRoot}/out/test/extension-tests/successful-build/test/*"
+                "${workspaceFolder}/out/*",
+                "${workspaceFolder}/out/src/*",
+                "${workspaceFolder}/out/test/*",
+                "${workspaceFolder}/out/test/extension-tests/successful-build/*",
+                "${workspaceFolder}/out/test/extension-tests/successful-build/test/*"
             ],
-            "preLaunchTask": "npm",
+            "preLaunchTask": "build-tests-with-tsc-watch",
             "windows": {
                 "env": {
                     "CMT_TESTING": "1",
@@ -134,20 +132,20 @@
             "request": "launch",
             "runtimeExecutable": "${execPath}",
             "args": [
-                "${workspaceRoot}/test/extension-tests/vs-preferred-gen/project-folder",
-                "--extensionDevelopmentPath=${workspaceRoot}",
-                "--extensionTestsPath=${workspaceRoot}/out/test/extension-tests/vs-preferred-gen"
+                "${workspaceFolder}/test/extension-tests/vs-preferred-gen/project-folder",
+                "--extensionDevelopmentPath=${workspaceFolder}",
+                "--extensionTestsPath=${workspaceFolder}/out/test/extension-tests/vs-preferred-gen"
             ],
             "stopOnEntry": false,
             "sourceMaps": true,
             "outFiles": [
-                "${workspaceRoot}/out/*",
-                "${workspaceRoot}/out/src/*",
-                "${workspaceRoot}/out/test/*",
-                "${workspaceRoot}/out/test/extension-tests/vs-preferred-gen/*",
-                "${workspaceRoot}/out/test/extension-tests/vs-preferred-gen/test/*"
+                "${workspaceFolder}/out/*",
+                "${workspaceFolder}/out/src/*",
+                "${workspaceFolder}/out/test/*",
+                "${workspaceFolder}/out/test/extension-tests/vs-preferred-gen/*",
+                "${workspaceFolder}/out/test/extension-tests/vs-preferred-gen/test/*"
             ],
-            "preLaunchTask": "npm",
+            "preLaunchTask": "build-tests-with-tsc-watch",
             "windows": {
                 "env": {
                     "CMT_TESTING": "1",
@@ -187,22 +185,22 @@
             "request": "launch",
             "runtimeExecutable": "${execPath}",
             "args": [
-                "${workspaceRoot}/test/smoke/_project-dir",
-                "--extensionDevelopmentPath=${workspaceRoot}",
-                "--extensionTestsPath=${workspaceRoot}/out/test/smoke",
+                "${workspaceFolder}/test/smoke/_project-dir",
+                "--extensionDevelopmentPath=${workspaceFolder}",
+                "--extensionTestsPath=${workspaceFolder}/out/test/smoke",
                 "--disable-extensions"
             ],
             "stopOnEntry": false,
             "sourceMaps": true,
             "outFiles": [
-                "${workspaceRoot}/out/*",
-                "${workspaceRoot}/out/test/**"
+                "${workspaceFolder}/out/*",
+                "${workspaceFolder}/out/test/**"
             ],
-            "preLaunchTask": "npm",
+            "preLaunchTask": "build-tests-with-tsc-watch",
             "env": {
                 "CMT_TESTING": "1",
                 "CMT_QUIET_CONSOLE": "1",
-                "CMT_SMOKE_DIR": "${workspaceRoot}/test/smoke"
+                "CMT_SMOKE_DIR": "${workspaceFolder}/test/smoke"
             }
         }
     ]

.vscode/settings.json

@@ -8,5 +8,5 @@
     },
     "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": "${workspaceRoot}/node_modules/.bin/clang-format"
+    "clang-format.executable": "${workspaceFolder}/node_modules/.bin/clang-format"
 }

.vscode/tasks.json

@@ -2,9 +2,45 @@
     "version": "2.0.0",
     "tasks": [
         {
-            "identifier": "npm",
+            "label": "build-with-webpack-watch",
             "type": "npm",
             "script": "compile",
+            "problemMatcher": [
+                {
+                    "owner": "typescript",
+                    "source": "ts",
+                    "applyTo": "closedDocuments",
+                    "fileLocation": "absolute",
+                    "severity": "error",
+                    "pattern": [
+                        {
+                            "regexp": "\\[tsl\\] ERROR in (.*)?\\((\\d+),(\\d+)\\)",
+                            "file": 1,
+                            "line": 2,
+                            "column": 3
+                        },
+                        {
+                            "regexp": "\\s*TS\\d+:\\s*(.*)",
+                            "message": 1
+                        }
+                    ],
+                    "background": {
+                        "activeOnStart": true,
+                        "beginsPattern": {
+                            "regexp": "Compilation (.*?)starting…"
+                        },
+                        "endsPattern": {
+                            "regexp": "Compilation (.*?)finished"
+                        }
+                    }
+                }
+            ],
+            "isBackground": true
+        },
+        {
+            "label": "build-tests-with-tsc-watch",
+            "type": "npm",
+            "script": "pretest",
             "problemMatcher": [
                 "$tsc-watch"
             ],

.vscodeignore

@@ -1,16 +1,21 @@
-.vscode/**
-out/test/**
-test/**
-src/**
-**/*.map
+.vscode/
+build/
+docs/
+i18n/
+out/
+scripts/
+src/
+test/
+vscode-extensions-localization-export/
+vscode-translations-import/
+.clang-format
 .gitignore
+.gitattributes
+.travis.yml
+appveyor.yml
+CHANGELOG.pre-0.11.0.md
+gulpfile.js
 tsconfig.json
-vsc-extension-quickstart.md
-build/**
-docs/**
-.ci-build/**
-.vscode-test/**
-cSpell.json
-CMakeLists.txt
 tslint.json
-.gitattributes
+webpack.config.js
+yarn.lock

CHANGELOG.md

@@ -1,6 +1,45 @@
 # What's New?
 
-[See the full changelog in the end-user documentation](https://vector-of-bool.github.io/docs/vscode-cmake-tools/changelog.html).
+## 1.2.0
+Thank you to the following CMake Tools contributors: koemai, bjosa, emanspeaks, som1lse,
+dcourtois, tsing80, andy-held, notskm, thezogoth, yokuyuki, dbird137, fabianogk, randshot.
+
+**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!
+
+Breaking changes:
+- The publisher id changes to ms-vscode.cmake-tools.
+- Scanning for kits is able to detect more accurately multiple VS installations.
+  To achieve this, a Visual Studio kit is defined differently now in cmake-tools-kits.json:
+  the "visualStudio" field represents an ID unique to the installation
+  as opposed to "VisualStudio.${VS Version}" (which may be the same for multiple same year VS installations).
+  The CMake Tools Extension is still able to work with the old definition VS kits,
+  but for simplicity and to avoid duplicates in the json file it will prompt for permission to delete them
+  each time a "Scan for kits" is performed.
+
+Features:
+- Support for localized messages.
+- Cross compile support for CppTools integration.
+- Adapt CppTools integration to API version 3. [#637](https://github.com/Microsoft/vscode-cmake-tools/issues/637)
+- Expand kit environment variables. [#460](https://github.com/Microsoft/vscode-cmake-tools/issues/460)
+- Add new commands: launchTargetDirectory, buildType, buildDirectory. [#334](https://github.com/Microsoft/vscode-cmake-tools/issues/334), [#654](https://github.com/Microsoft/vscode-cmake-tools/issues/654), [#564](https://github.com/Microsoft/vscode-cmake-tools/issues/564), [#559](https://github.com/Microsoft/vscode-cmake-tools/issues/559), [#695](https://github.com/Microsoft/vscode-cmake-tools/issues/695)
+- Add support for VS2010.
+
+Improvements:
+- Restructuring of the CMake Driver.
+- Improve stability of CMake Generator Selection. [#512](https://github.com/Microsoft/vscode-cmake-tools/issues/512)
+- Refactor and extend CMS-server driver test.
+- Rework the CMake Build from a terminal to a task.
+- Add Launch target test.
+- Increase wait time in test to open terminal.
+
+Bug fixes:
+- Cannot execute current target without a debugger. [#601](https://github.com/Microsoft/vscode-cmake-tools/issues/601)
+- Path clobbering by bad kit file env. [#701](https://github.com/Microsoft/vscode-cmake-tools/issues/701), [#713](https://github.com/Microsoft/vscode-cmake-tools/issues/713)
+- Target install missing. [#504](https://github.com/Microsoft/vscode-cmake-tools/issues/504)
+- CTest controller updated on reconfig. [#212](https://github.com/Microsoft/vscode-cmake-tools/issues/212)
+- Recalculate total for every run of CTest.
+- Debug target does not find GDB. [#375](https://github.com/Microsoft/vscode-cmake-tools/issues/375)
 
 ## 1.1.3
 

CHANGELOG.pre-0.11.0.md

@@ -123,7 +123,7 @@
     `ctrl+f5` keybinding**
   - Fix issue with being able to switch back to the `all` target
   - Fix issue with CTest output being garbled without line breaks
-  - Fix hang when build tools generate large amounts of output.*
+  - Fix extension not responding when build tools generate large amounts of output.*
   - **New** make-shift progress bar for build progress (supports Make and Ninja).*
   - Options to control what output parsers are enabled*
   \* Special thanks goes to [bbosnjak](https://github.com/bbosnjak) for these ones!
@@ -253,4 +253,4 @@ feel free to open an issue on [the GitHub page](https://github.com/vector-of-boo
 
 ### Version 0.1.0
 
-- First useful release
+- First useful release