Skip to content

Commit 95b3ffb

Browse files
committed
Fixed Windows issues in tasks.json
1 parent cdfe319 commit 95b3ffb

File tree

1 file changed

+53
-5
lines changed

1 file changed

+53
-5
lines changed

.vscode/tasks.json

Lines changed: 53 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -65,6 +65,15 @@
6565
"relative",
6666
"${workspaceRoot}/_bld/debug"
6767
]
68+
},
69+
"windows": {
70+
"problemMatcher": {
71+
"base": "$msCompile",
72+
"fileLocation": [
73+
"relative",
74+
"${workspaceRoot}/_bld/debug"
75+
]
76+
}
6877
}
6978
},
7079
{
@@ -81,6 +90,15 @@
8190
"relative",
8291
"${workspaceRoot}/_bld/debug"
8392
]
93+
},
94+
"windows": {
95+
"problemMatcher": {
96+
"base": "$msCompile",
97+
"fileLocation": [
98+
"relative",
99+
"${workspaceRoot}/_bld/debug"
100+
]
101+
}
84102
}
85103
},
86104
{
@@ -97,6 +115,15 @@
97115
"relative",
98116
"${workspaceRoot}/_bld/release"
99117
]
118+
},
119+
"windows": {
120+
"problemMatcher": {
121+
"base": "$msCompile",
122+
"fileLocation": [
123+
"relative",
124+
"${workspaceRoot}/_bld/release"
125+
]
126+
}
100127
}
101128
},
102129
{
@@ -107,15 +134,22 @@
107134
"Generate leaf.hpp"
108135
],
109136
"command": "../../b2 test link=shared,static variant=debug,release,leaf_debug_diag0,leaf_release_diag0,leaf_debug_single_header,leaf_release_single_header,leaf_debug_embedded,leaf_release_embedded exception-handling=off rtti=off cxxstd=11,14,1z,17 && ../../b2 test link=shared,static variant=debug,release,leaf_debug_diag0,leaf_release_diag0,leaf_debug_single_header,leaf_release_single_header exception-handling=on,off cxxstd=11,14,1z,17",
110-
"windows": {
111-
"command": "..\\..\\b2 test link=shared,static variant=debug,release,leaf_debug_diag0,leaf_release_diag0,leaf_debug_single_header,leaf_release_single_header,leaf_debug_embedded,leaf_release_embedded exception-handling=off rtti=off cxxstd=14,17,latest && ..\\..\\b2 test link=shared,static variant=debug,release,leaf_debug_diag0,leaf_release_diag0,leaf_debug_single_header,leaf_release_single_header exception-handling=on,off cxxstd=14,17,latest",
112-
},
113137
"problemMatcher": {
114138
"base": "$gcc",
115139
"fileLocation": [
116140
"relative",
117141
"${workspaceRoot}/_bld/release"
118142
]
143+
},
144+
"windows": {
145+
"command": "..\\..\\b2 test link=shared,static variant=debug,release,leaf_debug_diag0,leaf_release_diag0,leaf_debug_single_header,leaf_release_single_header,leaf_debug_embedded,leaf_release_embedded exception-handling=off rtti=off cxxstd=14,17,latest && ..\\..\\b2 test link=shared,static variant=debug,release,leaf_debug_diag0,leaf_release_diag0,leaf_debug_single_header,leaf_release_single_header exception-handling=on,off cxxstd=14,17,latest",
146+
"problemMatcher": {
147+
"base": "$msCompile",
148+
"fileLocation": [
149+
"relative",
150+
"${workspaceRoot}/_bld/release"
151+
]
152+
}
119153
}
120154
},
121155
{
@@ -125,16 +159,30 @@
125159
},
126160
"label": "Test current editor file",
127161
"type": "shell",
128-
"command": "cd ${workspaceRoot}/_bld/debug && ninja && {meson test ${fileBasenameNoExtension} || cat ./meson-logs/testlog.txt}",
162+
<<<<<<< Updated upstream
163+
"command": "cd ${workspaceRoot}/_bld/debug && ninja && { meson test ${fileBasenameNoExtension} || cat ./meson-logs/testlog.txt; }",,
129164
"windows": {
130-
"command": "cd ${workspaceRoot}/_bld/debug && ninja && (meson test ${fileBasenameNoExtension} || cat ./meson-logs/testlog.txt)",
165+
"command": "cd ${workspaceRoot}/_bld/debug && ninja && (meson test ${fileBasenameNoExtension} || type .\\meson-logs\\testlog.txt)",
131166
},
167+
=======
168+
"command": "cd ${workspaceRoot}/_bld/debug && ninja && {meson test ${fileBasenameNoExtension} || cat ./meson-logs/testlog.txt}",
169+
>>>>>>> Stashed changes
132170
"problemMatcher": {
133171
"base": "$gcc",
134172
"fileLocation": [
135173
"relative",
136174
"${workspaceRoot}/_bld/debug"
137175
]
176+
},
177+
"windows": {
178+
"command": "cd ${workspaceRoot}/_bld/debug && ninja && (meson test ${fileBasenameNoExtension} || type .\\meson-logs\\testlog.txt)",
179+
"problemMatcher": {
180+
"base": "$msCompile",
181+
"fileLocation": [
182+
"relative",
183+
"${workspaceRoot}/_bld/debug"
184+
]
185+
}
138186
}
139187
}
140188
]

0 commit comments

Comments
 (0)