diff --git a/build.gradle b/build.gradle index b85b2781c6dbda9511c78e08189c402e51ccd9b0..88458d3cd6bd932cb2339a9f40b58ec80c43ae58 100644 --- a/build.gradle +++ b/build.gradle @@ -17,12 +17,21 @@ mainClassName = 'de.tudresden.inf.st.mrc.MinimalMain' repositories { jcenter() + maven { + name "gitlab-maven" + url "https://gitlab.example.com/api/v4/groups/jastadd/-/packages/maven" + } } apply plugin: 'jastadd' configurations { baseRuntimeClasspath + ragconnectClasspath +} + +run { + standardInput = System.in } File genSrc = file("src/gen/java") @@ -34,6 +43,7 @@ dependencies { implementation group: 'org.fusesource.mqtt-client', name: 'mqtt-client', version: '1.15' implementation group: 'org.apache.logging.log4j', name: 'log4j-api', version: '2.11.2' implementation group: 'org.apache.logging.log4j', name: 'log4j-core', version: '2.11.2' + ragconnectClasspath group: 'de.tudresden.inf.st', name: 'ragconnect.base', version: '0.2.3' jastadd2 "org.jastadd:jastadd:2.3.4" } @@ -45,16 +55,16 @@ def relastFiles = ["src/gen/jastadd/MinimalModel.relast", "src/gen/jastadd/RagCo // phase: ragConnect task ragConnect(type: JavaExec) { group = 'Build' - main = '-jar' + main = 'org.jastadd.ragconnect.compiler.Compiler' + classpath = configurations.ragconnectClasspath args([ - 'libs/ragconnect.jar', - '--verbose', '--o=src/gen/jastadd', 'src/main/jastadd/MinimalModel.relast', 'src/main/jastadd/MinimalModel.connect', - '--rootNode=MinimalModel' + '--rootNode=A' ]) + } // phase: RelAst @@ -102,7 +112,7 @@ jastadd { } cleanGen.doFirst { - delete "src/gen/java/org" + delete "src/gen/java/de" delete "src/gen-res/BuildInfo.properties" } @@ -125,6 +135,10 @@ jastadd { extraJastAddOptions = ["--lineColumnNumbers", '--List=JastAddList'] } +cleanGen.doFirst { + delete "src/gen/jastadd" +} + // Workflow configuration for phases generateAst.dependsOn relastToJastAdd relastToJastAdd.dependsOn ragConnect diff --git a/libs/ragconnect.jar b/libs/ragconnect.jar deleted file mode 100644 index c2a95e44dc2a392419f58a5a31731d0e7e61849f..0000000000000000000000000000000000000000 Binary files a/libs/ragconnect.jar and /dev/null differ diff --git a/src/main/jastadd/MinimalModel.relast b/src/main/jastadd/MinimalModel.relast index fb529663da370382b07bf406ffc65173d06e3564..9009e2787814bb8020d1459fc5d9758f9cc1ca06 100644 --- a/src/main/jastadd/MinimalModel.relast +++ b/src/main/jastadd/MinimalModel.relast @@ -1,3 +1,2 @@ -MinimalModel ::= A ; A ::= <Input:String> /<OutputOnA:String>/ B* ; B ::= /<OutputOnB:String>/ ; diff --git a/src/main/java/de/tudresden/inf/st/mrc/MinimalMain.java b/src/main/java/de/tudresden/inf/st/mrc/MinimalMain.java index 48a0ac3997a79b86a192d06b7fb380e41d752f9b..937fe5fc4524427d2482b37cec01e0bf9eb636cb 100644 --- a/src/main/java/de/tudresden/inf/st/mrc/MinimalMain.java +++ b/src/main/java/de/tudresden/inf/st/mrc/MinimalMain.java @@ -2,9 +2,9 @@ package de.tudresden.inf.st.mrc; import de.tudresden.inf.st.mrc.ast.A; import de.tudresden.inf.st.mrc.ast.B; -import de.tudresden.inf.st.mrc.ast.MinimalModel; import java.io.IOException; +import java.util.Scanner; /** * Minimal main. @@ -13,7 +13,6 @@ import java.io.IOException; */ public class MinimalMain { public static void main(String[] args) throws IOException { - MinimalModel model = new MinimalModel(); A a = new A(); // set some default value for input a.setInput(""); @@ -21,7 +20,6 @@ public class MinimalMain { B b2 = new B(); a.addB(b1); a.addB(b2); - model.setA(a); // a.OutputOnA -> a.Input a.addDependencyA(a); @@ -35,6 +33,9 @@ public class MinimalMain { b1.connectOutputOnB("mqtt://localhost/b1/out", true); b2.connectOutputOnB("mqtt://localhost/b2/out", false); - while (true) {} +// while (true) {} + System.out.println("[Enter] to exit"); + Scanner scanner = new Scanner(System.in); + scanner.nextLine(); } }