From a9bc320d75aa10f9fd5a58578d8c01e595ac65d0 Mon Sep 17 00:00:00 2001 From: simonliuwaterloo Date: Thu, 23 Mar 2023 00:42:05 -0400 Subject: [PATCH 1/3] Add dependencies --- org.alloytools.alloy.dashbuild/bnd.bnd | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/org.alloytools.alloy.dashbuild/bnd.bnd b/org.alloytools.alloy.dashbuild/bnd.bnd index aa86faab9..c8366e4e1 100644 --- a/org.alloytools.alloy.dashbuild/bnd.bnd +++ b/org.alloytools.alloy.dashbuild/bnd.bnd @@ -1,4 +1,4 @@ -Main-Class: ca.uwaterloo.watform.dash4whole.Dash +Main-Class: ca.uwaterloo.watform.dash4whole.RapidDash -buildpath: \ org.alloytools.alloy.application,\ @@ -23,4 +23,7 @@ Main-Class: ca.uwaterloo.watform.dash4whole.Dash @${repo;org.sat4j.core}, \ @${repo;org.sat4j.maxsat}, \ @${repo;org.sat4j.pb}, \ + @/Users/jianyanli/Projects/org.alloytools.alloy/cnf/jars/velocity-engine-core-2.3.jar, \ + @/Users/jianyanli/Projects/org.alloytools.alloy/cnf/jars/gson-2.8.2.jar, \ + @/Users/jianyanli/Projects/org.alloytools.alloy/cnf/jars/commons-lang3-3.12.0.jar, \ LICENSES From 36e14183439bd7e88f0a509ced343403cb777a39 Mon Sep 17 00:00:00 2001 From: simonliuwaterloo Date: Thu, 23 Mar 2023 12:04:28 -0400 Subject: [PATCH 2/3] Include template file in jar --- org.alloytools.alloy.application/bnd.bnd | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/org.alloytools.alloy.application/bnd.bnd b/org.alloytools.alloy.application/bnd.bnd index cad7146ef..8f76ddbd9 100644 --- a/org.alloytools.alloy.application/bnd.bnd +++ b/org.alloytools.alloy.application/bnd.bnd @@ -1,5 +1,6 @@ -includeresource: \ - src/main/resources + src/main/resources, \ + src/main/java, \ -buildpath: \ lib/apple-osx-ui.jar;version=file,\ From 274fb7574a594e57d676e655d5726e0ee8fabd10 Mon Sep 17 00:00:00 2001 From: simonliuwaterloo Date: Sun, 26 Mar 2023 19:41:44 -0400 Subject: [PATCH 3/3] Add more packages --- .../main/java/ca/uwaterloo/watform/dash4whole/RapidDash.java | 2 +- .../src/main/java/ca/uwaterloo/watform/parser/DashLexer.java | 2 +- .../src/main/java/ca/uwaterloo/watform/parser/DashParser.java | 4 ++-- .../src/main/java/ca/uwaterloo/watform/parser/DashSym.java | 2 +- org.alloytools.alloy.dashbuild/bnd.bnd | 2 ++ 5 files changed, 7 insertions(+), 5 deletions(-) diff --git a/org.alloytools.alloy.application/src/main/java/ca/uwaterloo/watform/dash4whole/RapidDash.java b/org.alloytools.alloy.application/src/main/java/ca/uwaterloo/watform/dash4whole/RapidDash.java index b3d2fafba..9dc3eff58 100644 --- a/org.alloytools.alloy.application/src/main/java/ca/uwaterloo/watform/dash4whole/RapidDash.java +++ b/org.alloytools.alloy.application/src/main/java/ca/uwaterloo/watform/dash4whole/RapidDash.java @@ -59,7 +59,7 @@ public static void main(String args[]) throws Exception { A4Reporter rep = new A4Reporter(); boolean parse = true; - boolean toFile = false; + boolean toFile = true; if (parse) { diff --git a/org.alloytools.alloy.dash/src/main/java/ca/uwaterloo/watform/parser/DashLexer.java b/org.alloytools.alloy.dash/src/main/java/ca/uwaterloo/watform/parser/DashLexer.java index ed6bef784..e584497a1 100644 --- a/org.alloytools.alloy.dash/src/main/java/ca/uwaterloo/watform/parser/DashLexer.java +++ b/org.alloytools.alloy.dash/src/main/java/ca/uwaterloo/watform/parser/DashLexer.java @@ -1,4 +1,4 @@ -/* The following code was generated by JFlex 1.4.1 on 06/02/23 11:36 AM */ +/* The following code was generated by JFlex 1.4.1 on 26/03/23 7:23 PM */ // Alloy Analyzer 4 -- Copyright (c) 2006-2008, Felix Chang // diff --git a/org.alloytools.alloy.dash/src/main/java/ca/uwaterloo/watform/parser/DashParser.java b/org.alloytools.alloy.dash/src/main/java/ca/uwaterloo/watform/parser/DashParser.java index d0074ae11..22a3e4ddd 100644 --- a/org.alloytools.alloy.dash/src/main/java/ca/uwaterloo/watform/parser/DashParser.java +++ b/org.alloytools.alloy.dash/src/main/java/ca/uwaterloo/watform/parser/DashParser.java @@ -1,7 +1,7 @@ //---------------------------------------------------- // The following code was generated by CUP v0.11a czt01 beta -// Mon Feb 06 11:36:26 EST 2023 +// Sun Mar 26 19:23:30 EDT 2023 //---------------------------------------------------- package ca.uwaterloo.watform.parser; @@ -67,7 +67,7 @@ import ca.uwaterloo.watform.parser.DashValidation; /** CUP v0.11a czt01 beta generated parser. - * @version Mon Feb 06 11:36:26 EST 2023 + * @version Sun Mar 26 19:23:30 EDT 2023 */ public class DashParser extends java_cup.runtime.lr_parser { diff --git a/org.alloytools.alloy.dash/src/main/java/ca/uwaterloo/watform/parser/DashSym.java b/org.alloytools.alloy.dash/src/main/java/ca/uwaterloo/watform/parser/DashSym.java index 9114be9e6..05b85c2a9 100644 --- a/org.alloytools.alloy.dash/src/main/java/ca/uwaterloo/watform/parser/DashSym.java +++ b/org.alloytools.alloy.dash/src/main/java/ca/uwaterloo/watform/parser/DashSym.java @@ -1,7 +1,7 @@ //---------------------------------------------------- // The following code was generated by CUP v0.11a czt01 beta -// Mon Feb 06 11:36:26 EST 2023 +// Sun Mar 26 19:23:30 EDT 2023 //---------------------------------------------------- package ca.uwaterloo.watform.parser; diff --git a/org.alloytools.alloy.dashbuild/bnd.bnd b/org.alloytools.alloy.dashbuild/bnd.bnd index c8366e4e1..1cd9d22ee 100644 --- a/org.alloytools.alloy.dashbuild/bnd.bnd +++ b/org.alloytools.alloy.dashbuild/bnd.bnd @@ -26,4 +26,6 @@ Main-Class: ca.uwaterloo.watform.dash4whole.RapidDash @/Users/jianyanli/Projects/org.alloytools.alloy/cnf/jars/velocity-engine-core-2.3.jar, \ @/Users/jianyanli/Projects/org.alloytools.alloy/cnf/jars/gson-2.8.2.jar, \ @/Users/jianyanli/Projects/org.alloytools.alloy/cnf/jars/commons-lang3-3.12.0.jar, \ + @/Users/jianyanli/Projects/org.alloytools.alloy/cnf/jars/slf4j-api-1.7.32.jar, \ + @/Users/jianyanli/Projects/org.alloytools.alloy/cnf/jars/slf4j-simple-1.7.32.jar, \ LICENSES