diff options
| author | David Lawrence <dlawrence@mozilla.com> | 2011-03-22 23:13:03 +0100 |
|---|---|---|
| committer | David Lawrence <dlawrence@mozilla.com> | 2011-03-22 23:13:03 +0100 |
| commit | 764a1fa6d114eee04b04ec1419052e3e4caa02d2 (patch) | |
| tree | b25aaa41ea74b0d65f987a1d02003249eb7244bd /Bugzilla | |
| parent | 17d2732fb8e8988291dde7cb31a8e5ce21206815 (diff) | |
| download | bugzilla-764a1fa6d114eee04b04ec1419052e3e4caa02d2.tar.gz bugzilla-764a1fa6d114eee04b04ec1419052e3e4caa02d2.tar.xz | |
Bug 643904 - Bugzilla::Extension should export a web_dir attribute to get full path to the extension's web directory
r/a=mkanat
Diffstat (limited to 'Bugzilla')
| -rw-r--r-- | Bugzilla/Extension.pm | 12 | ||||
| -rw-r--r-- | Bugzilla/Install/Util.pm | 9 |
2 files changed, 20 insertions, 1 deletions
diff --git a/Bugzilla/Extension.pm b/Bugzilla/Extension.pm index 857d0d75b..dbfee0971 100644 --- a/Bugzilla/Extension.pm +++ b/Bugzilla/Extension.pm @@ -26,7 +26,7 @@ use Bugzilla::Constants; use Bugzilla::Error; use Bugzilla::Install::Util qw( extension_code_files extension_template_directory - extension_package_directory); + extension_package_directory extension_web_directory); use File::Basename; use File::Spec; @@ -214,6 +214,7 @@ sub lib_dir { sub template_dir { return extension_template_directory(@_); } sub package_dir { return extension_package_directory(@_); } +sub web_dir { return extension_web_directory(@_); } ###################### # Helper Subroutines # @@ -786,6 +787,15 @@ This defaults to the C<template> subdirectory of the L</package_dir>. If you want to override this method, and you have a F<Config.pm>, you must override this method in F<Config.pm>. +=head3 C<web_dir> + +The directory that your package's web related files are in, such as css and javascript. + +This defaults to the C<web> subdirectory of the L</package_dir>. + +If you want to override this method, and you have a F<Config.pm>, you must +override this method in F<Config.pm>. + =head3 C<lib_dir> The directory where your extension's libraries are. diff --git a/Bugzilla/Install/Util.pm b/Bugzilla/Install/Util.pm index c8d3d8eb4..a2371a0be 100644 --- a/Bugzilla/Install/Util.pm +++ b/Bugzilla/Install/Util.pm @@ -46,6 +46,7 @@ our @EXPORT_OK = qw( extension_package_directory extension_requirement_packages extension_template_directory + extension_web_directory indicate_progress install_string include_languages @@ -214,6 +215,14 @@ sub extension_template_directory { return "$base_dir/template"; } +# Used in this file and in Bugzilla::Extension. +sub extension_web_directory { + my $extension = shift; + my $class = ref($extension) || $extension; + my $base_dir = extension_package_directory($class); + return "$base_dir/web"; +} + # For extensions that are in the extensions/ dir, this both sets and fetches # the name of the directory that stores an extension's "stuff". We need this # when determining the template directory for extensions (or other things |