From 7c7832ba401d64f1ea40e4347eb0dd61821366ba Mon Sep 17 00:00:00 2001
From: TopchetoEU <36534413+TopchetoEU@users.noreply.github.com>
Date: Sun, 16 Mar 2025 01:50:21 +0200
Subject: [PATCH] restructure

---
 Makefile                            | 20 ++++++++++----------
 {lib => src/entry}/build.lua        |  0
 {lib => src/entry}/errfunc.lua      |  0
 {lib => src/entry}/fmt.c            |  0
 {lib => src/entry}/fs.c             |  0
 {lib => src/entry}/http.c           |  0
 {lib => src/entry}/lib.h            |  0
 {lib => src/entry}/main.c           |  0
 {lib => src/entry}/zlib.c           |  0
 src/{ => main}/cli/dump.lua         |  0
 src/{ => main}/cli/help.lua         |  0
 src/{ => main}/cli/pack.lua         |  0
 src/{ => main}/cli/query.lua        |  0
 src/{ => main}/flatpak.lua          |  0
 src/{ => main}/formats/gvariant.lua |  0
 src/{ => main}/formats/ini.lua      |  0
 src/{ => main}/formats/xml.lua      |  0
 src/{ => main}/init.lua             |  0
 src/{ => main}/ostree.lua           |  0
 src/{ => main}/util/args.lua        |  0
 src/{ => main}/util/printing.lua    |  0
 21 files changed, 10 insertions(+), 10 deletions(-)
 rename {lib => src/entry}/build.lua (100%)
 rename {lib => src/entry}/errfunc.lua (100%)
 rename {lib => src/entry}/fmt.c (100%)
 rename {lib => src/entry}/fs.c (100%)
 rename {lib => src/entry}/http.c (100%)
 rename {lib => src/entry}/lib.h (100%)
 rename {lib => src/entry}/main.c (100%)
 rename {lib => src/entry}/zlib.c (100%)
 rename src/{ => main}/cli/dump.lua (100%)
 rename src/{ => main}/cli/help.lua (100%)
 rename src/{ => main}/cli/pack.lua (100%)
 rename src/{ => main}/cli/query.lua (100%)
 rename src/{ => main}/flatpak.lua (100%)
 rename src/{ => main}/formats/gvariant.lua (100%)
 rename src/{ => main}/formats/ini.lua (100%)
 rename src/{ => main}/formats/xml.lua (100%)
 rename src/{ => main}/init.lua (100%)
 rename src/{ => main}/ostree.lua (100%)
 rename src/{ => main}/util/args.lua (100%)
 rename src/{ => main}/util/printing.lua (100%)

diff --git a/Makefile b/Makefile
index ae2777f..fe15ce6 100644
--- a/Makefile
+++ b/Makefile
@@ -7,20 +7,20 @@ lua := lua
 cc := gcc
 
 dst_dir = dst
-src_lua_dir = src
-src_c_dir = lib
+src_main_dir = src/main
+src_entry_dir = src/entry
 
 # Uncomment to get debugging symbols
 # flags := -g
 
