Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
10 changes: 5 additions & 5 deletions src/filesystems/local/LocalLanguageActions.ts
Original file line number Diff line number Diff line change
Expand Up @@ -165,7 +165,7 @@ export const LocalLanguageActions: Record<string, Action[]> = {
"extensions": [
`GLOBAL`
],
"name": `Build all`,
"name": `Build all with gmake`,
"command": `/QOpenSys/pkgs/bin/gmake BUILDLIB=&CURLIB ERR=*EVENTF`,
environment: `pase`,
deployFirst: true,
Expand All @@ -174,18 +174,18 @@ export const LocalLanguageActions: Record<string, Action[]> = {
"extensions": [
`GLOBAL`
],
"name": `Build current`,
"name": `Build current with gmake`,
"command": `/QOpenSys/pkgs/bin/gmake &BASENAME BUILDLIB=&CURLIB ERR=*EVENTF`,
environment: `pase`,
deployFirst: true,
}
],
"ibmi-bob": [
"The Object Builder for i (TOBi)": [
{
"extensions": [
`GLOBAL`
],
"name": `Build all`,
"name": `Build all with TOBi`,
"command": `OPT=*EVENTF BUILDLIB=&CURLIB /QOpenSys/pkgs/bin/makei build`,
environment: `pase`,
deployFirst: true,
Expand All @@ -198,7 +198,7 @@ export const LocalLanguageActions: Record<string, Action[]> = {
"extensions": [
`GLOBAL`
],
"name": `Build current`,
"name": `Build current with TOBi`,
"command": `OPT=*EVENTF BUILDLIB=&CURLIB /QOpenSys/pkgs/bin/makei compile -f &BASENAME`,
environment: `pase`,
deployFirst: true,
Expand Down
8 changes: 4 additions & 4 deletions src/ui/actions.ts
Original file line number Diff line number Diff line change
Expand Up @@ -207,14 +207,14 @@ export async function runAction(instance: Instance, uris: vscode.Uri | vscode.Ur
const parent = path.parse(pathData.dir).base;
let name = pathData.name;

// Logic to handle second extension, caused by bob.
const bobTypes = [`.PGM`, `.SRVPGM`];
// Logic to handle second extension, caused by TOBi.
const tobiTypes = [`.PGM`, `.SRVPGM`];
const secondName = path.parse(name);
if (secondName.ext && bobTypes.includes(secondName.ext.toUpperCase())) {
if (secondName.ext && tobiTypes.includes(secondName.ext.toUpperCase())) {
name = secondName.name;
}

// Remove bob text convention
// Remove TOBi text convention
if (name.includes(`-`)) {
name = name.substring(0, name.indexOf(`-`));
}
Expand Down
Loading