diff --git a/.gitignore b/.gitignore index 78cbee510..bc4dc2542 100644 --- a/.gitignore +++ b/.gitignore @@ -2,8 +2,7 @@ .DS_Store */.DS_Store .idea -.vscode/settings.json -.vscode/tasks.json +.vscode/*.json .cproject .project .settings diff --git a/.vscode/launch.json b/.vscode/jhrg/launch.json similarity index 89% rename from .vscode/launch.json rename to .vscode/jhrg/launch.json index 6ffafd5b9..704186780 100644 --- a/.vscode/launch.json +++ b/.vscode/jhrg/launch.json @@ -15,7 +15,7 @@ }, { "name": "PATH", - "value": "${env:HYRAX_PREFIX}/bin:${env:HYRAX_PREFIX}/deps/bin:${env:PATH}" + "value": "${config:PATH}" } ], "MIMode": "lldb", diff --git a/.vscode/jhrg/settings.json b/.vscode/jhrg/settings.json new file mode 100644 index 000000000..5a1e9bf9f --- /dev/null +++ b/.vscode/jhrg/settings.json @@ -0,0 +1,16 @@ +{ + "prefix": "/Users/jimg/src/opendap/hyrax_git/build", + "PATH": "${config:prefix}/bin:${config:prefix}/deps/bin:${env:PATH}", + "C_Cpp.default.configurationProvider": "ms-vscode.makefile-tools", + "C_Cpp.default.compileCommands": "${workspaceFolder}/compile_commands.json", + "C_Cpp.default.cppStandard": "c++14", + "C_Cpp.default.intelliSenseMode": "macos-clang-arm64", + "terminal.integrated.env.osx": { + "prefix": "${config:prefix}", + "PATH": "${config:PATH}" + }, + "terminal.integrated.env.linux": { + "prefix": "${config:prefix}", + "PATH": "${config:PATH}" + } +} diff --git a/.vscode/jhrg/tasks.json b/.vscode/jhrg/tasks.json new file mode 100644 index 000000000..5d16266c1 --- /dev/null +++ b/.vscode/jhrg/tasks.json @@ -0,0 +1,77 @@ +{ + "version": "2.0.0", + "options": { + "cwd": "${workspaceFolder}", + "env": { + "TESTSUITEFLAGS": "-j", + "prefix": "${config:prefix}", + "PATH": "${config:PATH}" + }, + "shell": { + "executable": "/bin/zsh", + "args": ["-c"] + } + }, + "tasks": [ + { + "label": "autotools: configure", + "type": "shell", + "command": "echo \"prefix: $prefix\" && autoreconf -fvi && ./configure --prefix=$prefix --enable-developer", + "problemMatcher": [], + "group": { + "kind": "build", + "isDefault": true + } + }, + { + "label": "autotools: build", + "type": "shell", + "command": "make -j", + "problemMatcher": ["$gcc"], + "group": { + "kind": "build", + "isDefault": true + } + }, + { + "label": "autotools: check", + "type": "shell", + "command": "make -j check", + "problemMatcher": ["$gcc"], + "group": { + "kind": "build", + "isDefault": true + } + }, + { + "label": "autotools: install", + "type": "shell", + "command": "make install", + "problemMatcher": [], + "group": { + "kind": "build", + "isDefault": true + } + }, + { + "label": "autotools: clean", + "type": "shell", + "command": "make clean", + "problemMatcher": [], + "group": { + "kind": "build", + "isDefault": true + } + }, + { + "label": "autotools: compile_commands", + "type": "shell", + "command": "make clean && bear -- make -j && bear --append -- make -j check", + "problemMatcher": ["$gcc"], + "group": { + "kind": "build", + "isDefault": true + } + } + ] +} diff --git a/.vscode/settings.json.template b/.vscode/settings.json.template deleted file mode 100644 index 83e8ce1cf..000000000 --- a/.vscode/settings.json.template +++ /dev/null @@ -1,14 +0,0 @@ -{ - "C_Cpp.default.configurationProvider": "ms-vscode.makefile-tools", - "C_Cpp.default.compileCommands": "${workspaceFolder}/compile_commands.json", - "C_Cpp.default.cppStandard": "c++14", - "C_Cpp.default.intelliSenseMode": "macos-clang-arm64", - "terminal.integrated.env.osx": { - "prefix": The litteral value of $prefix - "PATH": $prefix litteral value + /bin: $prefix litteral value + deps/bin:${env:PATH} - }, - "terminal.integrated.env.linux": { - "prefix": The litteral value of $prefix - "PATH": $prefix litteral value + /bin: $prefix litteral value + deps/bin:${env:PATH}" - } -} diff --git a/.vscode/tasks.json.template b/.vscode/tasks.json.template deleted file mode 100644 index 5e9ba1646..000000000 --- a/.vscode/tasks.json.template +++ /dev/null @@ -1,86 +0,0 @@ -{ - "version": "2.0.0", - "options": { - "cwd": "${workspaceFolder}", - "env": { - "TESTSUITEFLAGS": "-j", - "prefix": Set to $prefix - "PATH": $prefix value /bin:$prefix value /deps/bin:${env:PATH - } - }, - "shell": { - "executable": "/bin/zsh", - "args": [ - "-c" - ] - } - }, - "tasks": [ - { - "label": "autotools: configure", - "type": "shell", - "command": "echo \"prefix: $prefix\" && autoreconf -fvi && ./configure --prefix=$prefix --enable-developer", - "problemMatcher": [], - "group": { - "kind": "build", - "isDefault": true - } - }, - { - "label": "autotools: build", - "type": "shell", - "command": "make -j", - "problemMatcher": [ - "$gcc" - ], - "group": { - "kind": "build", - "isDefault": true - } - }, - { - "label": "autotools: check", - "type": "shell", - "command": "make -j check", - "problemMatcher": [ - "$gcc" - ], - "group": { - "kind": "build", - "isDefault": true - } - }, - { - "label": "autotools: install", - "type": "shell", - "command": "make install", - "problemMatcher": [], - "group": { - "kind": "build", - "isDefault": true - } - }, - { - "label": "autotools: clean", - "type": "shell", - "command": "make clean", - "problemMatcher": [], - "group": { - "kind": "build", - "isDefault": true - } - }, - { - "label": "autotools: compile_commands", - "type": "shell", - "command": "make clean && bear -- make -j && bear --append -- make -j check", - "problemMatcher": [ - "$gcc" - ], - "group": { - "kind": "build", - "isDefault": true - } - } - ] -}