Skip to content

Commit 06adae9

Browse files
committed
fix: source filename with spaces
1 parent b712c96 commit 06adae9

File tree

3 files changed

+15
-14
lines changed

3 files changed

+15
-14
lines changed

7800bas.bat

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,12 +24,12 @@ echo dasm version: %DASMVER%
2424

2525

2626
REM --- Source file check ---
27-
if X%1==X (
27+
if "%~1"=="" (
2828
echo ### ERROR: No source file specified.
2929
exit /b 1
3030
)
3131

32-
if "%1"=="-v" (
32+
if /i "%~1"=="-v" (
3333
REM Just version check
3434
exit /b 0
3535
)
@@ -103,3 +103,4 @@ exit /b 1
103103
endlocal
104104
exit /b 0
105105

106+

7800basic.sh

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -26,15 +26,15 @@ if [ "$1" = "-v" ] ; then
2626
fi
2727

2828
if [ ! -f "$1" ]; then
29-
echo "### ERROR: Source file '$1' not found."
29+
echo "### ERROR: Source file \"$1\" not found."
3030
exit 2
3131
fi
3232

3333
echo
3434

3535
echo "Starting build of $1"
36-
wasmtime run --dir=. --dir=$bas7800dir $bas7800dir/7800preprocess.wasm <"$1" >"$1.pre"
37-
wasmtime run --dir=. --dir=$bas7800dir $bas7800dir/7800basic.wasm -i "$bas7800dir" -b "$1" -p "$1.pre"
36+
wasmtime run --dir=. --dir="$bas7800dir" "$bas7800dir/7800preprocess.wasm" <"$1" >"$1.pre"
37+
wasmtime run --dir=. --dir="$bas7800dir" "$bas7800dir/7800basic.wasm" -i "$bas7800dir" -b "$1" -p "$1.pre"
3838

3939
if [ "$?" -ne "0" ]
4040
then
@@ -44,27 +44,27 @@ fi
4444
rm -f "$1.pre"
4545
if [ "$2" = "-O" ]
4646
then
47-
wasmtime run --dir=. --dir=$bas7800dir $bas7800dir/7800postprocess.wasm -i "$bas7800dir" | wasmtime run --dir=. --dir=$bas7800dir $bas7800dir/7800optimize.wasm > "$1.asm"
47+
wasmtime run --dir=. --dir="$bas7800dir" "$bas7800dir/7800postprocess.wasm" -i "$bas7800dir" | wasmtime run --dir=. --dir="$bas7800dir" "$bas7800dir/7800optimize.wasm" > "$1.asm"
4848
else
49-
wasmtime run --dir=. --dir=$bas7800dir $bas7800dir/7800postprocess.wasm -i "$bas7800dir" > "$1.asm"
49+
wasmtime run --dir=. --dir="$bas7800dir" "$bas7800dir/7800postprocess.wasm" -i "$bas7800dir" > "$1.asm"
5050
fi
5151

5252
if [ -r banksetrom.asm ] ; then
53-
wasmtime run --dir=. --dir=$bas7800dir $bas7800dir/dasm.wasm "$bas7800dir/includes/banksetskeleton.asm" -I"$bas7800dir/includes" -f3 -l"banksetrom.list.txt" -p20 -s"banksetrom.symbol.txt" -o"banksetrom.bin" | wasmtime $bas7800dir/7800filter.wasm
54-
wasmtime run --dir=. --dir=$bas7800dir $bas7800dir/banksetsymbols.wasm
53+
wasmtime run --dir=. --dir="$bas7800dir" "$bas7800dir/dasm.wasm" "$bas7800dir/includes/banksetskeleton.asm" -I"$bas7800dir/includes" -f3 -l"banksetrom.list.txt" -p20 -s"banksetrom.symbol.txt" -o"banksetrom.bin" | wasmtime "$bas7800dir/7800filter.wasm"
54+
wasmtime run --dir=. --dir="$bas7800dir" "$bas7800dir/banksetsymbols.wasm"
5555
fi
5656

57-
wasmtime run --dir=. --dir=$bas7800dir $bas7800dir/dasm.wasm $1.asm -I"$bas7800dir/includes" -f3 -l"$1.list.txt" -p20 -s"$1.symbol.txt" -o"$1.bin" | wasmtime $bas7800dir/7800filter.wasm
57+
wasmtime run --dir=. --dir="$bas7800dir" "$bas7800dir/dasm.wasm" "$1.asm" -I"$bas7800dir/includes" -f3 -l"$1.list.txt" -p20 -s"$1.symbol.txt" -o"$1.bin" | wasmtime "$bas7800dir/7800filter.wasm"
5858

59-
wasmtime run --dir=. --dir=$bas7800dir $bas7800dir/7800sign.wasm -w "$1.bin"
59+
wasmtime run --dir=. --dir="$bas7800dir" "$bas7800dir/7800sign.wasm" -w "$1.bin"
6060

6161
if [ -r banksetrom.asm ] ; then
6262
cat "banksetrom.bin" >> "$1.bin"
6363
rm -f banksetrom.bin banksetrom.asm
6464
fi
6565

6666

67-
wasmtime run --dir=. --dir=$bas7800dir $bas7800dir/7800header.wasm -o -f a78info.cfg "$1.bin"
68-
wasmtime run --dir=. --dir=$bas7800dir $bas7800dir/7800makecc2.wasm "$1.bin"
67+
wasmtime run --dir=. --dir="$bas7800dir" "$bas7800dir/7800header.wasm" -o -f a78info.cfg "$1.bin"
68+
wasmtime run --dir=. --dir="$bas7800dir" "$bas7800dir/7800makecc2.wasm" "$1.bin"
6969

7070
exit 0

release.dat

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
0.37
1+
0.38

0 commit comments

Comments
 (0)