un peu mieux mais pas encore ca

git-svn-id: svn+ssh://scm.gforge.inria.fr/svn/coq/trunk@7533 85f007b7-540e-0410-9357-904b9bb8a0f7

1 files changed, 39 insertions, 38 deletions

diff --git a/distrib/windows/coq.nsi.in b/distrib/windows/coq.nsi.in
index 26f5d07e7f..8947ad2ae6 100755
--- a/distrib/windows/coq.nsi.in
+++ b/distrib/windows/coq.nsi.in
@@ -8,10 +8,7 @@
 
 !define MY_PRODUCT "Coq" ;Define your own software name here
 !define MY_VERSION "@VERSION@" ;Define your own software version here
-!define COQ_EXE_NAME "coq.exe"
-!define COQ_EXE_PATH "..\..\bin\coq.exe"
-!define COQIDE_EXE_NAME "coqide.exe"
-!define COQIDE_EXE_PATH "..\..\bin\coqide.exe"
+!define EXE_PATH "..\..\bin\"
 
 !include "MUI.nsh"
 
@@ -40,7 +37,7 @@
 ;Modern UI Configuration
 
   !insertmacro MUI_PAGE_WELCOME
-  !insertmacro MUI_PAGE_LICENSE "..\..\COPYING"
+  !insertmacro MUI_PAGE_LICENSE "..\..\LICENSE"
   !insertmacro MUI_PAGE_COMPONENTS
   !insertmacro MUI_PAGE_DIRECTORY
   !insertmacro MUI_PAGE_INSTFILES
@@ -84,14 +81,40 @@
 ;--------------------------------
 ;Installer Sections
 
+SetCompress off
+
 Section "Coq" Sec1
 
   ;ADD YOUR OWN STUFF HERE!
 
-  SetOutPath "$INSTDIR"
-  File "${COQ_EXE_PATH}"
+  SetOutPath "$INSTDIR\"
+  File "..\..\Coq.bat"
+
+  SetOutPath "$INSTDIR\bin"
+  File /x coqide.* ${EXE_PATH}\*.exe
   File "coq.ico"
 
+  SetOutPath "$INSTDIR\lib\theories"
+  File /r ..\..\theories\*.vo
+  SetOutPath "$INSTDIR\lib\contrib"
+  File /r ..\..\contrib\*.vo
+  SetOutPath "$INSTDIR\lib\theories7"
+  File /r ..\..\theories7\*.vo
+  SetOutPath "$INSTDIR\lib\contrib7"
+  File /r ..\..\contrib7\*.vo
+  SetOutPath "$INSTDIR\lib\states"
+  File ..\..\states\initial.coq
+  SetOutPath "$INSTDIR\lib\states7"
+  File ..\..\states7\initial.coq
+  File ..\..\states7\barestate.coq
+  SetOutPath "$INSTDIR\latex"
+  File ..\..\tools\coqdoc\coqdoc.sty
+  File ..\..\tools\coqdoc\style.css
+  SetOutPath "$INSTDIR\emacs"
+  File ..\..\tools\*.el
+  SetOutPath "$INSTDIR\man"
+  File ..\..\man\*.1
+
   ;Store install folder
   WriteRegStr HKCU "Software\${MY_PRODUCT}" "" $INSTDIR
   
@@ -115,7 +138,7 @@ Section "Coq" Sec1
 
 ; Start Menu Entries
   CreateDirectory "$SMPROGRAMS\Coq"
-  CreateShortCut "$SMPROGRAMS\Coq\Coq.lnk" "$INSTDIR\coq.exe" "" "$INSTDIR\coq.ico" 0 
+  CreateShortCut "$SMPROGRAMS\Coq\Coq.lnk" "$INSTDIR\Coq.bat" "" "$INSTDIR\coq.ico" 0 
   WriteINIStr "$SMPROGRAMS\Coq\Coq-HomePage.url" "InternetShortcut" "URL" "http://coq.inria.fr"
   CreateShortCut "$SMPROGRAMS\Coq\Uninstall.lnk" "$INSTDIR\Uninstall.exe" "" "$INSTDIR\Uninstall.exe" 0
 
@@ -124,16 +147,19 @@ SectionEnd
 Section "CoqIde" Sec2
 
   SetOutPath "$INSTDIR"
-  File "${COQIDE_EXE_PATH}"
+  File ..\..\Coqide.bat
+
+  SetOutPath "$INSTDIR\bin"
+  File ${EXE_PATH}\coqide.*
 
   ; Start Menu Entries
-  CreateShortCut "$SMPROGRAMS\Coq\CoqIde.lnk" "$INSTDIR\${COQIDE_EXE_NAME}" "" "$INSTDIR\coq.ico" 0 
+  CreateShortCut "$SMPROGRAMS\Coq\CoqIde.lnk" "$INSTDIR\Coqide.bat" "" "$INSTDIR\coq.ico" 0 
 
 SectionEnd
 
 Section  "The GTK DLLs (needed by CoqIde)" Sec3
   
-  SetOutPath "$INSTDIR"
+  SetOutPath "$INSTDIR\bin"
   File /r /x CVS  dlls\*.*
 
 SectionEnd
@@ -153,39 +179,14 @@ SectionEnd
 Section "Uninstall"
 
 ;; Binaries
-  Delete "$INSTDIR\${COQ_EXE_NAME}"
-  Delete "$INSTDIR\${COQIDE_EXE_NAME}"
+  Delete "$INSTDIR\bin\*.exe"
 
 ;; Icon
   Delete "$INSTDIR\coq.ico"
 
 ;; DLLs
 
-  Delete "$INSTDIR\iconv.dll" 
-  Delete "$INSTDIR\libgdk-win32-2.0-0.dll"
-  Delete "$INSTDIR\libgdk_pixbuf-2.0-0.dll"
-  Delete "$INSTDIR\libglib-2.0-0.dll"
-  Delete "$INSTDIR\libgobject-2.0-0.dll"
-  Delete "$INSTDIR\libgtk-win32-2.0-0.dll"
-  Delete "$INSTDIR\libpango-1.0-0.dll"
-  Delete "$INSTDIR\librsvg-2-2.dll"
-  Delete "$INSTDIR\freetype6.dll"
-  Delete "$INSTDIR\iconv.dll"
-  Delete "$INSTDIR\intl.dll"
-  Delete "$INSTDIR\libart_lgpl_2-2.dll"
-  Delete "$INSTDIR\libatk-1.0-0.dll"
-  Delete "$INSTDIR\libfontconfig-1.dll"
-  Delete "$INSTDIR\libgdk_pixbuf-2.0-0.dll"
-  Delete "$INSTDIR\libgmodule-2.0-0.dll"
-  Delete "$INSTDIR\libgsf-1-1.dll"
-  Delete "$INSTDIR\libpangoft2-1.0-0.dll"
-  Delete "$INSTDIR\libpangowin32-1.0-0.dll"
-  Delete "$INSTDIR\libxml2.dll"
-  Delete "$INSTDIR\xmlparse.dll"
-  Delete "$INSTDIR\xmltok.dll"
-  Delete "$INSTDIR\zlib1.dll"
-  RMDir /r "$INSTDIR\etc"
-  RMDir /r "$INSTDIR\lib"
+  Delete "$INSTDIR\bin\*.dll" 
     
 ;; Start Menu
   Delete "$SMPROGRAMS\Coq\Coq.lnk"