[Jifty-commit] r1023 - in jifty/branches/jifty-jsan: . inc/Module inc/Module/Install lib lib/Jifty/Script lib/Jifty/Upgrade lib/Jifty/Web/Form

jifty-commit at lists.jifty.org jifty-commit at lists.jifty.org
Mon May 8 19:20:15 EDT 2006


Author: trs
Date: Mon May  8 19:20:11 2006
New Revision: 1023

Modified:
   jifty/branches/jifty-jsan/   (props changed)
   jifty/branches/jifty-jsan/Changelog
   jifty/branches/jifty-jsan/META.yml
   jifty/branches/jifty-jsan/Makefile.PL
   jifty/branches/jifty-jsan/SIGNATURE
   jifty/branches/jifty-jsan/inc/Module/Install.pm
   jifty/branches/jifty-jsan/inc/Module/Install/AutoInstall.pm
   jifty/branches/jifty-jsan/inc/Module/Install/Base.pm
   jifty/branches/jifty-jsan/inc/Module/Install/Can.pm
   jifty/branches/jifty-jsan/inc/Module/Install/Fetch.pm
   jifty/branches/jifty-jsan/inc/Module/Install/Include.pm
   jifty/branches/jifty-jsan/inc/Module/Install/Makefile.pm
   jifty/branches/jifty-jsan/inc/Module/Install/Metadata.pm
   jifty/branches/jifty-jsan/inc/Module/Install/Scripts.pm
   jifty/branches/jifty-jsan/inc/Module/Install/Share.pm
   jifty/branches/jifty-jsan/inc/Module/Install/Win32.pm
   jifty/branches/jifty-jsan/inc/Module/Install/WriteAll.pm
   jifty/branches/jifty-jsan/lib/Jifty.pm
   jifty/branches/jifty-jsan/lib/Jifty/Script/Action.pm
   jifty/branches/jifty-jsan/lib/Jifty/Script/Model.pm
   jifty/branches/jifty-jsan/lib/Jifty/Upgrade/Internal.pm
   jifty/branches/jifty-jsan/lib/Jifty/Util.pm
   jifty/branches/jifty-jsan/lib/Jifty/Web/Form/Field.pm

Log:
 r10356 at zot (orig r1016):  jesse | 2006-05-06 22:27:11 -0400
  r13266 at hualien:  jesse | 2006-05-06 22:26:52 -0400
  File::Path doesn't do what we'd expect on paths that already exist.
 
 r10357 at zot (orig r1017):  audreyt | 2006-05-07 01:22:09 -0400
 * Update the inc tree to 0.62 for various fixes,
   in particular improved share_dir compatibility.
 r10358 at zot (orig r1018):  jesse | 2006-05-07 15:28:01 -0400
  r13295 at hualien:  jesse | 2006-05-07 13:41:03 -0400
  * We were inconsistently using Jifty::Util::make_path as a subroutine. It's a class method.
    This could break the stub generators and tutorial.  Thanks to Sean E. Millichamp
 
 r10359 at zot (orig r1019):  jesse | 2006-05-07 15:28:09 -0400
  r13298 at hualien:  jesse | 2006-05-07 15:27:44 -0400
  * 0.60507
 
 r10361 at zot (orig r1021):  jesse | 2006-05-07 18:34:57 -0400
 * If users were upgrading from pre->0.60427 versions of Jifty, the table upgrades semantics could bite them as they did the wrong thing
 on "repeated" upgrades.
 
 
 r10364 at zot (orig r1022):  trs | 2006-05-08 19:19:54 -0400
  r10363 at zot:  tom | 2006-05-08 19:19:29 -0400
  Include the .argument-<name> class in the surrounding .form_field div
 


Modified: jifty/branches/jifty-jsan/Changelog
==============================================================================
--- jifty/branches/jifty-jsan/Changelog	(original)
+++ jifty/branches/jifty-jsan/Changelog	Mon May  8 19:20:11 2006
@@ -1,3 +1,21 @@
+0.60507 (7 May 2006)
+
+* Pod fixes from Eric Wilhelm
+  lib/Jifty/Object.pm - removed incorrect '=for' directive
+  lib/Jifty/Web/Form/Field.pm - removed incorrect '=for' directive
+  lib/Jifty/Web/Form.pm - removed incorrect '=for' directive
+  
+
+* Better failure messages on when schema upgrades with SQLite fail from Alex Vandiver
+   * Be a little more explicit about SQLite's limitation, and a possible
+     (painful) workaround
+ 
+* Update the inc tree to 0.62 for various fixes,
+   in particular improved share_dir compatibility. --Audrey Tang
+
+* We were inconsistently using Jifty::Util::make_path as a subroutine. It's a class method.
+  This could break the stub generators and tutorial.  Thanks to Sean E. Millichamp
+
 0.60505 - Cinco de Jifty! (5 May 2006)
 
   * Native support for times and timezones.

