[svn] gpgme - r1364 - in trunk: . tests tests/gpg
svn author mo
cvs at cvs.gnupg.org
Sun Apr 19 20:03:49 CEST 2009
Author: mo
Date: 2009-04-19 20:03:49 +0200 (Sun, 19 Apr 2009)
New Revision: 1364
Added:
trunk/tests/gpg/mkdemodirs.in
Removed:
trunk/tests/gpg/mkdemodirs
Modified:
trunk/ChangeLog
trunk/Makefile.am
trunk/tests/ChangeLog
trunk/tests/gpg/Makefile.am
Log:
* Makefile.am (DISTCHECK_CONFIGURE_FLAGS): Specify --with-gpg.
* gpg/Makefile.am (EXTRA_DIST): Replaced mkdemodirs with mkdemodirs.in.
(mkdemodirs): New target.
(clean-local): Added command for removing mkdemodirs script.
(./Alpha/Secret.gpg): Added dependency on mkdemodirs.
* gpg/mkdemodirs: Renamed to ...
* gpg/mkdemodirs.in: ... here.
* gpg/mkdemodirs.in (GPG): Derive value from @GPG@ instead of hard-coding "gpg".
Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog 2009-04-15 12:04:21 UTC (rev 1363)
+++ trunk/ChangeLog 2009-04-19 18:03:49 UTC (rev 1364)
@@ -1,3 +1,7 @@
+2009-04-19 Moritz <moritz at gnu.org>
+
+ * Makefile.am (DISTCHECK_CONFIGURE_FLAGS): Specify --with-gpg.
+
2009-03-06 Marcus Brinkmann <marcus at g10code.de>
* assuan/: Update to libassuan SVN 2009-03-06.
Modified: trunk/tests/ChangeLog
===================================================================
--- trunk/tests/ChangeLog 2009-04-15 12:04:21 UTC (rev 1363)
+++ trunk/tests/ChangeLog 2009-04-19 18:03:49 UTC (rev 1364)
@@ -1,3 +1,14 @@
+2009-04-19 Moritz <moritz at gnu.org>
+
+ * gpg/Makefile.am (EXTRA_DIST): Replaced mkdemodirs with mkdemodirs.in.
+ (mkdemodirs): New target.
+ (clean-local): Added command for removing mkdemodirs script.
+ (./Alpha/Secret.gpg): Added dependency on mkdemodirs.
+
+ * gpg/mkdemodirs: Renamed to ...
+ * gpg/mkdemodirs.in: ... here.
+ * gpg/mkdemodirs.in (GPG): Derive value from @GPG@ instead of hard-coding "gpg".
+
2009-02-24 Werner Koch <wk at g10code.com>
* opassuan/t-command.c: Adjust for changed new op_assuan interface.
Modified: trunk/Makefile.am
===================================================================
--- trunk/Makefile.am 2009-04-15 12:04:21 UTC (rev 1363)
+++ trunk/Makefile.am 2009-04-19 18:03:49 UTC (rev 1364)
@@ -1,6 +1,6 @@
# Makefile.am - Top level Makefile for GPGME.
# Copyright (C) 2000 Werner Koch (dd9jn)
-# Copyright (C) 2001, 2002, 2004, 2005, 2008 g10 Code GmbH
+# Copyright (C) 2001, 2002, 2004, 2005, 2008, 2009 g10 Code GmbH
#
# This file is part of GPGME.
#
@@ -22,6 +22,8 @@
ACLOCAL_AMFLAGS = -I m4
AUTOMAKE_OPTIONS = dist-bzip2
+DISTCHECK_CONFIGURE_FLAGS = --with-gpg="@GPG@"
+
EXTRA_DIST = gpgme.spec.in autogen.sh
if BUILD_ASSUAN
Modified: trunk/tests/gpg/Makefile.am
===================================================================
--- trunk/tests/gpg/Makefile.am 2009-04-15 12:04:21 UTC (rev 1363)
+++ trunk/tests/gpg/Makefile.am 2009-04-19 18:03:49 UTC (rev 1364)
@@ -1,5 +1,5 @@
# Copyright (C) 2000 Werner Koch (dd9jn)
-# Copyright (C) 2001, 2004, 2005 g10 Code GmbH
+# Copyright (C) 2001, 2004, 2005, 2009 g10 Code GmbH
#
# This file is part of GPGME.
#
@@ -40,7 +40,7 @@
CLEANFILES = secring.gpg pubring.gpg pubring.kbx trustdb.gpg dirmngr.conf
DISTCLEANFILES = pubring.gpg~ pubring.kbx~ random_seed gpg.conf gpg-agent.conf
-EXTRA_DIST = mkdemodirs pubdemo.asc secdemo.asc cipher-1.asc cipher-2.asc \
+EXTRA_DIST = mkdemodirs.in pubdemo.asc secdemo.asc cipher-1.asc cipher-2.asc \
geheim.txt pubkey-1.asc seckey-1.asc pinentry
INCLUDES = -I$(top_builddir)/src
@@ -52,8 +52,13 @@
# We don't run t-genkey in the test suite, because it takes too long
noinst_PROGRAMS = $(TESTS) t-genkey
+mkdemodirs: mkdemodirs.in Makefile
+ sed -e 's,[@]GPG[@],$(GPG),g' < $(srcdir)/mkdemodirs.in > mkdemodirs
+ chmod +x mkdemodirs
+
clean-local:
- $(srcdir)/mkdemodirs --clean
+ -./mkdemodirs --clean
+ -rm -f mkdemodirs
all-local: ./pubring.gpg ./gpg.conf ./gpg-agent.conf
@@ -62,8 +67,8 @@
$(GPG) --homedir . --allow-secret-key-import \
--import Alpha/Secret.gpg Zulu/Secret.gpg
-./Alpha/Secret.gpg: secdemo.asc
- srcdir=$(srcdir) $(srcdir)/mkdemodirs
+./Alpha/Secret.gpg: mkdemodirs secdemo.asc
+ srcdir=$(srcdir) ./mkdemodirs
./gpg.conf:
# This is required for t-sig-notations.
Deleted: trunk/tests/gpg/mkdemodirs
Copied: trunk/tests/gpg/mkdemodirs.in (from rev 1363, trunk/tests/gpg/mkdemodirs)
===================================================================
--- trunk/tests/gpg/mkdemodirs.in (rev 0)
+++ trunk/tests/gpg/mkdemodirs.in 2009-04-19 18:03:49 UTC (rev 1364)
@@ -0,0 +1,55 @@
+#!/bin/sh
+# Copyright (C) 2004 g10 Code GmbH
+#
+# This file is part of GPGME.
+#
+# GPGME 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.
+#
+# GPGME is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
+# or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General
+# Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public
+# License along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
+
+set -e
+
+GPG="@GPG@ --batch --quiet --no-secmem-warning"
+NAMES='Alpha Bravo Charlie Delta Echo Foxtrot Golf Hotel India
+ Juliet Kilo Lima Mike November Oscar Papa Quebec Romeo
+ Sierra Tango Uniform Victor Whisky XRay Yankee Zulu'
+
+if [ "$1" = "--clean" ]; then
+ (for i in $NAMES; do
+ [ -d $i ] && rm -r $i || true
+ done) || true
+ exit 0
+fi
+
+[ -z "$srcdir" ] && srcdir="../tests"
+
+
+$GPG --dearmor -o secdemo.gpg --yes $srcdir/secdemo.asc
+$GPG --dearmor -o pubdemo.gpg --yes $srcdir/pubdemo.asc
+[ -f ./tdb.tmp ] && rm ./tdb.tmp
+GPGDEMO="$GPG --homedir . --trustdb-name ./tdb.tmp --no-default-keyring
+ --keyring pubdemo.gpg --secret-keyring secdemo.gpg"
+echo -n "Creating:"
+for name in $NAMES; do
+ echo -n " $name"
+ [ -d $name ] && rm -r $name
+ mkdir $name
+ $GPGDEMO --export-secret-key -o - $name > $name/Secret.gpg
+ $GPG --homedir $name --allow-secret-key-import --import $name/Secret.gpg
+ $GPGDEMO --export -o - $name > $name/Public.gpg
+ $GPG --homedir $name --import $name/Public.gpg
+ [ -f $name/pubring.gpg~ ] && rm $name/pubring.gpg~
+done
+echo "."
+[ -f ./tdb.tmp ] && rm ./tdb.tmp
+rm pubdemo.gpg secdemo.gpg
Property changes on: trunk/tests/gpg/mkdemodirs.in
___________________________________________________________________
Name: svn:executable
+ *
Name: svn:keywords
+ Author Date Id Revision
Name: svn:mergeinfo
+
Name: svn:eol-style
+ native
More information about the Gnupg-commits
mailing list