[Winpt-commits] r58 - in trunk: . Src

[scm-commit at wald.intevation.org]

Author: werner
Date: 2005-11-02 14:36:03 +0100 (Wed, 02 Nov 2005)
New Revision: 58

Added:
   trunk/README.SVN
Modified:
   trunk/Makefile.am
   trunk/Src/ChangeLog
   trunk/Src/WinPT.cpp
   trunk/Src/wptGPG.cpp
   trunk/autogen.sh
Log:
Add comments and a README.SVN


Modified: trunk/Makefile.am
===================================================================
--- trunk/Makefile.am	2005-11-02 11:29:44 UTC (rev 57)
+++ trunk/Makefile.am	2005-11-02 13:36:03 UTC (rev 58)
@@ -14,7 +14,7 @@
 ACLOCAL_AMFLAGS = -I m4
 AUTOMAKE_OPTIONS = dist-bzip2
 
-EXTRA_DIST = autogen.sh
+EXTRA_DIST = autogen.sh README.SVN
 
 SUBDIRS = Gnupg w32gpgme PTD Src Include
 

Added: trunk/README.SVN
===================================================================
--- trunk/README.SVN	2005-11-02 11:29:44 UTC (rev 57)
+++ trunk/README.SVN	2005-11-02 13:36:03 UTC (rev 58)
@@ -0,0 +1,47 @@
+If you are building from Subversion, run the script
+
+./autogen.sh
+
+first, to make sure that you have all the necessary maintainer tools
+are installed and to build the actual configuration files.  Then run
+
+./autogen --build-w32
+
+followed by the usual make.
+
+If autogen.sh complains about insufficient versions of the required
+tools, or the tools are not installed, you may use environment
+variables to override the default tool names:
+
+ AUTOMAKE_SUFFIX  is used as a suffix for all tools from the automake
+                  package.  For example 
+                     AUTOMAKE_SUFFIX="-1.7" ./autogen.sh
+                  uses "automake-1.7" and "aclocal-1.7.
+ AUTOMAKE_PREFIX  is used as a prefix for all tools from the automake
+                  page and may be combined with AUTOMAKE_SUFFIX. e.g.:
+                    AUTOMAKE_PREFIX=/usr/foo/bin ./autogen.sh
+                  uses "automake" and "aclocal" in the /usr/foo/bin
+                  directory.
+ AUTOCONF_SUFFIX  is used as a suffix for all tools from the automake
+                  package
+ AUTOCONF_PREFIX  is used as a prefix for all tools from the automake
+                  package
+ GETTEXT_SUFFIX   is used as a suffix for all tools from the gettext
+                  package
+ GETTEXT_PREFIX   is used as a prefix for all tools from the gettext
+                  package
+
+It is also possible to use the variable name AUTOMAKE, AUTOCONF,
+ACLOCAL, AUTOHEADER, GETTEXT and MSGMERGE to directly specify the name
+of the programs to run.  It is however better to use the suffix and
+prefix forms as described above because that does not require
+knowledge about the actual tools used by autgen.sh.
+
+
+Please don't use autopoint, libtoolize or autoreconf unless you are
+the current maintainer and want to update the standard configuration
+files.  All those files should be in the repository and only updated
+manually if the maintainer decides that newer versions are required.
+The maintainer should also make sure that the required version of
+automake et al. are properly indicated at the top of configure.ac and
+take care to copy the files and not merely use symlinks.


Property changes on: trunk/README.SVN
___________________________________________________________________
Name: svn:eol-style
   + native

Modified: trunk/Src/ChangeLog
===================================================================
--- trunk/Src/ChangeLog	2005-11-02 11:29:44 UTC (rev 57)
+++ trunk/Src/ChangeLog	2005-11-02 13:36:03 UTC (rev 58)
@@ -1,6 +1,7 @@
 2005-11-02  Werner Koch  <wk at g10code.com>
 
 	* WinPT.cpp (WinMain): Disabled PTD version tests.
+	(check_crypto_engine): Fixed version check for scard.
 
 	* wptErrors.cpp (debug_end): Add dummy function.
 

Modified: trunk/Src/WinPT.cpp
===================================================================
--- trunk/Src/WinPT.cpp	2005-11-02 11:29:44 UTC (rev 57)
+++ trunk/Src/WinPT.cpp	2005-11-02 13:36:03 UTC (rev 58)
@@ -187,7 +187,7 @@
 	return rc;
     }
     /* We enable smartcard support for GPG: 1.9 or >= 1.4 */
-    if (ma >= 1 && mi >= 4)
+    if ((ma == 1 && mi >= 4) || ma > 1)
 	scard_support = 1;
 
     gpgver[0] = ma;
@@ -254,10 +254,10 @@
 
     glob_hinst = hinst;
 
-    #ifdef _DEBUG
+#ifdef _DEBUG
     gpg_set_debug_mode (1);
     debug = 1;
-    #endif
+#endif
 
     s = PTD_get_version ();
     // FIXME: Using strcmp here is wrong

Modified: trunk/Src/wptGPG.cpp
===================================================================
--- trunk/Src/wptGPG.cpp	2005-11-02 11:29:44 UTC (rev 57)
+++ trunk/Src/wptGPG.cpp	2005-11-02 13:36:03 UTC (rev 58)
@@ -170,6 +170,8 @@
 /* Return the full path (with the gpg exe name). First the registry is scanned
    for the entry 'gpgProgram'. If it wasn't set, the default path is the
    appended string 'gpg.exe' is used. */
+
+/* FIXME:  Use gpgme's engine info here. */
 char*
 get_gnupg_prog (void)
 {    
@@ -358,6 +360,8 @@
 	gpgme_release (ctx);
 	return rc;
     }
+
+    /* FIXME: This check is wrong! */
     if (major < *r_major || minor < *r_minor)
 	rc = 1;
     else {

Modified: trunk/autogen.sh
===================================================================
--- trunk/autogen.sh	2005-11-02 11:29:44 UTC (rev 57)
+++ trunk/autogen.sh	2005-11-02 13:36:03 UTC (rev 58)
@@ -117,7 +117,7 @@
     cat <<EOF
 
 Note that you may use alternative versions of the tools by setting 
-the corresponding environment variables; see README.CVS for details.
+the corresponding environment variables; see README.SVN for details.
                    
 EOF
     exit 1