r14759 - in /branches/upstream/libterm-readline-gnu-perl/current: Gnu.pm Gnu.xs Gnu/XS.pm Gnu/euc_jp.pm MANIFEST META.yml Makefile.PL README

tincho-guest at users.alioth.debian.org tincho-guest at users.alioth.debian.org
Mon Feb 11 12:05:28 UTC 2008


Author: tincho-guest
Date: Mon Feb 11 12:05:27 2008
New Revision: 14759

URL: http://svn.debian.org/wsvn/?sc=1&rev=14759
Log:
[svn-upgrade] Integrating new upstream version, libterm-readline-gnu-perl (1.17a)

Removed:
    branches/upstream/libterm-readline-gnu-perl/current/Gnu/euc_jp.pm
Modified:
    branches/upstream/libterm-readline-gnu-perl/current/Gnu.pm
    branches/upstream/libterm-readline-gnu-perl/current/Gnu.xs
    branches/upstream/libterm-readline-gnu-perl/current/Gnu/XS.pm
    branches/upstream/libterm-readline-gnu-perl/current/MANIFEST
    branches/upstream/libterm-readline-gnu-perl/current/META.yml
    branches/upstream/libterm-readline-gnu-perl/current/Makefile.PL
    branches/upstream/libterm-readline-gnu-perl/current/README

Modified: branches/upstream/libterm-readline-gnu-perl/current/Gnu.pm
URL: http://svn.debian.org/wsvn/branches/upstream/libterm-readline-gnu-perl/current/Gnu.pm?rev=14759&op=diff
==============================================================================
--- branches/upstream/libterm-readline-gnu-perl/current/Gnu.pm (original)
+++ branches/upstream/libterm-readline-gnu-perl/current/Gnu.pm Mon Feb 11 12:05:27 2008
@@ -1,9 +1,9 @@
 #
 #	Gnu.pm --- The GNU Readline/History Library wrapper module
 #
-#	$Id: Gnu.pm,v 1.96 2006-04-02 01:59:53+09 hiroo Exp $
+#	$Id: Gnu.pm,v 1.97 2008-02-07 23:12:23+09 hiroo Exp $
 #
-#	Copyright (c) 2006 Hiroo Hayashi.  All rights reserved.
+#	Copyright (c) 2008 Hiroo Hayashi.  All rights reserved.
 #
 #	This program is free software; you can redistribute it and/or
 #	modify it under the same terms as Perl itself.
@@ -73,7 +73,7 @@
     use DynaLoader;
     use vars qw($VERSION @ISA @EXPORT_OK);
 
-    $VERSION = '1.16';
+    $VERSION = '1.17';
 
     # Term::ReadLine::Gnu::AU makes a function in
     # `Term::ReadLine::Gnu::XS' as a method.

Modified: branches/upstream/libterm-readline-gnu-perl/current/Gnu.xs
URL: http://svn.debian.org/wsvn/branches/upstream/libterm-readline-gnu-perl/current/Gnu.xs?rev=14759&op=diff
==============================================================================
--- branches/upstream/libterm-readline-gnu-perl/current/Gnu.xs (original)
+++ branches/upstream/libterm-readline-gnu-perl/current/Gnu.xs Mon Feb 11 12:05:27 2008
@@ -1,9 +1,9 @@
 /*
  *	Gnu.xs --- GNU Readline wrapper module
  *
- *	$Id: Gnu.xs,v 1.110 2006-04-02 01:53:29+09 hiroo Exp $
+ *	$Id: Gnu.xs,v 1.111 2008-02-06 23:48:59+09 hiroo Exp $
  *
- *	Copyright (c) 2006 Hiroo Hayashi.  All rights reserved.
+ *	Copyright (c) 2008 Hiroo Hayashi.  All rights reserved.
  *
  *	This program is free software; you can redistribute it and/or
  *	modify it under the same terms as Perl itself.
@@ -2665,14 +2665,18 @@
 	{
 	  switch (id) {
 	  case 0:
+#if 0	  /* PerlIO_releaseFILE must be called only before closing FILE *. */
 	    if (instreamPIO != NULL)
 	      PerlIO_releaseFILE(instreamPIO, rl_instream);
+#endif
 	    rl_instream = PerlIO_findFILE(stream);
 	    RETVAL = instreamPIO = stream;
 	    break;
 	  case 1:
+#if 0	  /* PerlIO_releaseFILE must be called only before closing FILE *. */
 	    if (outstreamPIO != NULL)
 	      PerlIO_releaseFILE(outstreamPIO, rl_outstream);
