Little bit of cleanup [CI SKIP]

main
Jef Roosens 2022-01-27 21:47:25 +01:00
parent 8e6b1e233f
commit 83f1e3aa3d
Signed by: Jef Roosens
GPG Key ID: 955C0660072F691F
2 changed files with 3 additions and 10 deletions

View File

@ -15,4 +15,3 @@ pipeline:
path: path:
- Dockerfile.builder - Dockerfile.builder
- patches/* - patches/*
- Makefile

View File

@ -2,15 +2,8 @@
SRC_DIR := src SRC_DIR := src
SOURCES != find '$(SRC_DIR)' -iname '*.v' SOURCES != find '$(SRC_DIR)' -iname '*.v'
LARCHIVE_VER := 3.5.2
LARCHIVE_DIR := libarchive-$(LARCHIVE_VER)
LARCHIVE_LIB := $(LARCHIVE_DIR)/libarchive/libarchive.so
V_RELEASE := weekly.2022.04 V_RELEASE := weekly.2022.04
V_PATH ?= v-$(V_RELEASE)/v V_PATH ?= v-$(V_RELEASE)/v
# Custom V command for linking libarchive
# V := LDFLAGS=$(PWD)/$(LARCHIVE_LIB) v -cflags '-I$(PWD)/$(LARCHIVE_DIR) -I $(PWD)/$(LARCHIVE_DIR)'
V := $(V_PATH) -showcc V := $(V_PATH) -showcc
all: vieter all: vieter
@ -32,6 +25,7 @@ prod: pvieter
pvieter: $(SOURCES) pvieter: $(SOURCES)
$(V) -o pvieter -prod $(SRC_DIR) $(V) -o pvieter -prod $(SRC_DIR)
# Only generate C code
.PHONY: c .PHONY: c
c: c:
$(V) -o vieter.c $(SRC_DIR) $(V) -o vieter.c $(SRC_DIR)
@ -45,12 +39,12 @@ run: vieter
.PHONY: run-prod .PHONY: run-prod
run-prod: prod run-prod: prod
API_KEY=test REPO_DIR=data LOG_LEVEL=DEBUG ./pvieter API_KEY=test DOWNLOAD_DIR=data/downloads REPO_DIR=data/repo PKG_DIR=data/pkgs LOG_LEVEL=DEBUG ./pvieter
# Same as run, but restart when the source code changes # Same as run, but restart when the source code changes
.PHONY: watch .PHONY: watch
watch: watch:
API_KEY=test REPO_DIR=data LOG_LEVEL=DEBUG $(V) watch run vieter API_KEY=test DOWNLOAD_DIR=data/downloads REPO_DIR=data/repo PKG_DIR=data/pkgs LOG_LEVEL=DEBUG $(V) watch run vieter
# =====OTHER===== # =====OTHER=====