diff options
-rw-r--r-- | appveyor.yml | 9 | ||||
-rw-r--r-- | appveyor_build.sh | 6 |
2 files changed, 5 insertions, 10 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% diff --git a/appveyor_build.sh b/appveyor_build.sh index 8e7b892720..b5993f9fd3 100644 --- a/appveyor_build.sh +++ b/appveyor_build.sh @@ -31,13 +31,11 @@ cd $APPVEYOR_BUILD_FOLDER cp config/m-nt.h config/m.h cp config/s-nt.h config/s.h -#cp config/Makefile.msvc config/Makefile cp config/Makefile.msvc64 config/Makefile PREFIX="C:/Program Files/OCaml" -echo "Edit config/Makefile so set PREFIX=$PREFIX" -cp config/Makefile config/Makefile.bak -sed -e "s|PREFIX=.*|PREFIX=$PREFIX|" config/Makefile.bak > config/Makefile +echo "Edit config/Makefile to set PREFIX=$PREFIX" +sed -i -e "s|PREFIX=.*|PREFIX=$PREFIX|" config/Makefile #run "Content of config/Makefile" cat config/Makefile run "make world" make world |