From cb2d69efa4d012a6828077675aba1d2a51d710ef Mon Sep 17 00:00:00 2001
From: Maxime Dénès
Date: Thu, 7 Sep 2017 11:43:37 +0200
Subject: Trying to properly propagate errors in Windows CI script.

---
 dev/ci/appveyor.bat | 14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)

(limited to 'dev')

diff --git a/dev/ci/appveyor.bat b/dev/ci/appveyor.bat
index ca6a5643c1..e2fbf1f6d1 100644
--- a/dev/ci/appveyor.bat
+++ b/dev/ci/appveyor.bat
@@ -23,13 +23,19 @@ if %USEOPAM% == false (
   call %APPVEYOR_BUILD_FOLDER%\dev\build\windows\MakeCoq_MinGW.bat -threads=1 ^
     -arch=%ARCH% -installer=Y -coqver=%APPVEYOR_BUILD_FOLDER_CFMT% ^
     -destcyg=%CYGROOT% -destcoq=%DESTCOQ% -cygcache=%CYGCACHE% ^
-    -setup %CYGROOT%\%SETUP%
-  copy "%CYGROOT%\build\coq-local\dev\nsis\*.exe" dev\nsis
-  7z a coq-opensource-archive-%ARCHLONG%.zip %CYGROOT%\build\tarballs\*
+    -setup %CYGROOT%\%SETUP% || GOTO ErrorExit
+  copy "%CYGROOT%\build\coq-local\dev\nsis\*.exe" dev\nsis || GOTO ErrorExit
+  7z a coq-opensource-archive-%ARCHLONG%.zip %CYGROOT%\build\tarballs\* || GOTO ErrorExit
 )
 
 if %USEOPAM% == true (
   %CYGROOT%\%SETUP% -qnNdO -R %CYGROOT% -l %CYGCACHE% -s %CYGMIRROR% ^
     -P rsync -P patch -P diffutils -P make -P unzip -P m4 -P findutils -P time
-  %CYGROOT%/bin/bash -l %APPVEYOR_BUILD_FOLDER%/dev/ci/appveyor.sh
+  %CYGROOT%/bin/bash -l %APPVEYOR_BUILD_FOLDER%/dev/ci/appveyor.sh || GOTO ErrorExit
 )
+
+GOTO :EOF
+
+:ErrorExit
+  ECHO ERROR MakeCoq_MinGW.bat failed
+  EXIT /b 1
-- 
cgit v1.2.3


From 6729388e9f51d7efb86ac64d10cc3eb4fffe44a0 Mon Sep 17 00:00:00 2001
From: Enrico Tassi
Date: Mon, 4 Sep 2017 15:37:00 +0200
Subject: dev/build/windows/makecoq_mingw.sh: install camlp5's META file

---
 dev/build/windows/makecoq_mingw.sh | 4 ++++
 1 file changed, 4 insertions(+)

(limited to 'dev')

diff --git a/dev/build/windows/makecoq_mingw.sh b/dev/build/windows/makecoq_mingw.sh
index f3e4cec0b9..f12cbe0a78 100644
--- a/dev/build/windows/makecoq_mingw.sh
+++ b/dev/build/windows/makecoq_mingw.sh
@@ -910,6 +910,10 @@ function make_camlp5 {
     log2 make install
     # For some reason gramlib.a is not copied, but it is required by Coq
     cp lib/gramlib.a "$PREFIXOCAML/libocaml/camlp5/"
+    # For some reason META is not copied, but it is required by coq_makefile
+    log2 make -C etc META
+    mkdir -p "$PREFIXOCAML/libocaml/site-lib/camlp5/"
+    cp etc/META "$PREFIXOCAML/libocaml/site-lib/camlp5/"
     log2 make clean
     build_post
   fi
-- 
cgit v1.2.3