6502/8bitworkshop
1
0
Fork 0
mirror of https://github.com/sehugg/8bitworkshop.git synced 2025-02-19 23:29:06 +00:00
Code Issues Projects Releases Wiki Activity

ca65: return listings if errors

Browse Source
This commit is contained in:
Steven Hugg 2022-02-19 11:35:30 -06:00
parent 349c45d7c0
commit 38920c6dce
1 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/worker/tools/cc65.ts
View File

@ -1,7 +1,7 @@
import { getFilenamePrefix, getRootBasePlatform } from "../../common/util"; import { getFilenamePrefix, getRootBasePlatform } from "../../common/util";
import { CodeListingMap, WorkerError } from "../../common/workertypes"; import { CodeListingMap, WorkerError } from "../../common/workertypes";
import { re_crlf, BuildStepResult, anyTargetChanged, execMain, gatherFiles, msvcErrorMatcher, populateEntry, populateExtraFiles, populateFiles, print_fn, putWorkFile, setupFS, staleFiles, BuildStep, emglobal, loadNative, moduleInstFn, fixParamsWithDefines, store, makeErrorMatcher } from "../workermain"; import { re_crlf, BuildStepResult, anyTargetChanged, execMain, gatherFiles, msvcErrorMatcher, populateEntry, populateExtraFiles, populateFiles, print_fn, putWorkFile, setupFS, staleFiles, BuildStep, emglobal, loadNative, moduleInstFn, fixParamsWithDefines, store, makeErrorMatcher, getWorkFileAsString } from "../workermain";
import { EmscriptenModule } from "../workermain" import { EmscriptenModule } from "../workermain"
@ -128,8 +128,12 @@ export function assembleCA65(step: BuildStep): BuildStepResult {
args.unshift.apply(args, ["-D", "__MAIN__=1"]); args.unshift.apply(args, ["-D", "__MAIN__=1"]);
} }
execMain(step, CA65, args); execMain(step, CA65, args);
if (errors.length) if (errors.length) {
return { errors: errors }; // TODO?
let listings : CodeListingMap = {};
listings[step.path] = { lines:[], text:getWorkFileAsString(step.path) };
return { errors, listings };
}
objout = FS.readFile(objpath, { encoding: 'binary' }); objout = FS.readFile(objpath, { encoding: 'binary' });
lstout = FS.readFile(lstpath, { encoding: 'utf8' }); lstout = FS.readFile(lstpath, { encoding: 'utf8' });
putWorkFile(objpath, objout); putWorkFile(objpath, objout);