X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/50bb9ea7186a464d1ccde40d2234ebc8542701ff..81f415c8460ed6a9dfed2997228e9184c201322e:/appveyor.yml

diff --git a/appveyor.yml b/appveyor.yml
index 69fc6c4172..12620d6444 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -8,21 +8,18 @@ clone_depth: 1
 
 # scripts that are called at very beginning, before repo cloning
 init:
-- cmake --version
 - git config --global core.longpaths true
 - git config --global core.autocrlf input
 
 environment:
   global:
-    #  BOOST_ROOT: c:\Libraries\boost_1_59_0 # Mandatory for MSVC15 right now, but not good on the long term
-    #  BOOST_LIBRARYDIR: c:\Libraries\boost_1_59_0\stage\lib
     BOOST_ROOT: c:\Libraries\boost
     BOOST_LIBRARYDIR: c:\Libraries\boost\stage\lib
     TESH_ARGS: C:/projects/simgrid/bin/tesh --setenv srcdir=C:/projects/simgrid/examples/java --setenv classpath=C:/projects/simgrid/examples/java;C:/projects/simgrid/teshsuite/java;C:/projects/simgrid/simgrid.jar --cd C:/projects/simgrid/examples/java
   matrix:
     - COMPILER: MinGW-w64
 
-# MSCV15 is too hard for me: I fail to get the lib to link on that platf.
+# MSCV15 is too hard for me: I fail to get the lib to link on that platf (even with c:\Libraries\boost_1_59_0)
 #    - COMPILER: MSVC15
 #      PLATFORM: Win32 # That's actually an appveyor parameter of MSVC15, it's useless with MinGW-w64
 #    - COMPILER: MSVC15
@@ -36,16 +33,11 @@ environment:
 #- if [%COMPILER%]==[MinGW-w64] appveyor DownloadFile "http://sourceforge.net/projects/luabinaries/files/5.3/Windows Libraries/Dynamic/lua-5.3_Win64_dllw4_lib.zip/download" -FileName lua.zip || appveyor DownloadFile "http://sourceforge.net/projects/luabinaries/files/5.3/Windows Libraries/Dynamic/lua-5.3_Win64_dllw4_lib.zip/download" -FileName lua.zip
 #- if [%COMPILER%]==[MinGW-w64] 7z x -tzip lua.zip > NULL
 
-# These are not used currently, because MinGW-w64 does its work
-#- if [%COMPILER%]==[MinGW]     set PATH=C:\MinGW\bin;%PATH%
-#- if [%COMPILER%]==[MinGW]     mingw-get update
-#- if [%COMPILER%]==[MinGW]     rename "C:\Program Files (x86)\Git\bin\sh.exe" "sh2.exe"
-#- if [%COMPILER%]==[MSYS2]     set PATH=C:\msys64\bin,%PATH%
 install:
-- if [%COMPILER%]==[MinGW-w64] set PATH=C:\mingw64\bin;%PATH%
-- if [%COMPILER%]==[MinGW-w64] rename "C:\Program Files (x86)\Git\bin\sh.exe" "sh2.exe"
-- if [%COMPILER%]==[MinGW-w64] appveyor DownloadFile "https://raw.githubusercontent.com/symengine/dependencies/5cff7d1736877336cf9fb58267111beea4fa152f/x86_64-4.9.1-release-posix-seh-rt_v3-rev1.7z" -FileName mw64.7z || appveyor DownloadFile "https://raw.githubusercontent.com/symengine/dependencies/5cff7d1736877336cf9fb58267111beea4fa152f/x86_64-4.9.1-release-posix-seh-rt_v3-rev1.7z" -FileName mw64.7z
+- if [%COMPILER%]==[MinGW-w64] call .appveyor-download.cmd "https://raw.githubusercontent.com/symengine/dependencies/5cff7d1736877336cf9fb58267111beea4fa152f/x86_64-4.9.1-release-posix-seh-rt_v3-rev1.7z" -FileName mw64.7z
 - if [%COMPILER%]==[MinGW-w64] 7z x -oC:\ mw64.7z > NUL
+- if [%COMPILER%]==[MinGW-w64] set PATH=C:\mingw64\bin;%PATH%-
+- if [%COMPILER%]==[MinGW-w64] rename "C:\Program Files\Git\usr\bin\sh.exe" "sh-ignored.exe"
 
 build_script:
 - if [%COMPILER%]==[MSVC15] if [%PLATFORM%]==[Win32] cmake -G "Visual Studio 14 2015"       -Denable_lua=OFF -Denable_java=ON -Denable_smpi=OFF -Denable_mallocators=OFF .