Modified: jifty/branches/jifty-jsan/META.yml
==============================================================================
--- jifty/branches/jifty-jsan/META.yml	(original)
+++ jifty/branches/jifty-jsan/META.yml	Mon May  8 19:20:11 2006
@@ -1,13 +1,16 @@
+build_requires: 
+  ExtUtils::MakeMaker: 6.11
 distribution_type: module
-generated_by: Module::Install version 0.610
-license: unknown
+generated_by: Module::Install version 0.620
+license: Perl
 name: Jifty
 no_index: 
   directory: 
     - inc
     - t
+  package: 
+    - DB
 requires: 
-  Apache::Session: 0
   App::CLI: 0.03
   Cache::Cache: 0
   Calendar::Simple: 0
@@ -15,16 +18,15 @@
   Class::Container: 0
   Clone: 0
   Compress::Zlib: 0
-  DBD::SQLite: 0
+  DBD::SQLite: 1.11
   Data::Page: 0
   Date::Manip: 0
-  Digest::MD5: 0
+  DateTime: 0
   Email::Folder: 0
   Email::LocalDelivery: 0
   Email::Send: 1.99_01
   Email::Simple: 0
   Email::Simple::Creator: 0
-  Encode: 0
   File::Find::Rule: 0
   File::MMagic: 0
   File::ShareDir: 0
@@ -37,7 +39,7 @@
   HTTP::Server::Simple::Recorder: 0
   Hash::Merge: 0
   Hook::LexWrap: 0
-  JSON::Syck: 0.1
+  JSON::Syck: 0.12
   Jifty::DBI: 0.16
   LWP::UserAgent: 0
   Locale::Maketext::Extract: 0.20
@@ -50,7 +52,6 @@
   Module::Refresh: 0.09
   Params::Validate: 0
   Pod::Simple: 0
-  Scalar::Util: 0
   String::Koremutake: 0
   Test::Base: 0.44
   Test::HTML::Lint: 0
@@ -58,14 +59,13 @@
   Test::More: 0.62
   Test::Pod::Coverage: 0
   Test::WWW::Mechanize: 0
-  Time::HiRes: 0
   UNIVERSAL::require: 0
   URI: 0
   WWW::Mechanize: 1.12
   XML::Writer: 0
   XML::XPath: 0
