diff options
| author | David Allsopp <david.allsopp@metastack.com> | 2017-09-30 12:25:22 +0100 |
|---|---|---|
| committer | David Allsopp <david.allsopp@metastack.com> | 2017-10-01 12:20:11 +0100 |
| commit | 9d6781317890e8ba4ab09497583f8507ea6caa1a (patch) | |
| tree | d3303e9e520d9ab922f4c0888a72df9c5b325d3f | |
| parent | 3e805f173a560862e35da4e08470e125ff2c829e (diff) | |
| download | ocaml-9d6781317890e8ba4ab09497583f8507ea6caa1a.tar.gz | |
Don't use Cygwin git on AppVeyor
It has a habit of breaking - do the Git setup using Git-for-Windows from
appveyor_build.cmd
| -rw-r--r-- | appveyor_build.cmd | 10 | ||||
| -rw-r--r-- | appveyor_build.sh | 14 |
2 files changed, 12 insertions, 12 deletions
diff --git a/appveyor_build.cmd b/appveyor_build.cmd index 2562d78bf3..b579cc2d2e 100644 --- a/appveyor_build.cmd +++ b/appveyor_build.cmd @@ -37,6 +37,16 @@ set INCLUDE=%OCAML_PREV_INCLUDE% goto :EOF :install +rem Temporarily initialise the submodule in the main (msvc64) build +git submodule update --init flexdll +git worktree add ..\build-mingw32 -b appveyor-build-mingw32 +cd ..\build-mingw32 +git submodule update --init flexdll +git worktree add ..\build-msvc32 -b appveyor-build-msvc32 +rem Temporarily initialise the submodule in the msvc32 build +cd ..\build-msvc32 +git submodule update --init flexdll + rem appveyor DownloadFile "http://alain.frisch.fr/flexdll/flexdll-0.35.tar.gz" -FileName "flexdll.tar.gz" || exit /b 1 appveyor DownloadFile "http://alain.frisch.fr/flexdll/flexdll-bin-0.35.zip" -FileName "flexdll.zip" || exit /b 1 rem flexdll.zip is processed here, rather than in appveyor_build.sh because the diff --git a/appveyor_build.sh b/appveyor_build.sh index b0a95ac06a..a8a1c43f84 100644 --- a/appveyor_build.sh +++ b/appveyor_build.sh @@ -52,8 +52,7 @@ case "$1" in echo "Edit config/Makefile to set PREFIX=$PREFIX" sed -e "s|PREFIX=.*|PREFIX=$PREFIX|" -e "/^ *CFLAGS *=/s/\r\?$/ -WX\0/" config/Makefile.msvc > config/Makefile - # Temporarily initialise the submodule in the msvc32 build - git submodule update --init flexdll + # Temporarily bootstrap flexdll run "make flexdll" make flexdll run "make world" make world run "make runtimeopt" make runtimeopt @@ -70,14 +69,6 @@ case "$1" in *) cd $APPVEYOR_BUILD_FOLDER - git worktree add ../build-mingw32 -b appveyor-build-mingw32 - git worktree add ../build-msvc32 -b appveyor-build-msvc32 - - cd ../build-mingw32 - git submodule update --init flexdll - - cd $APPVEYOR_BUILD_FOLDER - # tar -xzf flexdll.tar.gz # cd flexdll-0.35 # make MSVC_DETECT=0 CHAINS=msvc64 support @@ -91,8 +82,7 @@ case "$1" in sed -e "s|PREFIX=.*|PREFIX=$PREFIX|" -e "/^ *CFLAGS *=/s/\r\?$/ -WX\0/" config/Makefile.msvc64 > config/Makefile #run "Content of config/Makefile" cat config/Makefile - # Temporarily initialise the submodule in the main (msvc64) build - git submodule update --init flexdll + # Temporarily bootstrap flexdll run "make flexdll" make flexdll run "make world" make world run "make bootstrap" make bootstrap |