8371425: Include folder names in vscode workspace virtual folders

Reviewed-by: erikj, jvernee, shade
This commit is contained in:
Kerem Kat 2025-11-10 11:33:56 +00:00 committed by Aleksey Shipilev
parent 681dab7205
commit 98f40e4575
2 changed files with 4 additions and 2 deletions

View File

@ -84,6 +84,8 @@ define CreateFromTemplate
$(SED) -e 's!{{TOPDIR}}!$(call SedEscape,$(call FixPath,$(TOPDIR)))!g' \ $(SED) -e 's!{{TOPDIR}}!$(call SedEscape,$(call FixPath,$(TOPDIR)))!g' \
-e 's!{{TOPDIR_RELATIVE}}!$(call SedEscape,$(call FixPath,$(strip \ -e 's!{{TOPDIR_RELATIVE}}!$(call SedEscape,$(call FixPath,$(strip \
$(call RelativePath,$(OUTPUTDIR),$(TOPDIR)))))!g' \ $(call RelativePath,$(OUTPUTDIR),$(TOPDIR)))))!g' \
-e 's!{{TOPDIR_BASE}}!$(notdir $(TOPDIR))!g' \
-e 's!{{OUTPUT_BASE}}!$(notdir $(OUTPUTDIR))!g' \
-e 's!{{WORKSPACE_ROOT}}!$(call SedEscape,$(call FixPath,$(WORKSPACE_ROOT)))!g' \ -e 's!{{WORKSPACE_ROOT}}!$(call SedEscape,$(call FixPath,$(WORKSPACE_ROOT)))!g' \
-e 's!{{OUTPUTDIR}}!$(call SedEscape,$(call FixPath,$(OUTPUTDIR)))!g' \ -e 's!{{OUTPUTDIR}}!$(call SedEscape,$(call FixPath,$(OUTPUTDIR)))!g' \
-e 's!{{CONF_NAME}}!$(CONF_NAME)!g' \ -e 's!{{CONF_NAME}}!$(CONF_NAME)!g' \

View File

@ -1,12 +1,12 @@
{ {
"folders": [ "folders": [
{ {
"name": "Source root", "name": "Source root ({{TOPDIR_BASE}})",
"path": "{{TOPDIR}}" "path": "{{TOPDIR}}"
}, },
// {{EXTRA_WORKSPACE_ROOT}} // {{EXTRA_WORKSPACE_ROOT}}
{ {
"name": "Build artifacts", "name": "Build artifacts ({{OUTPUT_BASE}})",
"path": "{{OUTPUTDIR}}" "path": "{{OUTPUTDIR}}"
} }
], ],