Skip to content

Commit 537d50a

Browse files
committed
Use TCL8 on macOS in preference
tclParser used by TCLProDebug doesn't compile on TCL 9. While that remains an upstream problem, try to find TCL 8 on macOS to fix CI at least.
1 parent 1699596 commit 537d50a

File tree

3 files changed

+13
-6
lines changed

3 files changed

+13
-6
lines changed

.github/workflows/build.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -113,7 +113,7 @@ jobs:
113113
brew update-reset
114114
brew doctor || true
115115
brew cleanup || true
116-
for p in vim go tcl-tk llvm lua luajit love neovim coreutils; do
116+
for p in vim go tcl-tk@8 llvm lua luajit love neovim coreutils; do
117117
brew install $p || brew outdated $p || brew upgrade $p
118118
done
119119
brew reinstall icu4c

README.md

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -175,7 +175,7 @@ runtime dependencies). They are categorised by their level of support:
175175
| C, C++, Rust, Jai, etc. | Tested | `--enable-rust`, `--enable-c`, etc. | CodeLLDB | none |
176176
| Python | Tested | `--all` or `--enable-python` | debugpy | Python 3 |
177177
| Go | Tested | `--enable-go` | delve | Go 1.16+ |
178-
| TCL | Supported | `--all` or `--enable-tcl` | tclpro | TCL 8.5 |
178+
| TCL | Supported | `--all` or `--enable-tcl` | tclpro | TCL >= 8.5 < 9.0 |
179179
| Bourne Shell | Supported | `--all` or `--enable-bash` | vscode-bash-debug | Bash v?? |
180180
| Lua | Tested | `--all` or `--enable-lua` | local-lua-debugger-vscode | Node >=12.13.0, Npm, Lua interpreter |
181181
| Node.js | Supported | `--force-enable-node` | vscode-js-debug | Node >= 18 |
@@ -1933,6 +1933,8 @@ for examk
19331933

19341934
* TCL (TclProDebug)
19351935

1936+
Requires TCL 8.x. Does not work with TCL 9.
1937+
19361938
See [my fork of TclProDebug](https://github.com/puremourning/TclProDebug) for instructions.
19371939

19381940
## C♯

python3/vimspector/installer.py

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -436,10 +436,15 @@ def InstallTclProDebug( name, root, gadget ):
436436
# '/MacOSX.platform/Developer/SDKs/MacOSX.sdk/System'
437437
# '/Library/Frameworks/Tcl.framework/Versions'
438438
# '/Current',
439-
for p in [ '/usr/local/opt/tcl-tk/lib', '/opt/homebrew/opt/tcl-tk/lib' ]:
440-
if os.path.exists( os.path.join( p, 'tclConfig.sh' ) ):
441-
configure.append( '--with-tcl=' + p )
442-
break
439+
for tcl in [ "tcl-tk@8", "tcl-tk" ]:
440+
for p in [ f'/usr/local/opt/{tcl}/lib', f'/opt/homebrew/opt/{tcl}/lib' ]:
441+
if os.path.exists( os.path.join( p, 'tclConfig.sh' ) ):
442+
Print( f"Found tclConfig.sh in {p}" )
443+
configure.append( '--with-tcl=' + p )
444+
break
445+
else:
446+
continue
447+
break
443448

444449

445450
with CurrentWorkingDir( os.path.join( root, 'lib', 'tclparser' ) ):

0 commit comments

Comments
 (0)