r73723 - in /trunk/libhtml-template-compiled-perl: Build.PL Changes MANIFEST META.json META.yml Makefile.PL debian/changelog debian/control examples/bench.pl lib/HTML/Template/Compiled.pm lib/HTML/Template/Compiled/Parser.pm
dom at users.alioth.debian.org
dom at users.alioth.debian.org
Thu Apr 28 21:37:17 UTC 2011
Author: dom
Date: Thu Apr 28 21:37:10 2011
New Revision: 73723
URL: http://svn.debian.org/wsvn/pkg-perl/?sc=1&rev=73723
Log:
New upstream release
Added:
trunk/libhtml-template-compiled-perl/META.json
- copied unchanged from r73722, branches/upstream/libhtml-template-compiled-perl/current/META.json
Modified:
trunk/libhtml-template-compiled-perl/Build.PL
trunk/libhtml-template-compiled-perl/Changes
trunk/libhtml-template-compiled-perl/MANIFEST
trunk/libhtml-template-compiled-perl/META.yml
trunk/libhtml-template-compiled-perl/Makefile.PL
trunk/libhtml-template-compiled-perl/debian/changelog
trunk/libhtml-template-compiled-perl/debian/control
trunk/libhtml-template-compiled-perl/examples/bench.pl
trunk/libhtml-template-compiled-perl/lib/HTML/Template/Compiled.pm
trunk/libhtml-template-compiled-perl/lib/HTML/Template/Compiled/Parser.pm
Modified: trunk/libhtml-template-compiled-perl/Build.PL
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libhtml-template-compiled-perl/Build.PL?rev=73723&op=diff
==============================================================================
--- trunk/libhtml-template-compiled-perl/Build.PL (original)
+++ trunk/libhtml-template-compiled-perl/Build.PL Thu Apr 28 21:37:10 2011
@@ -6,6 +6,15 @@
my $build = Module::Build->new(
create_makefile_pl => 'traditional',
license => 'perl',
+ resources => {
+ repository => {
+ url => 'https://htcompiled.svn.sourceforge.net/svnroot/htcompiled',
+ type => 'svn',
+ },
+ },
+ configure_requires => {
+ 'Module::Build' => 0,
+ },
module_name => 'HTML::Template::Compiled',
dist_author => 'Tina Mueller',
requires => {
Modified: trunk/libhtml-template-compiled-perl/Changes
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libhtml-template-compiled-perl/Changes?rev=73723&op=diff
==============================================================================
--- trunk/libhtml-template-compiled-perl/Changes (original)
+++ trunk/libhtml-template-compiled-perl/Changes Thu Apr 28 21:37:10 2011
@@ -1,4 +1,15 @@
Revision history for Perl extension HTML::Template::Compiled.
+
+0.95 Wed Apr 27 20:48:13 CEST 2011
+- Just moving developer release to regular release
+
+0.94_002 Thu Aug 19 23:43:41 CEST 2010
+- Fix for 5.12: ignore Storable fatal error abour regexp items.
+ thanks to Daniel Tašov for the hint. just a workaround for now
+
+0.94_001 Wed Sep 16 19:41:01 CEST 2009
+- Fix memory leak when compiling
+ Thanks to Henrik Tougaard
0.94 Thu Sep 10 19:55:04 CEST 2009
- Fix test
Modified: trunk/libhtml-template-compiled-perl/MANIFEST
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libhtml-template-compiled-perl/MANIFEST?rev=73723&op=diff
==============================================================================
--- trunk/libhtml-template-compiled-perl/MANIFEST (original)
+++ trunk/libhtml-template-compiled-perl/MANIFEST Thu Apr 28 21:37:10 2011
@@ -99,3 +99,4 @@
t/templates/loop_included.tmpl
t/templates/user_template.html
META.yml Module meta-data (added by MakeMaker)
+META.json
Modified: trunk/libhtml-template-compiled-perl/META.yml
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libhtml-template-compiled-perl/META.yml?rev=73723&op=diff
==============================================================================
--- trunk/libhtml-template-compiled-perl/META.yml (original)
+++ trunk/libhtml-template-compiled-perl/META.yml Thu Apr 28 21:37:10 2011
@@ -1,26 +1,21 @@
---
+abstract: 'Template System Compiles HTML::Template files to Perl code'
+author:
+ - 'Tina Mueller'
+build_requires: {}
+configure_requires:
+ Module::Build: 0
+dynamic_config: 1
+generated_by: 'Module::Build version 0.38, CPAN::Meta::Converter version 2.110930'
+license: perl
+meta-spec:
+ url: http://module-build.sourceforge.net/META-spec-v1.4.html
+ version: 1.4
name: HTML-Template-Compiled
-version: 0.94
-author:
- - Tina Mueller
-abstract: Template System Compiles HTML::Template files to Perl code
-license: perl
-resources:
- license: http://dev.perl.org/licenses/
-requires:
- Carp: 0
- File::Basename: 0
- File::Spec: 0
- Test::More: 0
- perl: v5.6.1
-recommends:
- URI::Escape: 0
-configure_requires:
- Module::Build: 0.340201
provides:
HTML::Template::Compiled:
file: lib/HTML/Template/Compiled.pm
- version: 0.94
+ version: 0.95
HTML::Template::Compiled::Classic:
file: lib/HTML/Template/Compiled/Classic.pm
version: 0.05
@@ -41,28 +36,40 @@
version: 0.02
HTML::Template::Compiled::Expression::Conditional:
file: lib/HTML/Template/Compiled/Expression.pm
+ version: 0
HTML::Template::Compiled::Expression::Defined:
file: lib/HTML/Template/Compiled/Expression/Expressions.pm
+ version: 0
HTML::Template::Compiled::Expression::Else:
file: lib/HTML/Template/Compiled/Expression.pm
+ version: 0
HTML::Template::Compiled::Expression::Elsif:
file: lib/HTML/Template/Compiled/Expression.pm
+ version: 0
HTML::Template::Compiled::Expression::Expressions:
file: lib/HTML/Template/Compiled/Expression/Expressions.pm
+ version: 0
HTML::Template::Compiled::Expression::Function:
file: lib/HTML/Template/Compiled/Expression.pm
+ version: 0
HTML::Template::Compiled::Expression::If:
file: lib/HTML/Template/Compiled/Expression.pm
+ version: 0
HTML::Template::Compiled::Expression::Literal:
file: lib/HTML/Template/Compiled/Expression/Expressions.pm
+ version: 0
HTML::Template::Compiled::Expression::Method:
file: lib/HTML/Template/Compiled/Expression.pm
+ version: 0
HTML::Template::Compiled::Expression::String:
file: lib/HTML/Template/Compiled/Expression/Expressions.pm
+ version: 0
HTML::Template::Compiled::Expression::Ternary:
file: lib/HTML/Template/Compiled/Expression/Expressions.pm
+ version: 0
HTML::Template::Compiled::Expression::Unless:
file: lib/HTML/Template/Compiled/Expression.pm
+ version: 0
HTML::Template::Compiled::Filter:
file: lib/HTML/Template/Compiled/Filter.pm
version: 0.03
@@ -74,7 +81,7 @@
version: 0.01
HTML::Template::Compiled::Parser:
file: lib/HTML/Template/Compiled/Parser.pm
- version: 0.11
+ version: 0.12
HTML::Template::Compiled::Plugin::DHTML:
file: lib/HTML/Template/Compiled/Plugin/DHTML.pm
version: 0.02
@@ -86,16 +93,27 @@
version: 0.02
HTML::Template::Compiled::Token::Text:
file: lib/HTML/Template/Compiled/Token.pm
+ version: 0
HTML::Template::Compiled::Token::close:
file: lib/HTML/Template/Compiled/Token.pm
+ version: 0
HTML::Template::Compiled::Token::open:
file: lib/HTML/Template/Compiled/Token.pm
+ version: 0
HTML::Template::Compiled::Token::single:
file: lib/HTML/Template/Compiled/Token.pm
+ version: 0
HTML::Template::Compiled::Utils:
file: lib/HTML/Template/Compiled/Utils.pm
version: 0.06
-generated_by: Module::Build version 0.340201
-meta-spec:
- url: http://module-build.sourceforge.net/META-spec-v1.4.html
- version: 1.4
+recommends:
+ URI::Escape: 0
+requires:
+ Carp: 0
+ File::Basename: 0
+ File::Spec: 0
+ Test::More: 0
+ perl: v5.6.1
+resources:
+ license: http://dev.perl.org/licenses/
+version: 0.95
Modified: trunk/libhtml-template-compiled-perl/Makefile.PL
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libhtml-template-compiled-perl/Makefile.PL?rev=73723&op=diff
==============================================================================
--- trunk/libhtml-template-compiled-perl/Makefile.PL (original)
+++ trunk/libhtml-template-compiled-perl/Makefile.PL Thu Apr 28 21:37:10 2011
@@ -1,5 +1,5 @@
-# Note: this file was auto-generated by Module::Build::Compat version 0.340201
-require 5.6.1;
+# Note: this file was auto-generated by Module::Build::Compat version 0.3800
+require 5.006001;
use ExtUtils::MakeMaker;
WriteMakefile
(
Modified: trunk/libhtml-template-compiled-perl/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libhtml-template-compiled-perl/debian/changelog?rev=73723&op=diff
==============================================================================
--- trunk/libhtml-template-compiled-perl/debian/changelog (original)
+++ trunk/libhtml-template-compiled-perl/debian/changelog Thu Apr 28 21:37:10 2011
@@ -1,8 +1,12 @@
-libhtml-template-compiled-perl (0.94-2) UNRELEASED; urgency=low
+libhtml-template-compiled-perl (0.95-1) UNRELEASED; urgency=low
+ [ gregor herrmann ]
* debian/rules: switch order of arguments to dh.
- -- gregor herrmann <gregoa at debian.org> Wed, 28 Jul 2010 14:32:42 -0400
+ [ Dominic Hargreaves ]
+ * New upstream release
+
+ -- Dominic Hargreaves <dom at earth.li> Thu, 28 Apr 2011 22:36:35 +0100
libhtml-template-compiled-perl (0.94-1) unstable; urgency=low
Modified: trunk/libhtml-template-compiled-perl/debian/control
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libhtml-template-compiled-perl/debian/control?rev=73723&op=diff
==============================================================================
--- trunk/libhtml-template-compiled-perl/debian/control (original)
+++ trunk/libhtml-template-compiled-perl/debian/control Thu Apr 28 21:37:10 2011
@@ -7,7 +7,8 @@
perl (>= 5.8) | libscalar-util-perl, liburi-perl, libhtml-parser-perl,
libtest-pod-perl, libtest-pod-coverage-perl
Maintainer: Debian Perl Group <pkg-perl-maintainers at lists.alioth.debian.org>
-Uploaders: Peter Pentchev <roam at ringlet.net>, Jonathan Yu <jawnsy at cpan.org>
+Uploaders: Peter Pentchev <roam at ringlet.net>, Jonathan Yu <jawnsy at cpan.org>,
+ Dominic Hargreaves <dom at earth.li>
Standards-Version: 3.8.3
Homepage: http://search.cpan.org/dist/HTML-Template-Compiled/
Vcs-Svn: svn://svn.debian.org/pkg-perl/trunk/libhtml-template-compiled-perl/
Modified: trunk/libhtml-template-compiled-perl/examples/bench.pl
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libhtml-template-compiled-perl/examples/bench.pl?rev=73723&op=diff
==============================================================================
--- trunk/libhtml-template-compiled-perl/examples/bench.pl (original)
+++ trunk/libhtml-template-compiled-perl/examples/bench.pl Thu Apr 28 21:37:10 2011
@@ -1,5 +1,5 @@
#!/usr/bin/perl
-# $Id: bench.pl 1085 2009-07-03 16:40:28Z tinita $
+# $Id: bench.pl 1112 2011-04-27 18:48:13Z tinita $
use strict;
use warnings;
use lib qw(blib/lib ../blib/lib);
@@ -31,10 +31,12 @@
'HTML::Template::Compiled::Classic' => 0,
# 'HTML::Template::JIT' => 0,
'Template' => 0,
+ 'Template::HTML' => 0,
'Template::Like' => 0,
'CGI::Ex::Template' => 0,
# not yet
'Text::ScriptTemplate' => 0,
+ 'Text::Xslate' => 0,
);
for my $key (sort keys %use) {
eval "require $key";
@@ -69,6 +71,7 @@
loop-context: $LOOP_CONTEXT
global-vars: $GLOBAL_VARS
case-sensitive: $CASE_SENSITIVE
+default-escape: $default_escape
";
sub new_htc {
@@ -232,6 +235,36 @@
#my $size = total_size($tt);
#print "size tt = $size\n";
return $tt;
+}
+
+sub new_tth {
+ my $tt= Template::HTML->new(
+ $FILE_CACHE
+ ? (
+ COMPILE_EXT => '.ttc',
+ COMPILE_DIR => 'cache/tt',
+ )
+ : (),
+ $MEM_CACHE
+ ? ()
+ : (CACHE_SIZE => 0),
+ INCLUDE_PATH => 'examples',
+ );
+ #my $size = total_size($tt);
+ #print "size tt = $size\n";
+ return $tt;
+}
+
+sub new_xslate {
+ my $t = Text::Xslate->new(
+ cache_dir => ($FILE_CACHE ? "cache/xslate" : undef),
+ cache => $MEM_CACHE,
+ path => 'examples',
+ syntax => 'TTerse',
+ );
+ #my $size = total_size($tt);
+ #print "size tt = $size\n";
+ return $t;
}
sub new_cet {
@@ -326,8 +359,22 @@
#my $size = total_size($t);
#print "size $t = $size\n";
#print $t->{code} if exists $t->{code};
- #my $out = $t->output;
- #print "\nOUT: $out";
+ #my $out = $t->output;
+ #print "\nOUT: $out";
+}
+
+sub output_xslate {
+ my $t = shift;
+ return unless defined $t;
+ my $filett = $tt_file;
+ #$t->process($filett, \%params, \*OUT);
+# $t->process($filett, \%params, \*OUT) or die $t->error();
+ #my $size = total_size($t);
+ #print "size $t = $size\n";
+ #print $t->{code} if exists $t->{code};
+ my $out = $t->render('test.xslate', \%params);
+ #my $out = $t->output;
+ #print "\nOUT: $out";
}
my $global_htc = $use{'HTML::Template::Compiled'} ? new_htc : undef;
@@ -337,6 +384,8 @@
my $global_htpl = $use{'HTML::Template::Pluggable'} ? new_htpl : undef;
my $global_htj = $use{'HTML::Template::JIT'} ? new_htj : undef;
my $global_tt = $use{'Template'} ? new_tt : undef;
+my $global_tth = $use{'Template::HTML'} ? new_tth : undef;
+my $global_xslate = $use{'Text::Xslate'} ? new_xslate : undef;
my $global_tl = $use{'Template::Like'} ? new_tl : undef;
my $global_cet = $use{'CGI::Ex::Template'} ? new_cet : undef;
my $global_tst = $use{'Text::ScriptTemplate'} ? new_tst : undef;
@@ -392,6 +441,22 @@
? ()
: (all_tt_new_object => sub {my $t = new_tt();output_tt($t)}),
): (),
+ $use{'Template::HTML'} ? (
+ #new_tt => sub {my $t = new_tt();},
+ #output_tt => sub {output_tt($global_tt)},
+ process_tth => sub {output_tt($global_tth)},
+ $MEM_CACHE
+ ? ()
+ : (all_tth_new_object => sub {my $t = new_tth();output_tt($t)}),
+ ): (),
+ $use{'Text::Xslate'} ? (
+ #new_tt => sub {my $t = new_tt();},
+ #output_tt => sub {output_tt($global_tt)},
+ process_xslate => sub {output_xslate($global_xslate)},
+ $MEM_CACHE
+ ? ()
+ : (all_xslate_new_object => sub {my $t = new_xslate();output_xslate($t)}),
+ ): (),
$use{'Template::Like'} ? (
process_tl => sub {output_tl($global_tl)},
): (),
Modified: trunk/libhtml-template-compiled-perl/lib/HTML/Template/Compiled.pm
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libhtml-template-compiled-perl/lib/HTML/Template/Compiled.pm?rev=73723&op=diff
==============================================================================
--- trunk/libhtml-template-compiled-perl/lib/HTML/Template/Compiled.pm (original)
+++ trunk/libhtml-template-compiled-perl/lib/HTML/Template/Compiled.pm Thu Apr 28 21:37:10 2011
@@ -1,8 +1,8 @@
package HTML::Template::Compiled;
-# $Id: Compiled.pm 1105 2009-09-10 17:56:17Z tinita $
+# $Id: Compiled.pm 1113 2011-04-27 18:49:59Z tinita $
# doesn't work with make tardist
#our $VERSION = ($version_pod =~ m/^\$VERSION = "(\d+(?:\.\d+)+)"/m) ? $1 : "0.01";
-our $VERSION = "0.94";
+our $VERSION = "0.95";
use Data::Dumper;
BEGIN {
use constant D => $ENV{HTC_DEBUG} || 0;
@@ -568,6 +568,16 @@
mtime => $times{mtime},
checked => $times{checked},
},
+ };
+ # TODO Storable cannot store qr//
+ # but as we don't need those serialized anyway
+ # we let Storable just store a dummy entry
+ local $Storable::forgive_me = 1;
+ local $SIG{__WARN__} = sub {
+ my ($w) = @_;
+ unless ($w =~ m/Can't store item REGEXP/) {
+ warn $w;
+ }
};
Storable::store($to_cache, "$cachefile.storable");
}
@@ -1554,7 +1564,7 @@
=head1 VERSION
-$VERSION = "0.94"
+$VERSION = "0.95"
=cut
@@ -2991,7 +3001,7 @@
Ronnie Neumann, Martin Fabiani, Kai Sengpiel, Jan Willamowius, Justin Day,
Steffen Winkler, Henrik Tougaard for ideas, beta-testing and patches
-perlmonks.org and perl-community.de for everyday learning
+L<http://www.perlmonks.org/> and http://www.perl-community.de/> for everyday learning
Corion, Limbic~Region, tye, runrig and others from perlmonks.org
Modified: trunk/libhtml-template-compiled-perl/lib/HTML/Template/Compiled/Parser.pm
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libhtml-template-compiled-perl/lib/HTML/Template/Compiled/Parser.pm?rev=73723&op=diff
==============================================================================
--- trunk/libhtml-template-compiled-perl/lib/HTML/Template/Compiled/Parser.pm (original)
+++ trunk/libhtml-template-compiled-perl/lib/HTML/Template/Compiled/Parser.pm Thu Apr 28 21:37:10 2011
@@ -1,11 +1,12 @@
package HTML::Template::Compiled::Parser;
-# $Id: Parser.pm 1102 2009-08-21 13:56:24Z tinita $
+# $Id: Parser.pm 1106 2009-09-16 17:44:06Z tinita $
use Carp qw(croak carp confess);
use strict;
use warnings;
use base qw(Exporter);
use HTML::Template::Compiled::Token qw(:tagtypes);
-our $VERSION = 0.11;
+my $scalar_util = eval "require Scalar::Util; 1";
+our $VERSION = 0.12;
my @vars;
BEGIN {
@vars = qw(
@@ -534,6 +535,7 @@
}
}
+ Scalar::Util::weaken($callback_found_tag) if $scalar_util;
$self->checkstack({
%$arg, name => T_END, open_or_close => CLOSING_TAG
} );
More information about the Pkg-perl-cvs-commits
mailing list