-lua_sources += $(wildcard $(src_lua_dir)/*.lua)
-lua_sources += $(wildcard $(src_lua_dir)/cli/*.lua)
-lua_sources += $(wildcard $(src_lua_dir)/formats/*.lua)
-lua_sources += $(wildcard $(src_lua_dir)/util/*.lua)
+main_sources += $(wildcard $(src_main_dir)/*.lua)
+main_sources += $(wildcard $(src_main_dir)/cli/*.lua)
+main_sources += $(wildcard $(src_main_dir)/formats/*.lua)
+main_sources += $(wildcard $(src_main_dir)/util/*.lua)
 
-c_sources = $(wildcard $(src_c_dir)/*.c)
+c_sources = $(wildcard $(src_entry_dir)/*.c)
 
-build_entry = $(src_c_dir)/build.lua
+build_entry = $(src_entry_dir)/build.lua
 
 target = $(dst_dir)/slimpack
 bytecode_target = $(dst_dir)/bytecode.h
@@ -32,7 +32,7 @@ build: $(target)
 $(dst_dir):
 	mkdir -p $@
 
-$(bytecode_target): $(lua_sources) $(dst_dir)
-	$(lua) lib/build.lua src $@ $(lua_sources)
+$(bytecode_target): $(main_sources) $(dst_dir) $(build_entry)
+	$(lua) $(build_entry) $(src_main_dir) $@ $(main_sources)
 $(target): $(c_sources) $(bytecode_target) $(dst_dir)
 	$(cc) $(flags) $(libraries) -include $(bytecode_target) $(c_sources) -o $@
diff --git a/lib/build.lua b/src/entry/build.lua
similarity index 100%
rename from lib/build.lua
rename to src/entry/build.lua
diff --git a/lib/errfunc.lua b/src/entry/errfunc.lua
similarity index 100%
rename from lib/errfunc.lua
rename to src/entry/errfunc.lua
diff --git a/lib/fmt.c b/src/entry/fmt.c
similarity index 100%
rename from lib/fmt.c
rename to src/entry/fmt.c
diff --git a/lib/fs.c b/src/entry/fs.c
similarity index 100%
rename from lib/fs.c
rename to src/entry/fs.c
diff --git a/lib/http.c b/src/entry/http.c
similarity index 100%
rename from lib/http.c
rename to src/entry/http.c
diff --git a/lib/lib.h b/src/entry/lib.h
similarity index 100%
rename from lib/lib.h
rename to src/entry/lib.h
diff --git a/lib/main.c b/src/entry/main.c
similarity index 100%
rename from lib/main.c
rename to src/entry/main.c
diff --git a/lib/zlib.c b/src/entry/zlib.c
similarity index 100%
rename from lib/zlib.c
rename to src/entry/zlib.c
diff --git a/src/cli/dump.lua b/src/main/cli/dump.lua
similarity index 100%
rename from src/cli/dump.lua
rename to src/main/cli/dump.lua
diff --git a/src/cli/help.lua b/src/main/cli/help.lua
similarity index 100%
rename from src/cli/help.lua
rename to src/main/cli/help.lua
diff --git a/src/cli/pack.lua b/src/main/cli/pack.lua
similarity index 100%
rename from src/cli/pack.lua
rename to src/main/cli/pack.lua
diff --git a/src/cli/query.lua b/src/main/cli/query.lua
similarity index 100%
rename from src/cli/query.lua
rename to src/main/cli/query.lua
diff --git a/src/flatpak.lua b/src/main/flatpak.lua
similarity index 100%
rename from src/flatpak.lua
rename to src/main/flatpak.lua
diff --git a/src/formats/gvariant.lua b/src/main/formats/gvariant.lua
similarity index 100%
rename from src/formats/gvariant.lua
rename to src/main/formats/gvariant.lua
diff --git a/src/formats/ini.lua b/src/main/formats/ini.lua
similarity index 100%
rename from src/formats/ini.lua
rename to src/main/formats/ini.lua
diff --git a/src/formats/xml.lua b/src/main/formats/xml.lua
similarity index 100%
rename from src/formats/xml.lua
rename to src/main/formats/xml.lua
diff --git a/src/init.lua b/src/main/init.lua
similarity index 100%
rename from src/init.lua
rename to src/main/init.lua
diff --git a/src/ostree.lua b/src/main/ostree.lua
similarity index 100%
rename from src/ostree.lua
rename to src/main/ostree.lua
diff --git a/src/util/args.lua b/src/main/util/args.lua
similarity index 100%
rename from src/util/args.lua
rename to src/main/util/args.lua
diff --git a/src/util/printing.lua b/src/main/util/printing.lua
similarity index 100%
rename from src/util/printing.lua
rename to src/main/util/printing.lua