gnupg (5 files)

[cvs user wk]

    Date: Thursday, February 3, 2005 @ 12:16:27
  Author: wk
    Path: /cvs/gnupg/gnupg

Modified: scripts/ChangeLog scripts/mk-w32-dist scripts/w32installer.nsi
          util/ChangeLog util/http.c

Last changes for W32


--------------------------+
 scripts/ChangeLog        |    6 ++++++
 scripts/mk-w32-dist      |    6 +++++-
 scripts/w32installer.nsi |   12 +++++++++---
 util/ChangeLog           |    4 ++++
 util/http.c              |    2 +-
 5 files changed, 25 insertions(+), 5 deletions(-)


Index: gnupg/scripts/ChangeLog
diff -u gnupg/scripts/ChangeLog:1.61 gnupg/scripts/ChangeLog:1.62
--- gnupg/scripts/ChangeLog:1.61	Wed Jan 26 18:44:48 2005
+++ gnupg/scripts/ChangeLog	Thu Feb  3 12:16:27 2005
@@ -1,3 +1,9 @@
+2005-02-03  Werner Koch  <wk at g10code.com>
+
+	* w32installer.nsi: Display README.W32 at the end of the
+	installation.
+	* mk-w32-dist: Append .txt to README.W32.
+	
 2005-01-26  Werner Koch  <wk at g10code.com>
 
 	* w32installer.nsi: Create a start menu entry and enhanced the
Index: gnupg/scripts/mk-w32-dist
diff -u gnupg/scripts/mk-w32-dist:1.16 gnupg/scripts/mk-w32-dist:1.17
--- gnupg/scripts/mk-w32-dist:1.16	Wed Jan 26 18:44:47 2005
+++ gnupg/scripts/mk-w32-dist	Thu Feb  3 12:16:27 2005
@@ -79,7 +79,11 @@
   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
Index: gnupg/scripts/w32installer.nsi
diff -u gnupg/scripts/w32installer.nsi:1.4 gnupg/scripts/w32installer.nsi:1.5
--- gnupg/scripts/w32installer.nsi:1.4	Wed Jan 26 18:44:47 2005
+++ gnupg/scripts/w32installer.nsi	Thu Feb  3 12:16:27 2005
@@ -60,7 +60,9 @@
 Var STARTMENU_FOLDER
 
 Var DOC_INSTALLED
+!ifdef WITH_WINPT
 Var WINPT_INSTALLED
+!endif
 
 ; ------------------
 ; Interface Settings
@@ -113,7 +115,7 @@
 
 !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 @@
   SetOutPath "$INSTDIR\Doc"
 
   File "README.txt"
-  File "README.W32"
+  File "README.W32.txt"
   File "COPYING.txt"
 
   Call InstallIconv
@@ -272,6 +274,8 @@
 
   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 @@
                  "$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 @@
                  "$INSTDIR\Doc\NEWS.winpt.txt"
 
  no_winpt_menu:
+!endif
 
   CreateShortCut "$SMPROGRAMS\$STARTMENU_FOLDER\uninst-gnupg.lnk" \
                  "$INSTDIR\uninst-gnupg.exe"
@@ -319,7 +325,7 @@
   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"
Index: gnupg/util/ChangeLog
diff -u gnupg/util/ChangeLog:1.179 gnupg/util/ChangeLog:1.180
--- gnupg/util/ChangeLog:1.179	Tue Feb  1 21:55:35 2005
+++ gnupg/util/ChangeLog	Thu Feb  3 12:16:27 2005
@@ -1,3 +1,7 @@
+2005-02-03  Werner Koch  <wk at g10code.com>
+
+	* http.c (connect_server): Define ERR outside of the !W32 block.
+
 2005-02-01  David Shaw  <dshaw at jabberwocky.com>
 
 	* http.c (connect_server): Fix fd leak when connecting to a
Index: gnupg/util/http.c
diff -u gnupg/util/http.c:1.32 gnupg/util/http.c:1.33
--- gnupg/util/http.c:1.32	Tue Feb  1 21:55:35 2005
+++ gnupg/util/http.c	Thu Feb  3 12:16:27 2005
@@ -930,13 +930,13 @@
 
   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