X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/deb5b356b8096d7ec29c46ad60eef6d218f3382c..7e9089a13ddf2e277b8c25877aef808174f9fffa:/.travis.yml

diff --git a/.travis.yml b/.travis.yml
index b5fabae4df..802afb315a 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -13,6 +13,7 @@ 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:
@@ -21,25 +22,29 @@ addons:
       - gcc-4.7
       - g++-4.7
 #      - clang
+
+# 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:
    - 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 liblua5.1-dev lua5.1 libboost-chrono1.48-dev ; 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
-   - curl http://www.lua.org/ftp/lua-5.3.0.tar.gz | tar xz
-   - cd lua-5.3.0 
-   -   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
 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=OFF -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