From ea3fb6c29253cb300ac9f9eb22bad98c27f3c100 Mon Sep 17 00:00:00 2001 From: Jeremy Baxter Date: Sat, 23 Dec 2023 18:19:51 +1300 Subject: [PATCH] move lua-5.4 -> external/luasrc we have to use the name "luasrc" rather than just "lua" because lua is in gitignore --- Makefile | 14 ++++++-------- config.mk | 2 +- external/json/Makefile | 2 +- {lua-5.4 => external/luasrc}/Makefile | 0 {lua-5.4 => external/luasrc}/README | 0 {lua-5.4 => external/luasrc}/lapi.c | 0 {lua-5.4 => external/luasrc}/lapi.h | 0 {lua-5.4 => external/luasrc}/lauxlib.c | 0 {lua-5.4 => external/luasrc}/lauxlib.h | 0 {lua-5.4 => external/luasrc}/lbaselib.c | 0 {lua-5.4 => external/luasrc}/lcode.c | 0 {lua-5.4 => external/luasrc}/lcode.h | 0 {lua-5.4 => external/luasrc}/lcorolib.c | 0 {lua-5.4 => external/luasrc}/lctype.c | 0 {lua-5.4 => external/luasrc}/lctype.h | 0 {lua-5.4 => external/luasrc}/ldblib.c | 0 {lua-5.4 => external/luasrc}/ldebug.c | 0 {lua-5.4 => external/luasrc}/ldebug.h | 0 {lua-5.4 => external/luasrc}/ldo.c | 0 {lua-5.4 => external/luasrc}/ldo.h | 0 {lua-5.4 => external/luasrc}/ldump.c | 0 {lua-5.4 => external/luasrc}/lfunc.c | 0 {lua-5.4 => external/luasrc}/lfunc.h | 0 {lua-5.4 => external/luasrc}/lgc.c | 0 {lua-5.4 => external/luasrc}/lgc.h | 0 {lua-5.4 => external/luasrc}/linit.c | 0 {lua-5.4 => external/luasrc}/liolib.c | 0 {lua-5.4 => external/luasrc}/ljumptab.h | 0 {lua-5.4 => external/luasrc}/llex.c | 0 {lua-5.4 => external/luasrc}/llex.h | 0 {lua-5.4 => external/luasrc}/llimits.h | 0 {lua-5.4 => external/luasrc}/lmathlib.c | 0 {lua-5.4 => external/luasrc}/lmem.c | 0 {lua-5.4 => external/luasrc}/lmem.h | 0 {lua-5.4 => external/luasrc}/loadlib.c | 0 {lua-5.4 => external/luasrc}/lobject.c | 0 {lua-5.4 => external/luasrc}/lobject.h | 0 {lua-5.4 => external/luasrc}/lopcodes.c | 0 {lua-5.4 => external/luasrc}/lopcodes.h | 0 {lua-5.4 => external/luasrc}/lopnames.h | 0 {lua-5.4 => external/luasrc}/loslib.c | 0 {lua-5.4 => external/luasrc}/lparser.c | 0 {lua-5.4 => external/luasrc}/lparser.h | 0 {lua-5.4 => external/luasrc}/lprefix.h | 0 {lua-5.4 => external/luasrc}/lstate.c | 0 {lua-5.4 => external/luasrc}/lstate.h | 0 {lua-5.4 => external/luasrc}/lstring.c | 0 {lua-5.4 => external/luasrc}/lstring.h | 0 {lua-5.4 => external/luasrc}/lstrlib.c | 0 {lua-5.4 => external/luasrc}/ltable.c | 0 {lua-5.4 => external/luasrc}/ltable.h | 0 {lua-5.4 => external/luasrc}/ltablib.c | 0 {lua-5.4 => external/luasrc}/ltm.c | 0 {lua-5.4 => external/luasrc}/ltm.h | 0 {lua-5.4 => external/luasrc}/lua.c | 0 {lua-5.4 => external/luasrc}/lua.h | 0 {lua-5.4 => external/luasrc}/lua.hpp | 0 {lua-5.4 => external/luasrc}/luac.c | 0 {lua-5.4 => external/luasrc}/luaconf.h | 0 {lua-5.4 => external/luasrc}/lualib.h | 0 {lua-5.4 => external/luasrc}/lundump.c | 0 {lua-5.4 => external/luasrc}/lundump.h | 0 {lua-5.4 => external/luasrc}/lutf8lib.c | 0 {lua-5.4 => external/luasrc}/lvm.c | 0 {lua-5.4 => external/luasrc}/lvm.h | 0 {lua-5.4 => external/luasrc}/lzio.c | 0 {lua-5.4 => external/luasrc}/lzio.h | 0 67 files changed, 8 insertions(+), 10 deletions(-) rename {lua-5.4 => external/luasrc}/Makefile (100%) rename {lua-5.4 => external/luasrc}/README (100%) rename {lua-5.4 => external/luasrc}/lapi.c (100%) rename {lua-5.4 => external/luasrc}/lapi.h (100%) rename {lua-5.4 => external/luasrc}/lauxlib.c (100%) rename {lua-5.4 => external/luasrc}/lauxlib.h (100%) rename {lua-5.4 => external/luasrc}/lbaselib.c (100%) rename {lua-5.4 => external/luasrc}/lcode.c (100%) rename {lua-5.4 => external/luasrc}/lcode.h (100%) rename {lua-5.4 => external/luasrc}/lcorolib.c (100%) rename {lua-5.4 => external/luasrc}/lctype.c (100%) rename {lua-5.4 => external/luasrc}/lctype.h (100%) rename {lua-5.4 => external/luasrc}/ldblib.c (100%) rename {lua-5.4 => external/luasrc}/ldebug.c (100%) rename {lua-5.4 => external/luasrc}/ldebug.h (100%) rename {lua-5.4 => external/luasrc}/ldo.c (100%) rename {lua-5.4 => external/luasrc}/ldo.h (100%) rename {lua-5.4 => external/luasrc}/ldump.c (100%) rename {lua-5.4 => external/luasrc}/lfunc.c (100%) rename {lua-5.4 => external/luasrc}/lfunc.h (100%) rename {lua-5.4 => external/luasrc}/lgc.c (100%) rename {lua-5.4 => external/luasrc}/lgc.h (100%) rename {lua-5.4 => external/luasrc}/linit.c (100%) rename {lua-5.4 => external/luasrc}/liolib.c (100%) rename {lua-5.4 => external/luasrc}/ljumptab.h (100%) rename {lua-5.4 => external/luasrc}/llex.c (100%) rename {lua-5.4 => external/luasrc}/llex.h (100%) rename {lua-5.4 => external/luasrc}/llimits.h (100%) rename {lua-5.4 => external/luasrc}/lmathlib.c (100%) rename {lua-5.4 => external/luasrc}/lmem.c (100%) rename {lua-5.4 => external/luasrc}/lmem.h (100%) rename {lua-5.4 => external/luasrc}/loadlib.c (100%) rename {lua-5.4 => external/luasrc}/lobject.c (100%) rename {lua-5.4 => external/luasrc}/lobject.h (100%) rename {lua-5.4 => external/luasrc}/lopcodes.c (100%) rename {lua-5.4 => external/luasrc}/lopcodes.h (100%) rename {lua-5.4 => external/luasrc}/lopnames.h (100%) rename {lua-5.4 => external/luasrc}/loslib.c (100%) rename {lua-5.4 => external/luasrc}/lparser.c (100%) rename {lua-5.4 => external/luasrc}/lparser.h (100%) rename {lua-5.4 => external/luasrc}/lprefix.h (100%) rename {lua-5.4 => external/luasrc}/lstate.c (100%) rename {lua-5.4 => external/luasrc}/lstate.h (100%) rename {lua-5.4 => external/luasrc}/lstring.c (100%) rename {lua-5.4 => external/luasrc}/lstring.h (100%) rename {lua-5.4 => external/luasrc}/lstrlib.c (100%) rename {lua-5.4 => external/luasrc}/ltable.c (100%) rename {lua-5.4 => external/luasrc}/ltable.h (100%) rename {lua-5.4 => external/luasrc}/ltablib.c (100%) rename {lua-5.4 => external/luasrc}/ltm.c (100%) rename {lua-5.4 => external/luasrc}/ltm.h (100%) rename {lua-5.4 => external/luasrc}/lua.c (100%) rename {lua-5.4 => external/luasrc}/lua.h (100%) rename {lua-5.4 => external/luasrc}/lua.hpp (100%) rename {lua-5.4 => external/luasrc}/luac.c (100%) rename {lua-5.4 => external/luasrc}/luaconf.h (100%) rename {lua-5.4 => external/luasrc}/lualib.h (100%) rename {lua-5.4 => external/luasrc}/lundump.c (100%) rename {lua-5.4 => external/luasrc}/lundump.h (100%) rename {lua-5.4 => external/luasrc}/lutf8lib.c (100%) rename {lua-5.4 => external/luasrc}/lvm.c (100%) rename {lua-5.4 => external/luasrc}/lvm.h (100%) rename {lua-5.4 => external/luasrc}/lzio.c (100%) rename {lua-5.4 => external/luasrc}/lzio.h (100%) diff --git a/Makefile b/Makefile index 01e4068..eddb224 100644 --- a/Makefile +++ b/Makefile @@ -33,16 +33,15 @@ cjson.a: external/json/*.c ${MAKE} -Cexternal/json mv -f external/json/cjson.a cjson.a -liblua.a: lua-5.4/*.c - ${MAKE} -Clua-5.4 - mv -f lua-5.4/liblua.a . +liblua.a: external/luasrc/*.c + ${MAKE} -Cexternal/luasrc + mv -f external/luasrc/liblua.a . clean: rm -f csto libcallisto.so ${OBJS} ${LIBS} - rm -fr include - rm -fr doc/*.html doc/modules + rm -fr include doc/*.html doc/modules clean-all: clean - ${MAKE} -s -Clua-5.4 clean + ${MAKE} -s -Cexternal/luasrc clean ${MAKE} -s -Cexternal/json clean doc: @@ -52,8 +51,7 @@ install: mkdir -p include/callisto mkdir -p "${DESTDIR}${PREFIX}"/{bin,include,lib} cp -f callisto.h include/callisto - cp -f lua-5.4/{lua.h,lualib.h,lauxlib.h,luaconf.h} \ - include/callisto + cp -f external/luasrc/{lua.h,lualib.h,lauxlib.h,luaconf.h} include/callisto cp -f csto "${DESTDIR}${PREFIX}"/bin cp -fR include/callisto "${DESTDIR}${PREFIX}"/include cp -f libcallisto.so "${DESTDIR}${PREFIX}"/lib diff --git a/config.mk b/config.mk index 9c6776c..978913f 100644 --- a/config.mk +++ b/config.mk @@ -1,5 +1,5 @@ CC = cc -CFLAGS = -std=c99 -pedantic -fpic -O2 -Wall -Wextra -Wno-override-init -I. -Ilua-5.4 +CFLAGS = -std=c99 -pedantic -fpic -O2 -Wall -Wextra -Wno-override-init -Iexternal/luasrc CPPFLAGS = -D_DEFAULT_SOURCE LDFLAGS = -lm diff --git a/external/json/Makefile b/external/json/Makefile index f130098..c110e5d 100644 --- a/external/json/Makefile +++ b/external/json/Makefile @@ -13,7 +13,7 @@ ##### Build defaults ##### CC = cc AR = ar cr -CFLAGS = -std=c99 -O2 -Wall -Wno-unused-function -pedantic -fpic -DNDEBUG -I../../lua-5.4 +CFLAGS = -std=c99 -O2 -Wall -Wno-unused-function -pedantic -fpic -DNDEBUG -I../luasrc OBJS = dtoa.o fpconv.o g_fmt.o lua_cjson.o strbuf.o ##### End customisable sections ##### diff --git a/lua-5.4/Makefile b/external/luasrc/Makefile similarity index 100% rename from lua-5.4/Makefile rename to external/luasrc/Makefile diff --git a/lua-5.4/README b/external/luasrc/README similarity index 100% rename from lua-5.4/README rename to external/luasrc/README diff --git a/lua-5.4/lapi.c b/external/luasrc/lapi.c similarity index 100% rename from lua-5.4/lapi.c rename to external/luasrc/lapi.c diff --git a/lua-5.4/lapi.h b/external/luasrc/lapi.h similarity index 100% rename from lua-5.4/lapi.h rename to external/luasrc/lapi.h diff --git a/lua-5.4/lauxlib.c b/external/luasrc/lauxlib.c similarity index 100% rename from lua-5.4/lauxlib.c rename to external/luasrc/lauxlib.c diff --git a/lua-5.4/lauxlib.h b/external/luasrc/lauxlib.h similarity index 100% rename from lua-5.4/lauxlib.h rename to external/luasrc/lauxlib.h diff --git a/lua-5.4/lbaselib.c b/external/luasrc/lbaselib.c similarity index 100% rename from lua-5.4/lbaselib.c rename to external/luasrc/lbaselib.c diff --git a/lua-5.4/lcode.c b/external/luasrc/lcode.c similarity index 100% rename from lua-5.4/lcode.c rename to external/luasrc/lcode.c diff --git a/lua-5.4/lcode.h b/external/luasrc/lcode.h similarity index 100% rename from lua-5.4/lcode.h rename to external/luasrc/lcode.h diff --git a/lua-5.4/lcorolib.c b/external/luasrc/lcorolib.c similarity index 100% rename from lua-5.4/lcorolib.c rename to external/luasrc/lcorolib.c diff --git a/lua-5.4/lctype.c b/external/luasrc/lctype.c similarity index 100% rename from lua-5.4/lctype.c rename to external/luasrc/lctype.c diff --git a/lua-5.4/lctype.h b/external/luasrc/lctype.h similarity index 100% rename from lua-5.4/lctype.h rename to external/luasrc/lctype.h diff --git a/lua-5.4/ldblib.c b/external/luasrc/ldblib.c similarity index 100% rename from lua-5.4/ldblib.c rename to external/luasrc/ldblib.c diff --git a/lua-5.4/ldebug.c b/external/luasrc/ldebug.c similarity index 100% rename from lua-5.4/ldebug.c rename to external/luasrc/ldebug.c diff --git a/lua-5.4/ldebug.h b/external/luasrc/ldebug.h similarity index 100% rename from lua-5.4/ldebug.h rename to external/luasrc/ldebug.h diff --git a/lua-5.4/ldo.c b/external/luasrc/ldo.c similarity index 100% rename from lua-5.4/ldo.c rename to external/luasrc/ldo.c diff --git a/lua-5.4/ldo.h b/external/luasrc/ldo.h similarity index 100% rename from lua-5.4/ldo.h rename to external/luasrc/ldo.h diff --git a/lua-5.4/ldump.c b/external/luasrc/ldump.c similarity index 100% rename from lua-5.4/ldump.c rename to external/luasrc/ldump.c diff --git a/lua-5.4/lfunc.c b/external/luasrc/lfunc.c similarity index 100% rename from lua-5.4/lfunc.c rename to external/luasrc/lfunc.c diff --git a/lua-5.4/lfunc.h b/external/luasrc/lfunc.h similarity index 100% rename from lua-5.4/lfunc.h rename to external/luasrc/lfunc.h diff --git a/lua-5.4/lgc.c b/external/luasrc/lgc.c similarity index 100% rename from lua-5.4/lgc.c rename to external/luasrc/lgc.c diff --git a/lua-5.4/lgc.h b/external/luasrc/lgc.h similarity index 100% rename from lua-5.4/lgc.h rename to external/luasrc/lgc.h diff --git a/lua-5.4/linit.c b/external/luasrc/linit.c similarity index 100% rename from lua-5.4/linit.c rename to external/luasrc/linit.c diff --git a/lua-5.4/liolib.c b/external/luasrc/liolib.c similarity index 100% rename from lua-5.4/liolib.c rename to external/luasrc/liolib.c diff --git a/lua-5.4/ljumptab.h b/external/luasrc/ljumptab.h similarity index 100% rename from lua-5.4/ljumptab.h rename to external/luasrc/ljumptab.h diff --git a/lua-5.4/llex.c b/external/luasrc/llex.c similarity index 100% rename from lua-5.4/llex.c rename to external/luasrc/llex.c diff --git a/lua-5.4/llex.h b/external/luasrc/llex.h similarity index 100% rename from lua-5.4/llex.h rename to external/luasrc/llex.h diff --git a/lua-5.4/llimits.h b/external/luasrc/llimits.h similarity index 100% rename from lua-5.4/llimits.h rename to external/luasrc/llimits.h diff --git a/lua-5.4/lmathlib.c b/external/luasrc/lmathlib.c similarity index 100% rename from lua-5.4/lmathlib.c rename to external/luasrc/lmathlib.c diff --git a/lua-5.4/lmem.c b/external/luasrc/lmem.c similarity index 100% rename from lua-5.4/lmem.c rename to external/luasrc/lmem.c diff --git a/lua-5.4/lmem.h b/external/luasrc/lmem.h similarity index 100% rename from lua-5.4/lmem.h rename to external/luasrc/lmem.h diff --git a/lua-5.4/loadlib.c b/external/luasrc/loadlib.c similarity index 100% rename from lua-5.4/loadlib.c rename to external/luasrc/loadlib.c diff --git a/lua-5.4/lobject.c b/external/luasrc/lobject.c similarity index 100% rename from lua-5.4/lobject.c rename to external/luasrc/lobject.c diff --git a/lua-5.4/lobject.h b/external/luasrc/lobject.h similarity index 100% rename from lua-5.4/lobject.h rename to external/luasrc/lobject.h diff --git a/lua-5.4/lopcodes.c b/external/luasrc/lopcodes.c similarity index 100% rename from lua-5.4/lopcodes.c rename to external/luasrc/lopcodes.c diff --git a/lua-5.4/lopcodes.h b/external/luasrc/lopcodes.h similarity index 100% rename from lua-5.4/lopcodes.h rename to external/luasrc/lopcodes.h diff --git a/lua-5.4/lopnames.h b/external/luasrc/lopnames.h similarity index 100% rename from lua-5.4/lopnames.h rename to external/luasrc/lopnames.h diff --git a/lua-5.4/loslib.c b/external/luasrc/loslib.c similarity index 100% rename from lua-5.4/loslib.c rename to external/luasrc/loslib.c diff --git a/lua-5.4/lparser.c b/external/luasrc/lparser.c similarity index 100% rename from lua-5.4/lparser.c rename to external/luasrc/lparser.c diff --git a/lua-5.4/lparser.h b/external/luasrc/lparser.h similarity index 100% rename from lua-5.4/lparser.h rename to external/luasrc/lparser.h diff --git a/lua-5.4/lprefix.h b/external/luasrc/lprefix.h similarity index 100% rename from lua-5.4/lprefix.h rename to external/luasrc/lprefix.h diff --git a/lua-5.4/lstate.c b/external/luasrc/lstate.c similarity index 100% rename from lua-5.4/lstate.c rename to external/luasrc/lstate.c diff --git a/lua-5.4/lstate.h b/external/luasrc/lstate.h similarity index 100% rename from lua-5.4/lstate.h rename to external/luasrc/lstate.h diff --git a/lua-5.4/lstring.c b/external/luasrc/lstring.c similarity index 100% rename from lua-5.4/lstring.c rename to external/luasrc/lstring.c diff --git a/lua-5.4/lstring.h b/external/luasrc/lstring.h similarity index 100% rename from lua-5.4/lstring.h rename to external/luasrc/lstring.h diff --git a/lua-5.4/lstrlib.c b/external/luasrc/lstrlib.c similarity index 100% rename from lua-5.4/lstrlib.c rename to external/luasrc/lstrlib.c diff --git a/lua-5.4/ltable.c b/external/luasrc/ltable.c similarity index 100% rename from lua-5.4/ltable.c rename to external/luasrc/ltable.c diff --git a/lua-5.4/ltable.h b/external/luasrc/ltable.h similarity index 100% rename from lua-5.4/ltable.h rename to external/luasrc/ltable.h diff --git a/lua-5.4/ltablib.c b/external/luasrc/ltablib.c similarity index 100% rename from lua-5.4/ltablib.c rename to external/luasrc/ltablib.c diff --git a/lua-5.4/ltm.c b/external/luasrc/ltm.c similarity index 100% rename from lua-5.4/ltm.c rename to external/luasrc/ltm.c diff --git a/lua-5.4/ltm.h b/external/luasrc/ltm.h similarity index 100% rename from lua-5.4/ltm.h rename to external/luasrc/ltm.h diff --git a/lua-5.4/lua.c b/external/luasrc/lua.c similarity index 100% rename from lua-5.4/lua.c rename to external/luasrc/lua.c diff --git a/lua-5.4/lua.h b/external/luasrc/lua.h similarity index 100% rename from lua-5.4/lua.h rename to external/luasrc/lua.h diff --git a/lua-5.4/lua.hpp b/external/luasrc/lua.hpp similarity index 100% rename from lua-5.4/lua.hpp rename to external/luasrc/lua.hpp diff --git a/lua-5.4/luac.c b/external/luasrc/luac.c similarity index 100% rename from lua-5.4/luac.c rename to external/luasrc/luac.c diff --git a/lua-5.4/luaconf.h b/external/luasrc/luaconf.h similarity index 100% rename from lua-5.4/luaconf.h rename to external/luasrc/luaconf.h diff --git a/lua-5.4/lualib.h b/external/luasrc/lualib.h similarity index 100% rename from lua-5.4/lualib.h rename to external/luasrc/lualib.h diff --git a/lua-5.4/lundump.c b/external/luasrc/lundump.c similarity index 100% rename from lua-5.4/lundump.c rename to external/luasrc/lundump.c diff --git a/lua-5.4/lundump.h b/external/luasrc/lundump.h similarity index 100% rename from lua-5.4/lundump.h rename to external/luasrc/lundump.h diff --git a/lua-5.4/lutf8lib.c b/external/luasrc/lutf8lib.c similarity index 100% rename from lua-5.4/lutf8lib.c rename to external/luasrc/lutf8lib.c diff --git a/lua-5.4/lvm.c b/external/luasrc/lvm.c similarity index 100% rename from lua-5.4/lvm.c rename to external/luasrc/lvm.c diff --git a/lua-5.4/lvm.h b/external/luasrc/lvm.h similarity index 100% rename from lua-5.4/lvm.h rename to external/luasrc/lvm.h diff --git a/lua-5.4/lzio.c b/external/luasrc/lzio.c similarity index 100% rename from lua-5.4/lzio.c rename to external/luasrc/lzio.c diff --git a/lua-5.4/lzio.h b/external/luasrc/lzio.h similarity index 100% rename from lua-5.4/lzio.h rename to external/luasrc/lzio.h