From 8ef6dd2134204171514cb38ef23ce23bc202d46e Mon Sep 17 00:00:00 2001 From: James Gallagher Date: Mon, 9 Mar 2026 17:24:21 -0600 Subject: [PATCH 1/3] Moved versioned vscode files to .vscode/jhrg --- .gitignore | 3 +-- .vscode/{ => jhrg}/launch.json | 0 .vscode/jhrg/settings.json | 17 +++++++++++++++++ .../{tasks.json.template => jhrg/tasks.json} | 7 +++---- .vscode/settings.json.template | 14 -------------- 5 files changed, 21 insertions(+), 20 deletions(-) rename .vscode/{ => jhrg}/launch.json (100%) create mode 100644 .vscode/jhrg/settings.json rename .vscode/{tasks.json.template => jhrg/tasks.json} (94%) delete mode 100644 .vscode/settings.json.template 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 100% rename from .vscode/launch.json rename to .vscode/jhrg/launch.json diff --git a/.vscode/jhrg/settings.json b/.vscode/jhrg/settings.json new file mode 100644 index 000000000..67db352ea --- /dev/null +++ b/.vscode/jhrg/settings.json @@ -0,0 +1,17 @@ +{ + // Edit for the Hyrax project. The prefix variable is used to set the PATH for both the C++ extension and the terminal. + "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}" + } +} \ No newline at end of file diff --git a/.vscode/tasks.json.template b/.vscode/jhrg/tasks.json similarity index 94% rename from .vscode/tasks.json.template rename to .vscode/jhrg/tasks.json index 5e9ba1646..ec1e62079 100644 --- a/.vscode/tasks.json.template +++ b/.vscode/jhrg/tasks.json @@ -4,9 +4,8 @@ "cwd": "${workspaceFolder}", "env": { "TESTSUITEFLAGS": "-j", - "prefix": Set to $prefix - "PATH": $prefix value /bin:$prefix value /deps/bin:${env:PATH - } + "prefix": "${config:prefix}", + "PATH": "${config:PATH}" }, "shell": { "executable": "/bin/zsh", @@ -83,4 +82,4 @@ } } ] -} +} \ No newline at end of file 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}" - } -} From f3b427eaf749fc5a0aa7058e7d93a94fdfe40c41 Mon Sep 17 00:00:00 2001 From: James Gallagher Date: Mon, 9 Mar 2026 17:35:00 -0600 Subject: [PATCH 2/3] Formatting --- .vscode/jhrg/launch.json | 60 +++++++++++++++++++++------------------- 1 file changed, 32 insertions(+), 28 deletions(-) diff --git a/.vscode/jhrg/launch.json b/.vscode/jhrg/launch.json index 6ffafd5b9..805047071 100644 --- a/.vscode/jhrg/launch.json +++ b/.vscode/jhrg/launch.json @@ -1,31 +1,35 @@ { - "version": "0.2.0", - "configurations": [ - { - "name": "Debug getdap4", - "type": "cppdbg", - "request": "launch", - "program": "${workspaceFolder}/.libs/getdap4", - "args": ["-d", "http://test.opendap.org/opendap/data/nc/fnoc1.nc"], - "cwd": "${workspaceFolder}", - "environment": [ + // Example debug launch configuration for the getdap4 test program. + "version": "0.2.0", + "configurations": [ { - "name": "DYLD_LIBRARY_PATH", - "value": "${workspaceFolder}/.libs:${env:DYLD_LIBRARY_PATH}" - }, - { - "name": "PATH", - "value": "${env:HYRAX_PREFIX}/bin:${env:HYRAX_PREFIX}/deps/bin:${env:PATH}" - } - ], - "MIMode": "lldb", - "setupCommands": [ - { - "description": "Allow stepping into all frames", - "text": "settings set target.process.thread.step-avoid-regexp ^$", - "ignoreFailures": true + "name": "Debug getdap4", + "type": "cppdbg", + "request": "launch", + "program": "${workspaceFolder}/.libs/getdap4", + "args": [ + "-d", + "http://test.opendap.org/opendap/data/nc/fnoc1.nc" + ], + "cwd": "${workspaceFolder}", + "environment": [ + { + "name": "DYLD_LIBRARY_PATH", + "value": "${workspaceFolder}/.libs:${env:DYLD_LIBRARY_PATH}" + }, + { + "name": "PATH", + "value": "${config:PATH}" + } + ], + "MIMode": "lldb", + "setupCommands": [ + { + "description": "Allow stepping into all frames", + "text": "settings set target.process.thread.step-avoid-regexp ^$", + "ignoreFailures": true + } + ] } - ] - } - ] -} + ] +} \ No newline at end of file From 207f826e8dce97150474278a2b9d443518a6dbce Mon Sep 17 00:00:00 2001 From: James Gallagher Date: Mon, 9 Mar 2026 22:04:31 -0600 Subject: [PATCH 3/3] pre-commit run --- .vscode/jhrg/launch.json | 60 +++++++------- .vscode/jhrg/settings.json | 31 ++++---- .vscode/jhrg/tasks.json | 158 ++++++++++++++++++------------------- 3 files changed, 118 insertions(+), 131 deletions(-) diff --git a/.vscode/jhrg/launch.json b/.vscode/jhrg/launch.json index 805047071..704186780 100644 --- a/.vscode/jhrg/launch.json +++ b/.vscode/jhrg/launch.json @@ -1,35 +1,31 @@ { - // Example debug launch configuration for the getdap4 test program. - "version": "0.2.0", - "configurations": [ + "version": "0.2.0", + "configurations": [ + { + "name": "Debug getdap4", + "type": "cppdbg", + "request": "launch", + "program": "${workspaceFolder}/.libs/getdap4", + "args": ["-d", "http://test.opendap.org/opendap/data/nc/fnoc1.nc"], + "cwd": "${workspaceFolder}", + "environment": [ { - "name": "Debug getdap4", - "type": "cppdbg", - "request": "launch", - "program": "${workspaceFolder}/.libs/getdap4", - "args": [ - "-d", - "http://test.opendap.org/opendap/data/nc/fnoc1.nc" - ], - "cwd": "${workspaceFolder}", - "environment": [ - { - "name": "DYLD_LIBRARY_PATH", - "value": "${workspaceFolder}/.libs:${env:DYLD_LIBRARY_PATH}" - }, - { - "name": "PATH", - "value": "${config:PATH}" - } - ], - "MIMode": "lldb", - "setupCommands": [ - { - "description": "Allow stepping into all frames", - "text": "settings set target.process.thread.step-avoid-regexp ^$", - "ignoreFailures": true - } - ] + "name": "DYLD_LIBRARY_PATH", + "value": "${workspaceFolder}/.libs:${env:DYLD_LIBRARY_PATH}" + }, + { + "name": "PATH", + "value": "${config:PATH}" + } + ], + "MIMode": "lldb", + "setupCommands": [ + { + "description": "Allow stepping into all frames", + "text": "settings set target.process.thread.step-avoid-regexp ^$", + "ignoreFailures": true } - ] -} \ No newline at end of file + ] + } + ] +} diff --git a/.vscode/jhrg/settings.json b/.vscode/jhrg/settings.json index 67db352ea..5a1e9bf9f 100644 --- a/.vscode/jhrg/settings.json +++ b/.vscode/jhrg/settings.json @@ -1,17 +1,16 @@ { - // Edit for the Hyrax project. The prefix variable is used to set the PATH for both the C++ extension and the terminal. - "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}" - } -} \ No newline at end of file + "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 index ec1e62079..5d16266c1 100644 --- a/.vscode/jhrg/tasks.json +++ b/.vscode/jhrg/tasks.json @@ -1,85 +1,77 @@ { - "version": "2.0.0", - "options": { - "cwd": "${workspaceFolder}", - "env": { - "TESTSUITEFLAGS": "-j", - "prefix": "${config:prefix}", - "PATH": "${config:PATH}" - }, - "shell": { - "executable": "/bin/zsh", - "args": [ - "-c" - ] - } + "version": "2.0.0", + "options": { + "cwd": "${workspaceFolder}", + "env": { + "TESTSUITEFLAGS": "-j", + "prefix": "${config:prefix}", + "PATH": "${config:PATH}" }, - "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 - } - } - ] -} \ No newline at end of file + "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 + } + } + ] +}