Changeset 3289

Timestamp:

03/12/09 08:02:52 (3 years ago)

Author:

jquelin

Message:

$PADRE_PLUGIN_DIR is in fact $PADRE_PLUGIN_LIBDIR

Location:

trunk/Padre/lib/Padre

Files:

• Config/Constants.pm (modified) (4 diffs)
• PluginManager.pm (modified) (2 diffs)

trunk/Padre/lib/Padre/Config/Constants.pm

@@ -18 +18 @@
 use base qw{ Exporter };
 
-my @dirs   = qw{ $PADRE_CONFIG_DIR $PADRE_PLUGIN_DIR    };
+my @dirs   = qw{ $PADRE_CONFIG_DIR $PADRE_PLUGIN_DIR $PADRE_PLUGIN_LIBDIR };
 my @files  = qw{ $CONFIG_FILE_HOST $CONFIG_FILE_USER    };
 my @stores = qw{ $HOST $HUMAN $PROJECT                  };
@@ -35 +35 @@
 
 # files & dirs
-our $PADRE_CONFIG_DIR = _find_padre_config_dir();
-our $PADRE_PLUGIN_DIR = _find_padre_plugin_dir();
-our $CONFIG_FILE_USER = catfile( $PADRE_CONFIG_DIR, 'config.yml' );
-our $CONFIG_FILE_HOST = catfile( $PADRE_CONFIG_DIR, 'config.db'  );
+our $PADRE_CONFIG_DIR    = _find_padre_config_dir();
+our $PADRE_PLUGIN_DIR    = catdir( $PADRE_CONFIG_DIR, 'plugins' );
+our $PADRE_PLUGIN_LIBDIR = catdir( $PADRE_PLUGIN_DIR, 'Padre', 'Plugin' );
+our $CONFIG_FILE_USER    = catfile( $PADRE_CONFIG_DIR, 'config.yml' );
+our $CONFIG_FILE_HOST    = catfile( $PADRE_CONFIG_DIR, 'config.db'  );
+
+{
+    # check if plugin directory exists, create it otherwise
+    unless ( -e $PADRE_PLUGIN_LIBDIR ) {
+        mkpath($PADRE_PLUGIN_LIBDIR) or
+        die "Cannot create plugins dir '$PADRE_PLUGIN_LIBDIR': $!";
+    }
+}
+
+
 
 # settings types (based on firefox)
@@ -166 +177 @@
 Private directory where Padre can look for plugins.
 
+=item * $PADRE_PLUGIN_LIBDIR
+
+Subdir of $PADRE_PLUGIN_DIR with the path C<Padre/Plugin> added (or whatever
+depending on your platform) so that perl can load a C<Padre::Plugin::> plugin.
 
 =back
@@ -188 +203 @@
 =item * dirs
 
-Imports C<$PADRE_CONFIG_DIR> and C<$PADRE_PLUGIN_DIR>.
+Imports C<$PADRE_CONFIG_DIR>, C<$PADRE_PLUGIN_DIR> and C<$PADRE_PLUGIN_LIBDIR>.
 
 =item * files

trunk/Padre/lib/Padre/PluginManager.pm

@@ -28 +28 @@
 use Scalar::Util             ();
 use Params::Util             qw{_IDENTIFIER _CLASS _INSTANCE};
-use Padre::Config::Constants qw{ $PADRE_PLUGIN_DIR };
+use Padre::Config::Constants qw{ $PADRE_PLUGIN_LIBDIR };
 use Padre::Util              ();
 use Padre::PluginHandle      ();
@@ -149 +149 @@
 
     # do not overwrite it unless stated so.
-    my $dst = catfile( $PADRE_PLUGIN_DIR, 'My.pm' );
+    my $dst = catfile( $PADRE_PLUGIN_LIBDIR, 'My.pm' );
     return if -e $dst && !$overwrite;