-  YAML::Syck: 0.41
+  YAML::Syck: 0.44
   perl: 5.8.3
   version: 0
 tests: t/*.t t/*/t/*.t
-version: 0.60321
+version: 0.60507

Modified: jifty/branches/jifty-jsan/Makefile.PL
==============================================================================
--- jifty/branches/jifty-jsan/Makefile.PL	(original)
+++ jifty/branches/jifty-jsan/Makefile.PL	Mon May  8 19:20:11 2006
@@ -67,6 +67,9 @@
     requires('JSON' => 0.01) unless can_use('JSON::Syck' => 0.12);
 }
 
+
+no_index package => 'DB';
+
 version_from('lib/Jifty.pm');
 #&auto_bundle_deps();
 &auto_install();
@@ -78,5 +81,5 @@
 # Test all of our sub-dist tests too
 tests('t/*.t t/*/t/*.t');
 
-&WriteAll;
+WriteAll;
 

Modified: jifty/branches/jifty-jsan/SIGNATURE
==============================================================================
--- jifty/branches/jifty-jsan/SIGNATURE	(original)
+++ jifty/branches/jifty-jsan/SIGNATURE	Mon May  8 19:20:11 2006
@@ -15,11 +15,11 @@
 Hash: SHA1
 
 SHA1 c671b21c022dd6c6f5447da308915d55cf299cb0 AUTHORS
-SHA1 294d7494dc273ed9b208e9f99c12af2c71641dd2 Changelog
+SHA1 88045a4c3e3594e42fb5e9a0a15f84f863c95ebc Changelog
 SHA1 f9aa96ce70078a5d1a938b07746e6de6728dab39 MANIFEST
 SHA1 3ad8481344a1d0ce2dc5726c1db8bea1917402de MANIFEST.SKIP
-SHA1 53976013485232bf38442c996cf25d3d09cc9203 META.yml
-SHA1 aa819a51c57165f0b77326becd675e73c94b098c Makefile.PL
+SHA1 87cd20be608c2d42de96e567c48b9a0e4a6b6e2b META.yml
+SHA1 80587cf51c5366ac4c6414b8e3c15e705c569c1f Makefile.PL
 SHA1 e395a2eabaf8faf8266dedc664c1eb52c6c589cf README
 SHA1 aaf8f7a1025fc97077072672f325e2a5f3c03a41 bin/build_par
 SHA1 b8033f506649985b6244c7c61462aae54a212c89 bin/jifty
@@ -49,20 +49,20 @@
 SHA1 109e87541d601c1be1d2042c6ab9d2952a94d36b doc/talks/yapc.asia.2006.xul
 SHA1 7d6cffbb4f916bfaba69540329cb7d7f67d12f25 etc/config.yml
 SHA1 0bb5ddbe64424d40536acdee2f09e853ab39087d inc/Module/AutoInstall.pm
-SHA1 e7688055bf405375921ea837273d8bdc68803efb inc/Module/Install.pm
-SHA1 4fad9a959426996f62d0e4e972cf09e3a0cf8c0c inc/Module/Install/AutoInstall.pm
-SHA1 e5b3215acb96829f2142dcfce736c1b6484fbc08 inc/Module/Install/Base.pm
-SHA1 07c44e137098675ea35a5d537df1e4af098382d9 inc/Module/Install/Can.pm
-SHA1 8f691f8e451ba687551fa836e8d75c4d514241e5 inc/Module/Install/Fetch.pm
-SHA1 0db6efc5925b96e1ea3b8bc46c3ecdb14660ae82 inc/Module/Install/Include.pm
-SHA1 81b798c6ca71d1b665a470fb49d32105084ac389 inc/Module/Install/Makefile.pm
-SHA1 c8c9737da19baa15ffa7d9d5037913f64b592189 inc/Module/Install/Metadata.pm
-SHA1 267e57a7b78351d5fa424fc4b8c595025a89305d inc/Module/Install/Scripts.pm
-SHA1 79b7956437c9f27ec9c664dc8a82ec1501124968 inc/Module/Install/Share.pm
-SHA1 b97304e2a5c405d950eeaa4afd09c6b5507571c3 inc/Module/Install/Win32.pm
-SHA1 73a588d58f7ad0a6a9ed0ea80c48fa12f234a02c inc/Module/Install/WriteAll.pm
+SHA1 e28cf2d3ba35f6ca3a448acc7bee191b7c390379 inc/Module/Install.pm
+SHA1 d7013668911c86af441cad115b897fc675a472de inc/Module/Install/AutoInstall.pm
+SHA1 e7c1c86f57b6778f4bdc7fd8c1b950e60ef41bc0 inc/Module/Install/Base.pm
+SHA1 e1829448769445cdaac384a888bf9ccf42e0d89a inc/Module/Install/Can.pm
+SHA1 70aa5e2055e8e38b4eecc5fc8c91762c0e97f551 inc/Module/Install/Fetch.pm
+SHA1 8d88f2cb120f2e64f374136df2e25d0bb6f0595b inc/Module/Install/Include.pm
+SHA1 8ac832baf4f9e8e72d3e8f103cee6e8a94ac80e1 inc/Module/Install/Makefile.pm
+SHA1 0807e79d6dbfda4fcd3db0fc7df2e33e0cba263b inc/Module/Install/Metadata.pm
+SHA1 567fde53d9f24db2ab823d1031dec5e48f55def6 inc/Module/Install/Scripts.pm
+SHA1 f49498cd0f5bcaccd1be89b1fc702eb95ea185e6 inc/Module/Install/Share.pm
+SHA1 4da0a1fce2339cc3f8c296c7716480d2564d9470 inc/Module/Install/Win32.pm
+SHA1 9a903a1d178954ad864c7dcc98f9fa5c005d1553 inc/Module/Install/WriteAll.pm
 SHA1 c17e8f3cf8ebe1eb4929fd2bd2fd530a9de1abd0 lib/Email/Send/Jifty/Test.pm
-SHA1 540a762bf7267ef70642fb1fa423071cbea54e21 lib/Jifty.pm
+SHA1 c7b897db7f21973ad9b8ed9edf154de5c779b370 lib/Jifty.pm
 SHA1 7716980f6d6e5a7bd348a35e604db63ff09cd282 lib/Jifty/API.pm
 SHA1 fb4e3976d963b9ef667eb8e6fadb85f0ff3f3dd8 lib/Jifty/Action.pm
 SHA1 a6d9d87b4fa06cfab36f249a67946b45669dcee7 lib/Jifty/Action/Autocomplete.pm
@@ -96,7 +96,7 @@
 SHA1 809ace5bafff5ad2461d5495464863ba808dfd19 lib/Jifty/Model/Metadata.pm
 SHA1 36de25464ae4eb07675f453cc590b634c6ff5a37 lib/Jifty/Model/Session.pm
 SHA1 c32efef334d710b29dfbc28a600ef041c20feb55 lib/Jifty/Notification.pm
-SHA1 5d8c61b520e0a214c48cf6ce5cc1cce0bfc18498 lib/Jifty/Object.pm
+SHA1 af5ebe2db6ce6dabacb3a4d80a81fa4ec0fe6fba lib/Jifty/Object.pm
 SHA1 2bf9dfd52536d9e374ab635d0e9145d855b9c802 lib/Jifty/Record.pm
 SHA1 545a5cab5814e0fd6610b7ec1b395190701dc170 lib/Jifty/Request.pm
 SHA1 f1a4b69c889b5d71b9ec63b809b2901506ee53e7 lib/Jifty/Request/Mapper.pm
@@ -104,27 +104,27 @@
 SHA1 008bc2cb27e6f3f6f3b5f1b1817c8f2a9aa20bd5 lib/Jifty/Result.pm
 SHA1 44466e45b0bf67fd0dd63e76f310acbdd27532b2 lib/Jifty/RightsFrom.pm
 SHA1 0306af64a6289796db4b5ff2b8c5e7c23506a9e3 lib/Jifty/Script.pm
-SHA1 8717170bc50a1a5a1a2ed7cc3db845fa83e1a1e7 lib/Jifty/Script/Action.pm
+SHA1 c84102766498aa2a3511e1e69f3bc8dbd72fae2f lib/Jifty/Script/Action.pm
 SHA1 cc832d70b473fc72ec3d4d29a926a36df056fdc6 lib/Jifty/Script/App.pm
 SHA1 29d13e52fe20d59515cb06fb30c38d111a407255 lib/Jifty/Script/FastCGI.pm
 SHA1 e25a259fc9fd3183a7981236f428f54ac4c4f49e lib/Jifty/Script/Help.pm
-SHA1 5ff6b511456d4fc5ea4c9d2139f01b92f558f5cc lib/Jifty/Script/Model.pm
+SHA1 175734f448f61ffefca0bbc1a4ddc75fff962dff lib/Jifty/Script/Model.pm
 SHA1 4268d0e323c346773bc8f700c4b61abe9b608507 lib/Jifty/Script/Po.pm
 SHA1 4c1dd92fe12322db280dec84cf58e6e2a6f458c1 lib/Jifty/Script/Schema.pm
 SHA1 e39ef348a0b44c2e61a9029ba6451db0ad203fbb lib/Jifty/Script/Server.pm
 SHA1 b2b0a6023d94fc265921711e8e916f5a42ebeb23 lib/Jifty/Server.pm
 SHA1 6d339d87ba1f06fe9d8f852758259debb2410af5 lib/Jifty/Test.pm
 SHA1 1c227c39f3d5ba712b476466776049ff1ef790f5 lib/Jifty/Test/WWW/Mechanize.pm
-SHA1 5173f96ed2149c567a89947d4fe7af1942a361c2 lib/Jifty/Upgrade.pm
+SHA1 7561e9fb302562617853fcc2a9be665a67ffc4d8 lib/Jifty/Upgrade.pm
 SHA1 ee051e7ba367a79e6a10c3ba03c0657c80d02f17 lib/Jifty/Upgrade/Internal.pm
-SHA1 c31c8615eb8750933ad013caabe930d21a585479 lib/Jifty/Util.pm
+SHA1 0a72131b6ef2bded2fc09a32eb1c00326eb44b40 lib/Jifty/Util.pm
 SHA1 55054be7348627f8c69f1edf3f0dfb7e7f4c4601 lib/Jifty/View/Mason/Handler.pm
 SHA1 e28c7337d93241f3ddc21740fb42a9aacbb32b6d lib/Jifty/View/Static/Handler.pm
 SHA1 b3a941af74599aa12e6dc18e6bf86fb5360b9a47 lib/Jifty/Web.pm
-SHA1 cec24f331a68394da33ce993d0f790f306240ea8 lib/Jifty/Web/Form.pm
+SHA1 db09fd9bbaebbf546d6ba51f2a43e84c8e853671 lib/Jifty/Web/Form.pm
 SHA1 0c9eb63024532f3e0ea15fe1904a3752adf7d10a lib/Jifty/Web/Form/Clickable.pm
 SHA1 362586699428578fd083e8d8128eb21b64a6c73c lib/Jifty/Web/Form/Element.pm
-SHA1 634eb327055bfc444f9a17d3502903197b9bbd66 lib/Jifty/Web/Form/Field.pm
+SHA1 3df36bd6f6fdee5470455402fb014cea555c9b43 lib/Jifty/Web/Form/Field.pm
 SHA1 c7c3c09acbba5139d6b01c99f255bcc3648a9838 lib/Jifty/Web/Form/Field/Button.pm
 SHA1 25794637f8ff0c36abb0c78254403b871e88069b lib/Jifty/Web/Form/Field/Checkbox.pm
 SHA1 9066ed3c620aa331451f4ac7045e66a3dee164e1 lib/Jifty/Web/Form/Field/Combobox.pm
@@ -293,7 +293,7 @@
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.2.2 (GNU/Linux)
 
-iD8DBQFEW58uEi9d9xCOQEYRAnduAJ48/4YvmCiKosdVALI9ciN2k3ND0ACghf6u
-R4DHRm0Msch/QIlVAamTVRY=
-=3Dxb
+iD8DBQFEXjx0Ei9d9xCOQEYRAmzuAJ48z2ko4T0I2oHZHvazAAmQ36gzcwCeKL0w
+JTUZ/wepkSrAlWjfw9o9MJs=
+=Q9E1
 -----END PGP SIGNATURE-----

Modified: jifty/branches/jifty-jsan/inc/Module/Install.pm
==============================================================================
--- jifty/branches/jifty-jsan/inc/Module/Install.pm	(original)
+++ jifty/branches/jifty-jsan/inc/Module/Install.pm	Mon May  8 19:20:11 2006
@@ -28,7 +28,7 @@
     # This is not enforced yet, but will be some time in the next few
     # releases once we can make sure it won't clash with custom
     # Module::Install extensions.
-    $VERSION = '0.61';
+    $VERSION = '0.62';
 }
 
 # Whether or not inc::Module::Install is actually loaded, the
@@ -116,7 +116,7 @@
     my %seen;
     foreach my $obj ( @exts ) {
         while (my ($method, $glob) = each %{ref($obj) . '::'}) {
-            next unless exists &{ref($obj).'::'.$method};
+            next unless $obj->can($method);
             next if $method =~ /^_/;
             next if $method eq uc($method);
             $seen{$method}++;

Modified: jifty/branches/jifty-jsan/inc/Module/Install/AutoInstall.pm
==============================================================================
--- jifty/branches/jifty-jsan/inc/Module/Install/AutoInstall.pm	(original)
+++ jifty/branches/jifty-jsan/inc/Module/Install/AutoInstall.pm	Mon May  8 19:20:11 2006
@@ -1,12 +1,15 @@
 #line 1
 package Module::Install::AutoInstall;
 
+use strict;
 use Module::Install::Base;
- at ISA = qw{Module::Install::Base};
-
-$VERSION = '0.61';
 
-use strict;
+use vars qw{$VERSION $ISCORE @ISA};
+BEGIN {
+	$VERSION = '0.62';
+	$ISCORE  = 1;
+	@ISA     = qw{Module::Install::Base};
+}
 
 sub AutoInstall { $_[0] }
 

Modified: jifty/branches/jifty-jsan/inc/Module/Install/Base.pm
==============================================================================
--- jifty/branches/jifty-jsan/inc/Module/Install/Base.pm	(original)
+++ jifty/branches/jifty-jsan/inc/Module/Install/Base.pm	Mon May  8 19:20:11 2006
@@ -1,7 +1,7 @@
 #line 1
 package Module::Install::Base;
 
-$VERSION = '0.61';
+$VERSION = '0.62';
 
 # Suspend handler for "redefined" warnings
 BEGIN {

Modified: jifty/branches/jifty-jsan/inc/Module/Install/Can.pm
==============================================================================
--- jifty/branches/jifty-jsan/inc/Module/Install/Can.pm	(original)
+++ jifty/branches/jifty-jsan/inc/Module/Install/Can.pm	Mon May  8 19:20:11 2006
@@ -9,13 +9,13 @@
 use File::Spec ();
 use ExtUtils::MakeMaker ();
 
-use vars qw{$VERSION @ISA};
+use vars qw{$VERSION $ISCORE @ISA};
 BEGIN {
-	$VERSION = '0.61';
+	$VERSION = '0.62';
+	$ISCORE  = 1;
 	@ISA     = qw{Module::Install::Base};
 }
 
-
 # check if we can load some module
 ### Upgrade this to not have to load the module if possible
 sub can_use {

Modified: jifty/branches/jifty-jsan/inc/Module/Install/Fetch.pm
==============================================================================
--- jifty/branches/jifty-jsan/inc/Module/Install/Fetch.pm	(original)
+++ jifty/branches/jifty-jsan/inc/Module/Install/Fetch.pm	Mon May  8 19:20:11 2006
@@ -4,9 +4,10 @@
 use strict;
 use Module::Install::Base;
 
-use vars qw{$VERSION @ISA};
+use vars qw{$VERSION $ISCORE @ISA};
 BEGIN {
-	$VERSION = '0.61';
+	$VERSION = '0.62';
+	$ISCORE  = 1;
 	@ISA     = qw{Module::Install::Base};
 }
 

Modified: jifty/branches/jifty-jsan/inc/Module/Install/Include.pm
==============================================================================
--- jifty/branches/jifty-jsan/inc/Module/Install/Include.pm	(original)
+++ jifty/branches/jifty-jsan/inc/Module/Install/Include.pm	Mon May  8 19:20:11 2006
@@ -1,12 +1,15 @@
 #line 1
 package Module::Install::Include;
 
+use strict;
 use Module::Install::Base;
- at ISA = qw(Module::Install::Base);
-
-$VERSION = '0.61';
 
-use strict;
+use vars qw{$VERSION $ISCORE @ISA};
+BEGIN {
+	$VERSION = '0.62';
+	$ISCORE  = 1;
+	@ISA     = qw{Module::Install::Base};
+}
 
 sub include {
 	shift()->admin->include(@_);

Modified: jifty/branches/jifty-jsan/inc/Module/Install/Makefile.pm
==============================================================================
--- jifty/branches/jifty-jsan/inc/Module/Install/Makefile.pm	(original)
+++ jifty/branches/jifty-jsan/inc/Module/Install/Makefile.pm	Mon May  8 19:20:11 2006
@@ -5,9 +5,10 @@
 use Module::Install::Base;
 use ExtUtils::MakeMaker ();
 
-use vars qw{$VERSION @ISA};
+use vars qw{$VERSION $ISCORE @ISA};
 BEGIN {
-	$VERSION = '0.61';
+	$VERSION = '0.62';
+	$ISCORE  = 1;
 	@ISA     = qw{Module::Install::Base};
 }
 
@@ -168,6 +169,15 @@
     $makefile =~ s/^(FULLPERL = .*)/$1 "-Iinc"/m;
     $makefile =~ s/^(PERL = .*)/$1 "-Iinc"/m;
 
+    # Module::Install will never be used to build the Core Perl
+    # Sometimes PERL_LIB and PERL_ARCHLIB get written anyway, which breaks
+    # PREFIX/PERL5LIB, and thus, install_share. Blank them if they exist
+    $makefile =~ s/^PERL_LIB = .+/PERL_LIB =/m;
+    #$makefile =~ s/^PERL_ARCHLIB = .+/PERL_ARCHLIB =/m;
+
+    # Perl 5.005 mentions PERL_LIB explicitly, so we have to remove that as well.
+    $makefile =~ s/("?)-I\$\(PERL_LIB\)\1//g;
+
     # XXX - This is currently unused; not sure if it breaks other MM-users
     # $makefile =~ s/^pm_to_blib\s+:\s+/pm_to_blib :: /mg;
 
@@ -195,4 +205,4 @@
 
 __END__
 
-#line 324
+#line 334

Modified: jifty/branches/jifty-jsan/inc/Module/Install/Metadata.pm
==============================================================================
--- jifty/branches/jifty-jsan/inc/Module/Install/Metadata.pm	(original)
+++ jifty/branches/jifty-jsan/inc/Module/Install/Metadata.pm	Mon May  8 19:20:11 2006
@@ -1,12 +1,15 @@
 #line 1
 package Module::Install::Metadata;
 
+use strict 'vars';
 use Module::Install::Base;
- at ISA = qw{Module::Install::Base};
-
-$VERSION = '0.61';
 
-use strict 'vars';
+use vars qw{$VERSION $ISCORE @ISA};
+BEGIN {
+	$VERSION = '0.62';
+	$ISCORE  = 1;
+	@ISA     = qw{Module::Install::Base};
+}
 
 my @scalar_keys = qw{
     name module_name abstract author version license
@@ -235,11 +238,13 @@
         ^
         use \s*
         v?
-        ([\d\.]+)
+        ([\d_\.]+)
         \s* ;
     /ixms
       )
     {
+        my $v = $1;
+        $v =~ s{_}{}g;
         $self->perl_version($1);
     }
     else {

Modified: jifty/branches/jifty-jsan/inc/Module/Install/Scripts.pm
==============================================================================
--- jifty/branches/jifty-jsan/inc/Module/Install/Scripts.pm	(original)
+++ jifty/branches/jifty-jsan/inc/Module/Install/Scripts.pm	Mon May  8 19:20:11 2006
@@ -5,10 +5,11 @@
 use Module::Install::Base;
 use File::Basename ();
 
-use vars qw{$VERSION @ISA};
+use vars qw{$VERSION $ISCORE @ISA};
 BEGIN {
-	$VERSION = '0.61';
-	@ISA     = qw(Module::Install::Base);
+	$VERSION = '0.62';
+	$ISCORE  = 1;
+	@ISA     = qw{Module::Install::Base};
 }
 
 sub prompt_script {

Modified: jifty/branches/jifty-jsan/inc/Module/Install/Share.pm
==============================================================================
--- jifty/branches/jifty-jsan/inc/Module/Install/Share.pm	(original)
+++ jifty/branches/jifty-jsan/inc/Module/Install/Share.pm	Mon May  8 19:20:11 2006
@@ -1,32 +1,40 @@
 #line 1
 package Module::Install::Share;
 
+use strict;
+use Module::Install::Base;
+
+use vars qw{$VERSION $ISCORE @ISA};
 BEGIN {
-	$VERSION = '0.61';
+	$VERSION = '0.62';
+	$ISCORE  = 1;
 	@ISA     = qw{Module::Install::Base};
 }
 
-use strict;
-use Module::Install::Base;
-
 sub install_share {
-    my ($self, $dir) = @_;
+	my ($self, $dir) = @_;
 
-    if ( ! defined $dir ) {
-        die "Cannot find the 'share' directory" unless -d 'share';
-        $dir = 'share';
-    }
+	if ( ! defined $dir ) {
+		die "Cannot find the 'share' directory" unless -d 'share';
+		$dir = 'share';
+	}
 
-    $self->postamble(<<"END_MAKEFILE");
+	$self->postamble(<<"END_MAKEFILE");
 config ::
 \t\$(NOECHO) \$(MOD_INSTALL) \\
 \t\t\"$dir\" \$(INST_AUTODIR)
 
 END_MAKEFILE
+
+	# The above appears to behave incorrectly when used with old versions
+	# of ExtUtils::Install (known-bad on RHEL 3, with 5.8.0)
+	# So when we need to install a share directory, make sure we add a
+	# dependency on a moderately new version of ExtUtils::MakeMaker.
+	$self->build_requires( 'ExtUtils::MakeMaker' => '6.11' );
 }
 
 1;
 
 __END__
 
-#line 90
+#line 98

Modified: jifty/branches/jifty-jsan/inc/Module/Install/Win32.pm
==============================================================================
--- jifty/branches/jifty-jsan/inc/Module/Install/Win32.pm	(original)
+++ jifty/branches/jifty-jsan/inc/Module/Install/Win32.pm	Mon May  8 19:20:11 2006
@@ -4,9 +4,10 @@
 use strict;
 use Module::Install::Base;
 
-use vars qw{$VERSION @ISA};
+use vars qw{$VERSION $ISCORE @ISA};
 BEGIN {
-	$VERSION = '0.61';
+	$VERSION = '0.62';
+	$ISCORE  = 1;
 	@ISA     = qw{Module::Install::Base};
 }
 

Modified: jifty/branches/jifty-jsan/inc/Module/Install/WriteAll.pm
==============================================================================
--- jifty/branches/jifty-jsan/inc/Module/Install/WriteAll.pm	(original)
+++ jifty/branches/jifty-jsan/inc/Module/Install/WriteAll.pm	Mon May  8 19:20:11 2006
@@ -1,12 +1,15 @@
 #line 1
 package Module::Install::WriteAll;
 
+use strict;
 use Module::Install::Base;
- at ISA = qw(Module::Install::Base);
-
-$VERSION = '0.61';
 
-use strict;
+use vars qw{$VERSION $ISCORE @ISA};
+BEGIN {
+	$VERSION = '0.62';
+	$ISCORE  = 1;
+	@ISA     = qw{Module::Install::Base};
+}
 
 sub WriteAll {
     my $self = shift;

Modified: jifty/branches/jifty-jsan/lib/Jifty.pm
==============================================================================
--- jifty/branches/jifty-jsan/lib/Jifty.pm	(original)
+++ jifty/branches/jifty-jsan/lib/Jifty.pm	Mon May  8 19:20:11 2006
@@ -5,7 +5,7 @@
 use encoding 'utf8';
 # Work around the fact that Time::Local caches thing on first require
 BEGIN { local $ENV{'TZ'} = "GMT";  require Time::Local;}
-our $VERSION = '0.60505';
+our $VERSION = '0.60507';
 
 =head1 NAME
 

Modified: jifty/branches/jifty-jsan/lib/Jifty/Script/Action.pm
==============================================================================
--- jifty/branches/jifty-jsan/lib/Jifty/Script/Action.pm	(original)
+++ jifty/branches/jifty-jsan/lib/Jifty/Script/Action.pm	Mon May  8 19:20:11 2006
@@ -145,7 +145,7 @@
         my ($volume, $dir, $file) = File::Spec->splitpath($path);
 
         # Make sure the directories we need are there
-        Jifty::Util::make_path($dir);
+        Jifty::Util->make_path($dir);
 
         # If it already exists, bail
         if (-e $path and not $self->{force}) {

Modified: jifty/branches/jifty-jsan/lib/Jifty/Script/Model.pm
==============================================================================
--- jifty/branches/jifty-jsan/lib/Jifty/Script/Model.pm	(original)
+++ jifty/branches/jifty-jsan/lib/Jifty/Script/Model.pm	Mon May  8 19:20:11 2006
@@ -148,7 +148,7 @@
         my ($volume, $dir, $file) = File::Spec->splitpath($path);
 
         # Make sure the directories we need are there
-	Jifty::Util::make_path($dir);
+	Jifty::Util->make_path($dir);
 
         # If it already exists, bail
         if (-e $path and not $self->{force}) {

Modified: jifty/branches/jifty-jsan/lib/Jifty/Upgrade/Internal.pm
==============================================================================
--- jifty/branches/jifty-jsan/lib/Jifty/Upgrade/Internal.pm	(original)
+++ jifty/branches/jifty-jsan/lib/Jifty/Upgrade/Internal.pm	Mon May  8 19:20:11 2006
@@ -6,6 +6,9 @@
 use base qw/Jifty::Upgrade/;
 use Jifty::Model::Metadata;
 
+# XXX TODO: there's probably a cleaner way to cope than "INITIAL_VERSION", perhaps using ->VERSIONS
+our $INITIAL_VERSION;
+
 =head2 Version 0.60427
 
 Version metadata, previously stored in _db_version, get migrated to
@@ -18,9 +21,13 @@
     my @v = Jifty->handle->fetch_result("SELECT major, minor, rev FROM _db_version");
     Jifty->handle->simple_query("DROP TABLE _db_version");
     Jifty::Model::Metadata->store( application_db_version => version->new(join'.', at v));
+    # Since we broke things before 0.60504 but fixed them shortly thereafter,
+    # Make sure the user doesn't run the 060504 upgrade unless they must
+    $INITIAL_VERSION = '0.60427';
 };
 
-since '0.60504' => sub {
+since '0.60504' => sub { 
+    return if ($INITIAL_VERSION == '0.60427');
     rename column => 'key', in => 'Jifty::Model::Session',  to => 'data_key';
     rename column => 'key', in => 'Jifty::Model::Metadata', to => 'data_key';
 };

Modified: jifty/branches/jifty-jsan/lib/Jifty/Util.pm
==============================================================================
--- jifty/branches/jifty-jsan/lib/Jifty/Util.pm	(original)
+++ jifty/branches/jifty-jsan/lib/Jifty/Util.pm	Mon May  8 19:20:11 2006
@@ -160,6 +160,7 @@
 sub make_path {
     my $self = shift;
     my $whole_path = shift;
+    return 1 if (-d $whole_path);
     File::Path::mkpath([$whole_path]);
 }
 

Modified: jifty/branches/jifty-jsan/lib/Jifty/Web/Form/Field.pm
==============================================================================
--- jifty/branches/jifty-jsan/lib/Jifty/Web/Form/Field.pm	(original)
+++ jifty/branches/jifty-jsan/lib/Jifty/Web/Form/Field.pm	Mon May  8 19:20:11 2006
@@ -331,6 +331,7 @@
     my $self = shift;
     my @classes = qw(form_field);
     if ($self->mandatory) { push @classes, 'mandatory' }
+    if ($self->name)      { push @classes, 'argument-'.$self->name }
     Jifty->web->out('<div class="'.join(' ', @classes).'">' ."\n");
 }
 


More information about the Jifty-commit mailing list