Skip to content

Commit

Permalink
Merge pull request #130 from FACT-Team/S3
Browse files Browse the repository at this point in the history
End of sprint 3
  • Loading branch information
aroquemaurel committed Feb 26, 2015
2 parents 8cf069f + 7b1081f commit baf465a
Show file tree
Hide file tree
Showing 271 changed files with 18,324 additions and 3,611 deletions.
3 changes: 3 additions & 0 deletions .gitattributes
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
*.ui linguist-language=XML
*.pro linguist-language=QMake
*.pri linguist-language=QMake
2 changes: 1 addition & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -13,4 +13,4 @@ tests/*.user
**/*.toc
**/*.synctex.gz
**/*.out

coverage.cfg
9 changes: 6 additions & 3 deletions .gitmodules
Original file line number Diff line number Diff line change
@@ -1,9 +1,12 @@
[submodule "tests/QTestRunner"]
path = tests/QTestRunner
url = git@github.com:FACT-Team/QTestRunner.git
url = https://github.com/FACT-Team/QTestRunner.git
[submodule "documents/LaTexTemplate"]
path = documents/LaTexTemplate
url = git@github.com:FACT-Team/LaTexTemplate.git
url = https://github.com/FACT-Team/LaTexTemplate.git
[submodule "fact-team.github.io"]
path = fact-team.github.io
url = git@github.com:FACT-Team/fact-team.github.io.git
url = https://github.com/FACT-Team/fact-team.github.io.git
[submodule "src/libs/qt-mustache"]
path = src/libs/qt-mustache
url = https://github.com/robertknight/qt-mustache.git
42 changes: 42 additions & 0 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,42 @@
language: cpp

env:
- QT_SELECT=qt5

compiler:
- g++

before_install:
- sudo add-apt-repository --yes ppa:ubuntu-sdk-team/ppa
- sudo add-apt-repository ppa:ubuntu-toolchain-r/test -y
- sudo apt-add-repository -y ppa:libreoffice/libreoffice-4-2
- sudo apt-get update -qq
- sudo apt-get install python-software-properties

install:
- sudo apt-get install g++-4.8 gdb
- sudo apt-get install doxygen doxygen-latex doxygen-doc
- sudo apt-get install -y lcov
# - sudo apt-get install texlive texlive-fonts-extra latex-xcolor texlive-extra-utils texlive-font-utils >> /dev/null
- wget -O Qt5.2.0.tar.xz https://www.dropbox.com/s/mkqtb8teeydsmrk/Qt5.2.0.tar.xz?dl=0
- mkdir ~/Qt5.2.0
- tar -xJf Qt5.2.0.tar.xz -C ~/Qt5.2.0
- sudo chmod -R 777 ~/Qt5.2.0/
- export CXX="g++-4.8"
- gem install coveralls-lcov

before_script:
- git config --global user.name "Travis FACT"
- git config --global user.email ups.fact@gmail.com
- chmod +x scripts/*.sh

script:
- cd scripts
- ./tests.sh
- ./coverage.sh
- ./doxygen.sh
- cd ../

after_success:
- cd fact-team.github.io/
- git push https://${TOK}@github.com/FACT-Team/fact-team.github.io.git master
2 changes: 1 addition & 1 deletion Doxyfile
Original file line number Diff line number Diff line change
Expand Up @@ -248,7 +248,7 @@ MAN_LINKS = NO
#---------------------------------------------------------------------------
# configuration options related to the XML output
#---------------------------------------------------------------------------
GENERATE_XML = NO
GENERATE_XML = yes
XML_OUTPUT = xml
XML_PROGRAMLISTING = YES
#---------------------------------------------------------------------------
Expand Down
2 changes: 1 addition & 1 deletion FactDev.pro
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
TEMPLATE = subdirs
CONFIG += ordered c++11
QMAKE_CXXFLAGS += -std=c++11
QMAKE_CXXFLAGS += -std=gnu++11

SUBDIRS = \
src \
Expand Down
Loading

0 comments on commit baf465a

Please sign in to comment.