Skip to content

Commit cf97d6c

Browse files
committed
On Windows forced to create a CMD Window in the terminal
Relabled the compiler and terminal windows Added a relative path indicator for the Makefile process
1 parent e317666 commit cf97d6c

8 files changed

Lines changed: 45 additions & 14 deletions

File tree

CHANGELOG.md

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,12 @@
22

33
The following enhancements and changes have been made to Atari Dev Studio:
44

5+
## 0.11.9
6+
7+
* Updated **Make** Terminal to create a **Command Window** on Windows rather than rely on the default (which is Powershell)
8+
* Updated the make call to prefix the filename with .\ (thanks lucienEn)
9+
* Relabled the the **Atari Compiler** window to **ADS Compiler** and the **atari-dev-studio** Terminal window to **ADS Terminal** for consistency.
10+
511
## 0.11.8
612

713
* Updated 7800basic to v0.40 (wasm)

out/application.js

Lines changed: 17 additions & 4 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

out/application.js.map

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

out/compilers/makeCompiler.js

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

out/compilers/makeCompiler.js.map

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
"name": "atari-dev-studio",
33
"displayName": "Atari Dev Studio",
44
"description": "Homebrew game creation for the Atari 8-bit consoles",
5-
"version": "0.11.8",
5+
"version": "0.11.9",
66
"icon": "images/icon.png",
77
"preview": false,
88
"author": "mksmith",

src/application.ts

Lines changed: 15 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -67,11 +67,13 @@ export const Description: string = vscode.extensions.getExtension(Id)!.packageJS
6767
export const PreferencesSettingsExtensionPath: string = `${(IsMacOS ? "Code" : "File")} -> Preferences -> Settings -> Extensions -> ${DisplayName}`;
6868
export const ChangeLogUri: vscode.Uri = vscode.Uri.parse(`https://marketplace.visualstudio.com/items/${Id}/changelog`);
6969
// -------------------------------------------------------------------------------------
70-
// ENVIRONMENT
70+
// Environment
7171
// -------------------------------------------------------------------------------------
7272
export const EnvironmentSummary: string = `Operating System: ${(IsWindows ? "Windows" : IsLinux ? "Linux" : IsMacOS ? "MacOS" : "Unknown")} (${OSArch}), VSCode: v${vscode.version}, ${DisplayName}: v${Version}`;
7373
export const SEVENTYEIGHTHUNDREDBASIC_WASMTIME_RELEASE = 0.37;
7474
export const BATARIBASIC_WASMTIME_RELEASE = 1.9;
75+
export const AtariDevStudioCompilerWindowName = "ADS Compiler";
76+
export const AtariDevStudioTerminalWindowName = "ADS Terminal";
7577
// -------------------------------------------------------------------------------------
7678
// Languages
7779
// -------------------------------------------------------------------------------------
@@ -80,7 +82,7 @@ export const BatariBasicLanguageId = "batariBasic";
8082
// -------------------------------------------------------------------------------------
8183
// Channels
8284
// -------------------------------------------------------------------------------------
83-
export const CompilerOutputChannel: vscode.OutputChannel = vscode.window.createOutputChannel("Atari Compiler");
85+
export const CompilerOutputChannel: vscode.OutputChannel = vscode.window.createOutputChannel(AtariDevStudioCompilerWindowName);
8486

8587
// -------------------------------------------------------------------------------------
8688
// Terminal
@@ -103,7 +105,17 @@ export async function InitialiseAdsTerminalAsync() {
103105
}
104106

105107
// Create
106-
AdsTerminal = vscode.window.createTerminal(`${Name}`);
108+
if (IsWindows) {
109+
// For windows we need to create a CMD window
110+
// NOTE: by default VSCode uses powershell
111+
AdsTerminal = vscode.window.createTerminal({
112+
name: AtariDevStudioTerminalWindowName,
113+
shellPath: "C:\\Windows\\System32\\cmd.exe"
114+
});
115+
} else {
116+
// Let system choose
117+
AdsTerminal = vscode.window.createTerminal(AtariDevStudioTerminalWindowName);
118+
}
107119

108120
// User closed a terminal? if so verify it's ours and clear the reference
109121
vscode.window.onDidCloseTerminal((terminal) => {

src/compilers/makeCompiler.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -55,8 +55,8 @@ export class MakeCompiler extends CompilerBase {
5555
console.log('debugger:MakeCompiler.ExecuteCompilerAsync');
5656

5757
// Launch and exit
58-
// note: we cannot wait for a result
59-
application.AdsTerminal?.sendText(`make -f ${this.FileName}`);
58+
// NOTE: we cannot wait for a result
59+
application.AdsTerminal?.sendText(`make -f .\\${this.FileName}`);
6060
return true;
6161
}
6262

0 commit comments

Comments
 (0)