[Templates] Developer Release 2.09c PATCHES
Axel Gerstmair
Axel Gerstmair <anthill@web.de>
Tue, 29 Apr 2003 18:47:47 +0200
------------DF1C44D2D0B147D
Content-Type: text/plain; charset=us-ascii
Content-Transfer-Encoding: 7bit
Hi Andy,
I tested under RedHat 9.0 and Windows XP (both Perl 5.8, no
Text::Autoformat, no DBI tests, no XML, with GD, with Image::Size,
Latex only with WinXP) and encountered the following problems:
- Disabling the XS stash during configuration is not honored
(Makefile.PL doesn't fix Config.pm).
I couldn't test the XS stash under Windows because I have no
appropriate compiler installed.
- Windows XP doesn't seem to be able to cope with POSIX::setlocale
correctly. Because of this, one date test failed (returned
'Dienstag' and expected 'Tuesday').
- t/gd.t fails with the latest version of libgd (2.0.12) and GD (2.07)
because the created bitmap differs (see gd.t.log).
I have appended three patches that fix these problems. The patch for
Makefile.PL also includes a fix for the new TT_EXTRAS option, which
was not saved to the .defaults.cfg file.
Best regards,
Axel
Index: date.t
===================================================================
RCS file: /template-toolkit/Template2/t/date.t,v
retrieving revision 2.9
diff -u -w -b -r2.9 date.t
--- date.t 2002/08/16 08:40:02 2.9
+++ date.t 2003/04/29 14:54:52
@@ -190,7 +190,8 @@
[% day.format('4:20:00 9-13-2000') %]
-- expect --
-Tuesday
+-- process --
+[% nowloc(time, '%A', 'en_GB') %]
-- test --
[% TRY %]
Index: gd.t
===================================================================
RCS file: /template-toolkit/Template2/t/gd.t,v
retrieving revision 2.6
diff -u -w -b -r2.6 gd.t
--- gd.t 2003/04/23 15:40:27 2.6
+++ gd.t 2003/04/29 15:44:44
@@ -126,27 +126,12 @@
b = poly.bounds; b0 = b.0; b1 = b.1; b2 = b.2; b3 = b.3;
poly.map(b0,b1,b2,b3,50,20,80,160);
im.filledPolygon(poly,white);
-END; -%][% im.png | hex -%]
+ END;
+ out = im.png | hex;
+ out.length > 1250 ? "ok" : "not ok"
+-%]
-- expect --
-89504e470d0a1a0a0000000d49484452000000e1000000b4040300000090de560d0000
-000f504c5445000000ffffffff00000000fffffacda03f5b3b0000022349444154789c
-eddad96d84500c85e1591a081d4454108906f2e0fe6bca2c2c77b70df615d19cd3c0a7
-ff010b242e170cc3300cc3b00fdd15224476f7eee2f4d359bc4f5367719a0a919ee223
-b110e9293ec13c72f872035f8979a4a3f806b3483f714ecc22fdc4054c23ddc435318d
-7413373089f41283c424d24b0cc138d2498c12a3c8eb30b8883118463a89496218e924
-a66010e923668941a48f98835ba48b5848dc225dc412b8467a88c5c435d2432c834be4
-30981f9d4ae212e920d6c039d24164061122c4ca1e47cee9b503224488e7179f60dfa3
-031122c4d388af93d3f5e8408408f15f8bbfc7c437a8397344c748b5487490d48a4447
-49a5487498d48944c749954864406a44220b52211299907231057792f3c9111c9d1cdc
-478ac512b88b948a65700f29146be00e5226d6413d29125ba09a94886d504b0a440e54
-92bcc8833a7201ab474702aa484e94811a9211a5a0826c8b72504e36450d28265ba20e
-94920d510b0a49f6e930df0788eb91ebf675051122c4f3881bd8ebe89c52bc7517c7ef
-cee26d1c3b8be3681bc98a8f44db48567c82a6919cf84ab48c0c4e4ef9e8bc41c3484e
-9c130d23397101ed2219714db48b64c40d348b6c8b41a259645b0c41abc8a618255a45
-36c518348a6c8949a2516408a6672e056d221b62966813d91073d024b22e16124d22eb
-6209b488ac8ac5448bc8aa58060d226b6225d120b226d6c0c391d1c9e9f2ad031122c4
-f38831d8fbaf720cc3300cc3b0a3fb03d69b699bd4e71fcb0000000049454e44ae4260
-82
+ok
-- test --
[% FILTER replace('.');
#
Index: Makefile.PL
===================================================================
RCS file: /template-toolkit/Template2/Makefile.PL,v
retrieving revision 2.38
diff -u -w -b -r2.38 Makefile.PL
--- Makefile.PL 2003/04/29 13:16:49 2.38
+++ Makefile.PL 2003/04/29 16:38:32
@@ -498,15 +498,21 @@
$TT_XS_ENABLE) =~ /^y/i);
if ($TT_XS_ENABLE) {
-
- $TT_XS_DEFAULT = (ttprompt('Do you want to use the XS Stash for all Templates?',
+ $TT_XS_DEFAULT =
+ (ttprompt('Do you want to use the XS Stash for all Templates?',
$TT_XS_DEFAULT) =~ /^y/i);
+ }
+ else {
+ # If the XS stash is disabled, we cannot use it as the default stash.
+ $TT_XS_DEFAULT = 0;
+ }
+ # Actually, we would have to fix 'Config.pm' only if the XS stash is
+ # disabled. But this way, we are sure the correct module is used.
fix_file(catfile('lib','Template','Config.pm'),
'$STASH',
$TT_XS_DEFAULT ? 'Template::Stash::XS' : 'Template::Stash');
}
-}
#------------------------------------------------------------------------
@@ -604,7 +610,9 @@
EOF
- if (ttprompt('Do you want to install these components?', $TT_EXTRAS) =~ /^y/i) {
+ if ($TT_EXTRAS = (
+ ttprompt('Do you want to install these components?',
+ $TT_EXTRAS) =~ /^y/i)) {
message(<<EOF);
You can chose any directory for the installation of the additional
@@ -892,18 +900,19 @@
sub write_defaults {
open(FP, "> $DEFAULTS_FILE") || die "$DEFAULTS_FILE: $!\n";
- my ( $ttdbi, $ttdocs, $ttsplash, $ttex,
+ my ( $ttdbi, $ttdocs, $ttsplash, $ttexamples, $ttextras,
$ttlatex, $ttxs_enable, $ttxs_default )
= map { $_ ? 'y' : 'n' }
( $TT_RUN_DBI, $TT_BUILD_DOCS, $TT_SPLASH_DOCS, $TT_EXAMPLES,
- $TT_LATEX_ENABLE, $TT_XS_ENABLE, $TT_XS_DEFAULT );
+ $TT_EXTRAS, $TT_LATEX_ENABLE, $TT_XS_ENABLE, $TT_XS_DEFAULT );
print FP <<EOF;
\$TT_PREFIX = '$TT_PREFIX';
\$TT_IMAGES = '$TT_IMAGES';
\$TT_RUN_DBI = '$ttdbi';
\$TT_BUILD_DOCS = '$ttdocs';
\$TT_SPLASH_DOCS = '$ttsplash';
-\$TT_EXAMPLES = '$ttex';
+\$TT_EXAMPLES = '$ttexamples';
+\$TT_EXTRAS = '$ttextras';
\$TT_SPLASH_THEME = '$TT_SPLASH_THEME';
\$TT_LATEX_ENABLE = '$ttlatex';
\$TT_LATEX_PATH = '$TT_LATEX_PATH';
------------DF1C44D2D0B147D
Content-Type: application/octet-stream; name="gd.t.log"
Content-Transfer-Encoding: base64
Content-Disposition: attachment; filename="gd.t.log"
MS4uMTEKb2sgMSAtIHJ1bm5pbmcgdGVzdF9leHBlY3QoKQpvayAyIC0gdGVtcGxhdGUgcHJvY2Vz
c29yIGlzIGVuZ2FnZWQKb2sgMyAtIGlucHV0IHJlYWQgYW5kIHNwbGl0IGludG8gNCB0ZXN0cwpv
ayA0IC0gdGVtcGxhdGUgdGV4dCAxIHByb2Nlc3NlZCBPSzogWyUgRklMVEVSIHJlcGxhY2UoJy4n
KTtcbiAgICAjXG4gIC4uLgpvayA1IC0gdGVtcGxhdGUgdGV4dCAxIG1hdGNoZWQgZXhwZWN0ZWQK
b2sgNiAtIHRlbXBsYXRlIHRleHQgMiBwcm9jZXNzZWQgT0s6IFslIEZJTFRFUiByZXBsYWNlKCcu
Jyk7XG4gICAgI1xuICAuLi4Kb2sgNyAtIHRlbXBsYXRlIHRleHQgMiBtYXRjaGVkIGV4cGVjdGVk
Cm9rIDggLSB0ZW1wbGF0ZSB0ZXh0IDMgcHJvY2Vzc2VkIE9LOiBbJSBGSUxURVIgcmVwbGFjZSgn
LicpO1xuICAgICNcbiAgLi4uCk1BVENIIEZBSUxFRAogaW5wdXQ6IFtbJSBGSUxURVIgcmVwbGFj
ZSgnLicpO1xuICAgICNcbiAgICAjIFRoaXMgaXMgdGVzdDQgZnJvbSBHRC0xLnh4L3QvR0QudFxu
ICAgICNcbiAgICBVU0UgaW0gPSBHRC5JbWFnZSgyMjUsMTgwKTtcbiAgICBibGFjayAgID0gaW0u
Y29sb3JBbGxvY2F0ZSgwLCAwLCAwKTtcbiAgICB3aGl0ZSAgID0gaW0uY29sb3JBbGxvY2F0ZSgy
NTUsIDI1NSwgMjU1KTtcbiAgICByZWQgICAgID0gaW0uY29sb3JBbGxvY2F0ZSgyNTUsIDAsIDAp
O1xuICAgIGJsdWUgICAgPSBpbS5jb2xvckFsbG9jYXRlKDAsMCwyNTUpO1xuICAgIHllbGxvdyAg
PSBpbS5jb2xvckFsbG9jYXRlKDI1NSwyNTAsMjA1KTtcbiAgICBVU0UgcG9seSA9IEdELlBvbHln
b247XG4gICAgcG9seS5hZGRQdCgwLDUwKTtcbiAgICBwb2x5LmFkZFB0KDI1LDI1KTtcbiAgICBw
b2x5LmFkZFB0KDUwLDUwKTtcbiAgICBpbS5maWxsZWRQb2x5Z29uKHBvbHksYmx1ZSk7XG4gICAg
cG9seS5vZmZzZXQoMTAwLDEwMCk7XG4gICAgaW0uZmlsbGVkUG9seWdvbihwb2x5LHJlZCk7XG4g
ICAgcG9seS5tYXAoNTAsNTAsMTAwLDEwMCwxMCwxMCwxMTAsNjApO1xuICAgIGltLmZpbGxlZFBv
bHlnb24ocG9seSx5ZWxsb3cpO1xuICAgIGIgPSBwb2x5LmJvdW5kczsgYjAgPSBiLjA7IGIxID0g
Yi4xOyBiMiA9IGIuMjsgYjMgPSBiLjM7XG4gICAgcG9seS5tYXAoYjAsYjEsYjIsYjMsNTAsMjAs
ODAsMTYwKTtcbiAgICBpbS5maWxsZWRQb2x5Z29uKHBvbHksd2hpdGUpO1xuRU5EOyAtJV1bJSBp
bS5wbmcgfCBoZXggLSVdXG5dCmV4cGVjdDogWzg5NTA0ZTQ3MGQwYTFhMGEwMDAwMDAwZDQ5NDg0
NDUyMDAwMDAwZTEwMDAwMDBiNDA0MDMwMDAwMDA5MGRlNTYwZDAwMDBcbjAwMGY1MDRjNTQ0NTAw
MDAwMGZmZmZmZmZmMDAwMDAwMDBmZmZmZmFjZGEwM2Y1YjNiMDAwMDAyMjM0OTQ0NDE1NDc4OWNc
bmVkZGFkOTZkODQ1MDBjODVlMTU5MWEwODFkNDQ1NDEwODkwNmYyZTBmZTZiY2EyYzJjNzdiNzBk
ZjYxNWQxOWNkM2MwYTdcbmZmMDEwYjI0MmUxNzBjYzMzMDBjYzNiMDBmZGQxNTIyNDQ3NmY3ZWVl
MmY0ZDM1OWJjNGY1MzY3NzE5YTBhOTE5ZWUyMjNcbmIxMTBlOTI5M2VjMTNjNzJmODcyMDM1Zjg5
NzlhNGEzZjgwNmIzNDgzZjcxNGVjYzIyZmRjNDA1NGMyM2RkYzQzNTMxOGRcbjc0MTMzNzMwODlm
NDEyODNjNDI0ZDI0YjBjYzEzOGQyNDk4YzEyYTNjOGViMzBiODg4MzExODQ2M2E4OTQ5NjIxOGU5
MjRcbmE2NjAxMGU5MjM2Njg5NDFhNDhmOTg4MzViYTQ4YjU4NDhkYzIyNWRjNDEyYjg0NjdhODhj
NWM0MzVkMjQzMmM4MzRiZTRcbjMwOTgxZjlkNGFlMjEyZTkyMGQ2YzAzOWQyNDE2NDA2MTEyMmM0
Y2ExZTQ3Y2VlOWI1MDMyMjQ0ODhlNzE3OWY2MGRmYTNcbjAzMTEyMmM0ZDM4OGFmOTNkM2Y1ZTg0
MDg0MDhmMTVmOGJiZmM3YzQzN2E4Mzk3MzQ0Yzc0OGI1NDg3NDkwZDQ4YTQ0NDdcbjQ5YTU0ODc0
OThkNDg5NDRjNzQ5OTU0ODY0NDA2YTQ0MjIwYjUyMjExMjk5OTA3MjMxMDU3NzkyZjNjOTExMWM5
ZDFjZGNcbjQ3OGFjNTEyYjg4Yjk0OGE2NTcwMGYyOTE0NmJlMDBlNTIyNmQ2NDEzZDI5MTI1YmEw
OWE5NDg4NmQ1MDRiMGE0NDBlNTRcbjkyYmNjODgzM2E3MjAxYWI0NzQ3MDJhYTQ4NGU5NDgxMWE5
MjExYTVhMDgyNmM4YjcyNTA0ZTM2NDUwZDI4MjY1YmEyMGVcbjk0OTIwZDUxMGIwYTQ5ZjZlOTMw
ZGYwNzg4ZWI5MWViZjY3NTA1MTEyMmM0ZjM4ODFiZDhlYmU4OWM1MmJjNzUxN2M3ZWZcbmNlZTI2
ZDFjM2I4YmUzNjgxYmM5OGE4ZjQ0ZGI0ODU2N2M4MmE2OTE5Y2Y4NGFiNDhjMGM0ZTRlZjllOGJj
NDFjMzQ4NGVcbjljMTMwZDIzMzk3MTAxZWQyMjE5NzE0ZGI0OGI2NGM0MGQzNDhiNmM4YjQxYTI1
OTY0NWIwYzQxYWJjOGE2MTgyNTVhNDVcbjM2YzUxODM0OGE2Yzg5NDlhMjUxNjQwOGE2NjcyZTA1
NmQyMjFiNjI5NjY4MTNkOTEwNzNkMDI0YjIyZTE2MTI0ZDIyZWJcbjYyMDliNDg4YWM4YWM1NDQ4
YmM4YWE1ODA2MGQyMjZiNjIyNWQxMjBiMjI2ZDZjMGMzOTFkMWM5ZTlmMmFkMDMxMTIyYzRcbmYz
ODgzMWQ4ZmJhZjcyMGNjMzMwMGNjM2IwYTNmYjAzZDY5YjY5OWJkNGU3MWZjYjAwMDAwMDAwNDk0
NTRlNDRhZTQyNjBcbjgyXQpvdXRwdXQ6IFs4OTUwNGU0NzBkMGExYTBhMDAwMDAwMGQ0OTQ4NDQ1
MjAwMDAwMGUxMDAwMDAwYjQwNDAzMDAwMDAwOTBkZTU2MGQwMDAwXG4wMDBmNTA0YzU0NDUwMDAw
MDBmZmZmZmZmZjAwMDAwMDAwZmZmZmZhY2RhMDNmNWIzYjAwMDAwMjI5NDk0NDQxNTQ3ODljXG5l
ZGQ3NDk2ZWMzMzAwYzg1ZTFhNGI5NDA3ZDgzYzIyNzI4ZTAwYjc0YzFmYjlmYTkxOTNjNDg5NjQ0
OTExNjI5NjQ3ODZmXG5lOWNkODczZjMwODhmODc0YzIzMDBjYzMzMDBjZmJkMDlkMjE0MmFjZWU5
Mjc5MzY3YzdiOGFkMzZmNjdmMTMyNGQ5ZGM1XG42OWNhNDQ3YThhZDdjNDRjYTRhNzc4MDNkMzQ4
NDdmMTllOTg0NjNhOGEwZjMwODlmNDEzZTdjNDI0ZDI0ZjVjYzA3ZGU0XG4zMDM4ODE2YmUyMmVm
MmVjMjY2ZTYwMWNlOTI2MDY4OTcxYTQ5YjE4ODI1MWE0OTcxODI1NDY5MTVlNjIwYzg2OTE0ZWUy
XG4yZTMxOGM3NDEyZjc2MDEwZTkyMzI2ODk0MWE0OGY5ODgyNWJlNDMwMzg5Y2I5NGNlMjE2ZTky
MmU2YzAzNWQyNDNjYzI2XG5hZTkxMWU2MjFlNWMyMjFkYzQ0MmUyMTJlOTIwOTZjMDM5ZDJlNWNk
NjFmNzAxZTJmNWU0YjhmZDA5ODAwODExZTI0Yjg4XG41ZDhmY2UwMDExMjJjNGNmMTVlZjI3YTdl
Yjk5ODMwODExZTJmMzg4MGZiMGU3ZDE4MWY4MjRlMjVmNmY5MWE4OGQ1NDhiXG40NDhkYTQ1NjI0
NmEyNTk1MjI1MTMzMzk4YmMyYTM0M2Q0NGM5ZTU1MjI1MTNiYTkxMjg5MGM0ODhkNDg2NDQxMmFj
NDNkXG43ODkwOTQ4YjI5Nzg4YzE0OGIzOWYwMTAyOTE1ZjNlMDExNTIyODk2YzAwM2E0NGMyYzgz
N2E3MjAxZDkzM2M3ODE2YTUyXG4yMmYyYTA5NjE0ODgzNTUwNDlkNmM1M2FhODIzYWJhMjA0NTQ5
MTM1NTEwNjZhYzg4YTI4MDUxNTI0MmZjYTQxMzljOThhXG4xYTUwNGFhZTI3Mjc3Nzc0NzRhMDkw
ZTQ0NDJkMjgyM2Q5NDY5NzQxODRmODgyNjJhN2FmZTQwMTIyYzRmNzExYmZiYThiXG5lMzRmNjdm
MTZiMWMyZGMxZTBlNDk0Y2VkYzM4OWE0NmQ2YzU2YmEyNjk2NDVkYmM4MTk2OTE1NWYxOWU2ODE5
NTkxNTFmXG5hMDYxNjQ0ZDljMTMwZDIzNmJlMjAyZGE0NTU2YzQzNWQxMmViMjIyNmVhMDU5NjQw
OGE2NDcyNzQ4MzQ4YmU0YzUxMGI0XG44YTY0YzUyOGQxMmE5MjE1NjNkMDI4OTIxMzc3ODk0Njkx
OWNiODA3NmQyMjE5MzE0OWI0ODk2NGM0MTQzNDg5MmM4Yjk5XG40NDkzYzg0ODhjOGU0ZTBlMzQ4
ODNjMTdjNTZjYTI0MTY0NTljYzgzZWQ5MTQ1YjE5MGQ4MWU1OTE0NGI2MDczNjRmOTU3XG5mNTFh
YzRmNzEwNjNiMGM3MTcyNGM0ZjcxMDMxMGNjMzMwMGNjMzJjZjcwZjU3ODE2ZTVhYzhkNGM3ZDEw
MDAwMDAwMDQ5XG40NTRlNDRhZTQyNjA4Ml0KRkFJTEVEIDk6ICAtIHRlbXBsYXRlIHRleHQgMyBk
aWQgbm90IG1hdGNoIGV4cGVjdGVkCm5vdCBvayA5IC0gdGVtcGxhdGUgdGV4dCAzIGRpZCBub3Qg
bWF0Y2ggZXhwZWN0ZWQKb2sgMTAgLSB0ZW1wbGF0ZSB0ZXh0IDQgcHJvY2Vzc2VkIE9LOiBbJSBG
SUxURVIgcmVwbGFjZSgnLicpO1xuICAgICNcbiAgLi4uCm9rIDExIC0gdGVtcGxhdGUgdGV4dCA0
IG1hdGNoZWQgZXhwZWN0ZWQK
------------DF1C44D2D0B147D--