From b6cc925e020bdeb7a89d269dc1a5e0f09e7db293 Mon Sep 17 00:00:00 2001
From: Lucas <89882946+notbad3500@users.noreply.github.com>
Date: Wed, 12 Jun 2024 18:01:21 +0200
Subject: [PATCH] Fixed Makefile

---
 pom.xml           |  5 +++--
 src/test/Makefile | 13 +++++--------
 2 files changed, 8 insertions(+), 10 deletions(-)

diff --git a/pom.xml b/pom.xml
index a11bfc7..e6506ea 100644
--- a/pom.xml
+++ b/pom.xml
@@ -9,8 +9,9 @@
     <version>1.0-SNAPSHOT</version>
 
     <properties>
-        <maven.compiler.source>22</maven.compiler.source>
-        <maven.compiler.target>22</maven.compiler.target>
+        <java.version>22</java.version>
+        <maven.compiler.source>${java.version}</maven.compiler.source>
+        <maven.compiler.target>${java.version}</maven.compiler.target>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
     </properties>
 
diff --git a/src/test/Makefile b/src/test/Makefile
index 68b9dd2..e14b5d4 100644
--- a/src/test/Makefile
+++ b/src/test/Makefile
@@ -2,20 +2,17 @@
 ### IntelliJs play buttons do not work. Run in "src/test" folder with "make" command to run all
 ### Or run only parts with "make compile-javac", "make delete" etc.
 
-all: delete compile-javac compile-raupenpiler
+all: compile-javac compile-raupenpiler
 
 compile-javac:
 	javac -d .\resources\output\javac .\resources\input\CompilerInput.java
 
 compile-raupenpiler:
-## funktioniert bisher nicht, das will die Klasse nicht laden, der traditionelle Weg findet externe Libraries (antlr) nicht, maven hat andere Probleme
-## Unseren Compiler also erstmal händisch starten: main.java/Main.java
-	#javac -d ./resources/output/raupenpiler -cp ../main/java;../../.lib/antlr-4.12.0-complete.jar ../main/java/Main.java
-	#java -cp ./resources/output/raupenpiler Main
-	#mvn -f ../../ compile
-	#mvn -f ../../ exec:java -Dexec.mainClass="Main"
+	cd ../.. ; mvn -DskipTests package
+	cd ../.. ; mvn exec:java -Dexec.mainClass="Main" # -Dexec.args="arg0 arg1 arg2"
 
-delete:
+
+clean:
 	rm -f ./resources/output/javac/*.class
 	rm -f ./resources/output/raupenpiler/*.class
 	rm -f ./java/*.class