Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 5 additions & 2 deletions appveyor.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ environment:
CYG_CACHE: C:/cygwin64/var/cache/setup
OCAML_PORT: msvc64
ARTEFACTS: no
FLEXDLL_VERSION: 0.43
matrix:
- OCAMLBRANCH: 3.11
- OCAMLBRANCH: 3.12
Expand All @@ -36,6 +37,8 @@ environment:
SKIP_OCAML_TEST: no
- OCAMLBRANCH: 5.0
OCAML_PORT: mingw64
- OCAMLBRANCH: 5.1
OCAML_PORT: mingw64
SKIP_OCAML_TEST: no
- OCAMLBRANCH: trunk
OCAML_PORT: mingw64
Expand All @@ -56,8 +59,8 @@ install:
- '%CYG_ROOT%\bin\bash -lc "zip --version" > nul || "%CYG_ROOT%\setup-x86_64.exe" --quiet-mode --no-shortcuts --no-startmenu --no-desktop --only-site --root "%CYG_ROOT%" --site "%CYG_MIRROR%" --local-package-dir "%CYG_CACHE%" --upgrade-also > nul'
- '%CYG_ROOT%\bin\bash -lc "cygcheck -dc cygwin"'
- call "C:\Program Files (x86)\Microsoft Visual Studio 14.0\VC\bin\amd64\vcvars64.bat"
- appveyor DownloadFile "https://github.com/alainfrisch/flexdll/archive/0.37.tar.gz" -FileName "flexdll.tar.gz"
- appveyor DownloadFile "https://github.com/alainfrisch/flexdll/releases/download/0.37/flexdll-bin-0.37.zip" -FileName "flexdll.zip"
- appveyor DownloadFile "https://github.com/ocaml/flexdll/archive/%FLEXDLL_VERSION%.tar.gz" -FileName "flexdll.tar.gz"
- appveyor DownloadFile "https://github.com/ocaml/flexdll/releases/download/%FLEXDLL_VERSION%/flexdll-bin-%FLEXDLL_VERSION%.zip" -FileName "flexdll.zip"
- appveyor DownloadFile "https://raw.githubusercontent.com/ocaml/ocaml/trunk/tools/msvs-promote-path" -FileName "msvs-promote-path"

build_script:
Expand Down
8 changes: 7 additions & 1 deletion appveyor_build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,7 @@ function configure_ocaml {
--disable-unix-lib \
--disable-bigarray-lib \
$GRAPHICS_DISABLE \
$OCAMLTEST_DISABLE \
--disable-debug-runtime
else
# "Classic" configuration
Expand Down Expand Up @@ -93,6 +94,7 @@ esac
MAKEOCAML=make
CONFIG_DIR=config
GRAPHICS_DISABLE=
OCAMLTEST_DISABLE=--disable-ocamltest
HEADER_DIR=
FLEXDLL_BOOTSTRAP_WORKS=1

Expand All @@ -105,9 +107,13 @@ case $OCAML_RELEASE in
406|407)
HEADER_DIR=byterun/caml;;
408)
OCAMLTEST_DISABLE=''
GRAPHICS_DISABLE=--disable-graph-lib
FLEXDLL_BOOTSTRAP_WORKS=0;;
409|410|411|412)
409|410)
OCAMLTEST_DISABLE=''
FLEXDLL_BOOTSTRAP_WORKS=0;;
411|412)
FLEXDLL_BOOTSTRAP_WORKS=0;;
esac

Expand Down