Skip to content
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

New targets (Debug, Release, Final, Shrinkler). [updated to 1.6.8] #200

Open
wants to merge 6 commits into
base: master
Choose a base branch
from
Open

New targets (Debug, Release, Final, Shrinkler). [updated to 1.6.8] #200

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
5f836e0
Targets, updated to 1.6.8.
davidcanadas Jan 3, 2023
86f0b56
Merge branch 'BartmanAbyss:master' into dev-remote-1.6.8-targets
davidcanadas Jan 29, 2023
c8f5dcb
Merge branch 'BartmanAbyss:master' into dev-remote-1.6.8-targets
davidcanadas Feb 1, 2023
9dc59c9
Merge pull request #40 from BartmanAbyss/master
davidcanadas May 7, 2023
b69a7c0
Fix for release builds.
davidcanadas Jun 5, 2023
925dffb
Merge branch 'dev-remote-1.6.8-targets' of https://github.com/davidca…
davidcanadas Jun 5, 2023
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
14,516 changes: 2,645 additions & 11,871 deletions package-lock.json
View file
Open in desktop

Large diffs are not rendered by default.

10 changes: 8 additions & 2 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -540,6 +540,11 @@
"type": "string",
"default": "c:/amiga/KICK31.rom",
"description": "Path to the Kickstart ROM for A4000 models."
},
"amiga.shrinkler.options": {
"type": "string",
"default": "-h -f dff180 -9 -t Decrunching...",
"description": "Additional arguments when packing Shrinkler targets."
}
}
}
Expand Down Expand Up @@ -569,7 +574,7 @@
"devtools-protocol": "^0.0.940865",
"eslint": "^8.2.0",
"eslint-config-prettier": "^8.3.0",
"eslint-plugin-import": "^2.25.3",
"eslint-plugin-import": "^2.24.1",
"eslint-plugin-jsdoc": "^37.0.3",
"eslint-plugin-prefer-arrow": "^1.2.3",
"fork-ts-checker-webpack-plugin": "^7.2.13",
Expand All @@ -587,7 +592,7 @@
"react-tabs": "^4.2.1",
"source-map-loader": "^4.0.0",
"style-loader": "^3.3.1",
"svg-inline-loader": "^0.8.2",
"svg-inline-loader": "^0.2.3",
"terser-webpack-plugin": "^5.2.5",
"ts-loader": "^9.2.6",
"ts-node": "^10.9.1",
Expand All @@ -600,6 +605,7 @@
"zustand": "^4.1.1"
},
"dependencies": {
"child_process": "^1.0.2",
"m68kdecode": "^1.1.4",
"vscode-cpptools": "^5.0.0",
"vscode-debugadapter": "^1.51.0",
Expand Down
1 change: 1 addition & 0 deletions src/extension.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -181,6 +181,7 @@ class AmigaDebugExtension {
vscode.commands.registerCommand('amiga.externalResources.colorReducer', () => vscode.env.openExternal(vscode.Uri.parse('http://deadliners.net/ColorReducer'))),
vscode.commands.registerCommand('amiga.externalResources.bltconCheatSheet', () => vscode.env.openExternal(vscode.Uri.parse('http://deadliners.net/BLTCONCheatSheet'))),
vscode.commands.registerCommand('amiga.externalResources.amigaHRM', () => vscode.commands.executeCommand('simpleBrowser.show', 'http://amigadev.elowar.com/read/ADCD_2.1/Hardware_Manual_guide/node0000.html')),
vscode.commands.registerCommand('amiga.programFolder', () => path.dirname(vscode.workspace.getConfiguration('amiga').get('program')?.toString().replace('\\', '/'))),
vscode.commands.registerCommand('amiga.setDisassembledMemory', (lines: SourceLineWithDisassembly[]) => this.disassembledMemoryProvider.setDisassembledMemory(lines)),
vscode.commands.registerCommand('amiga.toggleCounts', () => this.assemblyDocumentManager.toggleCounts()),

Expand Down
123 changes: 120 additions & 3 deletions template/.vscode/launch.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
"preLaunchTask": "compile",
"name": "AROS",
"config": "A500",
"program": "${workspaceFolder}/${config:amiga.program}",
"program": "${workspaceFolder}/${config:amiga.program}-rel",
"internalConsoleOptions": "openOnSessionStart"
},
{
Expand All @@ -16,7 +16,7 @@
"preLaunchTask": "compile",
"name": "Amiga 500",
"config": "A500",
"program": "${workspaceFolder}/${config:amiga.program}",
"program": "${workspaceFolder}/${config:amiga.program}-rel",
"kickstart": "${config:amiga.rom-paths.A500}",
"internalConsoleOptions": "openOnSessionStart"
},
Expand All @@ -26,7 +26,7 @@
"preLaunchTask": "compile",
"name": "Amiga 1200",
"config": "A1200",
"program": "${workspaceFolder}/${config:amiga.program}",
"program": "${workspaceFolder}/${config:amiga.program}-rel",
"kickstart": "${config:amiga.rom-paths.A1200}",
"internalConsoleOptions": "openOnSessionStart"
},
Expand All @@ -36,7 +36,124 @@
"preLaunchTask": "compile",
"name": "Amiga 4000",
"config": "A4000",
"program": "${workspaceFolder}/${config:amiga.program}-rel",
"kickstart": "${config:amiga.rom-paths.A4000}",
"internalConsoleOptions": "openOnSessionStart"
},
{
"type": "amiga",
"request": "launch",
"preLaunchTask": "compile-debug",
"name": "Debug - AROS",
"config": "A500",
"program": "${workspaceFolder}/${config:amiga.program}-dbg",
"internalConsoleOptions": "openOnSessionStart"
},
{
"type": "amiga",
"request": "launch",
"preLaunchTask": "compile-debug",
"name": "Debug - Amiga 500",
"config": "A500",
"program": "${workspaceFolder}/${config:amiga.program}-dbg",
"kickstart": "${config:amiga.rom-paths.A500}",
"internalConsoleOptions": "openOnSessionStart"
},
{
"type": "amiga",
"request": "launch",
"preLaunchTask": "compile-debug",
"name": "Debug - Amiga 1200",
"config": "A1200",
"program": "${workspaceFolder}/${config:amiga.program}-dbg",
"kickstart": "${config:amiga.rom-paths.A1200}",
"internalConsoleOptions": "openOnSessionStart"
},
{
"type": "amiga",
"request": "launch",
"preLaunchTask": "compile-debug",
"name": "Debug - Amiga 4000",
"config": "A4000",
"program": "${workspaceFolder}/${config:amiga.program}-dbg",
"kickstart": "${config:amiga.rom-paths.A4000}",
"internalConsoleOptions": "openOnSessionStart"
},
{
"type": "amiga",
"request": "launch",
"preLaunchTask": "compile-final",
"name": "Final - AROS",
"config": "A500",
"program": "${workspaceFolder}/${config:amiga.program}",
"internalConsoleOptions": "openOnSessionStart"
},
{
"type": "amiga",
"request": "launch",
"preLaunchTask": "compile-final",
"name": "Final - Amiga 500",
"config": "A500",
"program": "${workspaceFolder}/${config:amiga.program}",
"kickstart": "${config:amiga.rom-paths.A500}",
"internalConsoleOptions": "openOnSessionStart"
},
{
"type": "amiga",
"request": "launch",
"preLaunchTask": "compile-final",
"name": "Final - Amiga 1200",
"config": "A1200",
"program": "${workspaceFolder}/${config:amiga.program}",
"kickstart": "${config:amiga.rom-paths.A1200}",
"internalConsoleOptions": "openOnSessionStart"
},
{
"type": "amiga",
"request": "launch",
"preLaunchTask": "compile-final",
"name": "Final - Amiga 4000",
"config": "A4000",
"program": "${workspaceFolder}/${config:amiga.program}",
"kickstart": "${config:amiga.rom-paths.A4000}",
"internalConsoleOptions": "openOnSessionStart"
},
{
"type": "amiga",
"request": "launch",
"preLaunchTask": "compile-shrinkled",
"name": "Shrinkled - AROS",
"config": "A500",
"program": "${workspaceFolder}/${config:amiga.program}-compressed",
"internalConsoleOptions": "openOnSessionStart"
},
{
"type": "amiga",
"request": "launch",
"preLaunchTask": "compile-shrinkled",
"name": "Shrinkled - Amiga 500",
"config": "A500",
"program": "${workspaceFolder}/${config:amiga.program}-compressed",
"kickstart": "${config:amiga.rom-paths.A500}",
"internalConsoleOptions": "openOnSessionStart"
},
{
"type": "amiga",
"request": "launch",
"preLaunchTask": "compile-shrinkled",
"name": "Shrinkled - Amiga 1200",
"config": "A1200",
"program": "${workspaceFolder}/${config:amiga.program}-compressed",
"kickstart": "${config:amiga.rom-paths.A1200}",
"internalConsoleOptions": "openOnSessionStart"
},
{
"type": "amiga",
"request": "launch",
"preLaunchTask": "compile-shrinkled",
"name": "Shrinkled - Amiga 4000",
"config": "A4000",
"program": "${workspaceFolder}/${config:amiga.program}-compressed",
"kickstart": "${config:amiga.rom-paths.A4000}",
"internalConsoleOptions": "openOnSessionStart"
}
Expand Down
126 changes: 125 additions & 1 deletion template/.vscode/tasks.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,11 @@
},
"args": [
"-j4",
"program=${config:amiga.program}",
"program=${workspaceFolder}\\${config:amiga.program}-rel",
"targetName=Release",
"ccExtraOptions=-gdwarf-3 -Ofast -DDEBUG",
"vasmExtraOptions=-dwarf=3 -DDEBUG",
"programFolder=${command:amiga.programFolder}"
],
"problemMatcher": [
{
Expand All @@ -45,6 +49,126 @@
"isDefault": true
}
},
{
"label": "compile-debug",
"type": "shell",
"windows": {
"command": "${command:amiga.bin-path}\\gnumake.exe",
"options": {
"cwd": "${workspaceRoot}",
"env": {
"PATH": "${env:PATH};${command:amiga.bin-path}\\opt\\bin;${command:amiga.bin-path}"
}
},
},
"command": "make",
"options": {
"cwd": "${workspaceRoot}",
"env": {
"PATH": "${env:PATH}:${command:amiga.bin-path}/opt/bin:${command:amiga.bin-path}"
}
},
"args": [
"-j4",
"program=${workspaceFolder}\\${config:amiga.program}-dbg",
"targetName=Debug",
"ccExtraOptions=-gdwarf-3 -DDEBUG",
"vasmExtraOptions=-dwarf=3 -DDEBUG",
"programFolder=${command:amiga.programFolder}"
],
"problemMatcher": [
{
"base": "$gcc",
"fileLocation": "absolute"
}
],
"presentation": {
"echo": true,
"reveal": "silent",
"focus": false,
"panel": "shared",
"showReuseMessage": false,
"clear": true
},
"group": {
"kind": "build",
"isDefault": false
}
},
{
"label": "compile-final",
"type": "shell",
"windows": {
"command": "${command:amiga.bin-path}\\gnumake.exe",
"options": {
"cwd": "${workspaceRoot}",
"env": {
"PATH": "${env:PATH};${command:amiga.bin-path}\\opt\\bin;${command:amiga.bin-path}"
}
},
},
"command": "make",
"options": {
"cwd": "${workspaceRoot}",
"env": {
"PATH": "${env:PATH}:${command:amiga.bin-path}/opt/bin:${command:amiga.bin-path}"
}
},
"args": [
"-j4",
"program=${workspaceFolder}\\${config:amiga.program}",
"targetName=Final",
"ccExtraOptions=-Ofast -DNDEBUG",
"vasmExtraOptions=-DNDEBUG",
"programFolder=${command:amiga.programFolder}"
],
"problemMatcher": [
{
"base": "$gcc",
"fileLocation": "absolute"
}
],
"presentation": {
"echo": true,
"reveal": "silent",
"focus": false,
"panel": "shared",
"showReuseMessage": false,
"clear": true
},
"group": {
"kind": "build",
"isDefault": false
}
},
{
"label" : "compile-shrinkled",
"type" : "shell",
"windows":
{
"command": "${workspaceRoot}/mkfinal.bat"
},
"args" : [ "${workspaceFolder}\\${config:amiga.program}.exe", "${command:amiga.bin-path}", "${config:amiga.shrinkler.options}" ],
"options":
{
"cwd": "${workspaceRoot}",
"env": {
"PATH": "${command:amiga.bin-path}\\opt\\bin;${command:amiga.bin-path}"
}
},
"problemMatcher": [ { "base": "$gcc", "fileLocation": "absolute" } ],
"presentation" :
{
"echo" : true,
"reveal" : "silent",
"focus" : false,
"panel" : "shared",
"showReuseMessage": false,
"clear" : true
},
"group": { "kind": "build", "isDefault": false },
"dependsOn": [ "compile-final" ]
},
{
"label": "clean",
"type": "shell",
Expand Down
Loading