From d8b5d2100180c4f599770ce56c33d68387659ec3 Mon Sep 17 00:00:00 2001 From: jbnadal Date: Tue, 3 Apr 2018 14:48:22 +0200 Subject: [PATCH] Update visual configuration --- .vscode/launch.json | 6 ++--- .vscode/settings.json | 54 ++++++++++++++++++++++++++++++++++++++++++- .vscode/tasks.json | 6 ++--- 3 files changed, 59 insertions(+), 7 deletions(-) diff --git a/.vscode/launch.json b/.vscode/launch.json index 926ee0d5..7a5168c7 100644 --- a/.vscode/launch.json +++ b/.vscode/launch.json @@ -8,14 +8,14 @@ "name": "(gdb) domo", "type": "cppdbg", "request": "launch", - "program": "${workspaceRoot}/_builds/x86_64_domo-debug/buildroot/build/domo/domod", + "program": "${workspaceRoot}/_builds/x86_64_domo-debug/buildroot/staging/usr/local/bin/domod", "args": [], "stopAtEntry": false, - "cwd": "${workspaceRoot}/_builds/x86_64_domo-debug/buildroot/staging", + "cwd": "${workspaceRoot}/_builds/x86_64_domo-debug/buildroot/staging/", "environment": [ { "name": "LD_LIBRARY_PATH", - "value": "${workspaceRoot}/_builds/x86_64_domo-debug/buildroot/staging/usr/lib" + "value": "${workspaceRoot}/_builds/x86_64_domo-debug/buildroot/staging/usr/lib:${workspaceRoot}/_builds/x86_64_domo-debug/buildroot/staging/usr/local/lib" } ], "externalConsole": true, diff --git a/.vscode/settings.json b/.vscode/settings.json index 87a401d3..2300be64 100644 --- a/.vscode/settings.json +++ b/.vscode/settings.json @@ -2,5 +2,57 @@ "files.exclude": { "**/_builds/dl": true, "**/_builds/*/buildroot/build": true - } + }, + "files.associations": { + "*.ipp": "cpp", + "functional": "cpp", + "rope": "cpp", + "typeinfo": "cpp", + "typeindex": "cpp", + "array": "cpp", + "*.tcc": "cpp", + "cmath": "cpp", + "complex": "cpp", + "cstdint": "cpp", + "exception": "cpp", + "algorithm": "cpp", + "chrono": "cpp", + "system_error": "cpp", + "tuple": "cpp", + "type_traits": "cpp", + "initializer_list": "cpp", + "iosfwd": "cpp", + "istream": "cpp", + "new": "cpp", + "ostream": "cpp", + "sstream": "cpp", + "stdexcept": "cpp", + "streambuf": "cpp", + "cctype": "cpp", + "cfenv": "cpp", + "cinttypes": "cpp", + "cstdio": "cpp", + "cstdlib": "cpp", + "cwchar": "cpp", + "cwctype": "cpp", + "utility": "cpp", + "clocale": "cpp", + "csetjmp": "cpp", + "csignal": "cpp", + "cstdarg": "cpp", + "cstddef": "cpp", + "cstring": "cpp", + "ctime": "cpp", + "atomic": "cpp", + "codecvt": "cpp", + "condition_variable": "cpp", + "slist": "cpp", + "future": "cpp", + "limits": "cpp", + "memory": "cpp", + "mutex": "cpp", + "ratio": "cpp", + "scoped_allocator": "cpp", + "thread": "cpp" + } } diff --git a/.vscode/tasks.json b/.vscode/tasks.json index 5bfa11b8..69a06d1a 100644 --- a/.vscode/tasks.json +++ b/.vscode/tasks.json @@ -8,7 +8,7 @@ { "label": "X86_64 - cmake - domod", "type": "shell", - "command": "mkdir -p ${BUILD_DIR}/domo && cd ${BUILD_DIR}/domo && cmake -DMODULE_PATH=${workspaceRoot}/bsp/cmake-modules -DworkspaceRoot=${workspaceRoot} -DCMAKE_BUILD_TYPE=Debug -DCMAKE_TOOLCHAIN_FILE=${workspaceRoot}/bsp/cmake-modules/toolchain-buildroot.cmake ${workspaceRoot}/src/prog/domod/builders/cmake", + "command": "mkdir -p ${BUILD_DIR}/domo && cd ${BUILD_DIR}/domo && cmake -DMODULE_PATH=${workspaceRoot}/bsp/cmake-modules -DworkspaceRoot=${workspaceRoot} -DCMAKE_BUILD_TYPE=Debug -DCMAKE_TOOLCHAIN_FILE=${workspaceRoot}/bsp/cmake-modules/toolchain-buildroot.cmake -DCMAKE_INSTALL_PREFIX=${workspaceRoot}/_builds/x86_64_domo-debug/buildroot/staging/usr/ ${workspaceRoot}/src/prog/domod/builders/cmake", "group": "build", "options": { "env": { @@ -27,7 +27,7 @@ "cwd": "${workspaceRoot}/_builds/x86_64_domo-debug/buildroot/build/domo", }, "type": "shell", - "command": "make", + "command": "make install", "group": "build", "presentation": { "echo": true, @@ -40,7 +40,7 @@ { "label": "X86_64 - cmake - libubus-cpp", "type": "shell", - "command": "mkdir -p ${BUILD_DIR}/ubus-cpp && cd ${BUILD_DIR}/ubus-cpp && cmake -DMODULE_PATH=${workspaceRoot}/bsp/cmake-modules -DworkspaceRoot=${workspaceRoot} -DCMAKE_BUILD_TYPE=Debug -DCMAKE_TOOLCHAIN_FILE=${workspaceRoot}/bsp/cmake-modules/toolchain-buildroot.cmake -DCMAKE_INSTALL_PREFIX=${workspaceRoot}/_builds/x86_64_domo-debug/buildroot/staging/ ${workspaceRoot}/src/lib/libubus-cpp/builders/cmake", + "command": "mkdir -p ${BUILD_DIR}/ubus-cpp && cd ${BUILD_DIR}/ubus-cpp && cmake -DMODULE_PATH=${workspaceRoot}/bsp/cmake-modules -DworkspaceRoot=${workspaceRoot} -DCMAKE_BUILD_TYPE=Debug -DCMAKE_TOOLCHAIN_FILE=${workspaceRoot}/bsp/cmake-modules/toolchain-buildroot.cmake -DCMAKE_INSTALL_PREFIX=${workspaceRoot}/_builds/x86_64_domo-debug/buildroot/staging/usr/ ${workspaceRoot}/src/lib/libubus-cpp/builders/cmake", "group": "build", "options": { "env": {