[Tkabber-dev] [tclgpg commit] r45 - trunk

codesite-noreply at google.com codesite-noreply at google.com
Sat Nov 22 21:15:14 MSK 2008


Author: sgolovan
Date: Sat Nov 22 10:14:14 2008
New Revision: 45

Added:
    trunk/tclgpg.tcl
       - copied, changed from r42, /trunk/tclgpg.tcl.in
Removed:
    trunk/tclgpg.tcl.in
Modified:
    trunk/ChangeLog
    trunk/configure.in
    trunk/pkgIndex.tcl.in
    trunk/tclgpg.c

Log:
	* configure.in, pkgIndex.tcl.in, tclgpg.tcl: Used an alternative method
	  of loading the library, so using generated tclgpg.tcl isn't necessary
	  anymore.

	* tclgpg.c: Changed the name of init function because of library name
	  change.


Modified: trunk/ChangeLog
==============================================================================
--- trunk/ChangeLog	(original)
+++ trunk/ChangeLog	Sat Nov 22 10:14:14 2008
@@ -13,6 +13,13 @@
  	  TEA_ADD_TCL_SOURCES macro to succeed if a file with suffix .in
  	  exists.

+	* configure.in, pkgIndex.tcl.in, tclgpg.tcl: Used an alternative method
+	  of loading the library, so using generated tclgpg.tcl isn't necessary
+	  anymore.
+
+	* tclgpg.c: Changed the name of init function because of library name
+	  change.
+
  2008-11-21  Sergei Golovan  <sgolovan at nes.ru>

  	* tclgpg.tcl, gpg.man: Implemented asynchronous mode for sign, verify,

Modified: trunk/configure.in
==============================================================================
--- trunk/configure.in	(original)
+++ trunk/configure.in	Sat Nov 22 10:14:14 2008
@@ -160,4 +160,4 @@
  # which require substituting th AC variables in.  Include these here.
  #--------------------------------------------------------------------

-LOCAL_AC_OUTPUT([Makefile tclgpg.tcl pkgIndex.tcl])
+LOCAL_AC_OUTPUT([Makefile pkgIndex.tcl])

Modified: trunk/pkgIndex.tcl.in
==============================================================================
--- trunk/pkgIndex.tcl.in	(original)
+++ trunk/pkgIndex.tcl.in	Sat Nov 22 10:14:14 2008
@@ -10,6 +10,9 @@
  #
  # $Id$

-package ifneeded gpg @PACKAGE_VERSION@ [list source [file join $dir  
tclgpg.tcl]]
+package ifneeded gpg @PACKAGE_VERSION@ \
+        "catch {load [file join [list $dir] @PKG_LIB_FILE@]}
+         source [file join [list $dir] tclgpg.tcl]
+         package provide gpg @PACKAGE_VERSION@"

  # vim:ft=tcl:ts=8:sw=4:sts=4:et

Modified: trunk/tclgpg.c
==============================================================================
--- trunk/tclgpg.c	(original)
+++ trunk/tclgpg.c	Sat Nov 22 10:14:14 2008
@@ -261,7 +261,7 @@
      return TCL_OK;
  }

-/* Tclgpg_Init --
+/* Gpg_Init --
   *
   *      Initialize the library and register ::gpg::CExecGPG command.
   *
@@ -275,7 +275,7 @@
   *      A new Tcl command is created.
   */

-int Tclgpg_Init (Tcl_Interp *interp) {
+int Gpg_Init (Tcl_Interp *interp) {
      if (Tcl_InitStubs (interp, "8.0", 0) == NULL)
          return TCL_ERROR;


Copied: trunk/tclgpg.tcl (from r42, /trunk/tclgpg.tcl.in)
==============================================================================
--- /trunk/tclgpg.tcl.in	(original)
+++ trunk/tclgpg.tcl	Sat Nov 22 10:14:14 2008
@@ -11,8 +11,7 @@

  package require Tcl 8.4

-if {[catch {load [file join [file dirname [info script]] \
-                            @PKG_LIB_FILE@]}]} {
+if {[::info commands ::gpg::CExecGPG] eq ""} {
      if {[package vsatisfies $::tcl_version 8.6]} {
          interp alias {} pipe {} chan pipe
      } elseif {[catch {package require pipe}]} {
@@ -33,8 +32,6 @@
      return -code error \
             "GnuPG 2 cannot be used without gpg-agent"
  }
-
-package provide gpg 1.0

  namespace eval ::gpg {
      variable validities [list unknown undefined never marginal full  
ultimate]


More information about the Tkabber-dev mailing list