+#endif
 	    rl_outstream = PerlIO_findFILE(stream);
 	    RETVAL = outstreamPIO = stream;
 #ifdef __CYGWIN__
@@ -2694,6 +2698,8 @@
 	    XSRETURN_UNDEF;
 	    break;
 	  }
+	  PerlIO_debug("TRG:store_iostream id %d fd %d\n",
+		       id, PerlIO_fileno(RETVAL));
 	}
     OUTPUT:
 	RETVAL
@@ -2722,6 +2728,8 @@
 	    XSRETURN_UNDEF;
 	    break;
 	  }
+	  PerlIO_debug("TRG:fetch_iostream id %d fd %d\n", 
+		       id, PerlIO_fileno(RETVAL));
 	}
     OUTPUT:
 	RETVAL

Modified: branches/upstream/libterm-readline-gnu-perl/current/Gnu/XS.pm
URL: http://svn.debian.org/wsvn/branches/upstream/libterm-readline-gnu-perl/current/Gnu/XS.pm?rev=14759&op=diff
==============================================================================
--- branches/upstream/libterm-readline-gnu-perl/current/Gnu/XS.pm (original)
+++ branches/upstream/libterm-readline-gnu-perl/current/Gnu/XS.pm Mon Feb 11 12:05:27 2008
@@ -2,9 +2,9 @@
 #
 #	XS.pm : perl function definition for Term::ReadLine::Gnu
 #
-#	$Id: XS.pm,v 1.22 2004-10-17 12:02:23-05 hiroo Exp $
-#
-#	Copyright (c) 2003 Hiroo Hayashi.  All rights reserved.
+#	$Id: XS.pm,v 1.23 2008-02-08 00:43:46+09 hiroo Exp $
+#
+#	Copyright (c) 2008 Hiroo Hayashi.  All rights reserved.
 #
 #	This program is free software; you can redistribute it and/or
 #	modify it under the same terms as Perl itself.
@@ -14,6 +14,9 @@
 use Carp;
 use strict;
 use AutoLoader 'AUTOLOAD';
+
+use vars qw($VERSION);
+$VERSION='1.17';	# added for CPAN
 
 # make aliases
 use vars qw(%Attribs);

Modified: branches/upstream/libterm-readline-gnu-perl/current/MANIFEST
URL: http://svn.debian.org/wsvn/branches/upstream/libterm-readline-gnu-perl/current/MANIFEST?rev=14759&op=diff
==============================================================================
--- branches/upstream/libterm-readline-gnu-perl/current/MANIFEST (original)
+++ branches/upstream/libterm-readline-gnu-perl/current/MANIFEST Mon Feb 11 12:05:27 2008
@@ -1,7 +1,6 @@
 Gnu.pm		The GNU Readline extension Perl module
 Gnu.xs		The GNU Readline extension external subroutines
 Gnu/XS.pm
-Gnu/euc_jp.pm
 INSTALL		Installtion instructions
 MANIFEST	This list of files
 Makefile.PL	The GNU Readline extension makefile writer
@@ -22,4 +21,3 @@
 t/inputrc	A file for t/readline.t
 t/readline.t	a test script for the GNU Readline extension
 typemap		The GNU Readline extension interface types
-META.yml                                 Module meta-data (added by MakeMaker)

Modified: branches/upstream/libterm-readline-gnu-perl/current/META.yml
URL: http://svn.debian.org/wsvn/branches/upstream/libterm-readline-gnu-perl/current/META.yml?rev=14759&op=diff
==============================================================================
--- branches/upstream/libterm-readline-gnu-perl/current/META.yml (original)
+++ branches/upstream/libterm-readline-gnu-perl/current/META.yml Mon Feb 11 12:05:27 2008
@@ -1,10 +1,12 @@
-# http://module-build.sourceforge.net/META-spec.html
-#XXXXXXX This is a prototype!!!  It will change in the future!!! XXXXX#
-name:         Term-ReadLine-Gnu
-version:      1.16
-version_from: Gnu.pm
-installdirs:  site
-requires:
-
-distribution_type: module
-generated_by: ExtUtils::MakeMaker version 6.17
+--- #YAML:1.0
+name:                Term-ReadLine-Gnu
+version:             1.17
+abstract:            ~
+license:             ~
+author:              ~
+generated_by:        ExtUtils::MakeMaker version 6.42
+distribution_type:   module
+requires:     
+meta-spec:
+    url:     http://module-build.sourceforge.net/META-spec-v1.3.html
+    version: 1.3

