From 4a7e46f2ad0e358d500c1eda85becec9a289452e Mon Sep 17 00:00:00 2001
From: Jan Dittberner <jandd@cacert.org>
Date: Tue, 8 Aug 2023 12:31:25 +0200
Subject: [PATCH] Add Go installation to Makefile

---
 .gitignore |  1 +
 Makefile   | 31 +++++++++++++++++++++----------
 2 files changed, 22 insertions(+), 10 deletions(-)

diff --git a/.gitignore b/.gitignore
index ae91c4c..ad720a5 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,3 @@
 /.idea/
 /.vagrant/
+/tmp/
diff --git a/Makefile b/Makefile
index 2dde510..ffd7c41 100644
--- a/Makefile
+++ b/Makefile
@@ -1,23 +1,34 @@
 SUBDIRS = cacert_resources oidc_app oidc_idp oidc_registration
+GO_VERSION = 1.20.7
 
-all: cacert_resources oidc_app/demo-app oidc_idp/cacert-idp oidc_registration/cacert-oidc-registration
+export PATH:=$(CURDIR)/tmp/go/bin:$(PATH)
 
-cacert_resources: force_look
-	echo building JS and CSS resources
+all: cacert_resources oidc_app/demo-app oidc_idp/cacert-idp
+
+$(CURDIR)/tmp/go$(GO_VERSION).linux-amd64.tar.gz:
+	mkdir -p tmp ; cd tmp ; \
+		curl -L -O https://go.dev/dl/go$(GO_VERSION).linux-amd64.tar.gz ; \
+
+install_go: $(CURDIR)/tmp/go$(GO_VERSION).linux-amd64.tar.gz
+	tar x -C $(CURDIR)/tmp -f $(CURDIR)/tmp/go$(GO_VERSION).linux-amd64.tar.gz
+	go version
+	go env
+
+install_yarn:
+	sudo apt install yarnpkg
+
+cacert_resources: install_yarn force_look
+	echo building UI resources : $(MAKE) $(MFLAGS)
 	cd cacert_resources ; $(MAKE) $(MFLAGS)
 
-oidc_app/demo-app: force_look
+oidc_app/demo-app: cacert_resources install_go force_look
 	echo building demo app : $(MAKE) $(MFLAGS)
 	cd oidc_app ; $(MAKE) $(MFLAGS)
 
-oidc_idp/cacert-idp: force_look
+oidc_idp/cacert-idp: cacert_resources install_go force_look
 	echo building CAcert IDP : $(MAKE) $(MFLAGS)
 	cd oidc_idp ; $(MAKE) $(MFLAGS)
 
-oidc_registration/cacert-oidc-registration: force_look
-	echo building CAcert client registration: $(MAKE) $(MFLAGS)
-	cd oidc_registration ; $(MAKE) $(MFLAGS)
-
 clean:
 	echo cleaning up in .
 	-for d in $(SUBDIRS) ; do ( cd $$d; $(MAKE) clean ); done
@@ -25,4 +36,4 @@ clean:
 force_look:
 	true
 
-.PHONY: all clean
+.PHONY: all clean install_go install_yarn