diff options
| author | Werner Koch <[email protected]> | 2005-02-03 11:16:27 +0000 |
|---|---|---|
| committer | Werner Koch <[email protected]> | 2005-02-03 11:16:27 +0000 |
| commit | 57ec15c0bb0abeec6d1c523e694f3b0881340fb4 (patch) | |
| tree | e3194009dbd881e26e90774e4a80c24e95261b4c /scripts | |
| parent | About to do a release candidate (diff) | |
| download | gnupg-57ec15c0bb0abeec6d1c523e694f3b0881340fb4.tar.gz gnupg-57ec15c0bb0abeec6d1c523e694f3b0881340fb4.zip | |
Last changes for W32RC-1-4-1rc1
Diffstat (limited to 'scripts')
| -rw-r--r-- | scripts/ChangeLog | 6 | ||||
| -rwxr-xr-x | scripts/mk-w32-dist | 6 | ||||
| -rw-r--r-- | scripts/w32installer.nsi | 12 |
3 files changed, 20 insertions, 4 deletions
diff --git a/scripts/ChangeLog b/scripts/ChangeLog index 183e71e9e..53f048eb9 100644 --- a/scripts/ChangeLog +++ b/scripts/ChangeLog @@ -1,3 +1,9 @@ +2005-02-03 Werner Koch <[email protected]> + + * w32installer.nsi: Display README.W32 at the end of the + installation. + * mk-w32-dist: Append .txt to README.W32. + 2005-01-26 Werner Koch <[email protected]> * w32installer.nsi: Create a start menu entry and enhanced the diff --git a/scripts/mk-w32-dist b/scripts/mk-w32-dist index d4556629f..0a0cab1ef 100755 --- a/scripts/mk-w32-dist +++ b/scripts/mk-w32-dist @@ -79,7 +79,11 @@ for i in README COPYING NEWS; do cp ${srcdir}/$i $i.txt todos $i.txt done -for i in README.W32 gnupg-w32.reg; do +for i in README.W32 ; do + cp ${srcdir}/doc/$i $i.txt + todos $i.txt +done +for i in gnupg-w32.reg; do cp ${srcdir}/doc/$i . todos $i done diff --git a/scripts/w32installer.nsi b/scripts/w32installer.nsi index 2606697db..71f3951d7 100644 --- a/scripts/w32installer.nsi +++ b/scripts/w32installer.nsi @@ -60,7 +60,9 @@ Var MYTMP Var STARTMENU_FOLDER Var DOC_INSTALLED +!ifdef WITH_WINPT Var WINPT_INSTALLED +!endif ; ------------------ ; Interface Settings @@ -113,7 +115,7 @@ Var WINPT_INSTALLED !insertmacro MUI_PAGE_INSTFILES -!define MUI_FINISHPAGE_SHOWREADME "README.txt" +!define MUI_FINISHPAGE_SHOWREADME "README.W32.txt" !define MUI_FINISHPAGE_SHOWREADME_TEXT "$(T_ShowReadme)" !define MUI_FINISHPAGE_LINK \ "Visit the GnuPG website for latest news and support" @@ -163,7 +165,7 @@ Section "Base" SecBase SetOutPath "$INSTDIR\Doc" File "README.txt" - File "README.W32" + File "README.W32.txt" File "COPYING.txt" Call InstallIconv @@ -272,6 +274,8 @@ Section "-Finish" CreateShortCut "$SMPROGRAMS\$STARTMENU_FOLDER\GnuPG README.lnk" \ "$INSTDIR\Doc\README.txt" + CreateShortCut "$SMPROGRAMS\$STARTMENU_FOLDER\GnuPG README.Windows.lnk" \ + "$INSTDIR\Doc\README.W32.txt" CreateShortCut "$SMPROGRAMS\$STARTMENU_FOLDER\GnuPG NEWS.lnk" \ "$INSTDIR\Doc\NEWS.txt" @@ -280,6 +284,7 @@ Section "-Finish" "$INSTDIR\Doc\gpg.man" +!ifdef WITH_WINPT IntCmp $WINPT_INSTALLED 1 0 no_winpt_menu no_winpt_menu CreateShortCut "$SMPROGRAMS\$STARTMENU_FOLDER\winpt.lnk" \ "$INSTDIR\winpt.exe" @@ -290,6 +295,7 @@ Section "-Finish" "$INSTDIR\Doc\NEWS.winpt.txt" no_winpt_menu: +!endif CreateShortCut "$SMPROGRAMS\$STARTMENU_FOLDER\uninst-gnupg.lnk" \ "$INSTDIR\uninst-gnupg.exe" @@ -319,7 +325,7 @@ Section "Uninstall" Delete "$INSTDIR\gpgkeys_ldap.exe" Delete "$INSTDIR\Doc\README.txt" - Delete "$INSTDIR\Doc\README.W32" + Delete "$INSTDIR\Doc\README.W32.txt" Delete "$INSTDIR\Doc\COPYING.txt" Delete "$INSTDIR\Doc\COPYING.LIB.txt" Delete "$INSTDIR\Doc\README.iconv.txt" |