Change build settings to get coverage

.github/workflows/test.yml

@@ -31,11 +31,11 @@ jobs:
       matrix:
         lua-version:
           - "5.1"
-          - "5.2"
-          - "5.3"
-          - "5.4"
-          - "luajit-2.0.5"
-          - "luajit-openresty"
+          # - "5.2"
+          # - "5.3"
+          # - "5.4"
+          # - "luajit-2.0.5"
+          # - "luajit-openresty"
     steps:
     -
       name: Checkout
@@ -44,7 +44,7 @@ jobs:
         submodules: 'true'
     -
       name: Setup Lua ${{ matrix.lua-version }}
-      uses: leafo/gh-actions-lua@v8.0.0
+      uses: leafo/gh-actions-lua@v8
       with:
         luaVersion: ${{ matrix.lua-version }}
     -
@@ -76,13 +76,13 @@ jobs:
       name: Run Test
       run: |
         testcase ./test/
-    # -
-    #   name: Generate coverage reports
-    #   run: |
-    #     sh ./covgen.sh
-    # -
-    #   name: Upload c coverage to Codecov
-    #   uses: codecov/codecov-action@v2
-    #   with:
-    #     files: ./coverage/lcov.info
-    #     flags: unittests
+    -
+      name: Generate coverage reports
+      run: |
+        sh ./covgen.sh
+    -
+      name: Upload c coverage to Codecov
+      uses: codecov/codecov-action@v2
+      with:
+        files: ./coverage/lcov.info
+        flags: unittests

Makefile

@@ -0,0 +1,28 @@
+TARGET=libtls.$(LIB_EXTENSION)
+SRCS=$(wildcard src/*.c)
+SOBJ=$(SRCS:.c=.$(LIB_EXTENSION))
+SUBMOD:=$(filter-out src/$(TARGET),$(SOBJ))
+INSTALL?=install
+
+ifdef LIBTLS_COVERAGE
+COVFLAGS=--coverage
+endif
+
+
+.PHONY: all install
+
+all: $(SOBJ)
+
+%.o: %.c
+	$(CC) $(CFLAGS) $(WARNINGS) $(COVFLAGS) $(CPPFLAGS) -o $@ -c $<
+
+%.$(LIB_EXTENSION): %.o
+	$(CC) -o $@ $^ $(LDFLAGS) $(LIBS) $(PLATFORM_LDFLAGS) $(COVFLAGS)
+
+install:
+	$(INSTALL) -d $(INST_LIBDIR)
+	$(INSTALL) src/$(TARGET) $(INST_LIBDIR)
+	$(INSTALL) -d $(INST_LIBDIR)/libtls
+	$(INSTALL) $(SUBMOD) $(INST_LIBDIR)/libtls/
+	rm -f ./src/*.o ./src/*.so ./src/*.gcda
+

README.md

@@ -1,6 +1,7 @@
 # lua-libtls
 
 [![test](https://github.com/mah0x211/lua-libtls/actions/workflows/test.yml/badge.svg)](https://github.com/mah0x211/lua-libtls/actions/workflows/test.yml)
+[![codecov](https://codecov.io/gh/mah0x211/lua-libtls/branch/master/graph/badge.svg)](https://codecov.io/gh/mah0x211/lua-libtls)
 
 
 libtls bindings for lua.

rockspecs/libtls-3.4.1-3.rockspec

@@ -22,35 +22,19 @@ external_dependencies = {
     },
 }
 build = {
-    type = "builtin",
-    modules = {
-        libtls = {
-            sources = {
-                "src/libtls.c",
-            },
-            libraries = {
-                "tls",
-            },
-            incdirs = {
-                "$(LIBTLS_INCDIR)",
-            },
-            libdirs = {
-                "$(LIBTLS_LIBDIR)",
-            },
-        },
-        ["libtls.config"] = {
-            sources = {
-                "src/config.c",
-            },
-            libraries = {
-                "tls",
-            },
-            incdirs = {
-                "$(LIBTLS_INCDIR)",
-            },
-            libdirs = {
-                "$(LIBTLS_LIBDIR)",
-            },
-        },
+    type = "make",
+    build_variables = {
+        SRCDIR = "src",
+        CFLAGS = "$(CFLAGS)",
+        WARNINGS = "-Wall -Wno-trigraphs -Wmissing-field-initializers -Wreturn-type -Wmissing-braces -Wparentheses -Wno-switch -Wunused-function -Wunused-label -Wunused-parameter -Wunused-variable -Wunused-value -Wuninitialized -Wunknown-pragmas -Wshadow -Wsign-compare",
+        CPPFLAGS = "-I$(LUA_INCDIR) -I$(LIBTLS_INCDIR)",
+        LDFLAGS = "$(LIBFLAG) -L$(LIBTLS_LIBDIR) -ltls",
+        LIB_EXTENSION = "$(LIB_EXTENSION)",
+        LIBTLS_COVERAGE = "$(LIBTLS_COVERAGE)",
+    },
+    install_variables = {
+        SRCDIR = "src",
+        INST_LIBDIR = "$(LIBDIR)",
+        LIB_EXTENSION = "$(LIB_EXTENSION)",
     },
 }

rockspecs/libtls-scm-1.rockspec

@@ -21,35 +21,19 @@ external_dependencies = {
     },
 }
 build = {
-    type = "builtin",
-    modules = {
-        libtls = {
-            sources = {
-                "src/libtls.c",
-            },
-            libraries = {
-                "tls",
-            },
-            incdirs = {
-                "$(LIBTLS_INCDIR)",
-            },
-            libdirs = {
-                "$(LIBTLS_LIBDIR)",
-            },
-        },
-        ["libtls.config"] = {
-            sources = {
-                "src/config.c",
-            },
-            libraries = {
-                "tls",
-            },
-            incdirs = {
-                "$(LIBTLS_INCDIR)",
-            },
-            libdirs = {
-                "$(LIBTLS_LIBDIR)",
-            },
-        },
+    type = "make",
+    build_variables = {
+        SRCDIR = "src",
+        CFLAGS = "$(CFLAGS)",
+        WARNINGS = "-Wall -Wno-trigraphs -Wmissing-field-initializers -Wreturn-type -Wmissing-braces -Wparentheses -Wno-switch -Wunused-function -Wunused-label -Wunused-parameter -Wunused-variable -Wunused-value -Wuninitialized -Wunknown-pragmas -Wshadow -Wsign-compare",
+        CPPFLAGS = "-I$(LUA_INCDIR) -I$(LIBTLS_INCDIR)",
+        LDFLAGS = "$(LIBFLAG) -L$(LIBTLS_LIBDIR) -ltls",
+        LIB_EXTENSION = "$(LIB_EXTENSION)",
+        LIBTLS_COVERAGE = "$(LIBTLS_COVERAGE)",
+    },
+    install_variables = {
+        SRCDIR = "src",
+        INST_LIBDIR = "$(LIBDIR)",
+        LIB_EXTENSION = "$(LIB_EXTENSION)",
     },
 }