[git] GpgEX - branch, master, updated. gpgex-0.9.7-15-g17a42a2
by Werner Koch
cvs at cvs.gnupg.org
Thu Jun 20 18:34:07 CEST 2013
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "GnupG extension for the Windows Explorer".
The branch, master has been updated
via 17a42a21318ff5ade9648f216ac097a76aecb6b9 (commit)
from 3cc9ee5a799bbd802f578386a22103b9a85b89cd (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit 17a42a21318ff5ade9648f216ac097a76aecb6b9
Author: Werner Koch <wk at gnupg.org>
Date: Thu Jun 20 18:07:53 2013 +0200
Update versioninfo.
* src/gnupg.ico: New.
* src/versioninfo.rc.in: Add content from icons.rc. Update version
info to useful values.
* src/icons.rc: Remove.
diff --git a/NEWS b/NEWS
index a6452e3..4c198c1 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,9 @@
+Noteworthy changes for version 1.0.0 (unreleased)
+-------------------------------------------------
+
+* Support 64 bit Windows.
+
+
Noteworthy changes for version 0.9.7 (2010-07-21)
-------------------------------------------------
diff --git a/src/Makefile.am b/src/Makefile.am
index 061f4ae..2c238b9 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -19,15 +19,12 @@ EXEEXT = .dll
AM_CFLAGS = $(LIBASSUAN_CFLAGS) $(GPG_ERROR_CFLAGS) -shared
AM_CXXFLAGS = $(LIBASSUAN_CFLAGS) $(GPG_ERROR_CFLAGS) -shared
-ICON_NAMES = key lock
-ICON_SIZES = 12 16
-ICONS = $(addprefix icon-, \
- $(foreach size,$(ICON_SIZES),$(addsuffix -$(size).bmp, $(ICON_NAMES))))
+ICONS = icon-key-12.bmp icon-key-16.bmp \
+ icon-lock-12.bmp icon-lock-16.bmp
nodist_gpgex_SOURCES = versioninfo.rc gpgex.manifest
gpgex_SOURCES = \
gpgex.def \
- icons.rc \
registry.h registry.c \
exechelp.h exechelp.c \
w32-gettext.c w32-gettext.h \
@@ -40,10 +37,10 @@ gpgex_SOURCES = \
$(ICONS)
libgpg-error.a:
- ln -sf $(shell $(GPG_ERROR_CONFIG) --prefix)/lib/libgpg-error.a
+ ln -sf $$($(GPG_ERROR_CONFIG) --prefix)/lib/libgpg-error.a .
libassuan.a:
- ln -sf $(shell $(LIBASSUAN_CONFIG) --prefix)/lib/libassuan.a
+ ln -sf $$($(LIBASSUAN_CONFIG) --prefix)/lib/libassuan.a .
clean-local:
rm -f libgpg-error.a libassuan.a
diff --git a/src/gnupg.ico b/src/gnupg.ico
new file mode 100644
index 0000000..4c4bae0
Binary files /dev/null and b/src/gnupg.ico differ
diff --git a/src/icons.rc b/src/icons.rc
deleted file mode 100644
index b8d3349..0000000
--- a/src/icons.rc
+++ /dev/null
@@ -1,4 +0,0 @@
-Key_12 BITMAP "icon-key-12.bmp"
-Key_16 BITMAP "icon-key-16.bmp"
-Lock_12 BITMAP "icon-lock-12.bmp"
-Lock_16 BITMAP "icon-lock-16.bmp"
diff --git a/src/versioninfo.rc.in b/src/versioninfo.rc.in
index a88c5a0..6528dc8 100644
--- a/src/versioninfo.rc.in
+++ b/src/versioninfo.rc.in
@@ -16,43 +16,45 @@
#include <afxres.h>
+1 ICON "./gnupg.ico"
-VS_VERSION_INFO VERSIONINFO
- FILEVERSION @BUILD_FILEVERSION@
- PRODUCTVERSION @BUILD_FILEVERSION@
- FILEFLAGSMASK 0x3fL
+1 VERSIONINFO
+ FILEVERSION @BUILD_FILEVERSION@
+ PRODUCTVERSION @BUILD_FILEVERSION@
+ FILEFLAGSMASK 0x3fL
#ifdef _DEBUG
- FILEFLAGS 0x21L
+ FILEFLAGS 0x01L /* VS_FF_DEBUG (0x1)*/
#else
- FILEFLAGS 0x20L
+ FILEFLAGS 0x00L
#endif
- FILEOS 0x40004L
- FILETYPE 0x1L
- FILESUBTYPE 0x0L
-BEGIN
+ FILEOS 0x40004L /* VOS_NT (0x40000) | VOS__WINDOWS32 (0x4) */
+ FILETYPE 0x2L /* VFT_DLL (0x2) */
+ FILESUBTYPE 0x0L /* VFT2_UNKNOWN */
+ BEGIN
BLOCK "StringFileInfo"
BEGIN
- BLOCK "040904b0"
+ BLOCK "040904b0" /* US English (0409), Unicode (04b0) */
BEGIN
- VALUE "Comments", "This plugin is available under the terms of the GNU Lesser General Public License.\0"
- VALUE "CompanyName", "g10 Code GmbH\0"
VALUE "FileDescription", "GpgEX - GnuPG shell extensions\0"
- VALUE "FileVersion", "@VERSION@\0"
VALUE "InternalName", "gpgex\0"
- VALUE "LegalCopyright", "Copyright © 2009 g10 Code GmbH\0"
- VALUE "LegalTrademarks", "\0"
VALUE "OriginalFilename", "gpgex.dll\0"
- VALUE "PrivateBuild", "\0"
VALUE "ProductName", "GpgEX\0"
VALUE "ProductVersion", "@VERSION@\0"
- VALUE "SpecialBuild", "@BUILD_TIMESTAMP@\0"
+ VALUE "CompanyName", "g10 Code GmbH\0"
+ VALUE "FileVersion", "@VERSION@\0"
+ VALUE "LegalCopyright", "Copyright \xa9 2013 g10 Code GmbH\r\n \
+This program is free software; you can redistribute it and/or modify it \
+under the terms of the GNU Lesser General Public License as published by \
+the Free Software Foundation; either version 2.1 of the License, \
+or (at your option) any later version.\0"
END
END
BLOCK "VarFileInfo"
BEGIN
VALUE "Translation", 0x409, 1200
END
-END
+ END
+
/* Fixme: It was not possible to convince Windows to use the manifest.
* Thus we resort to static linking of gpgex with the helper
@@ -68,3 +70,12 @@ END
* hints to fix this are welcome.
*/
/* ISOLATIONAWARE_MANIFEST_RESOURCE_ID RT_MANIFEST "gpgex.manifest" */
+
+
+/*
+ * Our bitmaps.
+ */
+Key_12 BITMAP "icon-key-12.bmp"
+Key_16 BITMAP "icon-key-16.bmp"
+Lock_12 BITMAP "icon-lock-12.bmp"
+Lock_16 BITMAP "icon-lock-16.bmp"
-----------------------------------------------------------------------
Summary of changes:
NEWS | 6 ++++++
src/Makefile.am | 11 ++++-------
src/gnupg.ico | Bin 0 -> 10134 bytes
src/icons.rc | 4 ----
src/versioninfo.rc.in | 49 ++++++++++++++++++++++++++++++-------------------
5 files changed, 40 insertions(+), 30 deletions(-)
create mode 100644 src/gnupg.ico
delete mode 100644 src/icons.rc
hooks/post-receive
--
GnupG extension for the Windows Explorer
http://git.gnupg.org
More information about the Gnupg-commits
mailing list