diff --git a/Makefile b/Makefile new file mode 100644 index 0000000000000000000000000000000000000000..2cc99ccb24900d50303a4c892b1cac627bb1a9fd --- /dev/null +++ b/Makefile @@ -0,0 +1,22 @@ +JVM= java +EXEC= mvn exec:$(JVM) +PACKAGE= mvn package +DIR_COMP= compilation/ +DIR_GATE= gateway/ +DIR_CLIE= client/ +ANGC= ng serve --open + +COMP_PORT= 6999 +GATE_PORT= 7000 + +all: package + +run: + cd $(DIR_GATE) ; $(PACKAGE) ; $(EXEC) & + cd $(DIR_COMP) ; $(PACKAGE) ; $(EXEC) & + cd $(DIR_CLIE) ; $(ANGC) + +clean: SHELL:=/bin/bash + @echo "kill $(lsof -t -i :6999)" +# kill $(lsof -t -i :$(GATE_PORT)) + \ No newline at end of file diff --git a/compilation/share_docker_file/__pycache__/sample.cpython-34.pyc b/compilation/share_docker_file/__pycache__/sample.cpython-34.pyc index ac5905a20d44279dd78eb5cf6c6c4545d0ad401d..33e5cc370319eb6c340f87ad47ab89fad1a2cfa1 100644 Binary files a/compilation/share_docker_file/__pycache__/sample.cpython-34.pyc and b/compilation/share_docker_file/__pycache__/sample.cpython-34.pyc differ diff --git a/compilation/src/main/java/DockerCompilation.java b/compilation/src/main/java/DockerCompilation.java index a1158beae7670ee15a7ecc461b9c5091950dda93..912d0ad34ce33db065b25355b69b03bae5e297a2 100644 --- a/compilation/src/main/java/DockerCompilation.java +++ b/compilation/src/main/java/DockerCompilation.java @@ -13,12 +13,12 @@ public class DockerCompilation { case "python": filename = "share_docker_file/sample.py"; filename_test = "share_docker_file/assert.py"; - cmd = "docker run --rm --mount type=bind,source=/Users/freak/Desktop/dojo-hepia/serveur_compilation/share_docker_file,dst=/env/ hey:1.1 python3 assert.py"; + cmd = "docker run --rm --mount type=bind,source=/Users/freak/Desktop/dojo-hepia/compilation/share_docker_file,dst=/env/ hey:1.1 python3 assert.py"; break; case "java": filename = "share_docker_file/kata.java"; filename_test = "share_docker_file/Main.java"; - cmd = "docker run --rm --mount type=bind,source=/Users/freak/Desktop/dojo-hepia/serveur_compilation/share_docker_file,dst=/env/ java:4.0 ./java_test.sh"; + cmd = "docker run --rm --mount type=bind,source=/Users/freak/Desktop/dojo-hepia/compilation/share_docker_file,dst=/env/ java:4.0 ./java_test.sh"; break; } diff --git a/compilation/target/05-1.0-SNAPSHOT.jar b/compilation/target/05-1.0-SNAPSHOT.jar index 70e608e3c291ebbc74fcf869294a52c6c30f587c..fa2e926592bbfc6c72468ce3938fb933d01d8676 100644 Binary files a/compilation/target/05-1.0-SNAPSHOT.jar and b/compilation/target/05-1.0-SNAPSHOT.jar differ diff --git a/compilation/target/classes/DockerCompilation.class b/compilation/target/classes/DockerCompilation.class index 1d41f08dd0bf2db9cbcee9b7c3a7e489b3546764..bd1b5426e62763ffa986a8644beefa3cfc242cdb 100644 Binary files a/compilation/target/classes/DockerCompilation.class and b/compilation/target/classes/DockerCompilation.class differ diff --git a/compilation/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst b/compilation/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst index fe006693a63312ec0d4bc11d213651ed4891c1c7..9b150db2aaa519a19d1139f0baa7bc2a6340282d 100644 --- a/compilation/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst +++ b/compilation/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst @@ -1,3 +1,3 @@ -/Users/freak/Desktop/dojo-hepia/serveur_compilation/src/main/java/HostCompilation.java -/Users/freak/Desktop/dojo-hepia/serveur_compilation/src/main/java/app.java -/Users/freak/Desktop/dojo-hepia/serveur_compilation/src/main/java/DockerCompilation.java +/Users/freak/Desktop/dojo-hepia/compilation/src/main/java/HostCompilation.java +/Users/freak/Desktop/dojo-hepia/compilation/src/main/java/app.java +/Users/freak/Desktop/dojo-hepia/compilation/src/main/java/DockerCompilation.java diff --git a/gateway/target/09-1.0-SNAPSHOT.jar b/gateway/target/09-1.0-SNAPSHOT.jar index eeeac7f88df93fa4d5187d7e95c5662d03021648..2381c521d3c4ad868ed9777c4c7c1c8c4722fa86 100644 Binary files a/gateway/target/09-1.0-SNAPSHOT.jar and b/gateway/target/09-1.0-SNAPSHOT.jar differ diff --git a/gateway/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst b/gateway/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst index 7cd36fcf2ffe06afcb0fc41aaf3606bfaa87551d..e8545315b0608c56cb3421477889a560d1624f53 100644 --- a/gateway/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst +++ b/gateway/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst @@ -1,7 +1,7 @@ -/Users/freak/Desktop/dojo-hepia/server_rest/src/main/java/app.java -/Users/freak/Desktop/dojo-hepia/server_rest/src/main/java/Program.java -/Users/freak/Desktop/dojo-hepia/server_rest/src/main/java/Kata.java -/Users/freak/Desktop/dojo-hepia/server_rest/src/main/java/LiveDB.java -/Users/freak/Desktop/dojo-hepia/server_rest/src/main/java/KataShowCase.java -/Users/freak/Desktop/dojo-hepia/server_rest/src/main/java/ProgramsDataBase.java -/Users/freak/Desktop/dojo-hepia/server_rest/src/main/java/ProgramShowCase.java +/Users/freak/Desktop/dojo-hepia/gateway/src/main/java/KataShowCase.java +/Users/freak/Desktop/dojo-hepia/gateway/src/main/java/ProgramShowCase.java +/Users/freak/Desktop/dojo-hepia/gateway/src/main/java/Program.java +/Users/freak/Desktop/dojo-hepia/gateway/src/main/java/app.java +/Users/freak/Desktop/dojo-hepia/gateway/src/main/java/LiveDB.java +/Users/freak/Desktop/dojo-hepia/gateway/src/main/java/Kata.java +/Users/freak/Desktop/dojo-hepia/gateway/src/main/java/ProgramsDataBase.java