X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/aaa3f5ef754ad7474fa95d2445a1c727d787113d..1c42257346c0dd7c97b859b1c201ca215e06a797:/appveyor.yml

diff --git a/appveyor.yml b/appveyor.yml
index c4dbb6d47d..7754de9285 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -12,40 +12,45 @@ init:
 - git config --global core.longpaths true
 - git config --global core.autocrlf input
 
-#platform: 
-#  - Win32 # This is Windows 32bits
-#  - x64   # This is Windows 64bits
-
 environment:
   global:
     BOOST_ROOT: c:\Libraries\boost_1_59_0
     BOOST_LIBRARYDIR: c:\Libraries\boost_1_59_0\stage\lib
     #  BOOST_ROOT: c:\Libraries\boost
     #  BOOST_LIBRARYDIR: c:\Libraries\boost\stage\lib
-    
+
   matrix:
-    - COMPILER: MSVC15
-      PLATFORM: Win32
-    - COMPILER: MSVC15
-      PLATFORM: x64
     - COMPILER: MinGW-w64
+
+#    - COMPILER: MSVC15
+#      PLATFORM: Win32
+#    - COMPILER: MSVC15
+#      PLATFORM: x64
       
 install:
 - 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%]==[MinGW-w64] set PATH=C:\mingw64\bin;%PATH%
-- if [%COMPILER%]==[MSYS2]     set PATH=C:\msys64\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
+- if [%COMPILER%]==[MinGW-w64] 7z x -oC:\ mw64.7z > NUL
+- if [%COMPILER%]==[MSYS2]     set PATH=C:\msys64\bin,%PATH%
 
 build_script:
-- if [%COMPILER%]==[MSVC15] if [%PLATFORM%]==[Win32] cmake -G "Visual Studio 14 2015"       -Denable_smpi=OFF -Denable_mallocators=OFF .
-- if [%COMPILER%]==[MSVC15] if [%PLATFORM%]==[x64]   cmake -G "Visual Studio 14 2015 Win64" -Denable_smpi=OFF -Denable_mallocators=OFF .
-- if not [%COMPILER%]==[MSVC15]                      cmake -G "MinGW Makefiles"             -Denable_smpi=OFF -Denable_mallocators=OFF .
+- if [%COMPILER%]==[MSVC15] if [%PLATFORM%]==[Win32] cmake -G "Visual Studio 14 2015"       -Denable_java=ON -Denable_smpi=OFF -Denable_mallocators=OFF .
+- if [%COMPILER%]==[MSVC15] if [%PLATFORM%]==[x64]   cmake -G "Visual Studio 14 2015 Win64" -Denable_java=ON -Denable_smpi=OFF -Denable_mallocators=OFF .
+- if not [%COMPILER%]==[MSVC15]                      cmake -G "MinGW Makefiles"             -Denable_java=ON -Denable_smpi=OFF -Denable_mallocators=OFF -Denable_lto=OFF .
 - if [%COMPILER%]==[MSVC15]     msbuild ALL_BUILD.vcxproj /verbosity:normal
-- if not [%COMPILER%]==[MSVC15] mingw32-make && mingw32-make install
+- if not [%COMPILER%]==[MSVC15] mingw32-make
 
 test_script:
 - ctest --output-on-failure
 
+artifacts:
+- path: simgrid.jar
+  name: jarfile
+
 # notifications:
 # - irc: "irc.debian.org#simgrid" # Not implemented by AppVeyor yet :(
 # Some source of inspiration: