eleksir/doll
0
Fork 0
Code Pull Requests Releases Activity

Move examples to examples dir, now LoadJsonFile() also returns err

Browse Source 
* Move examples from cmd to examples dir
* Update Makefile
* LoadJsonFile() dies in-place on read or parse error which is not correct
* LoadJsonFile() wastes Instance map, now it returns its own map and error if any
This commit is contained in:
eleksir
2025-10-27 20:28:27 +03:00
parent 521ac9abc0
commit f2948d705a
9 changed files with 102 additions and 86 deletions
Download Patch File Download Diff File Expand all files Collapse all files

39
Makefile
View File

@@ -7,6 +7,8 @@ BINARY=${MYNAME}
UNIX_BINARY=${MYNAME}
WINDOWS_BINARY=${MYNAME}.exe
RMCMD=rm -rf
EXAMPLE01=01-LoadJsonFile
EXAMPLE02=02-TestLuaScript
# На windows имя бинарника может зависеть не только от платформы, но и от выбранной цели, для linux-а суффикс .exe
# не нужен
@@ -58,19 +60,19 @@ clean:
ifeq ($(OS),Windows_NT)
ifeq ($(SHELL),sh.exe)
# # Vanilla cmd.exe / powershell.
if exist 01-LoadJsonFile.exe ${RMCMD} 01-LoadJsonFile.exe
if exist 01-LoadJsonFile ${RMCMD} 01-LoadJsonFile
if exist 02-TestLuaScript.exe ${RMCMD} 02-TestLuaScript.exe
if exist 02-TestLuaScript ${RMCMD} 02-TestLuaScript
if exist ${EXAMPLE01}.exe ${RMCMD} ${EXAMPLE01}.exe
if exist ${EXAMPLE01} ${RMCMD} ${EXAMPLE01}
if exist ${EXAMPLE02}.exe ${RMCMD} ${EXAMPLE02}.exe
if exist ${EXAMPLE02} ${RMCMD} ${EXAMPLE02}
else # not ifeq ($(SHELL),sh.exe)
${RMCMD} ./01-LoadJsonFile.exe
${RMCMD} ./01-LoadJsonFile
${RMCMD} ./02-TestLuaScript.exe
${RMCMD} ./02-TestLuaScript
${RMCMD} ./${EXAMPLE01}.exe
${RMCMD} ./${EXAMPLE01}
${RMCMD} ./${EXAMPLE02}.exe
${RMCMD} ./${EXAMPLE02}
endif # ifeq ($(SHELL),sh.exe)
else # not ifeq ($(OS),Windows_NT)
${RMCMD} ./01-LoadJsonFile
${RMCMD} ./02-TestLuaScript
${RMCMD} ${EXAMPLE01}
${RMCMD} ${EXAMPLE02}
endif
@@ -80,23 +82,23 @@ upgrade:
go mod vendor
01-LoadJsonFile: clean
${EXAMPLE01}: clean
ifeq ($(OS),Windows_NT)
# Looks like on windows gnu make explicitly set SHELL to sh.exe, if it was not set.
ifeq ($(SHELL), sh.exe)
# # Vanilla cmd.exe / powershell.
SET "CGO_ENABLED=0"
go build ${BUILDOPTS} -o 01-LoadJsonFile.exe ./cmd/01-LoadJsonFile
go build ${BUILDOPTS} -o ${EXAMPLE01}.exe ./cmd/${EXAMPLE01}
else ifeq (,$(findstring(Git/usr/bin/sh.exe, $(SHELL))))
# # git-bash
CGO_ENABLED=0 go build ${BUILDOPTS} -o 01-LoadJsonFile.exe ./cmd/01-LoadJsonFile
CGO_ENABLED=0 go build ${BUILDOPTS} -o ${EXAMPLE01}.exe ./cmd/${EXAMPLE01}
else # not ifeq (,$(findstring(Git/usr/bin/sh.exe, $(SHELL))))
# # Some other shell.
# # TODO: handle it.
$(info "-- Dunno how to handle this shell: ${SHELL}")
endif # ifeq (,$(findstring(Git/usr/bin/sh.exe, $(SHELL))))
else # not ($(OS),Windows_NT)
CGO_ENABLED=0 go build ${BUILDOPTS} -o 01-LoadJsonFile ./cmd/01-LoadJsonFile
CGO_ENABLED=0 go build ${BUILDOPTS} -o ${EXAMPLE01} ./cmd/${EXAMPLE01}
endif # ifeq ($(OS),Windows_NT)
@@ -106,17 +108,18 @@ ifeq ($(OS),Windows_NT)
ifeq ($(SHELL), sh.exe)
# # Vanilla cmd.exe / powershell.
SET "CGO_ENABLED=0"
go build ${BUILDOPTS} -o 02-TestLuaScript.exe ./cmd/02-TestLuaScript
go build ${BUILDOPTS} -o ${EXAMPLE02}.exe ./cmd/${EXAMPLE02}
else ifeq (,$(findstring(Git/usr/bin/sh.exe, $(SHELL))))
# # git-bash
CGO_ENABLED=0 go build ${BUILDOPTS} -o 02-TestLuaScript.exe ./cmd/02-TestLuaScript
CGO_ENABLED=0 go build ${BUILDOPTS} -o ${EXAMPLE02}.exe ./cmd/${EXAMPLE02}
else # not ifeq (,$(findstring(Git/usr/bin/sh.exe, $(SHELL))))
# # Some other shell.
# # TODO: handle it.
$(info "-- Dunno how to handle this shell: ${SHELL}")
endif # ifeq (,$(findstring(Git/usr/bin/sh.exe, $(SHELL))))
else # not ($(OS),Windows_NT)
CGO_ENABLED=0 go build ${BUILDOPTS} -o 02-TestLuaScript ./cmd/02-TestLuaScript
CGO_ENABLED=0 go build ${BUILDOPTS} -o ${EXAMPLE02} ./cmd/${EXAMPLE02}
endif # ifeq ($(OS),Windows_NT)
# vim: set ft=make noet ai ts=4 sw=4 sts=4:
# vim: set ft=make noet ai ts=4 sw=4 sts=4: