mirrors/cosmopolitan
1
0
Fork 0
mirror of https://github.com/jart/cosmopolitan.git synced 2025-02-26 07:49:05 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Make default redbean lua module path zip:.lua/...

Browse source 
Fixes #157
This commit is contained in:
Justine Tunney 2021-05-16 19:05:35 -07:00
parent 6a8c21269f
commit 3057315a1b
5 changed files with 23 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
third_party/lua/luaconf.h vendored
View file

@ -219,15 +219,13 @@
#else /* }{ */
#define LUA_ROOT "/usr/local/"
#define LUA_LDIR LUA_ROOT "share/lua/" LUA_VDIR "/"
#define LUA_CDIR LUA_ROOT "lib/lua/" LUA_VDIR "/"
#define LUA_ROOT "zip:"
#define LUA_LDIR LUA_ROOT ".lua/"
#define LUA_CDIR LUA_ROOT ".lua/"
#if !defined(LUA_PATH_DEFAULT)
#define LUA_PATH_DEFAULT \
LUA_LDIR"?.lua;" LUA_LDIR"?/init.lua;" \
LUA_CDIR"?.lua;" LUA_CDIR"?/init.lua;" \
"./?.lua;" "./?/init.lua"
LUA_LDIR"?.lua;" LUA_LDIR"?/init.lua"
#endif
#if !defined(LUA_CPATH_DEFAULT)

2
tool/net/demo/.init.lua
View file

@ -1,3 +1,5 @@
mymodule = require "mymodule"
-- /.init.lua is loaded at startup in redbean's main process
HidePath('/usr/share/zoneinfo/')

10
tool/net/demo/.lua/mymodule.lua Normal file
View file

@ -0,0 +1,10 @@
local mymodule = {}
function mymodule.hello()
SetStatus(200)
SetHeader('Content-Type', 'text/html; charset=US-ASCII')
Write("<!doctype html>\r\n")
Write("<b>Hello World!</b>\r\n")
end
return mymodule

2
tool/net/demo/hello.lua
View file

@ -1,2 +1,2 @@
Write('hello world\r\n')
StoreAsset('/hi', 'sup')
mymodule.hello()

7
tool/net/net.mk
View file

@ -92,6 +92,7 @@ o/$(MODE)/tool/net/redbean-demo.com: \
tool/net/.help.txt \
tool/net/demo/.init.lua \
tool/net/demo/.reload.lua \
tool/net/demo/.lua/mymodule.lua \
tool/net/demo/404.html \
tool/net/demo/hello.lua \
tool/net/demo/index.html \
@ -110,7 +111,11 @@ o/$(MODE)/tool/net/redbean-demo.com: \
@$(COMPILE) -AOBJCOPY -T$@ $(OBJCOPY) -S -O binary $< $@
@$(COMPILE) -AMKDIR -T$@ mkdir -p o/$(MODE)/tool/net/.redbean-demo
@$(COMPILE) -ADD -T$@ dd if=$@ of=o/$(MODE)/tool/net/.redbean-demo/.ape bs=64 count=11 conv=notrunc 2>/dev/null
@$(COMPILE) -AZIP -T$@ zip -qj $@ o/$(MODE)/tool/net/.redbean-demo/.ape tool/net/.help.txt tool/net/demo/.init.lua tool/net/demo/.reload.lua tool/net/demo/hello.lua
@$(COMPILE) -AZIP -T$@ zip -qj $@ o/$(MODE)/tool/net/.redbean-demo/.ape tool/net/.help.txt tool/net/demo/.init.lua tool/net/demo/.reload.lua
@$(COMPILE) -ARM -T$@ rm -rf o/$(MODE)/tool/net/.lua
@$(COMPILE) -ACP -T$@ cp -R tool/net/demo/.lua o/$(MODE)/tool/net/
@(cd o/$(MODE)/tool/net && zip -qr redbean-demo.com .lua)
@$(COMPILE) -AZIP -T$@ zip -qj $@ tool/net/demo/hello.lua
@echo "&lt;-- check out this lua server page" | $(COMPILE) -AZIP -T$@ zip -cqj $@ tool/net/demo/redbean.lua
@$(COMPILE) -AZIP -T$@ zip -qj $@ tool/net/demo/404.html tool/net/favicon.ico tool/net/redbean.png tool/net/demo/redbean-form.lua tool/net/demo/redbean-xhr.lua
@echo Uncompressed for HTTP Range requests | $(COMPILE) -AZIP -T$@ zip -cqj0 $@ tool/net/demo/seekable.txt