Skip to content

Commit

Permalink
From revision 7451244a60a3da3d925b5ca33f11c5b4ede5b5a9 of sierra6
Browse files Browse the repository at this point in the history
  • Loading branch information
llarose committed May 26, 2015
1 parent a7f6e89 commit c3d1ab9
Show file tree
Hide file tree
Showing 138 changed files with 79,241 additions and 2 deletions.
35 changes: 35 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,35 @@
*.class

# Package Files #
*.jar
*.war

# gwt caches and compiled units #
war/gwt_bree/
gwt-unitCache/

# boilerplate generated classes #
.apt_generated/

# more caches and things from deploy #
war/WEB-INF/deploy/
war/WEB-INF/classes/

#compilation logs
.gwt/

#caching for already compiled files
gwt-unitCache/

#gwt junit compilation files
www-test/

#old GWT (1.5) created this dir
.gwt-tmp/

#build crap
target/

#protect workspace
web/.idea/misc.xml
web/.idea/workspace.xml
6 changes: 6 additions & 0 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
language: java

jdk:
- oraclejdk7

script: mvn test -f web/pom.xml
8 changes: 8 additions & 0 deletions Directory Structure.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
Structure de dossiers
=====================

db = scripts de cr�ation de la base de donn�es
web = IntelliJ workspace
tools = programmes utilitaires random
tests = random crap
docs = documentation random
36 changes: 36 additions & 0 deletions Help GIT.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,36 @@
Configure GIT (ONCE ONLY)
-------------------------
git config --global user.email "YOUR EMAIL"
git config --global user.name "YOUR FULL NAME"
git config --global push.default current
git config --global core.autocrlf true
git config --global credential.helper wincred

git clone https://github.com/kevenv/sierra6.git TO GET THE INITIAL PROJECT DIRECTORY (ONCE ONLY)

Commands
--------
status STATUS
commit -m "message" LOCAL COMMIT (avec message d'une ligne)
commit LOCAL COMMIT (va ouvrir notepad++ et vous pourrez ecrire un commit message detaillé de plusieurs lignes)
commit --amend UPDATE A LOCAL COMMIT (change the commit message)
push REMOTE COMMIT
pull REMOTE DOWNLOAD

add ADD FILE
add . ADD ALL FILES
rm REMOVE FILE

Workflow
--------
1. status
2. add/rm
3. commit
peut demander de faire un pull avant
4. push

Outils
------
-TortoiseSVN (GUI + Merge tools)
-SourceTree (GUI Atlassian)
-P4Merge (Merge tool)
27 changes: 27 additions & 0 deletions READ ME.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
Install
=======

-git
https://github.com/msysgit/msysgit/releases/download/Git-1.9.5-preview20150319/Git-1.9.5-preview20150319.exe

-JDK7 (Java SE Development Kit 7u79)
http://www.oracle.com/technetwork/java/javase/downloads/jdk7-downloads-1880260.html

-GWT sdk
http://goo.gl/t7FQSn

-IntelliJ (IntelliJ Ultimate - Trial)
http://download.jetbrains.com/idea/ideaIU-14.1.3.exe

-GWT intelliJ plugin
[Int�gr� � IntelliJ, mais doit �tre activ�]

-GWTP intelliJ plugin
https://plugins.jetbrains.com/plugin/download?pr=&updateId=19583

-pgAdmin
https://ftp.postgresql.org/pub/pgadmin3/release/v1.20.0/win32/pgadmin3-1.20.0.zip

Setup workspace
===============
[TODO]
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
# sierra8
sierra8
# sierra6
Projet S6 Génie Informatique - Université de Sherbrooke
Empty file added db/empty.txt
Empty file.
Empty file added docs/empty.txt
Empty file.
Empty file added tests/empty.txt
Empty file.
Empty file added tools/empty.txt
Empty file.
1 change: 1 addition & 0 deletions web/.idea/.name

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

13 changes: 13 additions & 0 deletions web/.idea/artifacts/sierra6_war.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

79 changes: 79 additions & 0 deletions web/.idea/artifacts/sierra6_war_exploded.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

39 changes: 39 additions & 0 deletions web/.idea/compiler.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

3 changes: 3 additions & 0 deletions web/.idea/copyright/profiles_settings.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading

0 comments on commit c3d1ab9

Please sign in to comment.