Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
T
the_dungeon_project
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
12
Issues
12
List
Boards
Labels
Service Desk
Milestones
Merge Requests
0
Merge Requests
0
Operations
Operations
Incidents
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
genie_logiciel_2015
the_dungeon_project
Commits
41dc1eca
Commit
41dc1eca
authored
Jan 02, 2016
by
Myriam Begel
Browse files
Options
Browse Files
Download
Plain Diff
Merge du Igniter_Main
parents
b74c7a79
c7341204
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
8 additions
and
19 deletions
+8
-19
Makefile
Makefile
+8
-4
lib/log4j-1.2.17.jar
lib/log4j-1.2.17.jar
+0
-0
src/graphics/guiSkeleton/Igniter_Main.java
src/graphics/guiSkeleton/Igniter_Main.java
+0
-11
src/log4j.properties
src/log4j.properties
+0
-4
No files found.
Makefile
View file @
41dc1eca
...
...
@@ -22,6 +22,7 @@ SRC = src/
# The lib directory
LIB
=
lib/
# Java compiler flags
JAVAFLAGS
=
-g
-d
$(BIN)
-cp
$(SRC)
:
$(LIB)
*
-target
$(JVM)
-source
$(JVM)
WARNINGFLAGS
=
-Xlint
:all,-unchecked,-serial
...
...
@@ -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
# "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
$(LIB)
$(BIN)
@
cp
src/log4j.properties bin/
# The line describing the action starts with <TAB>
$(BIN)%.class
:
$(SRC)%.java
@
echo
$<
@
mkdir
-p
bin
$(COMPILE)
$<
# Hack pour bin/
hack
:
@
mkdir
-p
bin
;
buildplay
:
all
cd
bin/
;
java
-cp
$(LIB)
*
:. graphics.guiSkeleton.Igniter_Main
...
...
lib/log4j-1.2.17.jar
deleted
100644 → 0
View file @
b74c7a79
File deleted
src/graphics/guiSkeleton/Igniter_Main.java
View file @
41dc1eca
...
...
@@ -4,11 +4,6 @@ import core.abilities.AbilityPackageInitialiser;
import
core.abilities.effects.EffectPackageInitialiser
;
import
graphics.graphical_abstraction.GraphicsMasterAbstraction
;
//Log system
import
logging.Logging
;
import
java.util.logging.Logger
;
/**
* Created by dupriez on 10/11/15.
*
...
...
@@ -17,14 +12,8 @@ import java.util.logging.Logger;
*/
public
class
Igniter_Main
{
static
Logger
logger
=
new
Logging
().
getLogger
();
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 **/
AbilityPackageInitialiser
.
initialisePackage
();
EffectPackageInitialiser
.
initialisePackage
();
...
...
src/log4j.properties
deleted
100644 → 0
View file @
b74c7a79
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
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment