aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEnrico Tassi2014-12-19 17:33:38 +0100
committerEnrico Tassi2014-12-19 17:47:50 +0100
commit0c999f02ffcd61fcace0cc2d045056a82992a100 (patch)
tree05635f44dea569eb07e0e35113d70c7276552cf1
parentb24741df01cd98dc63b6c4d43b11e6e38b44a887 (diff)
Win32: fix installer
Still unsure about .o file (should they be shipped for the native_compute machinery or .cmxs suffice?)
-rwxr-xr-xdev/make-installer-win32.sh2
-rwxr-xr-xdev/nsis/coq.nsi8
2 files changed, 8 insertions, 2 deletions
diff --git a/dev/make-installer-win32.sh b/dev/make-installer-win32.sh
index 0a39e8d76e..e21a16b77f 100755
--- a/dev/make-installer-win32.sh
+++ b/dev/make-installer-win32.sh
@@ -5,7 +5,7 @@ ZIP=_make.zip
URL1=http://sourceforge.net/projects/gnuwin32/files/make/3.81/make-3.81-bin.zip/download
URL2=http://sourceforge.net/projects/gnuwin32/files/make/3.81/make-3.81-dep.zip/download
-./configure -prefix ./ -with-doc no -no-native-compiler
+./configure -prefix ./ -with-doc no
make
if [ ! -e bin/make.exe ]; then
wget -O $ZIP $URL1 && 7z x $ZIP "bin/*"
diff --git a/dev/nsis/coq.nsi b/dev/nsis/coq.nsi
index 1f598a88d3..547b73c870 100755
--- a/dev/nsis/coq.nsi
+++ b/dev/nsis/coq.nsi
@@ -93,8 +93,13 @@ Section "Coq" Sec1
SetOutPath "$INSTDIR\lib\theories"
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\*.cmxs
SetOutPath "$INSTDIR\lib\plugins"
File /r ${COQ_SRC_PATH}\plugins\*.vo
+ File /r ${COQ_SRC_PATH}\plugins\*.v
+ File /r ${COQ_SRC_PATH}\plugins\*.glob
File /r ${COQ_SRC_PATH}\plugins\*.cmxs
SetOutPath "$INSTDIR\lib\tools\coqdoc"
File ${COQ_SRC_PATH}\tools\coqdoc\coqdoc.sty
@@ -104,7 +109,8 @@ Section "Coq" Sec1
SetOutPath "$INSTDIR\man"
File ${COQ_SRC_PATH}\man\*.1
SetOutPath "$INSTDIR\lib\toploop"
- File ${COQ_SRC_PATH}\stm\stmworkertop.cmxs
+ File ${COQ_SRC_PATH}\stm\queryworkertop.cmxs
+ File ${COQ_SRC_PATH}\stm\proofworkertop.cmxs
File ${COQ_SRC_PATH}\stm\tacworkertop.cmxs
File ${COQ_SRC_PATH}\ide\coqidetop.cmxs