Skip to content

Commit

Permalink
chore: cleanup deps, clib manifest
Browse files Browse the repository at this point in the history
  • Loading branch information
exbotanical committed Apr 29, 2023
1 parent ec6a312 commit 8d9b75b
Show file tree
Hide file tree
Showing 3 changed files with 22 additions and 16 deletions.
4 changes: 2 additions & 2 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ TESTDIR := t
LINCDIR := include

SRC := $(wildcard $(SRCDIR)/*.c)
DEPS := $(wildcard $(DEPSDIR)/*/*.c)
DEPS := $(filter-out $(wildcard $(DEPSDIR)/tap.c/*), $(wildcard $(DEPSDIR)/*/*.c))
OBJ := $(addprefix obj/, $(notdir $(SRC:.c=.o)) $(notdir $(DEPS:.c=.o)))

CFLAGS = -I$(LINCDIR) -I$(DEPSDIR) -g -ggdb -fPIC -Wall -Wextra -pedantic -Wnonnull-compare -Wno-missing-braces
Expand Down Expand Up @@ -55,7 +55,7 @@ test:
$(MAKE) integ_test

unit_test: $(STATIC_TARGET)
$(CC) $(wildcard $(TESTDIR)/unit/*.c) $(STATIC_TARGET) -I$(LINCDIR) -I$(SRCDIR) -I$(DEPSDIR) $(LIBS) -o $(UNIT_TARGET)
$(CC) $(wildcard $(TESTDIR)/unit/*.c) $(wildcard $(DEPSDIR)/tap.c/*.c) $(STATIC_TARGET) -I$(LINCDIR) -I$(SRCDIR) -I$(DEPSDIR) $(LIBS) -o $(UNIT_TARGET)
./$(UNIT_TARGET)
$(MAKE) clean

Expand Down
6 changes: 3 additions & 3 deletions TODO.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,15 +5,15 @@
- [x] name header file
- [ ] ensure example + docs code runs
- [ ] Use Fathom analytics
- [ ] github workflows
- [x] github workflows

## Pre-release
- [x] SSL support
- [x] Cookies
- [x] Name this project: Ys?
- [ ] Lock deps versions
- [x] Lock deps versions
- [x] Document
- [ ] Filter out test deps in builds
- [x] Filter out test deps in builds

- [x] Clean up all objects w/ free where necessary
- [x] Validate NULLs and allocated objects
Expand Down
28 changes: 17 additions & 11 deletions clib.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
"author": "Matthew Zito",
"repo": "exbotanical/libys",
"license": "MIT",
"description": "A C server framework",
"description": "The Modern Web Application Framework for C",
"keywords": [
"rest",
"api",
Expand All @@ -13,35 +13,41 @@
"concurrency"
],
"src": [
"src/libys.h",

"include/libys.h",
"src/cache.c",
"src/cache.h",
"src/client.h",
"src/config.c",
"src/config.h",
"src/const.c",
"src/cookie.c",
"src/cookie.h",
"src/cors.c",
"src/cors.h",
"src/file.c",
"src/fs_router.c",
"src/fs_router.h",
"src/header.c",
"src/header.h",
"src/const.c",
"src/json.c",
"src/json.h",
"src/ip.c",
"src/ip.h",
"src/logger.c",
"src/logger.h",
"src/middleware.c",
"src/middleware.h",
"src/path.c",
"src/path.h",
"src/regexpr.c",
"src/regexpr.h",
"src/request.c",
"src/request.h",
"src/response.c",
"src/response.h",
"src/router.c",
"src/router.h",
"src/server.c",
"src/server.h",
"src/sighandler.c",
"src/sighandler.h",
"src/time.c",
"src/trie.c",
"src/trie.h",
"src/url.c",
Expand All @@ -52,9 +58,9 @@
"src/xmalloc.h"
],
"dependencies": {
"exbotanical/libhash": "*",
"exbotanical/lib.thread": "*",
"exbotanical/libutil": "*"
"exbotanical/libhash": "0.0.6",
"exbotanical/lib.thread": "0.0.1",
"exbotanical/libutil": "0.0.9"
},
"development": {
"thlorenz/tap.c": "*"
Expand Down

0 comments on commit 8d9b75b

Please sign in to comment.