diff --git a/build.sh b/build.sh index d8596eb..bd6815d 100755 --- a/build.sh +++ b/build.sh @@ -1,10 +1,11 @@ -#!/bin/sh +#!/bin/bash +LUA=${LUA:-lua} rm -r target/* mkdir target &>/dev/null -lua luapreproc.lua module/init.lua target/init.lua +$LUA luapreproc.lua module/init.lua target/init.lua echo _OSVERSION=\"PsychOS 2.0a2-$(git rev-parse --short HEAD)\" > target/version.lua cat target/version.lua target/init.lua > target/tinit.lua mv target/tinit.lua target/init.lua cp -r service/ lib/ cfg/ target/ -lua finddesc.lua $(find module/ -type f) $(find lib/ -type f) > apidoc.md +$LUA finddesc.lua $(find module/ -type f) $(find lib/ -type f) > apidoc.md rm target/version.lua diff --git a/finddesc.lua b/finddesc.lua index 513a271..d2c4df4 100644 --- a/finddesc.lua +++ b/finddesc.lua @@ -12,14 +12,14 @@ for _,file in pairs(tA) do for k,v in pairs(lines) do local name, args, desc = v:match("function%s+(.+)%s*%((.*)%)%s*%-%-%s*(.+)") if name and args and desc then - docfiles[file][#docfiles[file]+1] = string.format("##%s(%s)\n%s",name,args,desc) + docfiles[file][#docfiles[file]+1] = string.format("## %s(%s)\n%s\n",name,args,desc) end end end for k,v in pairs(docfiles) do if #v > 0 then - print("#"..k) + print("\n# "..k) for l,m in pairs(v) do print(m) end diff --git a/luapreproc.lua b/luapreproc.lua index cf2e176..00b2a8b 100755 --- a/luapreproc.lua +++ b/luapreproc.lua @@ -179,6 +179,7 @@ local env = {code = ""} setmetatable(env, {__index=_env}) env:process(arg[1]) local tmpfile = os.tmpname() +if tmpfile:sub(#tmpfile) == "." then tmpfile = tmpfile:sub(1, #tmpfile - 1) end local tmpf = io.open(tmpfile, "wb") tmpf:write(env.code) tmpf:close()