Skip to content

Several vscode extension fixes and updates. #1966

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Several vscode extension fixes and updates. #1966

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions tools/vscode-extension/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,11 @@ The panel will have the ability to install the tools on the most popular platfor

### Changelog

- 0.4.0
- Fixed installation issues with MacOS Sequoia.
- Bumping gcc to 15.2.0
- Bumping binutils to 2.45
- Fixed installation issues with Windows MIPS toolchain when PowerShell is the default shell.
Comment on lines +21 to +25
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

⚠️ Potential issue

Polish changelog wording/branding.

Use “macOS”, and consistent past tense/branding for GCC/Binutils.

-- 0.4.0
-  - Fixed installation issues with MacOS Sequoia.
-  - Bumping gcc to 15.2.0
-  - Bumping binutils to 2.45
-  - Fixed installation issues with Windows MIPS toolchain when PowerShell is the default shell.
+- 0.4.0
+  - Fixed installation issues with macOS Sequoia.
+  - Bumped GCC to 15.2.0.
+  - Bumped Binutils to 2.45.
+  - Fixed installation issues with the Windows MIPS toolchain when PowerShell is the default shell.
📝 Committable suggestion

‼️ IMPORTANT
Carefully review the code before committing. Ensure that it accurately replaces the highlighted code, contains no missing lines, and has no issues with indentation. Thoroughly test & benchmark the code to ensure it meets the requirements.

Suggested change
- 0.4.0
- Fixed installation issues with MacOS Sequoia.
- Bumping gcc to 15.2.0
- Bumping binutils to 2.45
- Fixed installation issues with Windows MIPS toolchain when PowerShell is the default shell.
- 0.4.0
- Fixed installation issues with macOS Sequoia.
- Bumped GCC to 15.2.0.
- Bumped Binutils to 2.45.
- Fixed installation issues with the Windows MIPS toolchain when PowerShell is the default shell.
🧰 Tools
🪛 LanguageTool

[grammar] ~21-~21: There might be a mistake here.
Context: ...endency locally. ### Changelog - 0.4.0 - Fixed installation issues with MacOS Seq...

(QB_NEW_EN)

[grammar] ~22-~22: There might be a mistake here.
Context: ... installation issues with MacOS Sequoia. - Bumping gcc to 15.2.0 - Bumping binuti...

(QB_NEW_EN)

[grammar] ~25-~25: There might be a mistake here.
Context: ...in when PowerShell is the default shell. - 0.3.9 - Fixed cube psyqo template's nu...

(QB_NEW_EN)

🤖 Prompt for AI Agents 
In tools/vscode-extension/README.md around lines 21 to 25, update changelog
wording/branding: change "MacOS" to "macOS", change "gcc" to "GCC" and
"binutils" to "Binutils", and make tense consistent by replacing "Bumping" with
"Bumped" so all bullet points use past tense (e.g., "Bumped GCC to 15.2.0",
"Bumped Binutils to 2.45").

- 0.3.9
- Fixed cube psyqo template's null pointer exception.
- Improved MacOS mips toolchain installation process.
Expand Down
2 changes: 1 addition & 1 deletion tools/vscode-extension/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
"name": "psx-dev",
"displayName": "PSX.Dev",
"description": "PlayStation 1 development made easy",
"version": "0.3.9",
"version": "0.4.0",
"engines": {
"vscode": "^1.75.0"
},
Expand Down
4 changes: 2 additions & 2 deletions tools/vscode-extension/tools.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@ async function installToolchain() {
} else {
if (win32MipsToolsInstalling) return
win32MipsToolsInstalling = true
await terminal.run('mips', ['install', mipsVersion])
await terminal.run('cmd', ['/c', `mips install ${mipsVersion}`])
}
Comment on lines +74 to 75
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

⚠️ Potential issue

Good fix for PowerShell default shell; propagate the same to GDB/Make.

Windows “mips” invocations elsewhere still call the tool directly and may fail under PowerShell. Use cmd /c consistently.

-          await terminal.run('cmd', ['/c', `mips install ${mipsVersion}`])
+          await terminal.run('cmd', ['/c', `mips install ${mipsVersion}`])

Also change below (other occurrences):

