From 5a0da4d8ea9b590e30ba9b194789b348be6bbc4f Mon Sep 17 00:00:00 2001
From: Guillaume Melquiond
Date: Thu, 17 Sep 2015 07:49:19 +0200
Subject: Fix Windows installer.

The theories/ directory contains no cmi/cmxs files when native_compute is
disabled, so do not try to ship them.
---
 dev/nsis/coq.nsi | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'dev/nsis')

diff --git a/dev/nsis/coq.nsi b/dev/nsis/coq.nsi
index 5b421e49dd..676490510c 100755
--- a/dev/nsis/coq.nsi
+++ b/dev/nsis/coq.nsi
@@ -95,8 +95,8 @@ Section "Coq" Sec1
   File /r ${COQ_SRC_PATH}\theories\*.vo
   File /r ${COQ_SRC_PATH}\theories\*.v
   File /r ${COQ_SRC_PATH}\theories\*.glob
-  File /r ${COQ_SRC_PATH}\theories\*.cmi
-  File /r ${COQ_SRC_PATH}\theories\*.cmxs
+  ; File /r ${COQ_SRC_PATH}\theories\*.cmi
+  ; File /r ${COQ_SRC_PATH}\theories\*.cmxs
   SetOutPath "$INSTDIR\lib\plugins"
   File /r ${COQ_SRC_PATH}\plugins\*.vo
   File /r ${COQ_SRC_PATH}\plugins\*.v
-- 
cgit v1.2.3


From f9ef1441083a988a938e163393dfbab04ab9da18 Mon Sep 17 00:00:00 2001
From: Maxime Dénès
Date: Thu, 7 Apr 2016 13:52:03 +0200
Subject: Use -win32 and -win64 suffixes for installer name on Windows.

---
 dev/nsis/coq.nsi | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'dev/nsis')

diff --git a/dev/nsis/coq.nsi b/dev/nsis/coq.nsi
index 676490510c..e1052b1e1b 100755
--- a/dev/nsis/coq.nsi
+++ b/dev/nsis/coq.nsi
@@ -13,7 +13,7 @@ SetCompressor lzma
 
 !define MY_PRODUCT "Coq" ;Define your own software name here
 !define COQ_SRC_PATH "..\.."
-!define OUTFILE "coq-installer-${VERSION}.exe"
+!define OUTFILE "coq-installer-${VERSION}-${ARCH}.exe"
 
 !include "MUI2.nsh"
 !include "FileAssociation.nsh"
-- 
cgit v1.2.3