[Jifty-commit] r3252 - in jifty/trunk: bin lib lib/Jifty

[jifty-commit at lists.jifty.org]

Author: alexmv
Date: Fri May 18 18:17:03 2007
New Revision: 3252

Modified:
   jifty/trunk/   (props changed)
   jifty/trunk/bin/jifty
   jifty/trunk/lib/Jifty.pm
   jifty/trunk/lib/Jifty/Util.pm

Log:
 r19193 at zoq-fot-pik:  chmrr | 2007-05-18 18:13:34 -0400
  * Push app_root/lib onto @INC when we create a new Jifty object


Modified: jifty/trunk/bin/jifty
==============================================================================
--- jifty/trunk/bin/jifty	(original)
+++ jifty/trunk/bin/jifty	Fri May 18 18:17:03 2007
@@ -4,12 +4,8 @@
 use File::Basename qw(dirname); 
 use UNIVERSAL::require;
 
-BEGIN {
-    Jifty::Util->require or die $UNIVERSAL::require::ERROR;
-    my $root = Jifty::Util->app_root;
-    unshift @INC, "$root/lib" if ($root);
-}
-
+use Jifty;
 use Jifty::Script;
+
 local $SIG{INT} = sub { warn "Stopped\n"; exit; };
 Jifty::Script->dispatch();

Modified: jifty/trunk/lib/Jifty.pm
==============================================================================
--- jifty/trunk/lib/Jifty.pm	(original)
+++ jifty/trunk/lib/Jifty.pm	Fri May 18 18:17:03 2007
@@ -150,6 +150,8 @@
     );
 
 
+    # Add the appliation's library path
+    push @INC, File::Spec->catdir(Jifty::Util->app_root, "lib");
 
     # Now that we've loaded the configuration, we can remove the temporary 
     # Jifty::DBI::Record baseclass for records and insert our "real" baseclass,

Modified: jifty/trunk/lib/Jifty/Util.pm
==============================================================================
--- jifty/trunk/lib/Jifty/Util.pm	(original)
+++ jifty/trunk/lib/Jifty/Util.pm	Fri May 18 18:17:03 2007
@@ -162,10 +162,6 @@
                 and lc($try) ne lc(File::Spec->catdir($Config::Config{bin}, "jifty"))
                 and lc($try) ne lc(File::Spec->catdir($Config::Config{scriptdir}, "jifty")) )
             {
-                #warn "root: ", File::Spec->catdir(@root);
-                #warn "bin/jifty: ", File::Spec->catdir($Config::Config{bin}, "jifty");
-                #warn "scriptdir/jifty: ", File::Spec->catdir($Config::Config{scriptdir}, "jifty");
-                #warn "try: $try";
                 return $APP_ROOT = File::Spec->catdir(@root);
             }
             pop @root;