diff options
| author |  Enrico Tassi <Enrico.Tassi@inria.fr> | 2014-12-29 17:30:21 +0100 |
|---|---|---|
| committer | Enrico Tassi <Enrico.Tassi@inria.fr> | 2014-12-30 10:22:05 +0100 |
| commit | ffd85fd9c15f0c199c12ef002464a0ecc3fec1d6 (patch) | |
| tree | d118e6fb56fbefd45e57c69ebcca7f1a745f3a59 | |
| parent | b231bc873a1954f0a81a123fb61159e1fa3cf9b7 (diff) | |
Minor fixes for the win32 installer
| -rwxr-xr-x | dev/make-installer-win32.sh | 7 | ||||
| -rwxr-xr-x | dev/nsis/coq.nsi | 14 |
2 files changed, 11 insertions, 10 deletions
diff --git a/dev/make-installer-win32.sh b/dev/make-installer-win32.sh index e21a16b77..ec7cd5773 100755 --- a/dev/make-installer-win32.sh +++ b/dev/make-installer-win32.sh @@ -5,8 +5,8 @@ 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 -make +[ -e config/Makefile ] || ./configure -prefix ./ -with-doc no +make -j2 if [ ! -e bin/make.exe ]; then wget -O $ZIP $URL1 && 7z x $ZIP "bin/*" wget -O $ZIP $URL2 && 7z x $ZIP "bin/*" @@ -15,5 +15,6 @@ fi VERSION=`grep ^VERSION= config/Makefile | cut -d = -f 2` cd dev/nsis "$NSIS" -DVERSION=$VERSION -DGTK_RUNTIME="`cygpath -w $BASE`" coq.nsi -ls *exe +echo Installer: +ls -h $PWD/*exe cd ../.. diff --git a/dev/nsis/coq.nsi b/dev/nsis/coq.nsi index 547b73c87..90e3fdaa5 100755 --- a/dev/nsis/coq.nsi +++ b/dev/nsis/coq.nsi @@ -2,7 +2,7 @@ ;NSIS Modern User Interface ;Written by Joost Verburg -;Modified by Julien Narboux and Pierre Letouzey +;Modified by Julien Narboux and Pierre Letouzey and Enrico Tassi ;SetCompress off SetCompressor lzma @@ -38,7 +38,7 @@ SetCompressor lzma !insertmacro MUI_PAGE_WELCOME !insertmacro MUI_PAGE_LICENSE "${COQ_SRC_PATH}/LICENSE" !insertmacro MUI_PAGE_COMPONENTS - !define MUI_DIRECTORYPAGE_TEXT_TOP "Select where to install Coq. The path MUST not include spaces." + !define MUI_DIRECTORYPAGE_TEXT_TOP "Select where to install Coq. The path MUST NOT include spaces." !insertmacro MUI_PAGE_DIRECTORY !insertmacro MUI_PAGE_INSTFILES !insertmacro MUI_PAGE_FINISH @@ -58,7 +58,7 @@ SetCompressor lzma ;Description LangString DESC_1 ${LANG_ENGLISH} "This package contains Coq and CoqIDE." - LangString DESC_2 ${LANG_ENGLISH} "This package contains the development files (*.cmi, *.cmo, *.cmx, ...) needed in order to build a plugin for Coq." + LangString DESC_2 ${LANG_ENGLISH} "This package contains the development files needed in order to build a plugin for Coq." ;-------------------------------- ; Check for white spaces @@ -95,11 +95,13 @@ 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 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\*.cmi File /r ${COQ_SRC_PATH}\plugins\*.cmxs SetOutPath "$INSTDIR\lib\tools\coqdoc" File ${COQ_SRC_PATH}\tools\coqdoc\coqdoc.sty @@ -109,10 +111,8 @@ Section "Coq" Sec1 SetOutPath "$INSTDIR\man" File ${COQ_SRC_PATH}\man\*.1 SetOutPath "$INSTDIR\lib\toploop" - 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 + File ${COQ_SRC_PATH}\stm\*top.cmxs + File ${COQ_SRC_PATH}\ide\*top.cmxs ; CoqIDE SetOutPath "$INSTDIR\ide\" |