Commit b2d6b0e4 authored by Alexander Weigl's avatar Alexander Weigl

dist as libs

parent 9260f35a
Pipeline #17229 passed with stages
in 10 minutes and 24 seconds
...@@ -31,12 +31,12 @@ import lombok.Setter; ...@@ -31,12 +31,12 @@ import lombok.Setter;
import org.antlr.v4.runtime.ParserRuleContext; import org.antlr.v4.runtime.ParserRuleContext;
import javax.annotation.Nullable; import javax.annotation.Nullable;
import java.util.Objects;
/** /**
* @author Alexander Weigl * @author Alexander Weigl
* @version 1 (27.04.17) * @version 1 (27.04.17)
*/ */
@EqualsAndHashCode
public abstract class ASTNode<T extends ParserRuleContext> public abstract class ASTNode<T extends ParserRuleContext>
implements Visitable, Copyable<ASTNode<T>> { implements Visitable, Copyable<ASTNode<T>> {
/** /**
...@@ -139,4 +139,17 @@ public abstract class ASTNode<T extends ParserRuleContext> ...@@ -139,4 +139,17 @@ public abstract class ASTNode<T extends ParserRuleContext>
} while (n != null); } while (n != null);
return depth; return depth;
} }
@Override
public boolean equals(Object o) {
if (this == o) return true;
if (o == null || getClass() != o.getClass()) return false;
ASTNode<?> astNode = (ASTNode<?>) o;
return Objects.equals(getRuleContext(), astNode.getRuleContext());
}
@Override
public int hashCode() {
return Objects.hash(getRuleContext());
}
} }
...@@ -25,16 +25,16 @@ package edu.kit.iti.formal.psdbg.parser.ast; ...@@ -25,16 +25,16 @@ package edu.kit.iti.formal.psdbg.parser.ast;
import edu.kit.iti.formal.psdbg.parser.ScriptLanguageParser; import edu.kit.iti.formal.psdbg.parser.ScriptLanguageParser;
import edu.kit.iti.formal.psdbg.parser.Visitor; import edu.kit.iti.formal.psdbg.parser.Visitor;
import lombok.Data; import lombok.*;
import lombok.Getter;
import lombok.NonNull; import java.util.Objects;
import lombok.Setter;
/** /**
* @author Alexander Weigl * @author Alexander Weigl
* @version 1 (27.04.17) * @version 1 (27.04.17)
*/ */
@Data @Data
@EqualsAndHashCode(callSuper = false)
public class ProofScript extends ASTNode<ScriptLanguageParser.ScriptContext> { public class ProofScript extends ASTNode<ScriptLanguageParser.ScriptContext> {
@NonNull @NonNull
@Getter @Getter
...@@ -73,4 +73,19 @@ public class ProofScript extends ASTNode<ScriptLanguageParser.ScriptContext> { ...@@ -73,4 +73,19 @@ public class ProofScript extends ASTNode<ScriptLanguageParser.ScriptContext> {
return getBody() != null ? getBody().eq(that.getBody()) : that.getBody() == null; return getBody() != null ? getBody().eq(that.getBody()) : that.getBody() == null;
} }
@Override
public boolean equals(Object o) {
if (this == o) return true;
if (o == null || getClass() != o.getClass()) return false;
if (!super.equals(o)) return false;
ProofScript that = (ProofScript) o;
return Objects.equals(getName(), that.getName()) &&
Objects.equals(getSignature(), that.getSignature()) &&
Objects.equals(getBody(), that.getBody());
}
@Override
public int hashCode() {
return Objects.hash(super.hashCode(), getName(), getSignature(), getBody());
}
} }
...@@ -72,6 +72,52 @@ ...@@ -72,6 +72,52 @@
<build> <build>
<plugins> <plugins>
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>appassembler-maven-plugin</artifactId>
<version>1.10</version>
<configuration>
<repositoryLayout>flat</repositoryLayout>
<repositoryName>libs</repositoryName>
<binFolder>./</binFolder>
<!-- Set the target configuration directory to be used in the bin scripts -->
<configurationDirectory>conf</configurationDirectory>
<!-- Copy the contents from "/src/main/config" to the target
configuration directory in the assembled application -->
<copyConfigurationDirectory>true</copyConfigurationDirectory>
<!-- Include the target configuration directory in the beginning of
the classpath declaration in the bin scripts -->
<includeConfigurationDirectoryInClasspath>true</includeConfigurationDirectoryInClasspath>
<!-- set alternative assemble directory -->
<assembleDirectory>${project.build.directory}/dist</assembleDirectory>
<!-- Extra JVM arguments that will be included in the bin scripts -->
<extraJvmArguments>-Xms128m</extraJvmArguments>
<!-- Generate bin scripts for windows and unix pr default -->
<platforms>
<platform>windows</platform>
<platform>unix</platform>
</platforms>
<programs>
<program>
<mainClass>edu.kit.iti.formal.psdbg.gui.ProofScriptDebugger</mainClass>
<id>psdbg</id>
<!-- Only generate unix shell script for this application -->
<platforms>
<platform>unix</platform>
<platform>windows</platform>
</platforms>
</program>
</programs>
</configuration>
<executions>
<execution>
<phase>package</phase>
</execution>
</executions>
</plugin>
<plugin> <plugin>
<groupId>org.lesscss</groupId> <groupId>org.lesscss</groupId>
<artifactId>lesscss-maven-plugin</artifactId> <artifactId>lesscss-maven-plugin</artifactId>
...@@ -92,12 +138,12 @@ ...@@ -92,12 +138,12 @@
</plugin> </plugin>
<!--
<plugin> <plugin>
<groupId>org.apache.maven.plugins</groupId> <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-shade-plugin</artifactId> <artifactId>maven-shade-plugin</artifactId>
<version>2.4.3</version> <version>2.4.3</version>
<configuration> <configuration>
<!-- put your configurations here -->
</configuration> </configuration>
<executions> <executions>
<execution> <execution>
...@@ -120,6 +166,7 @@ ...@@ -120,6 +166,7 @@
</execution> </execution>
</executions> </executions>
</plugin> </plugin>
-->
<plugin> <plugin>
<groupId>org.antlr</groupId> <groupId>org.antlr</groupId>
<artifactId>antlr4-maven-plugin</artifactId> <artifactId>antlr4-maven-plugin</artifactId>
...@@ -149,10 +196,10 @@ ...@@ -149,10 +196,10 @@
<name>bintray</name> <name>bintray</name>
<url>http://dl.bintray.com/jerady/maven</url> <url>http://dl.bintray.com/jerady/maven</url>
</repository> </repository>
<repository> <repository>
<id>sonatype</id> <id>sonatype</id>
<url>https://oss.sonatype.org/content/repositories/snapshots/</url> <url>https://oss.sonatype.org/content/repositories/snapshots/</url>
</repository> </repository>
</repositories> </repositories>
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment