Commit 2a174c48 authored by Carlos Galindo's avatar Carlos Galindo
Browse files

Preparation for release' 

* Now generating fat jars via maven
* Packaging of scripts via Makefile
* Fix detection of scripts file
* Updated README
* Disabled printing in Flusher
* Removed iml project files
* Added optional printing of the graph (to dot or pdf)
parent 20bcffb3

.gitignore

+1 −0
Original line number Diff line number Diff line
@@ -2,3 +2,4 @@ dist/ 
build/

bin/

*.beam

target/

EDG/EDG.iml

deleted100644 → 0
+0 −24
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="UTF-8"?>

<module org.jetbrains.idea.maven.project.MavenProjectsManager.isMavenModule="true" type="JAVA_MODULE" version="4">

  <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_11">

    <output url="file://$MODULE_DIR$/target/classes" />

    <output-test url="file://$MODULE_DIR$/target/test-classes" />

    <content url="file://$MODULE_DIR$">

      <sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" />

      <sourceFolder url="file://$MODULE_DIR$/src/main/resources" type="java-resource" />

      <sourceFolder url="file://$MODULE_DIR$/src/test/java" isTestSource="true" />

      <excludeFolder url="file://$MODULE_DIR$/target" />

    </content>

    <orderEntry type="inheritedJdk" />

    <orderEntry type="sourceFolder" forTests="false" />

    <orderEntry type="library" name="org.jgrapht:jgrapht-core:1.3.1" level="project" />

    <orderEntry type="library" name="org.jgrapht:jgrapht-io:1.3.1" level="project" />

    <orderEntry type="module" module-name="Miscellanea" />

    <orderEntry type="library" name="Maven: org.jgrapht:jgrapht-core:1.3.1" level="project" />

    <orderEntry type="library" name="Maven: org.jheaps:jheaps:0.10" level="project" />

    <orderEntry type="library" name="Maven: org.jgrapht:jgrapht-io:1.3.1" level="project" />

    <orderEntry type="library" name="Maven: org.antlr:antlr4-runtime:4.7.2" level="project" />

    <orderEntry type="library" name="Maven: org.apache.commons:commons-text:1.6" level="project" />

    <orderEntry type="library" name="Maven: org.apache.commons:commons-lang3:3.8.1" level="project" />

  </component>

</module>
 
 No newline at end of file

EDG/pom.xml

+7 −8
Original line number Diff line number Diff line
@@ -4,20 +4,19 @@ 
         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">

    <modelVersion>4.0.0</modelVersion>



    <groupId>es.upv.dsic.slicing</groupId>

    <artifactId>EDG</artifactId>

    <version>1.0-SNAPSHOT</version>



    <properties>

        <maven.compiler.source>11</maven.compiler.source>

        <maven.compiler.target>11</maven.compiler.target>

    </properties>

    <parent>

        <artifactId>e-knife-parent</artifactId>

        <groupId>es.upv.mist.slicing</groupId>

        <version>1.1.0</version>

    </parent>



    <dependencies>

        <dependency>

            <groupId>es.upv.dsic.slicing</groupId>

            <groupId>es.upv.mist.slicing</groupId>

            <artifactId>Miscellanea</artifactId>

            <version>1.0-SNAPSHOT</version>

            <version>1.1.0</version>

        </dependency>

        <dependency>

            <groupId>org.jgrapht</groupId>

Makefile

0 → 100644
+24 −0
Original line number Diff line number Diff line 
VERSION:=1.1.0



.PHONY: all

all: beams



.PHONY: release

release: beams

	mvn clean package

	mkdir -p e-knife-$(VERSION)/ebin

	cp e-Knife/target/e-Knife-$(VERSION)-jar-with-dependencies.jar e-knife-$(VERSION)/e-knife.jar

	cd e-knife-$(VERSION)/ebin/ && jar -xf ../e-knife.jar ast.beam ast.erl saver.beam saver.erl

	zip -rq e-knife-$(VERSION){.zip,/}

	rm -rf e-knife-$(VERSION)/



.PHONY: clean

clean:

	mvn clean

	rm -f e-Knife/src/main/resources/*.beam



.PHONY: beams

beams: e-Knife/src/main/resources/ast.beam e-Knife/src/main/resources/saver.beam



e-Knife/src/main/resources/%.beam: e-Knife/src/main/resources/%.erl

	erlc -o e-Knife/src/main/resources/ $<
 
 No newline at end of file

Miscellanea/Miscellanea.iml

deleted100644 → 0
+0 −15
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="UTF-8"?>

<module org.jetbrains.idea.maven.project.MavenProjectsManager.isMavenModule="true" type="JAVA_MODULE" version="4">

  <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_11">

    <output url="file://$MODULE_DIR$/target/classes" />

    <output-test url="file://$MODULE_DIR$/target/test-classes" />

    <content url="file://$MODULE_DIR$">

      <sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" />

      <sourceFolder url="file://$MODULE_DIR$/src/main/resources" type="java-resource" />

      <sourceFolder url="file://$MODULE_DIR$/src/test/java" isTestSource="true" />

      <excludeFolder url="file://$MODULE_DIR$/target" />

    </content>

    <orderEntry type="inheritedJdk" />

    <orderEntry type="sourceFolder" forTests="false" />

  </component>

</module>
 
 No newline at end of file