Merge branch 'bugfix-changelog_in_windows_installer' into 'develop'

Bugfix changelog in windows installer

See merge request !14

BuildServer/Windows/Windows_resources/nsis/CHANGELOG.txt

-This is the MDANSE changes log file.

BuildServer/Windows/Windows_resources/nsis/MDANSE_installer.nsi

@@ -32,7 +32,7 @@ ShowInstDetails show
 ShowUnInstDetails show
 
 !define PUBLISHER "Institut Laue-Langevin"
-!define WEB_SITE "https://github.com/eurydyce/MDANSE"
+!define WEB_SITE "http://www.mdanse.org"
 !define UNINST_KEY "Software\Microsoft\Windows\CurrentVersion\Uninstall\MDANSE"
 !define UNINST_ROOT_KEY "HKLM"
 
@@ -60,7 +60,7 @@ and time correlation functions."
 !insertmacro MUI_PAGE_WELCOME
 
 ; Insert a "License" page in the installer
-!insertmacro MUI_PAGE_LICENSE "LICENSE.txt"
+!insertmacro MUI_PAGE_LICENSE "LICENSE"
 
 ; Insert a page to browse for the installation directory
 !insertmacro MUI_PAGE_DIRECTORY
@@ -73,7 +73,7 @@ and time correlation functions."
 !define MUI_FINISHPAGE_RUN_TEXT "Start MDANSE ${VERSION}"
 !define MUI_FINISHPAGE_RUN "$INSTDIR\MDANSE_launcher.bat"
 ; Insert in the finish page the possibility to view the changelog
-!define MUI_FINISHPAGE_SHOWREADME_TEXT "View Changelog"
+!define MUI_FINISHPAGE_SHOWREADME_TEXT "View CHANGELOG"
 !define MUI_FINISHPAGE_SHOWREADME_NOTCHECKED
 !define MUI_FINISHPAGE_SHOWREADME "$INSTDIR\CHANGELOG.txt"
 ; Actually insert the finish page to the installer
@@ -101,7 +101,7 @@ Section "MDANSE ${VERSION}" SEC01
   SetOverwrite on
   File /r /x *.pyc /x *.pyo /x *.log /x *.egg-info "${TARGET_DIR}\*"
   File "CHANGELOG.txt"
-  File "LICENSE.txt"
+  File "LICENSE"
   File "MDANSE_launcher.bat"
   File "MDANSE_command_shell.bat"
   CreateDirectory "${ICONS_DIR}"
@@ -145,6 +145,7 @@ Section uninstall
   SetShellVarContext all
   Delete "$INSTDIR\MDANSE.url"
   Delete "$INSTDIR\uninst.exe"
+  Delete "$INSTDIR\LICENSE"
   Delete "$INSTDIR\CHANGELOG.txt"
   Delete "$INSTDIR\MDANSE_launcher.bat"
   Delete "$INSTDIR\MDANSE_command_shell.bat"

BuildServer/Windows/deploy.bat

@@ -7,6 +7,12 @@ rem MDANSE_TEMPORARY_INSTALLATION_DIR
 
 cd "%MDANSE_SOURCE_DIR%\\BuildServer\\Windows"
 
+rem copy LICENSE
+copy %MDANSE_SOURCE_DIR%\\LICENSE %MDANSE_SOURCE_DIR%\\BuildServer\\Windows\\Windows_resources\\nsis\\
+
+rem copy CHANGELOG to CHANGELOG.txt (compulsory to be opened by nsis through an external text editor)
+copy %MDANSE_SOURCE_DIR%\\CHANGELOG %MDANSE_SOURCE_DIR%\\BuildServer\\Windows\\Windows_resources\\nsis\\CHANGELOG.txt
+
 rem Copy site.py 
 copy %MDANSE_SOURCE_DIR%\\BuildServer\\Windows\\Windows_resources\\site.py %MDANSE_TEMPORARY_INSTALLATION_DIR%\\Lib\\
 
@@ -27,4 +33,4 @@ if %STATUS% neq 0 (
 move %MDANSE_TEMPORARY_INSTALLATION_DIR%\\MDANSE*.exe %MDANSE_SOURCE_DIR%\\BuildServer\\
 rem Remove NSIS log file
 del NSISlog.txt
-cd %MDANSE_SOURCE_DIR%
\ No newline at end of file
+cd %MDANSE_SOURCE_DIR%