[energy] C++-ification, remove nested xbt_dynar

[simgrid.git] / appveyor.yml

diff --git a/appveyor.yml b/appveyor.yml
index de0639a..4e2b504 100644 (file)
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -33,16 +33,16 @@ 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
+# Perl: The installed version breaks with Perl::IPC 0.94. Get an older one.
+- call .appveyor-download.cmd "http://strawberryperl.com/download/5.18.4.1/strawberry-perl-5.18.4.1-64bit.msi" -FileName strawberry-perl.msi
+- msiexec /i "strawberry-perl.msi" /qn INSTALLDIR="C:\projects\perl"
+# Sane migwin, as installed by symengine
+- 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
+# Take the newly installed stuff in the path
+- set PATH=C:\mingw64\bin;C:\projects\perl\perl\bin;C:\projects\perl\perl\site\bin;C:\projects\perl\c\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 .
@@ -52,7 +52,6 @@ build_script:
 - if not [%COMPILER%]==[MSVC15] mingw32-make VERBOSE=1
 - cd C:/projects/simgrid/examples/java && java -classpath ".;../../simgrid.jar" masterslave.Masterslave ../platforms/platform.xml masterslave/masterslaveDeployment.xml || true
 
-
 # I cant use the cmake test because of the following error:
 #   Test project C:/projects/simgrid
 #        Start   1: mc-replay-random-bug