From aecf0aab50890c45130ddc0595b83f187d089956 Mon Sep 17 00:00:00 2001
From: Joao Esperancinha <jofisaes@gmail.com>
Date: Mon, 8 May 2023 22:37:38 +0200
Subject: [PATCH] Makefile upgrade

---
 Makefile | 26 ++++++++++++++++++++------
 1 file changed, 20 insertions(+), 6 deletions(-)

diff --git a/Makefile b/Makefile
index 23a3b4cc7..d23705183 100644
--- a/Makefile
+++ b/Makefile
@@ -1,5 +1,9 @@
 SHELL := /bin/bash
 GRADLE_VERSION ?= 8.1.1
+MODULE_LOCATIONS := jeorg-kotlin-apps/jeorg-microchip-maker/jeorg-microchip-maker-gui \
+					jeorg-kotlin-arrow-optics/jeorg-kotlin-arrow-optics-gradle-1 \
+
+
 b: clean build
 clean:
 	if [[ -f jeorg-kotlin-apps/jeorg-microchip-maker/jeorg-microchip-maker-gui/kotlin-js-store/yarn.lock ]]; then rm jeorg-kotlin-apps/jeorg-microchip-maker/jeorg-microchip-maker-gui/kotlin-js-store/yarn.lock; fi
@@ -8,16 +12,26 @@ build: build-gradle build-maven
 build-maven:
 	mvn clean install
 build-gradle:
-	cd jeorg-kotlin-apps/jeorg-microchip-maker/jeorg-microchip-maker-gui && make b
-	cd jeorg-kotlin-arrow-optics/jeorg-kotlin-arrow-optics-gradle-1 && make b
+		@for location in $(MODULE_LOCATIONS); do \
+      		export CURRENT=$(shell pwd); \
+      		echo "Building $$location..."; \
+    		cd $$location; \
+    		make b; \
+    		cd $$CURRENT; \
+    	done
+upgrade:
+	@for location in $(MODULE_LOCATIONS); do \
+  		export CURRENT=$(shell pwd); \
+  		echo "Upgrading $$location..."; \
+		cd $$location; \
+		gradle wrapper --gradle-version $(GRADLE_VERSION); \
+		cd $$CURRENT; \
+	done
 build-chip-maker:
 	cd jeorg-kotlin-apps/jeorg-microchip-maker && mvn clean install
 	cd jeorg-kotlin-apps/jeorg-microchip-maker/jeorg-microchip-maker-gui && gradle build test
 ksp-dyescape-health-test:
 	cd jeorg-kotlin-arrow-optics/jeorg-ksp-plugin-test && mvn clean install
-upgrade:
-	cd jeorg-kotlin-apps/jeorg-microchip-maker/jeorg-microchip-maker-gui && gradle wrapper --gradle-version $(GRADLE_VERSION)
-	cd jeorg-kotlin-arrow-optics/jeorg-kotlin-arrow-optics-gradle-1 && gradle wrapper --gradle-version $(GRADLE_VERSION)
 upgrade-gradle:
 	sudo apt upgrade
 	sudo apt update
@@ -33,7 +47,7 @@ upgrade-gradle:
 		sdk install gradle $$gradleOnlineVersion; \
 		sdk use gradle $$gradleOnlineVersion; \
 		export GRADLE_VERSION=$$gradleOnlineVersion; \
-	fi; \
+	fi;
 	make upgrade
 install-linux:
 	sudo apt-get install jq