security-and-privacy/gnupg
security-and-privacy/gnupg
1
0
Fork 0
mirror of git://git.gnupg.org/gnupg.git synced 2025-04-17 15:44:34 +02:00
Code Activity

Last changes for W32

Browse Source
This commit is contained in:
Werner Koch 2005-02-03 11:16:27 +00:00
parent 907353ed60
commit 57ec15c0bb
5 changed files with 25 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
scripts/ChangeLog
View File

@ -1,3 +1,9 @@
2005-02-03 Werner Koch <wk@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@g10code.com> 2005-01-26 Werner Koch <wk@g10code.com>
* w32installer.nsi: Create a start menu entry and enhanced the * w32installer.nsi: Create a start menu entry and enhanced the

6
scripts/mk-w32-dist
View File

@ -79,7 +79,11 @@ for i in README COPYING NEWS; do
cp ${srcdir}/$i $i.txt cp ${srcdir}/$i $i.txt
todos $i.txt todos $i.txt
done 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 . cp ${srcdir}/doc/$i .
todos $i todos $i
done done

12
scripts/w32installer.nsi
View File

@ -60,7 +60,9 @@ Var MYTMP
Var STARTMENU_FOLDER Var STARTMENU_FOLDER
Var DOC_INSTALLED Var DOC_INSTALLED
!ifdef WITH_WINPT
Var WINPT_INSTALLED Var WINPT_INSTALLED
!endif
; ------------------ ; ------------------
; Interface Settings ; Interface Settings
@ -113,7 +115,7 @@ Var WINPT_INSTALLED
!insertmacro MUI_PAGE_INSTFILES !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_SHOWREADME_TEXT "$(T_ShowReadme)"
!define MUI_FINISHPAGE_LINK \ !define MUI_FINISHPAGE_LINK \
"Visit the GnuPG website for latest news and support" "Visit the GnuPG website for latest news and support"
@ -163,7 +165,7 @@ Section "Base" SecBase
SetOutPath "$INSTDIR\Doc" SetOutPath "$INSTDIR\Doc"
File "README.txt" File "README.txt"
File "README.W32" File "README.W32.txt"
File "COPYING.txt" File "COPYING.txt"
Call InstallIconv Call InstallIconv
@ -272,6 +274,8 @@ Section "-Finish"
CreateShortCut "$SMPROGRAMS\$STARTMENU_FOLDER\GnuPG README.lnk" \ CreateShortCut "$SMPROGRAMS\$STARTMENU_FOLDER\GnuPG README.lnk" \
"$INSTDIR\Doc\README.txt" "$INSTDIR\Doc\README.txt"
CreateShortCut "$SMPROGRAMS\$STARTMENU_FOLDER\GnuPG README.Windows.lnk" \
"$INSTDIR\Doc\README.W32.txt"
CreateShortCut "$SMPROGRAMS\$STARTMENU_FOLDER\GnuPG NEWS.lnk" \ CreateShortCut "$SMPROGRAMS\$STARTMENU_FOLDER\GnuPG NEWS.lnk" \
"$INSTDIR\Doc\NEWS.txt" "$INSTDIR\Doc\NEWS.txt"
@ -280,6 +284,7 @@ Section "-Finish"
"$INSTDIR\Doc\gpg.man" "$INSTDIR\Doc\gpg.man"
!ifdef WITH_WINPT
IntCmp $WINPT_INSTALLED 1 0 no_winpt_menu no_winpt_menu IntCmp $WINPT_INSTALLED 1 0 no_winpt_menu no_winpt_menu
CreateShortCut "$SMPROGRAMS\$STARTMENU_FOLDER\winpt.lnk" \ CreateShortCut "$SMPROGRAMS\$STARTMENU_FOLDER\winpt.lnk" \
"$INSTDIR\winpt.exe" "$INSTDIR\winpt.exe"
@ -290,6 +295,7 @@ Section "-Finish"
"$INSTDIR\Doc\NEWS.winpt.txt" "$INSTDIR\Doc\NEWS.winpt.txt"
no_winpt_menu: no_winpt_menu:
!endif
CreateShortCut "$SMPROGRAMS\$STARTMENU_FOLDER\uninst-gnupg.lnk" \ CreateShortCut "$SMPROGRAMS\$STARTMENU_FOLDER\uninst-gnupg.lnk" \
"$INSTDIR\uninst-gnupg.exe" "$INSTDIR\uninst-gnupg.exe"
@ -319,7 +325,7 @@ Section "Uninstall"
Delete "$INSTDIR\gpgkeys_ldap.exe" Delete "$INSTDIR\gpgkeys_ldap.exe"
Delete "$INSTDIR\Doc\README.txt" 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.txt"
Delete "$INSTDIR\Doc\COPYING.LIB.txt" Delete "$INSTDIR\Doc\COPYING.LIB.txt"
Delete "$INSTDIR\Doc\README.iconv.txt" Delete "$INSTDIR\Doc\README.iconv.txt"

4
util/ChangeLog
View File

@ -1,3 +1,7 @@
2005-02-03 Werner Koch <wk@g10code.com>
* http.c (connect_server): Define ERR outside of the !W32 block.
2005-02-01 David Shaw <dshaw@jabberwocky.com> 2005-02-01 David Shaw <dshaw@jabberwocky.com>
* http.c (connect_server): Fix fd leak when connecting to a * http.c (connect_server): Fix fd leak when connecting to a

2
util/http.c
View File

@ -930,13 +930,13 @@ connect_server( const char *server, ushort port, unsigned int flags,
if(!connected) if(!connected)
{ {
int err=errno;
#ifdef _WIN32 #ifdef _WIN32
if(hostfound) if(hostfound)
log_error("%s: Unable to connect: ec=%d\n",server,(int)WSAGetLastError()); log_error("%s: Unable to connect: ec=%d\n",server,(int)WSAGetLastError());
else else
log_error("%s: Host not found: ec=%d\n",server,(int)WSAGetLastError()); log_error("%s: Host not found: ec=%d\n",server,(int)WSAGetLastError());
#else #else
int err=errno;
if(hostfound) if(hostfound)
log_error("%s: %s\n",server,strerror(err)); log_error("%s: %s\n",server,strerror(err));
else else