Merge branch 'dev' into cron

cron
Jef Roosens 2022-04-15 11:13:04 +02:00
commit 92ca5b8024
Signed by untrusted user: Jef Roosens
GPG Key ID: B75D4F293C7052DB
5 changed files with 22 additions and 15 deletions

View File

@ -3,6 +3,8 @@ matrix:
- linux/amd64 - linux/amd64
- linux/arm64 - linux/arm64
branches:
exclude: [main, dev]
platform: ${PLATFORM} platform: ${PLATFORM}
pipeline: pipeline:

View File

@ -7,6 +7,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
## [Unreleased](https://git.rustybever.be/Chewing_Bever/vieter) ## [Unreleased](https://git.rustybever.be/Chewing_Bever/vieter)
* Moved away from compiler fork
## [0.2.0](https://git.rustybever.be/Chewing_Bever/vieter/src/tag/0.2.0) ## [0.2.0](https://git.rustybever.be/Chewing_Bever/vieter/src/tag/0.2.0)
### Changed ### Changed

View File

@ -2,7 +2,7 @@
SRC_DIR := src SRC_DIR := src
SOURCES != find '$(SRC_DIR)' -iname '*.v' SOURCES != find '$(SRC_DIR)' -iname '*.v'
V_PATH ?= v/v V_PATH ?= v
V := $(V_PATH) -showcc -gc boehm V := $(V_PATH) -showcc -gc boehm
all: vieter all: vieter
@ -71,11 +71,11 @@ test:
.PHONY: v .PHONY: v
v: v/v v: v/v
v/v: v/v:
git clone --single-branch --branch patches https://git.rustybever.be/Chewing_Bever/vieter-v v git clone --single-branch https://git.rustybever.be/Chewing_Bever/v v
make -C v make -C v
clean: clean:
rm -rf 'data' 'vieter' 'dvieter' 'pvieter' 'vieter.c' 'pkg' 'src/vieter' 'afvieter' 'suvieter' rm -rf 'data' 'vieter' 'dvieter' 'pvieter' 'vieter.c' 'dvieterctl' 'vieterctl' 'pkg' 'src/vieter' *.pkg.tar.zst
# =====EXPERIMENTAL===== # =====EXPERIMENTAL=====

View File

@ -2,7 +2,7 @@
pkgbase='vieter' pkgbase='vieter'
pkgname='vieter' pkgname='vieter'
pkgver=0.1.0.rc1.r117.gc3ac00f pkgver=0.2.0.r24.g9a56bd0
pkgrel=1 pkgrel=1
depends=('glibc' 'openssl' 'libarchive' 'gc') depends=('glibc' 'openssl' 'libarchive' 'gc')
makedepends=('git' 'gcc') makedepends=('git' 'gcc')
@ -23,7 +23,7 @@ build() {
# Build the compiler # Build the compiler
CFLAGS= make v CFLAGS= make v
make prod V_PATH=v/v make prod
} }
package() { package() {

View File

@ -20,15 +20,12 @@ a while now. I wanted a fast language that I could code while relaxing, without
having to exert too much mental effort & V seemed like the right choice for having to exert too much mental effort & V seemed like the right choice for
that. that.
### Custom Compiler ### Compiler
Currently, this program only works with a very slightly modified version of the Vieter compiles with the standard Vlang compiler. However, I do maintain a
V standard library, and therefore the compiler. The source code for this fork [mirror](https://git.rustybever.be/Chewing_Bever/v). This is to ensure my CI
can be found [here](https://git.rustybever.be/Chewing_Bever/vieter-v). You can does not break without reason, as I control when & how frequently the mirror is
obtain this modified version of the compiler by running `make v`, which will updated to reflect the official repository.
clone & build the compiler. Afterwards, all make commands that require the V
compiler will use this new binary. I try to keep this fork as up to date with
upstream as possible.
## Features ## Features
@ -44,9 +41,15 @@ upstream as possible.
In order to build Vieter, you'll need a couple of libraries: In order to build Vieter, you'll need a couple of libraries:
* An installation of V
* gc * gc
* libarchive * libarchive
* openssl * openssl
Before building Vieter, you'll have to build the compiler using `make v`. **NOTE**: if you encounter any issues compiling Vieter using the absolute
Afterwards, run `make` to build the debug binary. latest version of V, it might be because my mirror is missing a specific commit
that causes issues. For this reason, the `make v` command exists which will
clone my compiler in the `v` directory & build it. Afterwards, you can use this
compiler with make by prepending all make commands with `V_PATH=v/v`. If you do
encounter this issue, please let me know so I can update my mirror & the
codebase to fix it!