From 20112b869395e670f068e01ad73c005da8a78a05 Mon Sep 17 00:00:00 2001
From: Jef Roosens <roosensjef@gmail.com>
Date: Fri, 15 Apr 2022 10:59:05 +0200
Subject: [PATCH] Switched to official compiler instead of fork

---
 CHANGELOG.md |  2 ++
 Makefile     |  6 +++---
 PKGBUILD     |  4 ++--
 README.md    | 23 +++++++++++++----------
 4 files changed, 20 insertions(+), 15 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 8738952..b4a7609 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -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)
 
+* Moved away from compiler fork
+
 ## [0.2.0](https://git.rustybever.be/Chewing_Bever/vieter/src/tag/0.2.0)
 
 ### Changed
diff --git a/Makefile b/Makefile
index 9421fb6..faae1a6 100644
--- a/Makefile
+++ b/Makefile
@@ -2,7 +2,7 @@
 SRC_DIR := src
 SOURCES != find '$(SRC_DIR)' -iname '*.v'
 
-V_PATH ?= v/v
+V_PATH ?= v
 V := $(V_PATH) -showcc -gc boehm
 
 all: vieter
@@ -68,8 +68,8 @@ test:
 .PHONY: 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
 
 clean:
-	rm -rf 'data' 'vieter' 'dvieter' 'pvieter' 'vieter.c' 'dvieterctl' 'vieterctl' 'pkg' 'src/vieter'
+	rm -rf 'data' 'vieter' 'dvieter' 'pvieter' 'vieter.c' 'dvieterctl' 'vieterctl' 'pkg' 'src/vieter' *.pkg.tar.zst
diff --git a/PKGBUILD b/PKGBUILD
index 5011ab1..0c558b4 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,7 +2,7 @@
 
 pkgbase='vieter'
 pkgname='vieter'
-pkgver=0.1.0.rc1.r117.gc3ac00f
+pkgver=0.2.0.r24.g9a56bd0
 pkgrel=1
 depends=('glibc' 'openssl' 'libarchive' 'gc')
 makedepends=('git' 'gcc')
@@ -23,7 +23,7 @@ build() {
     # Build the compiler
     CFLAGS= make v
 
-    make prod
+    V_PATH=v/v make prod
 }
 
 package() {
diff --git a/README.md b/README.md
index cd78f74..96b104d 100644
--- a/README.md
+++ b/README.md
@@ -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
 that.
 
-### Custom Compiler
+### Compiler
 
-Currently, this program only works with a very slightly modified version of the
-V standard library, and therefore the compiler. The source code for this fork
-can be found [here](https://git.rustybever.be/Chewing_Bever/vieter-v). You can
-obtain this modified version of the compiler by running `make v`, which will
-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.
+Vieter compiles with the standard Vlang compiler. However, I do maintain a
+[mirror](https://git.rustybever.be/Chewing_Bever/v). This is to ensure my CI
+does not break without reason, as I control when & how frequently the mirror is
+updated to reflect the official repository.
 
 ## Features
 
@@ -44,9 +41,15 @@ upstream as possible.
 
 In order to build Vieter, you'll need a couple of libraries:
 
+* An installation of V
 * gc
 * libarchive
 * openssl
 
-Before building Vieter, you'll have to build the compiler using `make v`.
-Afterwards, run `make` to build the debug binary.
+**NOTE**: if you encounter any issues compiling Vieter using the absolute
+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!