|
43 | 43 | "[c]": { |
44 | 44 | "editor.rulers": [80], |
45 | 45 | }, |
46 | | - |
| 46 | + |
| 47 | + // Disable C/C++ extension intellisense so clangd intellisense works |
| 48 | + "C_Cpp.intelliSenseEngine": "disabled", |
| 49 | + |
| 50 | + // Clangd configuration |
| 51 | + "clangd.path": "/usr/bin/clangd", |
| 52 | + "clangd.arguments": [ |
| 53 | + "--pretty", |
| 54 | + "--compile-commands-dir=${env:WORKSPACE_DIR}" |
| 55 | + ] |
47 | 56 | }, |
48 | 57 |
|
49 | 58 | // Launch configuration |
|
173 | 182 | "label": "Build", |
174 | 183 | "detail": "Does a full build of OS161. Mapped to CTRL + SHIFT + B.", |
175 | 184 | "type": "shell", |
176 | | - "command": "./build.sh -p ${env:WORKSPACE_DIR}/os161/root -k ${input:kernel}", |
177 | | - "options": { |
178 | | - "cwd": "${env:WORKSPACE_DIR}/scripts" |
179 | | - }, |
| 185 | + "command": "bear -- bash scripts/build.sh -p ${env:WORKSPACE_DIR}/os161/root -k ${input:kernel}", |
180 | 186 | "problemMatcher": [], |
181 | 187 | "group": "build" |
182 | 188 | }, |
183 | 189 | { |
184 | 190 | "label": "Clean Build", |
185 | 191 | "detail": "Restore the source tree to a pristine state and remove all generated files", |
186 | 192 | "type": "shell", |
187 | | - "command": "./clean_build.sh", |
188 | | - "options": { |
189 | | - "cwd": "${env:WORKSPACE_DIR}/scripts" |
190 | | - }, |
| 193 | + "command": "bash scripts/clean_build.sh", |
191 | 194 | "problemMatcher": [] |
192 | 195 | }, |
193 | 196 | { |
194 | 197 | "label": "Configure OS Tree", |
195 | 198 | "detail": "Configures the OS tree with the provided path", |
196 | 199 | "type": "shell", |
197 | | - "command": "./configure_os_tree.sh -p ${env:WORKSPACE_DIR}/os161/root", |
198 | | - "options": { |
199 | | - "cwd": "${env:WORKSPACE_DIR}/scripts/build_helpers", |
200 | | - }, |
| 200 | + "command": "bash scripts/build_helpers/configure_os_tree.sh -p ${env:WORKSPACE_DIR}/os161/root", |
201 | 201 | "problemMatcher": [], |
202 | 202 | }, |
203 | 203 | { |
204 | 204 | "label": "Compile Userland", |
205 | 205 | "detail": "Compiles userland in src/", |
206 | | - "command": "./compile_userland.sh", |
| 206 | + "command": "bash scripts/build_helpers/compile_userland.sh", |
207 | 207 | "type": "shell", |
208 | | - "options": { |
209 | | - "cwd": "${env:WORKSPACE_DIR}/scripts/build_helpers", |
210 | | - }, |
211 | 208 | "problemMatcher": [], |
212 | 209 | }, |
213 | 210 | { |
214 | 211 | "label": "Configure and Compile Kernel", |
215 | 212 | "detail": "Configure and compile a specified kernel", |
216 | | - "command": "./configure_and_compile_kernel.sh -k ${input:kernel}", |
| 213 | + "command": "bash scripts/build_helpers/configure_and_compile_kernel.sh -k ${input:kernel}", |
217 | 214 | "type": "shell", |
218 | | - "options": { |
219 | | - "cwd": "${env:WORKSPACE_DIR}/scripts/build_helpers", |
220 | | - }, |
221 | 215 | "problemMatcher": [] |
222 | 216 | }, |
223 | 217 | ], |
|
0 commit comments