Logo AND Algorithmique Numérique Distribuée
Public GIT Repository
projects / simgrid.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: ce63a9e)
[appveyor] disable lua for now
authorMartin Quinson <martin.quinson@loria.fr>
Mon, 19 Oct 2015 21:54:09 +0000 (23:54 +0200)
committerMartin Quinson <martin.quinson@loria.fr>
Mon, 19 Oct 2015 22:00:52 +0000 (00:00 +0200)
And comment a bit the appveyor file, killing some dead code on the way.

appveyor.yml patch | blob | history

diff --git a/appveyor.yml b/appveyor.yml
index ef9b600..d01ae94 100644 (file)
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -18,38 +18,38 @@ environment:
     #  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
     #  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
-    LUA_HINT: C:/projects/simgrid
   matrix:
     - COMPILER: MinGW-w64
 
   matrix:
     - COMPILER: MinGW-w64
 
+# MSCV15 is too hard for me: I fail to get the lib to link on that platf.
 #    - COMPILER: MSVC15
 #    - COMPILER: MSVC15
-#      PLATFORM: Win32
+#      PLATFORM: Win32 # That's actually an appveyor parameter of MSVC15, it's useless with MinGW-w64
 #    - COMPILER: MSVC15
 #      PLATFORM: x64
 
 #    - COMPILER: MSVC15
 #      PLATFORM: x64
 
-# Having an optional Lua is too complex wrt Java dll dependencies, so disable it for now
+# When Lua will become mandatory, we will have to download it precompiled. It's Windows after all
 #
 #
-#- if [%COMPILER%]==[MinGW-w64] appveyor DownloadFile "http://www.lua.org/ftp/lua-5.3.1.tar.gz" -FileName lua-5.3.1.tar.gz || appveyor DownloadFile "http://www.lua.org/ftp/lua-5.3.1.tar.gz" -FileName lua-5.3.1.tar.gz
-#- if [%COMPILER%]==[MinGW-w64] tar xfz lua-5.3.1.tar.gz 
-#- if [%COMPILER%]==[MinGW-w64] cd lua-5.3.1 && mingw32-make mingw && mingw32-make INSTALL_TOP=C:/mingw64 install && cd ..
-# http://sourceforge.net/projects/luabinaries/files/5.3/Windows%20Libraries/Dynamic/lua-5.3_Win64_dllw4_lib.zip/download
+#environment:
+#LUA_HINT: C:/projects/simgrid
+#install:
+#- 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:
 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%]==[MSYS2]     set PATH=C:\msys64\bin,%PATH%
 - 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] 7z x -oC:\ mw64.7z > NUL
 - 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] 7z x -oC:\ mw64.7z > NUL
-- 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 && ls -lR
 
 build_script:
 
 build_script:
-- if [%COMPILER%]==[MSVC15] if [%PLATFORM%]==[Win32] cmake -G "Visual Studio 14 2015"       -Denable_lua=ON -Denable_java=ON -Denable_smpi=OFF -Denable_mallocators=OFF .
-- if [%COMPILER%]==[MSVC15] if [%PLATFORM%]==[x64]   cmake -G "Visual Studio 14 2015 Win64" -Denable_lua=ON -Denable_java=ON -Denable_smpi=OFF -Denable_mallocators=OFF .
-- if not [%COMPILER%]==[MSVC15]                      cmake -G "MinGW Makefiles"             -Denable_lua=ON -Denable_java=ON -Denable_smpi=OFF -Denable_mallocators=OFF -Denable_lto=OFF .
+- if [%COMPILER%]==[MSVC15] if [%PLATFORM%]==[Win32] cmake -G "Visual Studio 14 2015"       -Denable_lua=OFF -Denable_java=ON -Denable_smpi=OFF -Denable_mallocators=OFF .
+- if [%COMPILER%]==[MSVC15] if [%PLATFORM%]==[x64]   cmake -G "Visual Studio 14 2015 Win64" -Denable_lua=OFF -Denable_java=ON -Denable_smpi=OFF -Denable_mallocators=OFF .
+- if not [%COMPILER%]==[MSVC15]                      cmake -G "MinGW Makefiles"             -Denable_lua=OFF -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 VERBOSE=1
 - cd C:/projects/simgrid/examples/java && java -classpath ".;../../simgrid.jar" masterslave.Masterslave ../platforms/platform.xml masterslave/masterslaveDeployment.xml || true
 - if [%COMPILER%]==[MSVC15]     msbuild ALL_BUILD.vcxproj /verbosity:normal
 - 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
Clone of SimGrid repository with local patches