-          await terminal.run('mips', ['install', mipsVersion])
+          await terminal.run('cmd', ['/c', `mips install ${mipsVersion}`])

(Repeat the same change in installMake.)

Committable suggestion skipped: line range outside the PR's diff.

🤖 Prompt for AI Agents 
In tools/vscode-extension/tools.js around lines 74-75, the code invokes "mips"
directly (await terminal.run('cmd', ['/c', `mips install ${mipsVersion}`]) is
present but other invocations call the tool directly), causing failures when
PowerShell is the default shell; update every direct mips invocation to run via
cmd with arguments (e.g., terminal.run('cmd', ['/c', `mips <args>`])) so the
command is executed under cmd /c, and apply the same pattern to installMake and
any GDB/Make invocations—replace calls like terminal.run('mips', [...]) or
terminal.run('gdb', ...) with terminal.run('cmd', ['/c', `mips ...`]) or
terminal.run('cmd', ['/c', `make ...`]) respectively, ensuring you pass the
entire command as a single string in the cmd /c call and update all other
occurrences in the file.

} catch (error) {
vscode.window.showErrorMessage(
Expand Down Expand Up @@ -306,7 +306,7 @@ async function installCMake() {
asset.browser_download_url.split('/').pop()
)
await downloader.downloadFile(asset.browser_download_url, filename)
await execFile('start', [filename])
await terminal.run('msiexec', ['/i', filename])
requiresReboot = true
break
case 'linux':
Expand Down
4 changes: 2 additions & 2 deletions tools/win32-mips/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# escape=`

# Dockerfile to generate the Windows g++-mipsel-none-elf-14.2.0.zip package.
# Dockerfile to generate the Windows g++-mipsel-none-elf-15.2.0.zip package.
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

⚠️ Potential issue

Sync Windows toolchain version across the extension.

Docker now produces 15.2.0 artifacts, but tools.js still installs 14.2.0. This will lead to users getting the older toolchain from the VS Code extension.

Apply in tools.js:

-const mipsVersion = '14.2.0'
+const mipsVersion = '15.2.0'
📝 Committable suggestion

‼️ IMPORTANT
Carefully review the code before committing. Ensure that it accurately replaces the highlighted code, contains no missing lines, and has no issues with indentation. Thoroughly test & benchmark the code to ensure it meets the requirements.

Suggested change
# Dockerfile to generate the Windows g++-mipsel-none-elf-15.2.0.zip package.
const mipsVersion = '15.2.0'
🤖 Prompt for AI Agents 
In tools/win32-mips/Dockerfile around line 3 and in tools.js (where the Windows
toolchain version is defined/installed), the project produces 15.2.0 artifacts
but tools.js still installs 14.2.0; update the version constant in tools.js to
"15.2.0" and change any related download filename, URL, checksum keys, and
package-name strings (e.g., g++-mipsel-none-elf-14.2.0.zip ->
g++-mipsel-none-elf-15.2.0.zip) so they match the Dockerfile output; ensure any
mapping or switch cases, release-tag strings, and tests referencing the old
version are updated accordingly and validate the download/checksum flow still
passes.


FROM mcr.microsoft.com/windows/servercore:ltsc2022
WORKDIR C:\windows\temp
Expand Down Expand Up @@ -80,6 +80,6 @@ RUN C:\msys64\usr\bin\bash.exe -l -c 'for t in cat cp echo mkdir rm touch which
RUN C:\msys64\usr\bin\bash.exe -l -c 'cp /mingw64/bin/mingw32-make.exe /DIST/bin/make.exe'
RUN C:\msys64\usr\bin\bash.exe -l -c 'cd /DIST && find . -name *.exe | while read bin ; do ldd $bin | cut -f2 -d\> | cut -f2 -d\ | grep -v /c/Windows/S | while read f ; do cp $f $(dirname $bin) ; done ; done || true'

RUN C:\msys64\usr\bin\bash.exe -l -c 'cd /DIST && zip /c/g++-mipsel-none-elf-14.2.0.zip . -r'
RUN C:\msys64\usr\bin\bash.exe -l -c 'cd /DIST && zip /c/g++-mipsel-none-elf-15.2.0.zip . -r'

CMD C:\msys64\usr\bin\bash.exe -l
Loading