Merge branch 'master' of scm.gforge.inria.fr:/gitroot/simgrid/simgrid

diff --git a/.travis.yml b/.travis.yml
index 2903aea..507fa53 100644 (file)
--- a/.travis.yml
+++ b/.travis.yml
@@ -24,10 +24,10 @@ addons:
 # 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 test -e /usr/bin/apt-get ; then sudo apt-get update  -qq ; fi
-   - if test -e /usr/bin/apt-get ; then sudo apt-get install -y cmake valgrind default-jdk gfortran liblua5.1-dev lua5.1 libboost-chrono1.48-dev ; fi
-   - if test -e /usr/bin/apt-get -a -e /usr/bin/gcc-4.7 ; then sudo update-alternatives --install /usr/bin/gcc gcc /usr/bin/gcc-4.7 50 ; fi
-   - if test -e /usr/bin/apt-get -a -e /usr/bin/g++-4.7 ; then sudo update-alternatives --install /usr/bin/g++ g++ /usr/bin/g++-4.7 50 ; fi
+   - 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 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=OFF -Denable_compile_warnings=ON . && make VERBOSE=1 && ctest --output-on-failure --timeout 100
 branches:

diff --git a/appveyor.yml b/appveyor.yml
index 0c55d30..0ff2a33 100644 (file)
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -12,16 +12,29 @@ platform:
 environment:
   BOOST_ROOT: c:\Libraries\boost
   BOOST_LIBRARYDIR: c:\Libraries\boost\stage\lib
-    
+
+install:
+#- ps: |
+#      if ($env:Compiler -eq "mingw" -AND -Not (Test-Path "C:\mingw64")) {
+#        # Install MinGW64
+#      $file = "x86_64-4.9.2-release-win32-seh-rt_v4-rev3.7z"
+#      $url  = "https://bintray.com/artifact/download/drewwells/generic/"
+#        $url += $file
+#      Invoke-WebRequest -UserAgent wget -Uri $url -OutFile $file
+#      &7z x -oC:\ $file > $null
+#      }
+- set PATH=C:\mingw64\bin;%PATH%
+- set CC=gcc
+
 build_script:
-- '"C:\Program Files (x86)\Microsoft Visual Studio 12.0\Common7\Tools\VsDevCmd"'
-- C:\MinGW\msys\1.0\bin\bash -lc "echo \"C:/MinGW /mingw\" > /etc/fstab"
-- C:\MinGW\msys\1.0\bin\bash -lc "printenv"
-- C:\MinGW\msys\1.0\bin\bash -lc "cd /c/projects/simgrid && cmake -G \"MSYS Makefiles\" -DBOOST_ROOT=\"%BOOST_ROOT%\" -DBOOST_LIBRARYDIR=\"%BOOST_LIBRARYDIR%\" -DBoost_USE_STATIC_LIBS=ON -Denable_debug=ON -Denable_documentation=OFF -Denable_coverage=OFF -Denable_tracing=ON -Denable_java=OFF -Denable_model-checking=OFF ."
-- C:\MinGW\msys\1.0\bin\bash -lc "cd /c/projects/simgrid; echo XXX simgrid_config.h; cat include/simgrid_config.h"
-- C:\MinGW\msys\1.0\bin\bash -lc "cd /c/projects/simgrid; echo XXX src/internal_config.h; cat src/internal_config.h"
+#- '"C:\Program Files (x86)\Microsoft Visual Studio 12.0\Common7\Tools\VsDevCmd"'
+#- bash -lc "echo \"C:/MinGW /mingw\" > /etc/fstab"
+- bash -lc "ls -lR /mingw64"
+- bash -lc "cd /c/projects/simgrid && cmake -G \"MSYS Makefiles\" -DBOOST_ROOT=\"%BOOST_ROOT%\" -DBOOST_LIBRARYDIR=\"%BOOST_LIBRARYDIR%\" -DBoost_USE_STATIC_LIBS=ON -Denable_debug=ON -Denable_documentation=OFF -Denable_coverage=OFF -Denable_tracing=ON -Denable_java=OFF -Denable_model-checking=OFF ."
+- bash -lc "cd /c/projects/simgrid; echo XXX simgrid_config.h; cat include/simgrid_config.h"
+- bash -lc "cd /c/projects/simgrid; echo XXX src/internal_config.h; cat src/internal_config.h"
 #- C:\MinGW\msys\1.0\bin\bash -lc "cd /c/projects/simgrid; echo XXX Internal builtins; gcc -dM -E - < /dev/null"
-- C:\MinGW\msys\1.0\bin\bash -lc "cd /c/projects/simgrid && make VERBOSE=1"
+- bash -lc "cd /c/projects/simgrid && make VERBOSE=1"
 
 test_script:
   cmd: ctest -VV
@@ -33,3 +46,5 @@ test_script:
 # https://github.com/osmcode/libosmium/blob/master/appveyor.yml
 # https://github.com/polysquare/cmake-unit/blob/master/appveyor.yml
 # https://github.com/openvswitch/ovs/blob/master/appveyor.yml
+# https://github.com/sass/libsass/blob/master/appveyor.yml <- install mingw-w64
+# https://github.com/sympy/symengine/blob/master/appveyor.yml <- use provided mingw-w64
\ No newline at end of file