summaryrefslogtreecommitdiff
path: root/appveyor.yml
diff options
context:
space:
mode:
authorDavid Allsopp <david.allsopp@metastack.com>2017-02-19 23:54:53 +0100
committerDavid Allsopp <david.allsopp@metastack.com>2017-02-20 11:05:55 +0100
commitc5b1134aa15094a3e1e4d1cbc95eafd89cb09669 (patch)
treea6f0cc773e6d37a02479fe51811f11ef7b0f279b /appveyor.yml
parent73d5ca819d8668c174792cada603eb1f40ea93e0 (diff)
downloadocaml-c5b1134aa15094a3e1e4d1cbc95eafd89cb09669.tar.gz
Tidy-up AppVeyor script a little
Diffstat (limited to 'appveyor.yml')
-rw-r--r--appveyor.yml9
1 files changed, 3 insertions, 6 deletions
diff --git a/appveyor.yml b/appveyor.yml
index ecde8454ea..f5e189f8f8 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -35,21 +35,18 @@ cache:
- C:\cygwin\var\cache\setup
install:
- - mkdir "%OCAMLROOT%"
- - mkdir "%OCAMLROOT%/bin"
- mkdir "%OCAMLROOT%/bin/flexdll"
- appveyor DownloadFile "http://alain.frisch.fr/flexdll/flexdll-bin-0.35.zip" -FileName "flexdll.zip"
- cinst 7zip.commandline
- 7za x -y flexdll.zip
- - for %%F in (*.c *.h *.exe *.o *.obj) do copy %%F "%OCAMLROOT%\bin\flexdll"
+ - for %%F in (flexdll.h flexlink.exe flexdll*_msvc64.obj default_amd64.manifest) do copy %%F "%OCAMLROOT%\bin\flexdll"
# Make sure the Cygwin path comes before the Git one (otherwise
# cygpath behaves crazily), but after the MSVC one.
- - set Path=C:\cygwin\bin;%Path%
+ - set Path=C:\cygwin\bin;%OCAMLROOT%\bin\flexdll;%Path%
- '%CYG_ROOT%\bin\bash -lc "cygcheck -dc cygwin"'
- - '"%CYG_ROOT%\setup-x86.exe" -qgnNdO -R "%CYG_ROOT%" -s "%CYG_MIRROR%" -l "%CYG_CACHE%" -P diffutils -P dos2unix -P gcc-core -P make -P ncurses >NUL'
+ - '"%CYG_ROOT%\setup-x86.exe" -qgnNdO -R "%CYG_ROOT%" -s "%CYG_MIRROR%" -l "%CYG_CACHE%" -P diffutils -P make >NUL'
- '%CYG_ROOT%\bin\bash -lc "cygcheck -dc cygwin"'
- call "C:\Program Files\Microsoft SDKs\Windows\v7.1\Bin\SetEnv.cmd" /x64
- - set Path=%OCAMLROOT%\bin;%OCAMLROOT%\bin\flexdll;%Path%
build_script:
- set PFPATH=%PROGRAMFILES%