[Rt-commit] rt branch, 3.8-trunk, updated. rt-3.8.6-20-g22e9567
jesse
jesse at bestpractical.com
Wed Oct 21 12:24:13 EDT 2009
The branch, 3.8-trunk has been updated
via 22e95676e0467cd0f0b48a98f362d41b9723b9c9 (commit)
from 170d9facaabcaa1f5feeac5aa213b54445f86225 (commit)
Summary of changes:
aclocal.m4 | 1 +
config.layout | 7 +++++++
configure.ac | 3 +++
lib/RT.pm.in | 8 +++++---
lib/RT/Plugin.pm | 4 +++-
m4/rt_layout.m4 | 5 +++--
6 files changed, 22 insertions(+), 6 deletions(-)
- Log -----------------------------------------------------------------
commit 22e95676e0467cd0f0b48a98f362d41b9723b9c9
Author: Jesse Vincent <jesse at bestpractical.com>
Date: Wed Oct 21 11:03:08 2009 -0400
Add a systemwide plugin directory at the request of the Debian RT maintainers
diff --git a/aclocal.m4 b/aclocal.m4
index a4b5be6..0e041b6 100755
--- a/aclocal.m4
+++ b/aclocal.m4
@@ -116,6 +116,7 @@ AC_DEFUN([RT_LAYOUT],[
RT_SUBST_EXPANDED_ARG(datadir)
RT_SUBST_EXPANDED_ARG(htmldir)
RT_SUBST_EXPANDED_ARG(manualdir)
+ RT_SUBST_EXPANDED_ARG(plugindir)
RT_SUBST_EXPANDED_ARG(localstatedir)
RT_SUBST_EXPANDED_ARG(logfiledir)
RT_SUBST_EXPANDED_ARG(masonstatedir)
diff --git a/config.layout b/config.layout
index 7fe9e05..52fcef1 100755
--- a/config.layout
+++ b/config.layout
@@ -23,6 +23,7 @@
sbindir: ${exec_prefix}/sbin
sysconfdir: ${prefix}/etc
mandir: ${prefix}/man
+ plugindir: ${prefix}/plugins
libdir: ${prefix}/lib
datadir: ${prefix}/share
htmldir: ${datadir}/html
@@ -44,6 +45,7 @@
sbindir: ${exec_prefix}/sbin
sysconfdir: ${prefix}/etc
mandir: ${prefix}/man
+ plugindir: ${prefix}/plugins
libdir: ${prefix}/lib
datadir: ${prefix}/share
htmldir: ${datadir}/html
@@ -70,6 +72,7 @@
libdir: ${prefix}/lib
mandir: ${datadir}/man
# FIXME: no such directory in FHS; shouldn't go to somewhere in "${datadir}/rt/"?
+ plugindir: ${datadir}/plugins
htmldir: ${datadir}/html
manualdir: ${datadir}/doc
localstatedir: /var
@@ -91,6 +94,7 @@
sbindir: ${exec_prefix}/sbin
sysconfdir: ${prefix}/etc+
mandir: ${prefix}/man
+ plugindir: ${prefix}/plugins
libdir: ${prefix}/lib+
datadir: ${prefix}/share+
htmldir: ${datadir}/html
@@ -113,6 +117,7 @@
sbindir: ${exec_prefix}/sbin
sysconfdir: ${prefix}/etc
mandir: ${prefix}/man
+ plugindir: ${prefix}/plugins
libdir: ${prefix}/lib
datadir: ${prefix}
htmldir: ${datadir}/html
@@ -140,6 +145,7 @@
datadir: /var/rt
htmldir: ${datadir}/html
manualdir: ${datadir}/doc
+ plugindir: ${datadir}/plugins
localstatedir: /var
logfiledir: ${localstatedir}/log/rt
masonstatedir: ${localstatedir}/rt/mason_data
@@ -158,6 +164,7 @@
sbindir: sbin
sysconfdir: etc
mandir: man
+ plugindir: plugins
libdir: lib
datadir: share
htmldir: ${datadir}/html
diff --git a/configure.ac b/configure.ac
index e9d9bc7..ae3c0d4 100755
--- a/configure.ac
+++ b/configure.ac
@@ -333,6 +333,7 @@ AC_SUBST([RT_BIN_PATH], ${exp_bindir})
AC_SUBST([RT_SBIN_PATH], ${exp_sbindir})
AC_SUBST([RT_VAR_PATH], ${exp_localstatedir})
AC_SUBST([RT_MAN_PATH], ${exp_mandir})
+AC_SUBST([RT_PLUGIN_PATH], ${exp_plugindir})
AC_SUBST([MASON_DATA_PATH], ${exp_masonstatedir})
AC_SUBST([MASON_SESSION_PATH], ${exp_sessionstatedir})
AC_SUBST([MASON_HTML_PATH], ${exp_htmldir})
@@ -353,6 +354,7 @@ AC_SUBST([RT_BIN_PATH_R], ${exp_prefix}/${exp_bindir})
AC_SUBST([RT_SBIN_PATH_R], ${exp_prefix}/${exp_sbindir})
AC_SUBST([RT_VAR_PATH_R], ${exp_prefix}/${exp_localstatedir})
AC_SUBST([RT_MAN_PATH_R], ${exp_prefix}/${exp_mandir})
+AC_SUBST([RT_PLUGIN_PATH_R], ${exp_prefix}/${exp_plugindir})
AC_SUBST([MASON_DATA_PATH_R], ${exp_prefix}/${exp_masonstatedir})
AC_SUBST([MASON_SESSION_PATH_R], ${exp_prefix}/${exp_sessionstatedir})
AC_SUBST([MASON_HTML_PATH_R], ${exp_prefix}/${exp_htmldir})
@@ -367,6 +369,7 @@ AC_SUBST([RT_DOC_PATH_R], ${exp_manualdir})
AC_SUBST([RT_LOCAL_PATH_R], ${exp_customdir})
AC_SUBST([RT_LIB_PATH_R], ${exp_libdir})
AC_SUBST([RT_ETC_PATH_R], ${exp_sysconfdir})
+AC_SUBST([RT_PLUGIN_PATH_R], ${exp_plugindir})
AC_SUBST([CONFIG_FILE_PATH_R], ${exp_sysconfdir})
AC_SUBST([RT_BIN_PATH_R], ${exp_bindir})
AC_SUBST([RT_SBIN_PATH_R], ${exp_sbindir})
diff --git a/lib/RT.pm.in b/lib/RT.pm.in
index 8112045..fb8afcb 100755
--- a/lib/RT.pm.in
+++ b/lib/RT.pm.in
@@ -66,9 +66,10 @@ our $EtcPath = '@RT_ETC_PATH@';
our $BinPath = '@RT_BIN_PATH@';
our $SbinPath = '@RT_SBIN_PATH@';
our $VarPath = '@RT_VAR_PATH@';
+our $PluginPath = '@RT_PLUGIN_PATH@';
our $LocalPath = '@RT_LOCAL_PATH@';
our $LocalEtcPath = '@LOCAL_ETC_PATH@';
-our $LocalLibPath = '@LOCAL_LIB_PATH@';
+our $LocalLibPath = '@LOCAL_LIB_PATH@';
our $LocalLexiconPath = '@LOCAL_LEXICON_PATH@';
our $LocalPluginPath = $LocalPath."/plugins";
@@ -108,8 +109,9 @@ unless ( File::Spec->file_name_is_absolute($EtcPath) ) {
$BasePath = Cwd::realpath( $BasePath );
for my $path ( qw/EtcPath BinPath SbinPath VarPath LocalPath LocalEtcPath
- LocalLibPath LocalLexiconPath LocalPluginPath MasonComponentRoot
- MasonLocalComponentRoot MasonDataDir MasonSessionDir/ ) {
+ LocalLibPath LocalLexiconPath PluginPath LocalPluginPath
+ MasonComponentRoot MasonLocalComponentRoot MasonDataDir
+ MasonSessionDir/ ) {
no strict 'refs';
# just change relative ones
$$path = File::Spec->catfile( $BasePath, $$path )
diff --git a/lib/RT/Plugin.pm b/lib/RT/Plugin.pm
index 8f016f5..ae2193d 100644
--- a/lib/RT/Plugin.pm
+++ b/lib/RT/Plugin.pm
@@ -106,8 +106,10 @@ sub _BasePath {
my $self = shift;
my $base = $self->{'name'};
$base =~ s/::/-/g;
+ my $local_base = $RT::LocalPluginPath."/".$base;
+ my $base_base = $RT::PluginPath."/".$base;
- return $RT::LocalPluginPath."/".$base;
+ return -d $local_base ? $local_base : $base_base;
}
=head2 ComponentRoot
diff --git a/m4/rt_layout.m4 b/m4/rt_layout.m4
index c92a108..fbb2890 100755
--- a/m4/rt_layout.m4
+++ b/m4/rt_layout.m4
@@ -27,7 +27,7 @@ AC_DEFUN([RT_LAYOUT],[
s/\s+$/\n/gim;
s/\+$/\/rt3/gim;
# m4 will not let us just use $1, we need @S|@1
-# s/^((?:bin|sbin|libexec|data|sysconf|sharedstate|localstate|lib|include|oldinclude|info|man)dir)\s*:\s*(.*)$/@S|@1=@S|@2/gim;
+# s/^((?:bin|sbin|libexec|data|sysconf|sharedstate|localstate|lib|include|oldinclude|plugin|info|man)dir)\s*:\s*(.*)$/@S|@1=@S|@2/gim;
# uh, should be [:=], but m4 apparently substitutes something...
s/^(.*?)\s*(?::|=)\s*(.*)$/\(test "x\@S|@@S|@1" = "xNONE" || test "x\@S|@@S|@1" = "x") && @S|@1=@S|@2/gim;
' < $1 > $pldconf
@@ -38,7 +38,7 @@ AC_DEFUN([RT_LAYOUT],[
changequote({,})
for var in prefix exec_prefix bindir sbindir \
sysconfdir mandir libdir datadir htmldir \
- localstatedir logfiledir masonstatedir \
+ localstatedir logfiledir masonstatedir plugindir \
sessionstatedir customdir custometcdir customhtmldir \
customlexdir customlibdir manualdir; do
eval "val=\"\$$var\""
@@ -63,6 +63,7 @@ AC_DEFUN([RT_LAYOUT],[
RT_SUBST_EXPANDED_ARG(datadir)
RT_SUBST_EXPANDED_ARG(htmldir)
RT_SUBST_EXPANDED_ARG(manualdir)
+ RT_SUBST_EXPANDED_ARG(plugindir)
RT_SUBST_EXPANDED_ARG(localstatedir)
RT_SUBST_EXPANDED_ARG(logfiledir)
RT_SUBST_EXPANDED_ARG(masonstatedir)
-----------------------------------------------------------------------
More information about the Rt-commit
mailing list