diff options
| -rw-r--r-- | distrib/Makefile | 12 | ||||
| -rwxr-xr-x | distrib/windows/coq.nsi | 13 |
2 files changed, 20 insertions, 5 deletions
diff --git a/distrib/Makefile b/distrib/Makefile index 3eba7d629e..f158a1ad06 100644 --- a/distrib/Makefile +++ b/distrib/Makefile @@ -36,6 +36,7 @@ noarguments: @echo "make pcoq-rpm to build a src.rpm and a rpm for pcoq on this arch" @echo "make deb to build a debian package" @echo "make win to build a windows package" + @echo "make win-installer to build a windows install program" @echo "make macosx to build a MacOS-X package on a disk image" @echo "make contrib-tag to tag the current contrib state with the release number" @echo "make contrib-tar-gz to build a tar.gz of contrib sources" @@ -280,6 +281,17 @@ $(COQWINZIP): $(TARGZ) mv $(WINBUILDROOT)/$(COQPACKAGE)/INSTALL.win $(WININSTALL)/INSTALL.txt cd $(WININSTALL); zip -A -r $(DISTRIBDIR)/$(COQWINZIP) * +################################# +# Windows installer +# Needs Nsis http://nsis.sourceforge.net/Main_Page +################################# + +MAKENSIS = "/cygdrive/c/Program Files/NSIS/makensis.exe" +WIN_INSTALLER:= $(COQPACKAGE)-installer.exe + +windows-installer:: + $(MAKENSIS) /DMY_VERSION=$(VERSION) /DOUTFILE=$(WIN_INSTALLER) windows/coq.nsi + clean:: rm -fr $(WINBUILDROOT) $(WININSTALL) diff --git a/distrib/windows/coq.nsi b/distrib/windows/coq.nsi index 9032d16ce3..7c6a405705 100755 --- a/distrib/windows/coq.nsi +++ b/distrib/windows/coq.nsi @@ -4,10 +4,10 @@ ;Written by Joost Verburg ;Modified by Julien Narboux -; This file is preprocessed by ./configure to subtitute @VERSION@ by the current version. +; The VERSION should be passed as an argument at compile time using : +; !define MY_PRODUCT "Coq" ;Define your own software name here -!define MY_VERSION "@VERSION@" ;Define your own software version here !define EXE_PATH "..\..\bin\" !include "MUI.nsh" @@ -18,7 +18,7 @@ Name "Coq" ;General - OutFile "Coq_@VERSION@_win32_installer.exe" + OutFile "${OUTFILE}" ;Folder selection page InstallDir "$PROGRAMFILES\${MY_PRODUCT}" @@ -82,6 +82,7 @@ FunctionEnd ;Installer Sections SetCompress off +;SetCompressor bzip2 ; Comment out after debuging. Section "Coq" Sec1 @@ -151,7 +152,8 @@ Section "Coq" Sec1 CreateDirectory "$SMPROGRAMS\Coq" CreateShortCut "$SMPROGRAMS\Coq\Coq.lnk" "$INSTDIR\Coq.bat" "" "$INSTDIR\bin\coq.ico" 0 - WriteINIStr "$SMPROGRAMS\Coq\Coq-HomePage.url" "InternetShortcut" "URL" "http://coq.inria.fr" + WriteINIStr "$SMPROGRAMS\Coq\The Coq HomePage.url" "InternetShortcut" "URL" "http://coq.inria.fr" + WriteINIStr "$SMPROGRAMS\Coq\The Coq Standard Library.url" "InternetShortcut" "URL" "http://coq.inria.fr/library-eng.html" CreateShortCut "$SMPROGRAMS\Coq\Uninstall.lnk" "$INSTDIR\Uninstall.exe" "" "$INSTDIR\Uninstall.exe" 0 SectionEnd @@ -243,7 +245,8 @@ Section "Uninstall" Delete "$SMPROGRAMS\Coq\Coq.lnk" Delete "$SMPROGRAMS\Coq\CoqIde.lnk" Delete "$SMPROGRAMS\Coq\Uninstall.lnk" - Delete "$SMPROGRAMS\Coq\Coq-HomePage.url" + Delete "$SMPROGRAMS\Coq\The Coq HomePage.url" + Delete "$SMPROGRAMS\Coq\The Coq Standard Library.url" Delete "$INSTDIR\Uninstall.exe" DeleteRegKey /ifempty HKCU "Software\${MY_PRODUCT}" |