r12269 - in /trunk/libhtml-template-pro-perl: Changes META.yml Makefile.PL README debian/changelog lib/HTML/Template/Pro.pm perl-HTML-Template-Pro.spec procore.h t/HTML-Template-Expr.t

ghostbar-guest at users.alioth.debian.org ghostbar-guest at users.alioth.debian.org
Wed Jan 9 03:34:02 UTC 2008 

Author: ghostbar-guest
Date: Wed Jan  9 03:33:59 2008
New Revision: 12269

URL: http://svn.debian.org/wsvn/?sc=1&rev=12269
Log:
new upstream release

Modified:
    trunk/libhtml-template-pro-perl/Changes
    trunk/libhtml-template-pro-perl/META.yml
    trunk/libhtml-template-pro-perl/Makefile.PL
    trunk/libhtml-template-pro-perl/README
    trunk/libhtml-template-pro-perl/debian/changelog
    trunk/libhtml-template-pro-perl/lib/HTML/Template/Pro.pm
    trunk/libhtml-template-pro-perl/perl-HTML-Template-Pro.spec
    trunk/libhtml-template-pro-perl/procore.h
    trunk/libhtml-template-pro-perl/t/HTML-Template-Expr.t

Modified: trunk/libhtml-template-pro-perl/Changes
URL: http://svn.debian.org/wsvn/trunk/libhtml-template-pro-perl/Changes?rev=12269&op=diff
==============================================================================
--- trunk/libhtml-template-pro-perl/Changes (original)
+++ trunk/libhtml-template-pro-perl/Changes Wed Jan  9 03:33:59 2008
@@ -141,3 +141,5 @@
 	- fix in clear_params() thanks to Sergey Konovalov
 	- fixed string escaping (see test_expr9)
 
+0.68  Tue Jan  8 19:59:12 EET 2008
+	- fixed Windows compilation thanks to Vyacheslav Shevelyov

Modified: trunk/libhtml-template-pro-perl/META.yml
URL: http://svn.debian.org/wsvn/trunk/libhtml-template-pro-perl/META.yml?rev=12269&op=diff
==============================================================================
--- trunk/libhtml-template-pro-perl/META.yml (original)
+++ trunk/libhtml-template-pro-perl/META.yml Wed Jan  9 03:33:59 2008
@@ -1,6 +1,6 @@
 --- #YAML:1.0
 name:                HTML-Template-Pro
-version:             0.67
+version:             0.68
 abstract:            Perl/XS module to use HTML Templates from CGI scripts
 license:             ~
 generated_by:        ExtUtils::MakeMaker version 6.32

Modified: trunk/libhtml-template-pro-perl/Makefile.PL
URL: http://svn.debian.org/wsvn/trunk/libhtml-template-pro-perl/Makefile.PL?rev=12269&op=diff
==============================================================================
--- trunk/libhtml-template-pro-perl/Makefile.PL (original)
+++ trunk/libhtml-template-pro-perl/Makefile.PL Wed Jan  9 03:33:59 2008
@@ -1,6 +1,7 @@
 use 5.005;
 use ExtUtils::MakeMaker;
 use Config;
+use File::Spec;
 $Verbose = 1;
 
 $O_FILES=qw/procore.o pbuffer.o proscope.o expr.o pstring.o tmpllog.o/;
@@ -28,9 +29,7 @@
     $DEF{MMAP}=has_mmap();
 }
 
