Skip to content

Commit

Permalink
Merge branch 'dev/snehara/allow-parallel-tests' of https://github.com…
Browse files Browse the repository at this point in the history
…/microsoft/vscode-cmake-tools into dev/snehara/allow-parallel-tests
  • Loading branch information
snehara99 committed Aug 1, 2023
2 parents 3399503 + 1dd040b commit 7a98a14
Show file tree
Hide file tree
Showing 17 changed files with 41 additions and 57 deletions.
2 changes: 1 addition & 1 deletion docs/kits.md
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@ Update [user-local kits](#user-local-kits) by running **Scan for Kits** from the

**3. Save results to the user-local kits file**

- The [user-local kit](#user-local-kits) `cmake-tooks-kits.json` file is updated with the new kit information.
- The [user-local kit](#user-local-kits) `cmake-tools-kits.json` file is updated with the new kit information.

> **Warning:**
> The name of each kit is generated from the kit compiler and version information. Kits with the same name will be overwritten. To prevent custom kits from being overwritten, give them unique names. CMake Tools will not delete entries from `cmake-tools-kits.json`. It only adds and updates existing ones.
Expand Down
2 changes: 1 addition & 1 deletion i18n/chs/src/cmakeProject.i18n.json
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@
"communication.changed.restart.driver": "在通信模式更改后重启 CMake 驱动程序。",
"generator.changed.restart.driver": "在生成器更改后重启 CMake 驱动程序。",
"preferredGenerator.changed.restart.driver": "在 preferredGenerators 更改后重启 CMake 驱动程序。",
"bad.executable": "CMake 可执行文件错误: {0}。请检查以确保它已安装,或者 {1} 设置的值包含正确的路径",
"targests.in.preset": "[预设中的目标]",
"constructing.cmakeproject": "构造新的 CMakeProject 实例",
"disposing.driver": "正在释放 CMake 驱动程序",
Expand Down Expand Up @@ -58,7 +59,6 @@
"error.on.switch.status": "工具包的切换出错({0})",
"cmake.version.not.supported": "CMake 版本 {0} 可能不受支持。所需的最低版本为 {1}。",
"not.starting.no.kits": "未启动 CMake 驱动程序: 未选择任何工具包",
"bad.executable": "CMake 可执行文件错误: {0}。请检查以确保它已安装,或者 {1} 设置的值包含正确的路径",
"starting.new.cmake.driver": "正在启动新的 CMake 驱动程序",
"source.directory.does.not.match": "源目录 {0} 与 CMake 缓存中的源目录 {1} 不匹配。需要运行干净配置来配置此项目。",
"clean.configure.title": "清理配置",
Expand Down
2 changes: 1 addition & 1 deletion i18n/cht/src/cmakeProject.i18n.json
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@
"communication.changed.restart.driver": "在通訊模式變更後重新啟動 CMake 驅動程式。",
"generator.changed.restart.driver": "在產生器變更後重新啟動 CMake 驅動程式。",
"preferredGenerator.changed.restart.driver": "在 preferredGenerators 變更後重新啟動 CMake 驅動程式。",
"bad.executable": "錯誤的 CMake 可執行檔: {0}。請檢查以確定已安裝,或 {1} 設定的值包含正確的路徑",
"targests.in.preset": "[預設的目標]",
"constructing.cmakeproject": "建構新的 CMakeProject 執行個體",
"disposing.driver": "處置 CMake 驅動程式",
Expand Down Expand Up @@ -58,7 +59,6 @@
"error.on.switch.status": "套件 ({0}) 的切換錯誤",
"cmake.version.not.supported": "可能不支援{0} CMake 版本。需要的最低版本為 {1}。",
"not.starting.no.kits": "未啟動 CMake 驅動程式: 未選取套件",
"bad.executable": "錯誤的 CMake 可執行檔: {0}。請檢查以確定已安裝,或 {1} 設定的值包含正確的路徑",
"starting.new.cmake.driver": "正在啟動新的 CMake 驅動程式",
"source.directory.does.not.match": "來源目錄 {0} 與 CMake 快取中的來源目錄不符: {1}。您必須執行清除組態才可設定此專案。",
"clean.configure.title": "清除設定",
Expand Down
2 changes: 1 addition & 1 deletion i18n/csy/src/cmakeProject.i18n.json
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@
"communication.changed.restart.driver": "Ovladač CMake se restartuje po změně režimu komunikace.",
"generator.changed.restart.driver": "Ovladač CMake se restartuje po změně generátoru.",
"preferredGenerator.changed.restart.driver": "Ovladač CMake se restartuje po změně hodnoty preferredGenerators.",
"bad.executable": "Chybný spustitelný soubor CMake: {0} Zkontrolujte, zda je nainstalovaný nebo zda hodnota nastavení {1} obsahuje správnou cestu.",
"targests.in.preset": "[Cíle v předvolbách]",
"constructing.cmakeproject": "Vytváří se nová instance CMakeProject",
"disposing.driver": "Ruší se ovladač CMake.",
Expand Down Expand Up @@ -58,7 +59,6 @@
"error.on.switch.status": "Chyba při přepnutí sady ({0})",
"cmake.version.not.supported": "{0} verze CMake se nemusí podporovat. Minimální požadovaná verze je {1}.",
"not.starting.no.kits": "Nespouští se ovladač CMake: nejsou vybrané žádné sady.",
"bad.executable": "Chybný spustitelný soubor CMake: {0} Zkontrolujte, zda je nainstalovaný nebo zda hodnota nastavení {1} obsahuje správnou cestu.",
"starting.new.cmake.driver": "Spouští se nový ovladač CMake.",
"source.directory.does.not.match": "Zdrojový adresář {0} se neshoduje se zdrojovým adresářem v mezipaměti CMake: {1}. Abyste mohli nakonfigurovat tento projekt, budete muset spustit čistou konfiguraci příkazem clean-configure.",
"clean.configure.title": "Vymazat a nakonfigurovat",
Expand Down
2 changes: 1 addition & 1 deletion i18n/deu/src/cmakeProject.i18n.json
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@
"communication.changed.restart.driver": "Der CMake-Treiber wird nach einer Änderung des Kommunikationsmodus neu gestartet.",
"generator.changed.restart.driver": "Der CMake-Treiber wird nach einer Generatoränderung neu gestartet.",
"preferredGenerator.changed.restart.driver": "Der CMake-Treiber wird nach einer preferredGenerators-Änderung neu gestartet.",
"bad.executable": "Ungültige ausführbare CMake-Datei: {0}. Stellen Sie sicher, dass sie installiert ist oder dass der Wert der {1}-Einstellung den richtigen Pfad enthält.",
"targests.in.preset": "[Ziele in Voreinstellung]",
"constructing.cmakeproject": "Erstellen einer neuen CMakeProject-Instanz",
"disposing.driver": "CMake-Treiber wird verworfen",
Expand Down Expand Up @@ -58,7 +59,6 @@
"error.on.switch.status": "Fehler beim Wechsel des Kits ({0})",
"cmake.version.not.supported": "CMake-Version {0} wird möglicherweise nicht unterstützt. Die erforderliche Mindestversion ist {1}.",
"not.starting.no.kits": "Der CMake-Treiber wird nicht gestartet: Es wurden keine Kits ausgewählt.",
"bad.executable": "Ungültige ausführbare CMake-Datei: {0}. Stellen Sie sicher, dass sie installiert ist oder dass der Wert der {1}-Einstellung den richtigen Pfad enthält.",
"starting.new.cmake.driver": "Neuer CMake-Treiber wird gestartet.",
"source.directory.does.not.match": "Das Quellverzeichnis {0} stimmt nicht mit dem Quellverzeichnis im CMake-Cache überein: {1}. Um dieses Projekt zu konfigurieren, müssen Sie clean-configure ausführen.",
"clean.configure.title": "Konfiguration bereinigen",
Expand Down
2 changes: 1 addition & 1 deletion i18n/esn/src/cmakeProject.i18n.json
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@
"communication.changed.restart.driver": "Reiniciando el controlador de CMake después de un cambio en el modo de comunicación.",
"generator.changed.restart.driver": "Reiniciando el controlador de CMake después de un cambio de generador.",
"preferredGenerator.changed.restart.driver": "Reiniciando el controlador de CMake después de un cambio de preferredGenerators.",
"bad.executable": "Ejecutable de CMake incorrecto: {0}. Compruebe que está instalado o que el valor de la configuración de {1} contiene la ruta de acceso correcta",
"targests.in.preset": "[Destinos predeterminados]",
"constructing.cmakeproject": "Creación de una instancia de CMakeProject",
"disposing.driver": "Eliminando el controlador de CMake",
Expand Down Expand Up @@ -58,7 +59,6 @@
"error.on.switch.status": "Error en el conmutador del kit ({0})",
"cmake.version.not.supported": "Es posible que no se admita la versión de CMake {0}. La versión mínima requerida es {1}.",
"not.starting.no.kits": "No se inicia el controlador de CMake: no hay ningún kit seleccionado",
"bad.executable": "Ejecutable de CMake incorrecto: {0}. Compruebe que está instalado o que el valor de la configuración de {1} contiene la ruta de acceso correcta",
"starting.new.cmake.driver": "Iniciando un nuevo controlador de CMake",
"source.directory.does.not.match": "El directorio de origen {0} no coincide con el de la memoria caché de CMake: {1}. Tendrá que ejecutar una configuración limpia para configurar este proyecto.",
"clean.configure.title": "Configuración limpia",
Expand Down
2 changes: 1 addition & 1 deletion i18n/fra/src/cmakeProject.i18n.json
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@
"communication.changed.restart.driver": "Redémarrage du pilote de CMake après un changement de mode de communication.",
"generator.changed.restart.driver": "Redémarrage du pilote de CMake après un changement de générateur.",
"preferredGenerator.changed.restart.driver": "Redémarrage du pilote de CMake après un changement de preferredGenerators.",
"bad.executable": "Exécutable CMake incorrect : {0}. Vérifiez qu’il est installé ou que la valeur du paramètre {1} contient le chemin d’accès approprié",
"targests.in.preset": "[Cibles dans la présélection]",
"constructing.cmakeproject": "Construction d'une instance de CMakeProject",
"disposing.driver": "Suppression du pilote CMake",
Expand Down Expand Up @@ -58,7 +59,6 @@
"error.on.switch.status": "Erreur durant le changement de kit ({0})",
"cmake.version.not.supported": "La version {0} de CMake peut ne pas être prise en charge. La version minimale requise est {1}.",
"not.starting.no.kits": "Impossible de démarrer le pilote CMake : aucun kit sélectionné",
"bad.executable": "Exécutable CMake incorrect : {0}. Vérifiez qu’il est installé ou que la valeur du paramètre {1} contient le chemin d’accès approprié",
"starting.new.cmake.driver": "Démarrage du nouveau pilote CMake",
"source.directory.does.not.match": "Le répertoire source {0} ne correspond pas au répertoire source du cache CMake{1}. Vous devez effectuer une nouvelle configuration pour configurer ce projet.",
"clean.configure.title": "Nouvelle configuration",
Expand Down
2 changes: 1 addition & 1 deletion i18n/ita/src/cmakeProject.i18n.json
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@
"communication.changed.restart.driver": "Riavvio del driver di CMake dopo una modifica della modalità di comunicazione.",
"generator.changed.restart.driver": "Riavvio del driver di CMake dopo una modifica del generatore.",
"preferredGenerator.changed.restart.driver": "Riavvio del driver di CMake dopo una modifica di preferredGenerators.",
"bad.executable": "Eseguibile CMake non valido: {0}. Verificare che sia installato o che il valore dell'impostazione {1} contenga il percorso corretto",
"targests.in.preset": "[Targets In Preset]",
"constructing.cmakeproject": "Costruzione di una nuova istanza di CMakeProject in corso",
"disposing.driver": "Eliminazione unità CMake",
Expand Down Expand Up @@ -58,7 +59,6 @@
"error.on.switch.status": "Errore durante il cambio del kit ({0})",
"cmake.version.not.supported": "La versione {0} CMake potrebbe non essere supportata. La versione minima richiesta è {1}.",
"not.starting.no.kits": "Il driver CMake non verrà avviato: non è stato selezionato alcun kit",
"bad.executable": "Eseguibile CMake non valido: {0}. Verificare che sia installato o che il valore dell'impostazione {1} contenga il percorso corretto",
"starting.new.cmake.driver": "Avvio del nuovo driver di CMake",
"source.directory.does.not.match": "La directory di origine {0} non corrisponde alla directory di origine nella cache di CMake: {1}. Per configurare questo progetto, è necessario eseguire una configurazione pulita.",
"clean.configure.title": "Configurazione pulita",
Expand Down
2 changes: 1 addition & 1 deletion i18n/jpn/src/cmakeProject.i18n.json
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@
"communication.changed.restart.driver": "通信モードの変更後に CMake ドライバーを再起動しています。",
"generator.changed.restart.driver": "ジェネレーターの変更後に CMake ドライバーを再起動しています。",
"preferredGenerator.changed.restart.driver": "preferredGenerators の変更後に CMake ドライバーを再起動しています。",
"bad.executable": "CMake 実行可能ファイルが正しくありません: {0}。インストールされているか、{1} 設定の値に正しいパスが含まれていることを確認してください",
"targests.in.preset": "[プリセット内のターゲット]",
"constructing.cmakeproject": "新しい CMakeProject インスタンスを構築しています",
"disposing.driver": "CMake ドライバーを破棄しています",
Expand Down Expand Up @@ -58,7 +59,6 @@
"error.on.switch.status": "キットの切り替えでエラーが発生しました ({0})",
"cmake.version.not.supported": "CMake バージョン {0} はサポートされていない可能性があります。最低限必要なバージョンは {1} です。",
"not.starting.no.kits": "CMake ドライバーは起動していません: キットが選択されていません",
"bad.executable": "CMake 実行可能ファイルが正しくありません: {0}。インストールされているか、{1} 設定の値に正しいパスが含まれていることを確認してください",
"starting.new.cmake.driver": "新しい CMake ドライバーを開始しています",
"source.directory.does.not.match": "ソース ディレクトリ {0} が、CMake キャッシュ内のソース ディレクトリと一致しません: {1}。このプロジェクトを構成するには、クリーン構成を実行する必要があります。",
"clean.configure.title": "クリーンして構成",
Expand Down
2 changes: 1 addition & 1 deletion i18n/kor/src/cmakeProject.i18n.json
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@
"communication.changed.restart.driver": "통신 모드 변경 후 CMake 드라이버를 다시 시작하는 중입니다.",
"generator.changed.restart.driver": "생성자 변경 후 CMake 드라이버를 다시 시작하는 중입니다.",
"preferredGenerator.changed.restart.driver": "preferredGenerators 변경 후 CMake 드라이버를 다시 시작하는 중입니다.",
"bad.executable": "잘못된 CMake 실행 파일: {0}. 설치되어 있는지 또는 {1} 설정 값에 올바른 경로가 포함되어 있는지 확인합니다.",
"targests.in.preset": "[미리 설정된 대상]",
"constructing.cmakeproject": "새 CMakeProject 인스턴스 생성",
"disposing.driver": "CMake 드라이버를 삭제하는 중",
Expand Down Expand Up @@ -58,7 +59,6 @@
"error.on.switch.status": "키트 전환 시 오류 발생({0})",
"cmake.version.not.supported": "CMake 버전 {0}은(는) 지원되지 않을 수 있습니다. 필요한 최소 버전은 {1}입니다.",
"not.starting.no.kits": "CMake 드라이버를 시작하지 않음: 선택된 키트가 없음",
"bad.executable": "잘못된 CMake 실행 파일: {0}. 설치되어 있는지 또는 {1} 설정 값에 올바른 경로가 포함되어 있는지 확인합니다.",
"starting.new.cmake.driver": "새 CMake 드라이버를 시작하는 중",
"source.directory.does.not.match": "소스 디렉터리 {0}이(가) CMake 캐시의 소스 디렉터리 {1}과(와) 일치하지 않습니다. 이 프로젝트를 구성하려면 clean-configure를 실행해야 합니다.",
"clean.configure.title": "클린 구성",
Expand Down
2 changes: 1 addition & 1 deletion i18n/plk/src/cmakeProject.i18n.json
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@
"communication.changed.restart.driver": "Ponowne uruchamianie sterownika narzędzia CMake po zmianie trybu komunikacji.",
"generator.changed.restart.driver": "Ponowne uruchamianie sterownika narzędzia CMake po zmianie generatora.",
"preferredGenerator.changed.restart.driver": "Ponowne uruchamianie sterownika narzędzia CMake po zmianie ustawienia preferredGenerators.",
"bad.executable": "Nieprawidłowy plik wykonywalny narzędzia CMake: {0}. Sprawdź, czy jest zainstalowany lub czy wartość ustawienia {1} zawiera poprawną ścieżkę",
"targests.in.preset": "[Wartości docelowe w ustawieniach wstępnych]",
"constructing.cmakeproject": "Konstruowanie nowego wystąpienia CMakeProject",
"disposing.driver": "Usuwanie sterownika CMake",
Expand Down Expand Up @@ -58,7 +59,6 @@
"error.on.switch.status": "Błąd przy przełączeniu zestawu ({0})",
"cmake.version.not.supported": "Wersja narzędzia Cmake {0} może nie być obsługiwana. Minimalna wymagana wersja to {1}.",
"not.starting.no.kits": "Nie można uruchomić sterownika narzędzia CMake: nie wybrano zestawu",
"bad.executable": "Nieprawidłowy plik wykonywalny narzędzia CMake: {0}. Sprawdź, czy jest zainstalowany lub czy wartość ustawienia {1} zawiera poprawną ścieżkę",
"starting.new.cmake.driver": "Uruchamianie nowego sterownika narzędzia CMake",
"source.directory.does.not.match": "Katalog źródłowy {0} nie pasuje do katalogu źródłowego w pamięci podręcznej narzędzia CMake: {1}. Aby skonfigurować ten projekt, należy uruchomić polecenie czyszczenia i konfigurowania.",
"clean.configure.title": "Wyczyść i skonfiguruj",
Expand Down
2 changes: 1 addition & 1 deletion i18n/ptb/src/cmakeProject.i18n.json
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@
"communication.changed.restart.driver": "Reiniciando o driver do CMake após uma alteração no modo de comunicação.",
"generator.changed.restart.driver": "Reiniciando o driver do CMake após uma alteração de gerador.",
"preferredGenerator.changed.restart.driver": "Reiniciando o driver do CMake após uma alteração de preferredGenerators.",
"bad.executable": "Executável incorreto do CMake: {0}. Verifique se ele está instalado ou se o valor da configuração {1} contém o caminho correto",
"targests.in.preset": "[Alvos em Predefinição]",
"constructing.cmakeproject": "Construindo a nova instância CMakeProject",
"disposing.driver": "Descartando o driver do CMake",
Expand Down Expand Up @@ -58,7 +59,6 @@
"error.on.switch.status": "Erro no comutador do kit ({0})",
"cmake.version.not.supported": "A versão do CMake {0} pode não ser compatível. A versão mínima necessária é {1}.",
"not.starting.no.kits": "Não iniciando o driver do CMake: nenhum kit selecionado",
"bad.executable": "Executável incorreto do CMake: {0}. Verifique se ele está instalado ou se o valor da configuração {1} contém o caminho correto",
"starting.new.cmake.driver": "Iniciando o novo driver do CMake",
"source.directory.does.not.match": "O diretório de origem {0} não corresponde ao diretório de origem no cache do CMake: {1}. Você precisará executar uma configuração limpa para configurar esse projeto.",
"clean.configure.title": "Limpar Configuração",
Expand Down
2 changes: 1 addition & 1 deletion i18n/rus/src/cmakeProject.i18n.json
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@
"communication.changed.restart.driver": "Перезапуск драйвера CMake после изменения режима связи.",
"generator.changed.restart.driver": "Перезапуск драйвера CMake после изменения генератора.",
"preferredGenerator.changed.restart.driver": "Перезапуск драйвера CMake после изменения preferredGenerators (предпочитаемых генераторов).",
"bad.executable": "Неверный исполняемый файл CMake: {0}. Убедитесь, что он установлен или что значение параметра {1} содержит правильный путь",
"targests.in.preset": "[Целевые значения в предустановке]",
"constructing.cmakeproject": "Создание нового экземпляра CMakeProject",
"disposing.driver": "Удаление драйвера CMake",
Expand Down Expand Up @@ -58,7 +59,6 @@
"error.on.switch.status": "Ошибка при смене набора ({0}).",
"cmake.version.not.supported": "CMake версии {0} может не поддерживаться. Минимальная требуемая версия: {1}.",
"not.starting.no.kits": "Драйвер CMake не запущен: не выбрано наборов.",
"bad.executable": "Неверный исполняемый файл CMake: {0}. Убедитесь, что он установлен или что значение параметра {1} содержит правильный путь",
"starting.new.cmake.driver": "Запуск нового драйвера CMake.",
"source.directory.does.not.match": "Исходный каталог {0} не соответствует исходному каталогу в кэше CMake: {1}. Потребуется выполнить очистку и перенастройку этого проекта.",
"clean.configure.title": "Настройка очистки",
Expand Down
Loading

0 comments on commit 7a98a14

Please sign in to comment.