kill dead code

[simgrid.git] / .travis.yml

diff --git a/.travis.yml b/.travis.yml
index f8f1d37..a7867b4 100644 (file)
--- a/.travis.yml
+++ b/.travis.yml
@@ -13,26 +13,45 @@ compiler:
 #              reference to non-static member function must be called
 #                        std::uninitialized_fill( buffer_, buffer_ + size, init_value );
 #                                                                    ^~~~
+#
 addons:
   apt: # Get recent versions of the compiler, even on Ubuntu Precise
-      sources:
-      - ubuntu-toolchain-r-test
-      packages:
-      - gcc-4.7
-      - g++-4.7
-      - clang
+    sources:
+    - ubuntu-toolchain-r-test
+    packages:
+    - gcc-4.7
+    - g++-4.7
+#      - clang
+#- coverity_scan:
+#    project:
+#      name: "mquinson/simgrid"
+#    notification_email: martin.quinson@loria.fr
+#    build_command_prepend: "cmake -Denable_documentation=OFF -Denable_coverage=OFF -Denable_java=OFF -Denable_model-checking=OFF -Denable_lua=OFF -Denable_compile_optimizations=OFF -Denable_smpi=ON -Denable_smpi_MPICH3_testsuite=OFF -Denable_compile_warnings=OFF ."  coverity_scan:
+#    build_command:   "make VERBOSE=1"
+#    branch_pattern: coverity_scan
+
+# Don't install lua from Debian as we need 5.3 and don't have a backport.
+#   Installing lua from the source does not make any dynamic library.
+#   - curl http://www.lua.org/ftp/lua-5.3.1.tar.gz | tar xz
+#   - cd lua-5.3.1 
+#   -   if [ ${TRAVIS_OS_NAME} = 'linux' ] ; then make linux ; else make macosx ; fi
+#   -   make INSTALL_TOP=$TRAVIS_BUILD_DIR/LuaInstall install
+#   - cd ..
+#   - ls -lR $TRAVIS_BUILD_DIR/LuaInstall
+
 # Install libboost-chrono1.48-dev to get boost 1.48 on Ubuntu Precise. What we really want is libboost-dev libboost-all-dev
 # Still need sudo for update-alternatives
 before_install:
-   - sudo apt-get update  -qq
-   - sudo apt-get install -y cmake valgrind default-jdk gfortran liblua5.1-dev lua5.1 libboost-chrono1.48-dev
-   - sudo update-alternatives --install /usr/bin/gcc gcc /usr/bin/gcc-4.7 50
-   - sudo update-alternatives --install /usr/bin/g++ g++ /usr/bin/g++-4.7 50
+   - if [ ${TRAVIS_OS_NAME} = 'linux' ] ; then sudo add-apt-repository --yes ppa:kubuntu-ppa/backports ; fi # cmake higher than 2.8.7
+   - if [ ${TRAVIS_OS_NAME} = 'linux' ] ; then sudo apt-get update  -qq ; fi
+   - if [ ${TRAVIS_OS_NAME} = 'linux' ] ; then sudo apt-get install -y cmake valgrind default-jdk gfortran libboost-chrono1.48-dev ; fi
+   - if [ ${TRAVIS_OS_NAME} = 'linux' ] ; then sudo update-alternatives --install /usr/bin/gcc gcc /usr/bin/gcc-4.7 50 ; fi
+   - if [ ${TRAVIS_OS_NAME} = 'linux' ] ; then sudo update-alternatives --install /usr/bin/g++ g++ /usr/bin/g++-4.7 50 ; fi
 script:
-   - cmake -Denable_documentation=OFF -Denable_coverage=OFF -Denable_java=ON -Denable_model-checking=OFF -Denable_lua=ON -Denable_compile_optimizations=ON -Denable_smpi=ON -Denable_smpi_MPICH3_testsuite=ON -Denable_compile_warnings=ON . && make VERBOSE=1 && ctest --output-on-failure --timeout 100
-branches:
-  only:
-     - master
+   - cmake -Denable_documentation=OFF -Denable_coverage=OFF -Denable_java=ON -Denable_model-checking=OFF -Denable_lua=OFF -Denable_compile_optimizations=OFF -Denable_smpi=ON -Denable_smpi_MPICH3_testsuite=OFF -Denable_compile_warnings=ON . && make VERBOSE=1 && ctest --output-on-failure --timeout 100
+# branches:
+#   only:
+#      - master
 notifications:
   recipients:
     - martin.quinson@loria.fr
@@ -47,4 +66,3 @@ notifications:
 os:
   - linux
   - osx
-  - windows