Commit 41dc1eca authored by Myriam Begel's avatar Myriam Begel

Merge du Igniter_Main

parents b74c7a79 c7341204
...@@ -22,6 +22,7 @@ SRC = src/ ...@@ -22,6 +22,7 @@ SRC = src/
# The lib directory # The lib directory
LIB = lib/ LIB = lib/
# Java compiler flags # Java compiler flags
JAVAFLAGS = -g -d $(BIN) -cp $(SRC):$(LIB)* -target $(JVM) -source $(JVM) JAVAFLAGS = -g -d $(BIN) -cp $(SRC):$(LIB)* -target $(JVM) -source $(JVM)
WARNINGFLAGS = -Xlint:all,-unchecked,-serial WARNINGFLAGS = -Xlint:all,-unchecked,-serial
...@@ -46,19 +47,22 @@ IMAGEFILES = $(wildcard $(SRC)$(IMG)*.png $(SRC)$(IMG)*.gif $(SRC)$(IMG)*.txt) ...@@ -46,19 +47,22 @@ IMAGEFILES = $(wildcard $(SRC)$(IMG)*.png $(SRC)$(IMG)*.gif $(SRC)$(IMG)*.txt)
# The first target is the one that is executed when you invoke # The first target is the one that is executed when you invoke
# "make". # "make".
.PHONY: all clean cleandoc .PHONY: all clean cleandoc hack
all : $(addprefix $(BIN), $(CLASS_FILES)) all : hack $(addprefix $(BIN), $(CLASS_FILES))
@cp -r $(addprefix $(SRC)$(IMG), $(IMAGEDIRS)) $(IMAGEFILES) $(BIN)$(IMG) @cp -r $(addprefix $(SRC)$(IMG), $(IMAGEDIRS)) $(IMAGEFILES) $(BIN)$(IMG)
@cp -r $(LIB) $(BIN) @cp -r $(LIB) $(BIN)
@cp src/log4j.properties bin/
# The line describing the action starts with <TAB> # The line describing the action starts with <TAB>
$(BIN)%.class : $(SRC)%.java $(BIN)%.class : $(SRC)%.java
@echo $< @echo $<
@mkdir -p bin
$(COMPILE) $< $(COMPILE) $<
# Hack pour bin/
hack :
@mkdir -p bin;
buildplay: all buildplay: all
cd bin/; java -cp $(LIB)*:. graphics.guiSkeleton.Igniter_Main cd bin/; java -cp $(LIB)*:. graphics.guiSkeleton.Igniter_Main
......
...@@ -4,11 +4,6 @@ import core.abilities.AbilityPackageInitialiser; ...@@ -4,11 +4,6 @@ import core.abilities.AbilityPackageInitialiser;
import core.abilities.effects.EffectPackageInitialiser; import core.abilities.effects.EffectPackageInitialiser;
import graphics.graphical_abstraction.GraphicsMasterAbstraction; import graphics.graphical_abstraction.GraphicsMasterAbstraction;
//Log system
import logging.Logging;
import java.util.logging.Logger;
/** /**
* Created by dupriez on 10/11/15. * Created by dupriez on 10/11/15.
* *
...@@ -17,14 +12,8 @@ import java.util.logging.Logger; ...@@ -17,14 +12,8 @@ import java.util.logging.Logger;
*/ */
public class Igniter_Main { public class Igniter_Main {
static Logger logger = new Logging().getLogger();
public static void main(String[] args) { public static void main(String[] args) {
logger.info("msg d'information");
logger.warning("msg d'avertissement");
logger.severe("msg d'erreur");
/** Initialise some packages to detect instantly uncorrect declarations **/ /** Initialise some packages to detect instantly uncorrect declarations **/
AbilityPackageInitialiser.initialisePackage(); AbilityPackageInitialiser.initialisePackage();
EffectPackageInitialiser.initialisePackage(); EffectPackageInitialiser.initialisePackage();
......
log4j.rootLogger=DEBUG, stdout
log4j.appender.stdout=org.apache.log4j.ConsoleAppender
log4j.appender.stdout.layout=org.apache.log4j.PatternLayout
log4j.appender.stdout.layout.ConversionPattern=%r [%t] %-5p (%F:%M:%L) %m%n
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