From 2910720457dee4b263901e8399ad9ea1ae911714 Mon Sep 17 00:00:00 2001
From: Luigi Santocanale <luigi.santocanale@lif.univ-mrs.fr>
Date: Sun, 22 Nov 2020 23:59:53 +0100
Subject: [PATCH] Reorganied once more addded jar build in Makefile
---
.idea/.name | 1 +
.idea/misc.xml | 2 +-
Makefile | 13 ++++++++++++-
src/{Graphs => Graph}/Arc.java | 2 +-
src/{Graphs => Graph}/Edge.java | 2 +-
src/{Graphs => Graph}/Graph.java | 2 +-
src/{Graphs => Graph}/RootedTree.java | 2 +-
src/{Graphs => }/GraphClasses/Complete.java | 4 ++--
src/{Graphs => }/GraphClasses/ErdosRenyi.java | 4 ++--
src/{Graphs => }/GraphClasses/Grid.java | 4 ++--
src/{Graphs => }/GraphClasses/Labyrinth.java | 4 ++--
src/{Graphs => }/GraphClasses/Lollipop.java | 4 ++--
src/Main.java | 4 ++--
src/RandomTreeAlgos/BreadthFirstSearch.java | 4 ++--
14 files changed, 32 insertions(+), 20 deletions(-)
create mode 100644 .idea/.name
rename src/{Graphs => Graph}/Arc.java (95%)
rename src/{Graphs => Graph}/Edge.java (97%)
rename src/{Graphs => Graph}/Graph.java (98%)
rename src/{Graphs => Graph}/RootedTree.java (99%)
rename src/{Graphs => }/GraphClasses/Complete.java (83%)
rename src/{Graphs => }/GraphClasses/ErdosRenyi.java (94%)
rename src/{Graphs => }/GraphClasses/Grid.java (97%)
rename src/{Graphs => }/GraphClasses/Labyrinth.java (99%)
rename src/{Graphs => }/GraphClasses/Lollipop.java (93%)
diff --git a/.idea/.name b/.idea/.name
new file mode 100644
index 0000000..8c5da5d
--- /dev/null
+++ b/.idea/.name
@@ -0,0 +1 @@
+TP3
\ No newline at end of file
diff --git a/.idea/misc.xml b/.idea/misc.xml
index 37e641e..8f5f4fa 100644
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
- <component name="ProjectRootManager" version="2" languageLevel="JDK_13" project-jdk-name="13" project-jdk-type="JavaSDK">
+ <component name="ProjectRootManager" version="2" languageLevel="JDK_13" default="false" project-jdk-name="13" project-jdk-type="JavaSDK">
<output url="file://$PROJECT_DIR$/out" />
</component>
</project>
\ No newline at end of file
diff --git a/Makefile b/Makefile
index 8879885..b372a59 100644
--- a/Makefile
+++ b/Makefile
@@ -4,6 +4,7 @@ MAINCLASS=Main
## Le chemin vers où votre classe compilée est installée
# Renommez si nécessaire
INSTALLDIR=out/production/TP3
+JARFILE=TP3RandomTrees
all: compile install exec
@@ -11,17 +12,27 @@ all: compile install exec
compile:
cd src ; make compile
+jar: compile
+ cd $(INSTALLDIR); \
+ echo Main-Class: $(subst /,.,$(MAINCLASS)) > manifest.txt ; \
+ jar cvfm $(JARFILE).jar manifest.txt ./
+ mv $(INSTALLDIR)/$(JARFILE).jar ./
+
install:
cd src ; make install
clean:
cd src ; make clean ; make cleanInstall
- rm *.zip
+ rm *.zip *.jar manifest.*
# Cible qui explique comment executer
exec:
java -classpath $(INSTALLDIR) $(MAINCLASS)
+# Ou autrement
+# exec: $(JARFILE).jar
+# java -jar $(JARFILE).jar
+
# Demarre automatiquement une demonstration de votre programme
# Il faut que cette demo soit convaincante
demo:
diff --git a/src/Graphs/Arc.java b/src/Graph/Arc.java
similarity index 95%
rename from src/Graphs/Arc.java
rename to src/Graph/Arc.java
index ae8ce2a..7de5608 100644
--- a/src/Graphs/Arc.java
+++ b/src/Graph/Arc.java
@@ -1,4 +1,4 @@
-package Graphs;
+package Graph;
public class Arc {
public Edge support;
diff --git a/src/Graphs/Edge.java b/src/Graph/Edge.java
similarity index 97%
rename from src/Graphs/Edge.java
rename to src/Graph/Edge.java
index da68eac..a439044 100644
--- a/src/Graphs/Edge.java
+++ b/src/Graph/Edge.java
@@ -1,4 +1,4 @@
-package Graphs;
+package Graph;
public class Edge implements Comparable<Edge> {
diff --git a/src/Graphs/Graph.java b/src/Graph/Graph.java
similarity index 98%
rename from src/Graphs/Graph.java
rename to src/Graph/Graph.java
index f70ccb6..36dd396 100644
--- a/src/Graphs/Graph.java
+++ b/src/Graph/Graph.java
@@ -1,4 +1,4 @@
-package Graphs;
+package Graph;
import java.util.ArrayList;
import java.util.LinkedList;
diff --git a/src/Graphs/RootedTree.java b/src/Graph/RootedTree.java
similarity index 99%
rename from src/Graphs/RootedTree.java
rename to src/Graph/RootedTree.java
index 699eb01..9793f12 100644
--- a/src/Graphs/RootedTree.java
+++ b/src/Graph/RootedTree.java
@@ -1,4 +1,4 @@
-package Graphs;
+package Graph;
import RandomTreeAlgos.BreadthFirstSearch;
diff --git a/src/Graphs/GraphClasses/Complete.java b/src/GraphClasses/Complete.java
similarity index 83%
rename from src/Graphs/GraphClasses/Complete.java
rename to src/GraphClasses/Complete.java
index 1b69984..8efa0d0 100644
--- a/src/Graphs/GraphClasses/Complete.java
+++ b/src/GraphClasses/Complete.java
@@ -1,5 +1,5 @@
-package Graphs.GraphClasses;
-import Graphs.* ;
+package GraphClasses;
+import Graph.* ;
public class Complete {
diff --git a/src/Graphs/GraphClasses/ErdosRenyi.java b/src/GraphClasses/ErdosRenyi.java
similarity index 94%
rename from src/Graphs/GraphClasses/ErdosRenyi.java
rename to src/GraphClasses/ErdosRenyi.java
index bf2199e..fc2b562 100644
--- a/src/Graphs/GraphClasses/ErdosRenyi.java
+++ b/src/GraphClasses/ErdosRenyi.java
@@ -1,5 +1,5 @@
-package Graphs.GraphClasses;
-import Graphs.* ;
+package GraphClasses;
+import Graph.* ;
import RandomTreeAlgos.BreadthFirstSearch;
import java.util.ArrayList;
diff --git a/src/Graphs/GraphClasses/Grid.java b/src/GraphClasses/Grid.java
similarity index 97%
rename from src/Graphs/GraphClasses/Grid.java
rename to src/GraphClasses/Grid.java
index 9ca60c2..b5a4e95 100644
--- a/src/Graphs/GraphClasses/Grid.java
+++ b/src/GraphClasses/Grid.java
@@ -1,5 +1,5 @@
-package Graphs.GraphClasses;
-import Graphs.*;
+package GraphClasses;
+import Graph.*;
import java.util.BitSet;
diff --git a/src/Graphs/GraphClasses/Labyrinth.java b/src/GraphClasses/Labyrinth.java
similarity index 99%
rename from src/Graphs/GraphClasses/Labyrinth.java
rename to src/GraphClasses/Labyrinth.java
index 0e8532d..b2360f2 100644
--- a/src/Graphs/GraphClasses/Labyrinth.java
+++ b/src/GraphClasses/Labyrinth.java
@@ -1,5 +1,5 @@
-package Graphs.GraphClasses;
-import Graphs.*;
+package GraphClasses;
+import Graph.*;
import java.awt.Color;
diff --git a/src/Graphs/GraphClasses/Lollipop.java b/src/GraphClasses/Lollipop.java
similarity index 93%
rename from src/Graphs/GraphClasses/Lollipop.java
rename to src/GraphClasses/Lollipop.java
index bdf2971..acc8da1 100644
--- a/src/Graphs/GraphClasses/Lollipop.java
+++ b/src/GraphClasses/Lollipop.java
@@ -1,5 +1,5 @@
-package Graphs.GraphClasses;
-import Graphs.*;
+package GraphClasses;
+import Graph.*;
import java.util.ArrayList;
import java.util.Collections;
diff --git a/src/Main.java b/src/Main.java
index 902b09b..b3b6173 100644
--- a/src/Main.java
+++ b/src/Main.java
@@ -1,5 +1,5 @@
-import Graphs.*;
-import Graphs.GraphClasses.*;
+import Graph.*;
+import GraphClasses.*;
import RandomTreeAlgos.BreadthFirstSearch;
import java.io.IOException;
diff --git a/src/RandomTreeAlgos/BreadthFirstSearch.java b/src/RandomTreeAlgos/BreadthFirstSearch.java
index bdfbb41..e2ec574 100644
--- a/src/RandomTreeAlgos/BreadthFirstSearch.java
+++ b/src/RandomTreeAlgos/BreadthFirstSearch.java
@@ -1,7 +1,7 @@
package RandomTreeAlgos;
-import Graphs.Arc;
-import Graphs.Graph;
+import Graph.Arc;
+import Graph.Graph;
import java.util.*;
--
GitLab