summaryrefslogtreecommitdiff
path: root/rt/devel/tools
diff options
context:
space:
mode:
Diffstat (limited to 'rt/devel/tools')
-rw-r--r--rt/devel/tools/apache.conf173
-rw-r--r--rt/devel/tools/change-loc-msgstr2
-rw-r--r--rt/devel/tools/extract-message-catalog8
-rw-r--r--rt/devel/tools/factory3
-rw-r--r--rt/devel/tools/license_tag10
-rw-r--r--rt/devel/tools/merge-rosetta.pl4
-rw-r--r--rt/devel/tools/rt-attributes-editor2
-rw-r--r--rt/devel/tools/tweak-template-locstring3
8 files changed, 19 insertions, 186 deletions
diff --git a/rt/devel/tools/apache.conf b/rt/devel/tools/apache.conf
deleted file mode 100644
index 2ae67c651..000000000
--- a/rt/devel/tools/apache.conf
+++ /dev/null
@@ -1,173 +0,0 @@
-# Single-process Apache testing with mod_perl, mod_fcgi, or mod_fastcgi
-#
-# Start this via:
-# apache2 -f `pwd`/devel/tools/apache.conf -DPERL -k start
-#
-# The full path to the configuration file is needed, or Apache assumes
-# it is under the ServerRoot. Since the deployment strategies differ
-# between RT 3 and 4, you must either supply -DRT3 if you are attempting
-# to deploy an rt3 instance. You must also supply one of -DPERL,
-# -DFASTCGI, or -DFCGID.
-#
-# The /opt/rt4/etc/apache_local.conf file should contain:
-# User chmrr
-# Group chmrr
-# Listen 8080
-# ...or the equivilent.
-#
-# Apache access and error logs will be written to /opt/rt4/var/log/.
-#
-<IfDefine !RT3>
-Include /opt/rt4/etc/apache_local.conf
-</IfDefine>
-<IfDefine RT3>
-Include /opt/rt3/etc/apache_local.conf
-</IfDefine>
-
-<IfModule mpm_prefork_module>
- StartServers 1
- MinSpareServers 1
- MaxSpareServers 1
- MaxClients 1
- MaxRequestsPerChild 0
-</IfModule>
-
-<IfModule mpm_worker_module>
- StartServers 1
- MinSpareThreads 1
- MaxSpareThreads 1
- ThreadLimit 1
- ThreadsPerChild 1
- MaxClients 1
- MaxRequestsPerChild 0
-</IfModule>
-
-ServerRoot /etc/apache2
-PidFile /opt/rt4/var/apache2.pid
-LockFile /opt/rt4/var/apache2.lock
-ServerAdmin root@localhost
-
-LoadModule authz_host_module /usr/lib/apache2/modules/mod_authz_host.so
-LoadModule env_module /usr/lib/apache2/modules/mod_env.so
-LoadModule alias_module /usr/lib/apache2/modules/mod_alias.so
-LoadModule mime_module /usr/lib/apache2/modules/mod_mime.so
-<IfDefine PERL>
- LoadModule perl_module /usr/lib/apache2/modules/mod_perl.so
-</IfDefine>
-<IfDefine FASTCGI>
- LoadModule fastcgi_module /usr/lib/apache2/modules/mod_fastcgi.so
-</IfDefine>
-<IfDefine FCGID>
- LoadModule fcgid_module /usr/lib/apache2/modules/mod_fcgid.so
-</IfDefine>
-
-ErrorLog "/opt/rt4/var/log/apache-error.log"
-TransferLog "/opt/rt4/var/log/apache-access.log"
-LogLevel debug
-
-<Directory />
- Options FollowSymLinks
- AllowOverride None
- Order deny,allow
- Deny from all
-</Directory>
-
-AddDefaultCharset UTF-8
-
-DocumentRoot /var/www
-<Directory /var/www>
- Order allow,deny
- Allow from all
-</Directory>
-
-Alias /NoAuth/images/ /opt/rt4/share/html/NoAuth/images/
-<Directory /opt/rt4/share/html/NoAuth/images>
- Order allow,deny
- Allow from all
-</Directory>
-
-<IfDefine !RT3>
-########## 4.0 mod_perl
-<IfDefine PERL>
- PerlSetEnv RT_SITE_CONFIG /opt/rt4/etc/RT_SiteConfig.pm
- <Location />
- Order allow,deny
- Allow from all
- SetHandler modperl
- PerlResponseHandler Plack::Handler::Apache2
- PerlSetVar psgi_app /opt/rt4/sbin/rt-server
- </Location>
- <Perl>
- use Plack::Handler::Apache2;
- Plack::Handler::Apache2->preload("/opt/rt4/sbin/rt-server");
- </Perl>
-</IfDefine>
-
-########## 4.0 mod_fastcgi
-<IfDefine FASTCGI>
- FastCgiIpcDir /opt/rt4/var
- FastCgiServer /opt/rt4/sbin/rt-server.fcgi -processes 1 -idle-timeout 300
- ScriptAlias / /opt/rt4/sbin/rt-server.fcgi/
- <Location />
- Order allow,deny
- Allow from all
- Options +ExecCGI
- AddHandler fastcgi-script fcgi
- </Location>
-</IfDefine>
-
-########## 4.0 mod_fcgid
-<IfDefine FCGID>
- FcgidProcessTableFile /opt/rt4/var/fcgid_shm
- FcgidIPCDir /opt/rt4/var
- ScriptAlias / /opt/rt4/sbin/rt-server.fcgi/
- <Location />
- Order allow,deny
- Allow from all
- Options +ExecCGI
- AddHandler fcgid-script fcgi
- </Location>
-</IfDefine>
-</IfDefine>
-
-
-<IfDefine RT3>
-########## 3.8 mod_perl
-<IfDefine PERL>
- PerlSetEnv RT_SITE_CONFIG /opt/rt3/etc/RT_SiteConfig.pm
- PerlRequire "/opt/rt3/bin/webmux.pl"
- <Location /NoAuth/images>
- SetHandler default
- </Location>
- <Location />
- SetHandler perl-script
- PerlResponseHandler RT::Mason
- </Location>
-</IfDefine>
-
-########## 3.8 mod_fastcgi
-<IfDefine FASTCGI>
- FastCgiIpcDir /opt/rt3/var
- FastCgiServer /opt/rt3/bin/mason_handler.fcgi -processes 1 -idle-timeout 300
- ScriptAlias / /opt/rt3/bin/mason_handler.fcgi/
- <Location />
- Order allow,deny
- Allow from all
- Options +ExecCGI
- AddHandler fastcgi-script fcgi
- </Location>
-</IfDefine>
-
-########## 3.8 mod_fcgid
-<IfDefine FCGID>
- FcgidProcessTableFile /opt/rt3/var/fcgid_shm
- FcgidIPCDir /opt/rt3/var
- ScriptAlias / /opt/rt3/bin/mason_handler.fcgi/
- <Location />
- Order allow,deny
- Allow from all
- Options +ExecCGI
- AddHandler fcgid-script fcgi
- </Location>
-</IfDefine>
-</IfDefine>
diff --git a/rt/devel/tools/change-loc-msgstr b/rt/devel/tools/change-loc-msgstr
index 75fc72df7..9eb9ac697 100644
--- a/rt/devel/tools/change-loc-msgstr
+++ b/rt/devel/tools/change-loc-msgstr
@@ -3,7 +3,7 @@
#
# COPYRIGHT:
#
-# This software is Copyright (c) 1996-2012 Best Practical Solutions, LLC
+# This software is Copyright (c) 1996-2013 Best Practical Solutions, LLC
# <sales@bestpractical.com>
#
# (Except where explicitly superseded by other copyright notices)
diff --git a/rt/devel/tools/extract-message-catalog b/rt/devel/tools/extract-message-catalog
index 1533cfa61..b95c99047 100644
--- a/rt/devel/tools/extract-message-catalog
+++ b/rt/devel/tools/extract-message-catalog
@@ -3,7 +3,7 @@
#
# COPYRIGHT:
#
-# This software is Copyright (c) 1996-2012 Best Practical Solutions, LLC
+# This software is Copyright (c) 1996-2013 Best Practical Solutions, LLC
# <sales@bestpractical.com>
#
# (Except where explicitly superseded by other copyright notices)
@@ -148,9 +148,9 @@ sub extract_strings_from_code {
$_ = <_>;
- # Mason filter: <&|/l>...</&>
+ # Mason filter: <&|/l>...</&> and <&|/l_unsafe>...</&>
my $line = 1;
- while (m!\G(.*?<&\|/l(.*?)&>(.*?)</&>)!sg) {
+ while (m!\G(.*?<&\|/l(?:_unsafe)?(.*?)&>(.*?)</&>)!sg) {
my ( $all, $vars, $str ) = ( $1, $2, $3 );
$vars =~ s/[\n\r]//g;
$line += ( $all =~ tr/\n/\n/ );
@@ -201,7 +201,7 @@ sub extract_strings_from_code {
# Comment-based qw mark: "qw(...)" # loc_qw
$line = 1;
pos($_) = 0;
- while (m/\G(.*?(?:qw\(([^)]+)\)[\}\)\],;]*)?$re_loc_qw_suffix)/smgo) {
+ while (m/\G(.*?(?:qw\(([^)]+)\)\s*[\{\}\)\],; ]*)?$re_loc_qw_suffix)/smgo) {
my ( $all, $str ) = ( $1, $2 );
$line += ( $all =~ tr/\n/\n/ );
unless ( defined $str ) {
diff --git a/rt/devel/tools/factory b/rt/devel/tools/factory
index 099d2db8c..5f9c49b46 100644
--- a/rt/devel/tools/factory
+++ b/rt/devel/tools/factory
@@ -3,7 +3,7 @@
#
# COPYRIGHT:
#
-# This software is Copyright (c) 1996-2012 Best Practical Solutions, LLC
+# This software is Copyright (c) 1996-2013 Best Practical Solutions, LLC
# <sales@bestpractical.com>
#
# (Except where explicitly superseded by other copyright notices)
@@ -47,6 +47,7 @@
#
# END BPS TAGGED BLOCK }}}
use strict;
+use warnings;
use DBI;
die "Usage: $0 database namespace" if @ARGV != 2;
diff --git a/rt/devel/tools/license_tag b/rt/devel/tools/license_tag
index de3bd3bc3..05bcf83e9 100644
--- a/rt/devel/tools/license_tag
+++ b/rt/devel/tools/license_tag
@@ -5,7 +5,7 @@
#
# COPYRIGHT:
#
-# This software is Copyright (c) 1996-2012 Best Practical Solutions, LLC
+# This software is Copyright (c) 1996-2013 Best Practical Solutions, LLC
# <sales@bestpractical.com>
#
# (Except where explicitly superseded by other copyright notices)
@@ -48,11 +48,13 @@
# those contributions and any derivatives thereof.
#
# END BPS TAGGED BLOCK }}}
+use strict;
+use warnings;
my $LICENSE = <<'EOL';
COPYRIGHT:
-This software is Copyright (c) 1996-2012 Best Practical Solutions, LLC
+This software is Copyright (c) 1996-2013 Best Practical Solutions, LLC
<sales@bestpractical.com>
(Except where explicitly superseded by other copyright notices)
@@ -113,7 +115,7 @@ tag_makefile ('README');
sub tag_mason {
my $pm = $_;
return unless (-f $pm);
- return if $pm =~ /images/ || $pm =~ /\.(?:png|jpe?g|gif)$/;
+ return if $pm =~ /\.(?:png|jpe?g|gif)$/;
open( FILE, '<', $pm ) or die "Failed to open $pm";
my $file = (join "", <FILE>);
close (FILE);
@@ -252,7 +254,7 @@ sub another_license {
my $name = shift;
my $file = shift;
- return 1 if ($name =~ /(?:FCKEditor|scriptaculous|superfish|tablesorter|farbtastic)/i);
+ return 1 if ($name =~ /(?:ckeditor|scriptaculous|superfish|tablesorter|farbtastic)/i);
return 0 if $file =~ /Copyright\s+\(c\)\s+\d\d\d\d-\d\d\d\d Best Practical Solutions/i;
return 1 if $file =~ /\b(copyright|GPL|Public Domain)\b/i; # common
diff --git a/rt/devel/tools/merge-rosetta.pl b/rt/devel/tools/merge-rosetta.pl
index e3b45a1ac..a0ef3e2a7 100644
--- a/rt/devel/tools/merge-rosetta.pl
+++ b/rt/devel/tools/merge-rosetta.pl
@@ -3,7 +3,7 @@
#
# COPYRIGHT:
#
-# This software is Copyright (c) 1996-2012 Best Practical Solutions, LLC
+# This software is Copyright (c) 1996-2013 Best Practical Solutions, LLC
# <sales@bestpractical.com>
#
# (Except where explicitly superseded by other copyright notices)
@@ -46,4 +46,6 @@
# those contributions and any derivatives thereof.
#
# END BPS TAGGED BLOCK }}}
+use strict;
+use warnings;
exec('sbin/rt-message-catalog', 'rosetta', @ARGV);
diff --git a/rt/devel/tools/rt-attributes-editor b/rt/devel/tools/rt-attributes-editor
index 92caeaf12..d3443177a 100644
--- a/rt/devel/tools/rt-attributes-editor
+++ b/rt/devel/tools/rt-attributes-editor
@@ -3,7 +3,7 @@
#
# COPYRIGHT:
#
-# This software is Copyright (c) 1996-2012 Best Practical Solutions, LLC
+# This software is Copyright (c) 1996-2013 Best Practical Solutions, LLC
# <sales@bestpractical.com>
#
# (Except where explicitly superseded by other copyright notices)
diff --git a/rt/devel/tools/tweak-template-locstring b/rt/devel/tools/tweak-template-locstring
index 7f8a8808f..d77ef9e94 100644
--- a/rt/devel/tools/tweak-template-locstring
+++ b/rt/devel/tools/tweak-template-locstring
@@ -3,7 +3,7 @@
#
# COPYRIGHT:
#
-# This software is Copyright (c) 1996-2012 Best Practical Solutions, LLC
+# This software is Copyright (c) 1996-2013 Best Practical Solutions, LLC
# <sales@bestpractical.com>
#
# (Except where explicitly superseded by other copyright notices)
@@ -47,6 +47,7 @@
#
# END BPS TAGGED BLOCK }}}
use strict;
+use warnings;
# run this script with:
# perl -0pi sbin/tweak-template-locstring `ack -f share/html -G 'html$'`
s!\<\&\|\/l([^&]*)\&\>[\n\s]+(.*?)[\n\s]*\<\/\&\>!;my ($arg, $x) = ($1, $2); $x =~ s/\s*\n\s*/ /g;"<&|/l$arg&>$x</&>"!smge;