AI_Assistant/openscad-playground
Watch
1
0
Fork
You've already forked openscad-playground
 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #36 from ochafik/main

Browse source 
Fix error reporting in non-default files + link bins
This commit is contained in:
Olivier Chafik 2024-07-08 01:28:33 +01:00 • committed by GitHub
commit 5481491433
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 10 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

17
Makefile
View file

@ -11,7 +11,7 @@ all: public
.PHONY: public .PHONY: public
public: \ public: \
libs/openscad-wasm \ src/wasm \
public/openscad.js \ public/openscad.js \
public/openscad.wasm \ public/openscad.wasm \
public/libraries/fonts.zip \ public/libraries/fonts.zip \
@ -49,19 +49,20 @@ dist/index.js: public
dist/openscad-worker.js: src/openscad-worker.ts dist/openscad-worker.js: src/openscad-worker.ts
npx rollup -c npx rollup -c
src/wasm: libs/openscad-wasm
rm -f src/wasm
ln -sf "$(shell pwd)/libs/openscad-wasm" src/wasm
libs/openscad-wasm: libs/openscad-wasm:
mkdir -p libs/openscad-wasm mkdir -p libs/openscad-wasm
wget ${WASM_BUILD_URL} -O libs/openscad-wasm.zip wget ${WASM_BUILD_URL} -O libs/openscad-wasm.zip
( cd libs/openscad-wasm && unzip ../openscad-wasm.zip ) ( cd libs/openscad-wasm && unzip ../openscad-wasm.zip )
rm libs/openscad-wasm.zip
rm -f src/wasm
ln -sf "$(shell pwd)/libs/openscad-wasm" src/wasm
public/openscad.js: libs/openscad-wasm public/openscad.js: libs/openscad-wasm libs/openscad-wasm/openscad.js
cp libs/openscad-wasm/openscad.{js,wasm} public ln -sf libs/openscad-wasm/openscad.js public/openscad.js
public/openscad.wasm: libs/openscad-wasm public/openscad.wasm: libs/openscad-wasm libs/openscad-wasm/openscad.wasm
cp libs/openscad-wasm/openscad.wasm public ln -sf libs/openscad-wasm/openscad.wasm public/openscad.wasm
public/libraries/fonts.zip: libs/liberation public/libraries/fonts.zip: libs/liberation
mkdir -p public/libraries mkdir -p public/libraries

2
src/runner/output-parser.ts
View file

@ -47,7 +47,7 @@ export function parseMergedOutputs(mergedOutputs: MergedOutputs, opts: MergedOut
const shiftSourceName = opts.shiftSourceLines && opts.shiftSourceLines.sourcePath; const shiftSourceName = opts.shiftSourceLines && opts.shiftSourceLines.sourcePath;
const getLine = (path: string, lineStr: string) => { const getLine = (path: string, lineStr: string) => {
const line = Number(lineStr); const line = Number(lineStr);
if (shiftSourceName && (path == shiftSourceName)) { if (shiftSourceName && path.endsWith(shiftSourceName)) {
return line - opts.shiftSourceLines!.skipLines; return line - opts.shiftSourceLines!.skipLines;
} else { } else {
return line; return line;