-$DEF{HAS_INT64_T}=has_x("int64_t i;");
-$DEF{HAS_INT68_T}=has_x("int68_t i;");
-$DEF{HAS_LONG_LONG}=has_x("long long i;");
+$DEF{INT64_NAME}   = $Config{i64type};
 
 my $i;
 for ($i=0; $i<@ARGV; $i++)  {
@@ -48,8 +47,7 @@
 $DEFINE.=' -DMMAP' if ($DEF{MMAP});
 $DEFINE.=' -DCOMPAT_ON_BROKEN_QUOTE -DCOMPAT_ALLOW_NAME_IN_CLOSING_TAG' if ($DEF{'IMITATE'});
 $DEFINE.=' -pedantic -DPEDANTIC' if ($DEF{'PEDANTIC'});
-$DEFINE.=' -DHAS_INT68_T' if ($DEF{'HAS_INT68_T'});
-$DEFINE.=' -DHAS_LONG_LONG' if ($DEF{'HAS_LONG_LONG'});
+$DEFINE.=' -DINT64_NAME="' . $DEF{'INT64_NAME'}.'"' if ($DEF{'INT64_NAME'});
 
 if ($DEF{PCRE}) {
     $INC.=' -I/usr/include/pcre';
@@ -166,20 +164,11 @@
 
 # those tests are copied from Time-HiRes-01.20
 
-sub TMPDIR {
-    my $TMPDIR =
-	(grep(defined $_ && -d $_ && -w _,
-	      ((defined $ENV{'TMPDIR'} ? $ENV{'TMPDIR'} : undef),
-	       qw(/var/tmp /usr/tmp /tmp))))[0]
-		   unless defined $TMPDIR;
-    $TMPDIR || die "Cannot find writable temporary directory.\n";
-}
-
 sub try_compile_and_link {
     my ($c, $cccmd, $ccflags) = @_;
 
     my ($ok) = 0;
-    my ($tmp) = ($^O eq 'VMS') ? "tmp$$" : TMPDIR . '/' . "tmp$$";
+    my ($tmp) =  File::Spec->catfile( File::Spec->tmpdir(), "tmp$$" );
     local(*TMPC);
 
     my $obj_ext = $Config{obj_ext} || ".o";
@@ -188,7 +177,7 @@
     if (open(TMPC, ">$tmp.c")) {
 	print TMPC $c;
 	close(TMPC);
-	my $COREincdir = $Config{'archlibexp'} . '/' . 'CORE';
+	my $COREincdir = File::Spec->canonpath(File::Spec->catfile($Config{'archlibexp'}, 'CORE'));
 	$ccflags .= ' '. $Config{'ccflags'} . ' ' . "-I$COREincdir";
 	my $cc=$Config{'cc'};
 	$cc||='cc';
@@ -207,8 +196,9 @@
 	}
 	else
 	{
-	    $ok = -s $tmp && -x _;
-	    unlink("$tmp.c", $tmp);
+		my $exe = $tmp . ($Config{_exe} || '');
+	    $ok = -s $exe && -x _;
+	    unlink("$tmp.c", $exe);
 	}
     }
     
@@ -271,32 +261,3 @@
     return 0;
 }
 
-sub has_x {
-    my ($x) = @_; 
-
-    return 1 if
-    try_compile_and_link(<<EOM);
-#include "EXTERN.h"
-#include "perl.h"
-#include "XSUB.h"
-
-#ifdef I_UNISTD
-#   include <unistd.h>
-#endif
-
-#ifdef I_SYS_TYPES
-#   include <sys/types.h>
-#endif
-
-#ifdef I_SYS_TIME
-#   include <sys/time.h>
-#endif
-
-int main _((int argc, char** argv, char** env))
-{
-	$x;
-}
-EOM
-    return 0;
-}
-

Modified: trunk/libhtml-template-pro-perl/README
URL: http://svn.debian.org/wsvn/trunk/libhtml-template-pro-perl/README?rev=12269&op=diff
==============================================================================
--- trunk/libhtml-template-pro-perl/README (original)
+++ trunk/libhtml-template-pro-perl/README Wed Jan  9 03:33:59 2008
@@ -1,4 +1,4 @@
-HTML-Template-Pro version 0.64
+HTML-Template-Pro version 0.67
 ==============================
 
 DESCRIPTION

Modified: trunk/libhtml-template-pro-perl/debian/changelog
URL: http://svn.debian.org/wsvn/trunk/libhtml-template-pro-perl/debian/changelog?rev=12269&op=diff
==============================================================================
--- trunk/libhtml-template-pro-perl/debian/changelog (original)
+++ trunk/libhtml-template-pro-perl/debian/changelog Wed Jan  9 03:33:59 2008
@@ -1,3 +1,9 @@
+libhtml-template-pro-perl (0.68.1-1) UNRELEASED; urgency=low
+
+  * New upstream release
+
+ -- Jose Luis Rivas <ghostbar38 at gmail.com>  Tue, 08 Jan 2008 22:56:46 -0430
+
 libhtml-template-pro-perl (0.67-1) unstable; urgency=low
 
   [ Vincent Danjean ]

Modified: trunk/libhtml-template-pro-perl/lib/HTML/Template/Pro.pm
URL: http://svn.debian.org/wsvn/trunk/libhtml-template-pro-perl/lib/HTML/Template/Pro.pm?rev=12269&op=diff
==============================================================================
--- trunk/libhtml-template-pro-perl/lib/HTML/Template/Pro.pm (original)
+++ trunk/libhtml-template-pro-perl/lib/HTML/Template/Pro.pm Wed Jan  9 03:33:59 2008
@@ -9,7 +9,7 @@
 use vars qw($VERSION @ISA);
 @ISA = qw(DynaLoader);
 
-$VERSION = '0.67';
+$VERSION = '0.68';
 
 bootstrap HTML::Template::Pro $VERSION;
 

Modified: trunk/libhtml-template-pro-perl/perl-HTML-Template-Pro.spec
URL: http://svn.debian.org/wsvn/trunk/libhtml-template-pro-perl/perl-HTML-Template-Pro.spec?rev=12269&op=diff
==============================================================================
--- trunk/libhtml-template-pro-perl/perl-HTML-Template-Pro.spec (original)
+++ trunk/libhtml-template-pro-perl/perl-HTML-Template-Pro.spec Wed Jan  9 03:33:59 2008
@@ -6,8 +6,13 @@
 %define module HTML-Template-Pro
 
 Name: perl-%module
+<<<<<<< .working
 Version: 0.67
 Release: alt1
+=======
+Version: 0.68
+Release: alt2
+>>>>>>> .merge-right.r12268
 
 Packager: Igor Yu. Vlasenko <viy at altlinux.org>
 
@@ -54,9 +59,21 @@
 %perl_vendor_man3dir/*
 
 %changelog
+<<<<<<< .working
 * Sun Dec 02 2007 Igor Vlasenko <viy at altlinux.ru> 0.67-alt1
 - new version; see Changes
 
+=======
+* Tue Jan 08 2008 Igor Vlasenko <viy at altlinux.ru> 0.68-alt2
+- fix for ix86
+
+* Tue Jan 08 2008 Igor Vlasenko <viy at altlinux.ru> 0.68-alt1
+- new version; see Changes
+
+* Sun Dec 02 2007 Igor Vlasenko <viy at altlinux.ru> 0.67-alt1
+- new version; see Changes
+
+>>>>>>> .merge-right.r12268
 * Thu Oct 04 2007 Igor Vlasenko <viy at altlinux.ru> 0.66-alt1
 - new version; see Changes
 

Modified: trunk/libhtml-template-pro-perl/procore.h
URL: http://svn.debian.org/wsvn/trunk/libhtml-template-pro-perl/procore.h?rev=12269&op=diff
==============================================================================
--- trunk/libhtml-template-pro-perl/procore.h (original)
+++ trunk/libhtml-template-pro-perl/procore.h Wed Jan  9 03:33:59 2008
@@ -21,18 +21,17 @@
 #define EXPRDBL 'd'
 #define EXPRPSTR 'p'
 
-#ifdef HAS_INT64_T
-typedef int64_t EXPR_int;
-#define EXPR_modifier "ll"
-#else
-#ifdef HAS_LONG_LONG
-typedef long long EXPR_int;
-#define EXPR_modifier "ll"
-#else
-typedef int EXPR_int;
-#define EXPR_modifier ""
-#endif
-#endif
+#ifdef INT64_NAME
+     typedef INT64_NAME EXPR_int;
+#  ifdef _MSC_VER
+#    define EXPR_modifier "I64"
+#  else
+#    define EXPR_modifier "ll"
+#  endif
+#else 
+     typedef int EXPR_int;
+#    define EXPR_modifier ""
+#endif 
 
 struct exprval {
   exprtype type;

Modified: trunk/libhtml-template-pro-perl/t/HTML-Template-Expr.t
URL: http://svn.debian.org/wsvn/trunk/libhtml-template-pro-perl/t/HTML-Template-Expr.t?rev=12269&op=diff
==============================================================================
--- trunk/libhtml-template-pro-perl/t/HTML-Template-Expr.t (original)
+++ trunk/libhtml-template-pro-perl/t/HTML-Template-Expr.t Wed Jan  9 03:33:59 2008
@@ -74,7 +74,10 @@
     if ($files_equal) {
 	ok($files_equal) && unlink "$file.raw";
     } else {
-	if (-x '/usr/bin/diff') {
+	if ($^O eq 'MSWin32') {
+		print STDERR "\n", `fc $file.out $file.raw`;
+	}
+	elsif (-x '/usr/bin/diff') {
 	    print STDERR `diff -C 3 $file.out $file.raw`;
 	} else {
 	    print STDERR "# >>> ---$file.raw---\n$output\n>>> ---end $file.raw---\n";

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