Last changes for W32RC-1-4-1rc1

5 files changed, 25 insertions, 5 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"
diff --git a/util/ChangeLog b/util/ChangeLog
index 15bfbde80..4cb53c792 100644
--- a/util/ChangeLog
+++ b/util/ChangeLog
@@ -1,3 +1,7 @@
+2005-02-03  Werner Koch  <[email protected]>
+
+	* http.c (connect_server): Define ERR outside of the !W32 block.
+
 2005-02-01  David Shaw  <[email protected]>
 
 	* http.c (connect_server): Fix fd leak when connecting to a
diff --git a/util/http.c b/util/http.c
index 989abd150..19393c360 100644
--- a/util/http.c
+++ b/util/http.c
@@ -930,13 +930,13 @@ connect_server( const char *server, ushort port, unsigned int flags,
 
   if(!connected)
     {
+      int err=errno;
 #ifdef _WIN32
       if(hostfound)
 	log_error("%s: Unable to connect: ec=%d\n",server,(int)WSAGetLastError());
       else
 	log_error("%s: Host not found: ec=%d\n",server,(int)WSAGetLastError());
 #else
-      int err=errno;
       if(hostfound)
 	log_error("%s: %s\n",server,strerror(err));
       else