From 06bea692cdf15f48588d665aa71949356963ecda Mon Sep 17 00:00:00 2001
From: Jean Privat <jean@pryen.org>
Date: Sun, 23 Jun 2024 22:11:01 -0400
Subject: [PATCH] wip

---
 .github/workflows/makefile.yml |  5 ++++-
 Makefile                       | 38 ++++++++++++++++++----------------
 src/full_bootstrap             |  2 ++
 3 files changed, 26 insertions(+), 19 deletions(-)

diff --git a/.github/workflows/makefile.yml b/.github/workflows/makefile.yml
index 9154d173a6..c5220ab7b2 100644
--- a/.github/workflows/makefile.yml
+++ b/.github/workflows/makefile.yml
@@ -11,7 +11,7 @@ jobs:
     - uses: actions/checkout@v4
     - name: Install dependencies
       run: sudo apt-get update && sudo apt-get install -y build-essential ccache libgc-dev graphviz libunwind-dev libreadline-dev pkg-config
-    - run: make
+    - run: make -C src ../bin/nitc # make bin/nitc
     - uses: actions/upload-artifact@v4
       with:
         path: bin
@@ -20,6 +20,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
     - uses: actions/checkout@v4
+    - run: git fetch origin # Ensure origin/master is present
     - run: make sanity-check
 
   tests-some:
@@ -42,6 +43,8 @@ jobs:
     - uses: actions/checkout@v4
     - name: Install dependencies
       run: sudo apt-get update && sudo apt-get install -y build-essential ccache libgc-dev graphviz libunwind-dev libreadline-dev pkg-config
+    - run 
+    - run: git fetch origin # Ensure origin/master is present
     - run: make nitunit-some
 
   bootstrap-full:
diff --git a/Makefile b/Makefile
index bb4c4de232..4020dd18ab 100644
--- a/Makefile
+++ b/Makefile
@@ -51,6 +51,12 @@ bin/nitdoc:
 bin/nitls:
 	cd src; make ../bin/nitls
 
+bin/nitunit:
+	cd src; make ../bin/nitunit
+
+bin/nitpick:
+	cd src; make ../bin/nitpick
+
 doc/stdlib/index.html: bin/nitdoc bin/nitls
 	@echo '***************************************************************'
 	@echo '* Generate doc for NIT standard library                       *'
@@ -96,30 +102,27 @@ sanity-check:
 	misc/jenkins/checksignedoffby.sh
 	misc/jenkins/checklicense.sh
 
-nitunit-some:
+nitunit-some: bin/nitls bin/nitunit
 	git diff --name-only origin/master..HEAD -- "*.nit" "*.res" "README.*" | grep -v "^tests/\|contrib/" > list0.txt || true
-	xargs nitls -pP < list0.txt > list.txt
+	xargs bin/nitls -pP < list0.txt > list.txt
 	test -s list.txt || exit 0
-	xargs nitunit < list.txt
-	junit2html nitunit.xml
+	xargs bin/nitunit < list.txt
 
-nitpick-full:
-	nitls lib src examples contrib
-	nitls -Pp lib src examples | grep -v -f tests/gitlab_ci.skip > list.txt || true # filter what is skipped by tests.sh
-	xargs nitpick < list.txt
+nitpick-full: bin/nitls bin/nitpick
+	bin/nitls lib src examples contrib
+	bin/nitls -Pp lib src examples | grep -v -f tests/gitlab_ci.skip > list.txt || true # filter what is skipped by tests.sh
+	xargs bin/nitpick < list.txt
 
 
 # LIB, CONTRIB AND OOT ##############################################
 
-nitunit-lib:
-	nitls -Pp lib | grep -v -f tests/gitlab_ci.skip > list.txt || true # filter what is skipped by tests.sh
-	xargs nitunit -v < list.txt
-	junit2html nitunit.xml
+nitunit-lib: bin/nitls bin/nitunit
+	bin/nitls -Pp lib | grep -v -f tests/gitlab_ci.skip > list.txt || true # filter what is skipped by tests.sh
+	xargs bin/nitunit -v < list.txt
 
 nitunit-src:
-	nitls -Pp src examples | grep -v -f tests/gitlab_ci.skip > list.txt || true # filter what is skipped by tests.sh
-	xargs nitunit -v < list.txt
-	junit2html nitunit.xml
+	bin/nitls -Pp src examples | grep -v -f tests/gitlab_ci.skip > list.txt || true # filter what is skipped by tests.sh
+	xargs bin/nitunit -v < list.txt
 
 test-contrib:
 	misc/jenkins/check_contrib.sh all check
@@ -134,9 +137,8 @@ bootstrap-full:
 bench-fast:
 	cd benchmarks && ./bench_engines.sh --fast --fast --html options
 
-nitunit-manual:
-	nitunit doc/manual/*.nit
-	junit2html nitunit.xml
+nitunit-manual: bin/nitunit
+	bin/nitunit doc/manual/*.nit
 
 # MORE TOOLS ########################################################
 
diff --git a/src/full_bootstrap b/src/full_bootstrap
index 7fc8d2e8ff..58a9b5c144 100755
--- a/src/full_bootstrap
+++ b/src/full_bootstrap
@@ -1,6 +1,8 @@
 set -e
 set -x
 
+./git-gen-version.sh
+
 # Check c_src is up-to-date
 make -C ../c_src