Test mingw32 as well as msvc64 on AppVeyor

gretay-js · Feb 20, 2017 · dd928f6 · dd928f6
1 parent 7d34f9b
commit dd928f6
Show file tree

Hide file tree

Showing 2 changed files with 26 additions and 1 deletion.
diff --git a/appveyor.yml b/appveyor.yml
@@ -30,6 +30,7 @@ environment:
     CYG_MIRROR: http://mirrors.kernel.org/sourceware/cygwin/
     CYG_CACHE: C:/cygwin/var/cache/setup
     OCAMLROOT: "%PROGRAMFILES%/OCaml"
+    OCAMLROOT2: "%PROGRAMFILES%/OCaml-mingw32"
 
 cache:
   - C:\cygwin\var\cache\setup
@@ -44,7 +45,7 @@ install:
   # cygpath behaves crazily), but after the MSVC one.
   - 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 make >NUL'
+  - '"%CYG_ROOT%\setup-x86.exe" -qgnNdO -R "%CYG_ROOT%" -s "%CYG_MIRROR%" -l "%CYG_CACHE%" -P diffutils -P make -P mingw64-i686-gcc-core >NUL'
   - '%CYG_ROOT%\bin\bash -lc "cygcheck -dc cygwin"'
   - call "C:\Program Files\Microsoft SDKs\Windows\v7.1\Bin\SetEnv.cmd" /x64
 
@@ -56,4 +57,6 @@ test_script:
   - '%APPVEYOR_BUILD_FOLDER%\ocamlc.opt -version'
   - set CAML_LD_LIBRARY_PATH=%OCAMLROOT%/lib/stublibs
   - '%CYG_ROOT%/bin/bash -lc "cd $APPVEYOR_BUILD_FOLDER && make tests"'
+  - '%CYG_ROOT%/bin/bash -lc "cd $APPVEYOR_BUILD_FOLDER/../build-mingw32 && make tests"'
   - '%CYG_ROOT%/bin/bash -lc "cd $APPVEYOR_BUILD_FOLDER && make install"'
+  - '%CYG_ROOT%/bin/bash -lc "cd $APPVEYOR_BUILD_FOLDER/../build-mingw32 && make install"'
diff --git a/appveyor_build.sh b/appveyor_build.sh
@@ -29,6 +29,14 @@ function run {
 
 cd $APPVEYOR_BUILD_FOLDER
 
+git worktree add ../build-mingw32 -b appveyor-build-mingw32
+
+cd ../build-mingw32
+
+git submodule update --init flexdll
+
+cd $APPVEYOR_BUILD_FOLDER
+
 cp config/m-nt.h config/m.h
 cp config/s-nt.h config/s.h
 cp config/Makefile.msvc64 config/Makefile
@@ -42,3 +50,17 @@ run "make world" make world
 run "make bootstrap" make bootstrap
 run "make opt" make opt
 run "make opt.opt" make opt.opt
+
+cd ../build-mingw32
+
+cp config/m-nt.h config/m.h
+cp config/s-nt.h config/s.h
+cp config/Makefile.mingw config/Makefile
+
+PREFIX="C:/Program Files/OCaml-mingw32"
+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 flexdll" make flexdll
+run "make world.opt" make world.opt