Merge branch 'dev' into multi-arch-repos [CI SKIP]
This commit is contained in:
commit
c3335fdb84
12 changed files with 44 additions and 112 deletions
15
Makefile
15
Makefile
|
|
@ -2,8 +2,7 @@
|
|||
SRC_DIR := src
|
||||
SOURCES != find '$(SRC_DIR)' -iname '*.v'
|
||||
|
||||
V_RELEASE := weekly.2022.06
|
||||
V_PATH ?= v-$(V_RELEASE)/v
|
||||
V_PATH ?= v/v
|
||||
V := $(V_PATH) -showcc -gc boehm
|
||||
ENV := API_KEY=test DOWNLOAD_DIR=data/downloads REPO_DIR=data/repos PKG_DIR=data/pkgs LOG_LEVEL=DEBUG
|
||||
|
||||
|
|
@ -56,7 +55,6 @@ run-prod: prod
|
|||
watch:
|
||||
$(ENV) $(V) watch run vieter
|
||||
|
||||
|
||||
# =====OTHER=====
|
||||
.PHONY: lint
|
||||
lint:
|
||||
|
|
@ -73,11 +71,10 @@ vet:
|
|||
|
||||
# Build & patch the V compiler
|
||||
.PHONY: v
|
||||
v: v-$(V_RELEASE)/v
|
||||
v-$(V_RELEASE)/v:
|
||||
curl -Lo - 'https://github.com/vlang/v/archive/refs/tags/$(V_RELEASE).tar.gz' | tar xzf -
|
||||
cd patches && sh patch.sh '../v-$(V_RELEASE)'
|
||||
make -C 'v-$(V_RELEASE)'
|
||||
v: v/v
|
||||
v/v:
|
||||
git clone --single-branch --branch patches https://git.rustybever.be/Chewing_Bever/vieter-v v
|
||||
make -C v
|
||||
|
||||
clean:
|
||||
rm -rf 'data' 'vieter' 'dvieter' 'pvieter' 'vieter.c' 'v-$(V_RELEASE)'
|
||||
rm -rf 'data' 'vieter' 'dvieter' 'pvieter' 'vieter.c'
|
||||
|
|
|
|||
Reference in a new issue