From 8440412db123ae19f858cafc9814fba72d6efe7a Mon Sep 17 00:00:00 2001 From: Martin Quinson Date: Mon, 14 Mar 2016 18:50:03 +0100 Subject: [PATCH] small cleanups to appveyor --- .appveyor-download.cmd | 22 ---------------------- appveyor.yml | 9 +-------- tools/cmake/DefinePackages.cmake | 1 - 3 files changed, 1 insertion(+), 31 deletions(-) delete mode 100644 .appveyor-download.cmd diff --git a/.appveyor-download.cmd b/.appveyor-download.cmd deleted file mode 100644 index ea7c3fd455..0000000000 --- a/.appveyor-download.cmd +++ /dev/null @@ -1,22 +0,0 @@ -rem This file is https://raw.githubusercontent.com/symengine/symengine/master/bin/appveyor-download.cmd -rem Try to download a given file, with at most maxRetries attempts -rem This is useful because AppVeyor suffers of many transient network error - -@echo off -rem initiate the retry number -set retryNumber=0 -set maxRetries=6 -set time=0 - -:DOWNLOAD -timeout %time% > NUL -set /a time=2*%time%+1 -appveyor DownloadFile %* - -rem problem? -IF NOT ERRORLEVEL 1 GOTO :EOF -@echo Oops, appveyor download exited with code %ERRORLEVEL% - let us try again! -set /a retryNumber=%retryNumber%+1 -IF %reTryNumber% LSS %maxRetries% (GOTO :DOWNLOAD) -@echo Sorry, we tried downloading the package for %maxRetries% times and all attempts were unsuccessful! -EXIT /B 1 \ No newline at end of file diff --git a/appveyor.yml b/appveyor.yml index 2d4894f623..dc6d2a78d0 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -16,15 +16,8 @@ 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 - matrix: - - COMPILER: MinGW-w64 install: -# 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;%PATH% # Strawberry perl is the one to work with gcc - choco install strawberryperl -version 5.20.1.1 - SET PATH=C:\strawberry\c\bin;C:\strawberry\perl\site\bin;C:\strawberry\perl\bin;%PATH% @@ -33,9 +26,9 @@ install: # Lua #- choco install lua53 # Basic dependencies: gcc and Cmake (must be placed before Perl in the path) +- SET PATH=C:\tools\mingw64\bin;%PATH% - choco install mingw cmake - rename "C:\Program Files\Git\usr\bin\sh.exe" "sh-ignored.exe" -- SET PATH=C:\tools\mingw64\bin;%PATH% build_script: - cmake -G "MinGW Makefiles" -Denable_lua=OFF -Denable_java=ON -Denable_smpi=OFF -Denable_mallocators=OFF -Denable_lto=OFF . diff --git a/tools/cmake/DefinePackages.cmake b/tools/cmake/DefinePackages.cmake index 0248c1e8a9..e7f948cbad 100644 --- a/tools/cmake/DefinePackages.cmake +++ b/tools/cmake/DefinePackages.cmake @@ -908,7 +908,6 @@ set(bin_files set(txt_files ${txt_files} - .appveyor-download.cmd AUTHORS COPYING README -- 2.20.1