Modified: branches/upstream/libterm-readline-gnu-perl/current/Makefile.PL
URL: http://svn.debian.org/wsvn/branches/upstream/libterm-readline-gnu-perl/current/Makefile.PL?rev=14759&op=diff
==============================================================================
--- branches/upstream/libterm-readline-gnu-perl/current/Makefile.PL (original)
+++ branches/upstream/libterm-readline-gnu-perl/current/Makefile.PL Mon Feb 11 12:05:27 2008
@@ -1,15 +1,15 @@
 #
 #	Makefile.PL for Term::ReadLine::Gnu
 #
-#	$Id: Makefile.PL,v 1.28 2005-10-01 10:44:06-05 hiroo Exp $
-#
-#	Copyright (c) 2005 Hiroo Hayashi.  All rights reserved.
+#	$Id: Makefile.PL,v 1.29 2008-02-06 23:50:09+09 hiroo Exp $
+#
+#	Copyright (c) 2008 Hiroo Hayashi.  All rights reserved.
 #		<hiroo.hayashi at computer.org>
 #
 #	This program is free software; you can redistribute it and/or
 #	modify it under the same terms as Perl itself.
 #
-#	OS/2 support is contributed by Ilya Zakharevich.
+#	OS/2 support was contributed by Ilya Zakharevich.
 #		<ilya at math.ohio-state.edu>
 #
 # Usage: perl Makefile.PL [--prefix=...] [--includedir=...] [--libdir=...]
@@ -186,6 +186,14 @@
     # execute it and get version
     my $rlver;
     chomp($rlver = `./rlver`);
+    # MacOS X 10.4 has libedit by default.
+    if ($rlver =~ /EditLine/) {
+	die <<EOM;
+!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+The libreadline you use is libedit library.  Use the GNU Readline Library.
+!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+EOM
+    }
     print "It seems that you have the GNU Readline Library version $rlver.\n";
     # $rlver may be '8.21-beta3' or '4.2a'
     return $rlver =~ /(\d+)\.(\d+)/;

Modified: branches/upstream/libterm-readline-gnu-perl/current/README
URL: http://svn.debian.org/wsvn/branches/upstream/libterm-readline-gnu-perl/current/README?rev=14759&op=diff
==============================================================================
--- branches/upstream/libterm-readline-gnu-perl/current/README (original)
+++ branches/upstream/libterm-readline-gnu-perl/current/README Mon Feb 11 12:05:27 2008
@@ -1,9 +1,9 @@
 	-*- Indented-text -*-
-$Id: README,v 1.26 2006-04-02 02:18:19+09 hiroo Exp $
+$Id: README,v 1.27 2008-02-07 23:09:14+09 hiroo Exp $
 
 Term::ReadLine::Gnu --- GNU Readline Library Wrapper Module
 
-	Copyright (c) 2006 Hiroo Hayashi.  All rights reserved.
+	Copyright (c) 2008 Hiroo Hayashi.  All rights reserved.
 
 	This program is free software; you can redistribute it and/or
 	modify it under the same terms as Perl itself.
@@ -65,6 +65,14 @@
 
 
 Revision History:
+
+1.17  2008-02-07
+	- Unnecessary PerlIO_releaseFILE() calls are removed.  This
+          fix prevents `make test' from failing on Perl 5.10.
+	- Makefile.PL now fails with the EditLine Library on MacOS X.
+          Use the GNU Readline Library.
+	- tested with readline-5.2 (which has no new feature to be
+          supported).
 
 1.16  2006-04-02
 	- fix Makefile.PL to work with the latest Cygwin.
@@ -118,7 +126,7 @@
 	  terminal, or a terminal with wrong TERM environment variable
 	  setting.
 	- update documents
-	- improve coding style of Gnu.xs. (indentation stype, more
+	- improve coding style of Gnu.xs. (indentation style, more
           typemap, etc.)
 
 1.11  2001-10-27
@@ -316,22 +324,17 @@
 	- support readline-2.2
 		add rl_unbind_function_in_map() and rl_unbind_command_in_map()
 		Makefile.PL checks the version of the GNU Readline Library
-
 	- define rl_save_prompt() and rl_restore_prompt()
-
 	- document fix
 		'Changes' file is removed.  It is merged into README file.
 		fix a bug in a sample program of rl_completion_entry_function
 
 1.00  1998-04-15
 	- the 1st major release
-
 	- ornaments feature is now on by default as recent
 	  Term::ReadLine and Term::ReadLine::Perl
-
 	- document fix
 		remove description related to mymalloc
-
 	- add ornaments-change function to t/readline.t which
 	  demonstrates rl_message().
 




More information about the Pkg-perl-cvs-commits mailing list