[Gpg4win-commits] r1222 - in trunk: . patches/gnupg2-2.0.12 src
scm-commit@wald.intevation.org
scm-commit at wald.intevation.org
Fri Jul 31 13:03:27 CEST 2009
Author: marcus
Date: 2009-07-31 13:03:26 +0200 (Fri, 31 Jul 2009)
New Revision: 1222
Added:
trunk/patches/gnupg2-2.0.12/09-sm-keylist.patch
Modified:
trunk/ChangeLog
trunk/Makefile.am
trunk/src/make-msi.bat
trunk/src/make-msi.pl
Log:
2009-07-31 Marcus Brinkmann <marcus at g10code.com>
* patches/gnupg2-2.0.12/09-sm-keylist.patch: New file.
* Makefile.am (EXTRA_DIST): Add it.
Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog 2009-07-31 08:40:08 UTC (rev 1221)
+++ trunk/ChangeLog 2009-07-31 11:03:26 UTC (rev 1222)
@@ -1,3 +1,8 @@
+2009-07-31 Marcus Brinkmann <marcus at g10code.com>
+
+ * patches/gnupg2-2.0.12/09-sm-keylist.patch: New file.
+ * Makefile.am (EXTRA_DIST): Add it.
+
2009-07-30 Werner Koch <wk at g10code.com>
* patches/gnupg2-2.0.12/08-sm-learn-card.patch: New.
Modified: trunk/Makefile.am
===================================================================
--- trunk/Makefile.am 2009-07-31 08:40:08 UTC (rev 1221)
+++ trunk/Makefile.am 2009-07-31 11:03:26 UTC (rev 1222)
@@ -50,6 +50,7 @@
patches/gnupg2-2.0.12/06-opgp-sign3072.patch \
patches/gnupg2-2.0.12/07-gpg-no-detached.patch \
patches/gnupg2-2.0.12/08-sm-learn-card.patch \
+ patches/gnupg2-2.0.12/09-sm-keylist.patch \
patches/gpgol-0.9.91/01-gpgme.patch \
patches/gpa-0.9.0/01-title-prop.patch \
patches/libetpan-0.57/01-gnutls_compat.patch \
Added: trunk/patches/gnupg2-2.0.12/09-sm-keylist.patch
===================================================================
--- trunk/patches/gnupg2-2.0.12/09-sm-keylist.patch 2009-07-31 08:40:08 UTC (rev 1221)
+++ trunk/patches/gnupg2-2.0.12/09-sm-keylist.patch 2009-07-31 11:03:26 UTC (rev 1222)
@@ -0,0 +1,22 @@
+#! /bin/sh
+patch -p0 -f $* < $0
+exit $?
+
+[sm]
+2009-07-29 Marcus Brinkmann <marcus at g10code.com>
+
+ * keylist.c (print_capabilities): Print a trailing colon.
+
+Index: keylist.c
+===================================================================
+--- sm/keylist.c (revision 5080)
++++ sm/keylist.c (working copy)
+@@ -286,6 +286,8 @@
+ es_putc ('S', fp);
+ if ((use & KSBA_KEYUSAGE_KEY_CERT_SIGN))
+ es_putc ('C', fp);
++
++ es_putc (':', fp);
+ }
+
+
Property changes on: trunk/patches/gnupg2-2.0.12/09-sm-keylist.patch
___________________________________________________________________
Name: svn:executable
+ *
Modified: trunk/src/make-msi.bat
===================================================================
--- trunk/src/make-msi.bat 2009-07-31 08:40:08 UTC (rev 1221)
+++ trunk/src/make-msi.bat 2009-07-31 11:03:26 UTC (rev 1222)
@@ -1,7 +1,7 @@
REM Usage: make-msi.bat [-L{de|en}] [FILE]
REM Defaults: -Len gpg4win.wix
REM
-set WIXPATH=C:\"Program Files"\"Windows Installer XML v3"\bin
+set WIXPATH=%ProgramFiles%\"Windows Installer XML v3"\bin
set LANG=en-us
IF NOT "%1"=="-Lde" GOTO langde
@@ -23,5 +23,21 @@
set FILE=%1
:nofile
-%WIXPATH%\candle.exe %FILE%
-%WIXPATH%\light.exe -ext WixUIExtension -cultures:%LANG% %FILE%obj
+
+REM We want to catch error, so always clean.
+del msi-custom-license.wixobj
+del msi-custom-ui.wixobj
+del %FILE%.wixobj
+del %FILE%.msi
+
+%WIXPATH%\candle.exe msi-custom-license.wxs
+IF ERRORLEVEL 1 GOTO End
+%WIXPATH%\candle.exe msi-custom-ui.wxs
+IF ERRORLEVEL 1 GOTO End
+%WIXPATH%\candle.exe %FILE%.wxs
+IF ERRORLEVEL 1 GOTO End
+REM Validity tests disabled with -sval due to non-advertised shortcuts.
+%WIXPATH%\light.exe -sval -ext WixUIExtension -ext WixUtilExtension -cultures:%LANG% msi-custom-license.wixobj msi-custom-ui.wixobj %FILE%.wixobj -out %FILE%.msi
+IF ERRORLEVEL 1 GOTO End
+
+:End
Modified: trunk/src/make-msi.pl
===================================================================
--- trunk/src/make-msi.pl 2009-07-31 08:40:08 UTC (rev 1221)
+++ trunk/src/make-msi.pl 2009-07-31 11:03:26 UTC (rev 1222)
@@ -1,6 +1,6 @@
#! /usr/bin/perl -w
# make-msi.pl - MSI Installer for GnuPG 4 Windows.
-# Copyright (C) 2007 g10 Code GmbH
+# Copyright (C) 2007, 2008 g10 Code GmbH
#
# This file is part of Gpg4win.
#
@@ -1591,11 +1591,23 @@
# Removed this, because it is not localized:
# <UIRef Id='WixUI_ErrorProgressText' />
+# We could do this, but we how to select on language?
+# Probably some conditional can be used.
+# <CustomAction Id="ShowReadMe" BinaryKey="WixCA" DllEntry="WixShellExec"
+# Execute="immediate" Return="check" Impersonate="yes" />
+# <Property Id="WIXUI_EXITDIALOGOPTIONALCHECKBOXTEXT" Value="Show README" />
+# <Property Id="WixShellExecTarget" Value="[#f_Kontact_0]" />
+# <UI>
+# <Publish Dialog="ExitDialog" Control="Finish" Event="DoAction"
+# Value="ShowReadMe"
+# Order="1">WIXUI_EXITDIALOGOPTIONALCHECKBOX</Publish>
+# </UI>
+
print <<EOF;
</Feature>
<WixVariable Id='WixUILicenseRtf' Value='gpl.rtf'/>
- <UIRef Id='WixUI_Mondo' />
+ <UIRef Id='WixUI_Gpg4Win' />
</Product>
</Wix>
More information about the Gpg4win-commits
mailing list