revise installer for windows

1 files changed, 16 insertions, 40 deletions

diff --git a/etc/win-installer.nsi b/etc/win-installer.nsi
index 8562acc..7b08705 100755
--- a/etc/win-installer.nsi
+++ b/etc/win-installer.nsi
@@ -1,13 +1,11 @@
 SetCompressor lzma
 
-; The VERSION should be passed as an argument at compile time using :
-;      nsis -DVERSION=1.5 win-installer.nsi
+; VERSION and BITS should be passed as an argument at compile time using:
+;      makensis -DVERSION=1.6 -DBITS=32 win-installer.nsi
 
 !define MY_PRODUCT "Coq" ;Define your own software name here
-!define SRC ".\"
-!define SRC_SSR "C:\Coq\lib\user-contrib\Ssreflect\"
-!define SRC_MC "C:\Coq\lib\user-contrib\MathComp\"
-!define OUTFILE "ssr-mathcomp-installer-${VERSION}.exe"
+!define SRC "C:\coq${BITS}\lib\user-contrib\mathcomp\"
+!define OUTFILE "ssreflect-mathcomp-installer-${VERSION}-win${BITS}.exe"
 
 !include "MUI2.nsh"
 
@@ -29,7 +27,7 @@ SetCompressor lzma
 ;Modern UI Configuration
 
   !insertmacro MUI_PAGE_WELCOME
-  !insertmacro MUI_PAGE_LICENSE "${SRC}\CeCILL-B"
+  !insertmacro MUI_PAGE_LICENSE ".\CeCILL-B"
   !insertmacro MUI_PAGE_COMPONENTS
   !define MUI_DIRECTORYPAGE_TEXT_TOP "Select where Coq is installed."
   !insertmacro MUI_PAGE_DIRECTORY
@@ -50,27 +48,25 @@ SetCompressor lzma
 ;Language Strings
 
   ;Description
-  LangString DESC_1 ${LANG_ENGLISH} "This package contains the Ssreflect proof language."
-  LangString DESC_2 ${LANG_ENGLISH} "This package contains the Mathematical Components lirbary."
+  LangString DESC ${LANG_ENGLISH} "The Ssreflect proof language and the Mathematical Components library."
 
 ;--------------------------------
 ;Installer Sections
 
 
-Section "Ssreflect" Sec1
+Section "Ssreflect and MathComp" Sec
 
-  SetOutPath "$INSTDIR\lib\user-contrib\Ssreflect\"
+  SetOutPath "$INSTDIR\lib\user-contrib\mathcomp\"
 
-  File /r ${SRC_SSR}\*.vo
-  File /r ${SRC_SSR}\*.v
-  File /r ${SRC_SSR}\*.glob
-  File /r ${SRC_SSR}\*.cmx
-  File /r ${SRC_SSR}\*.cmxs
-  File /r ${SRC_SSR}\*.cmi
+  File /r ${SRC}\*.vo
+  File /r ${SRC}\*.v
+  File /r ${SRC}\*.glob
+  File /r ${SRC}\*.cmxs
+  File /r ${SRC}\*.cmi
 
   CreateDirectory "$SMPROGRAMS\Coq"
 
-  WriteINIStr "$SMPROGRAMS\Coq\The Ssreflect Library.url" "InternetShortcut" "URL" "http://ssr.msr-inria.inria.fr/doc/ssreflect-${VERSION}/"
+  WriteINIStr "$SMPROGRAMS\Coq\The Mathematical Components Library.url" "InternetShortcut" "URL" "http://math-comp.github.io/math-comp/"
 
   WriteINIStr "$SMPROGRAMS\Coq\The Ssreflect User Manaul.url" "InternetShortcut" "URL" "http://hal.inria.fr/inria-00258384/en"
         
@@ -79,35 +75,15 @@ Section "Ssreflect" Sec1
 
 SectionEnd
 
-Section "MathComp" Sec2
-
-  SetOutPath "$INSTDIR\lib\user-contrib\MathComp\"
-
-  File /r ${SRC_MC}\*.vo
-  File /r ${SRC_MC}\*.v
-  File /r ${SRC_MC}\*.glob
-  File /r ${SRC_MC}\*.cmx
-  File /r ${SRC_MC}\*.cmxs
-  File /r ${SRC_MC}\*.cmi
-
-  CreateDirectory "$SMPROGRAMS\Coq"
-
-  WriteINIStr "$SMPROGRAMS\Coq\The Mathematical Components Library.url" "InternetShortcut" "URL" "http://ssr.msr-inria.inria.fr/doc/mathcomp-${VERSION}/"
-
-SectionEnd
-
 !insertmacro MUI_FUNCTION_DESCRIPTION_BEGIN
-  !insertmacro MUI_DESCRIPTION_TEXT ${Sec1} $(DESC_1)
-  !insertmacro MUI_DESCRIPTION_TEXT ${Sec2} $(DESC_2)
+  !insertmacro MUI_DESCRIPTION_TEXT ${Sec} $(DESC)
 !insertmacro MUI_FUNCTION_DESCRIPTION_END
  
 Section "Uninstall"
 
-  RMDir /r "$INSTDIR\lib\user-contrib\MathComp\"
-  RMDir /r "$INSTDIR\lib\user-contrib\Ssreflect\"
+  RMDir /r "$INSTDIR\lib\user-contrib\mathcomp\"
 
   Delete "$SMPROGRAMS\Coq\The Mathematical Components Library.url"
-  Delete "$SMPROGRAMS\Coq\The Ssreflect Library.url"
   Delete "$SMPROGRAMS\Coq\The Ssreflect User Manaul.url"
 
   Delete "$INSTDIR\Uninstall Ssreflect and MathComp.exe"