Bug 1283930 - Add Makefile.PL & local/lib/perl5 support to bmo/master + local symlink to data/ directory

37 files changed, 86 insertions, 94 deletions

diff --git a/scripts/addcustomfield.pl b/scripts/addcustomfield.pl
index 886d1ac5c..6e128ab6f 100755
--- a/scripts/addcustomfield.pl
+++ b/scripts/addcustomfield.pl
@@ -17,7 +17,8 @@
 #                 David Miller <justdave@mozilla.com>
 
 use strict;
-use lib qw(. lib);
+use FindBin qw($RealBin);
+use lib ("$RealBin/..", "$RealBin/../lib", "$RealBin/../local/lib/perl5");
 
 use Bugzilla;
 use Bugzilla::Constants;
diff --git a/scripts/clear-memcached.pl b/scripts/clear-memcached.pl
index 01202ce7c..0ce97e7a0 100755
--- a/scripts/clear-memcached.pl
+++ b/scripts/clear-memcached.pl
@@ -10,9 +10,8 @@
 use strict;
 use warnings;
 
-use FindBin qw($Bin);
-use lib "$Bin/..";
-use lib "$Bin/../lib";
+use FindBin qw($RealBin);
+use lib ("$RealBin/..", "$RealBin/../lib", "$RealBin/../local/lib/perl5");
 
 use Bugzilla;
 use Bugzilla::Constants;
diff --git a/scripts/clear-templates.pl b/scripts/clear-templates.pl
index 8b0864d46..81c85646b 100755
--- a/scripts/clear-templates.pl
+++ b/scripts/clear-templates.pl
@@ -9,7 +9,8 @@
 
 use strict;
 use warnings;
-use lib qw(. lib);
+use FindBin qw($RealBin);
+use lib ("$RealBin/..", "$RealBin/../lib", "$RealBin/../local/lib/perl5");
 
 use Bugzilla;
 use Bugzilla::Constants;
diff --git a/scripts/close_bugs_wontfix.pl b/scripts/close_bugs_wontfix.pl
index 34c871373..e0bd5351b 100755
--- a/scripts/close_bugs_wontfix.pl
+++ b/scripts/close_bugs_wontfix.pl
@@ -10,8 +10,8 @@ use 5.10.1;
 use strict;
 use warnings;
 
-use FindBin '$RealBin';
-use lib "$RealBin/../..", "$RealBin/../../lib";
+use FindBin;
+use lib "$FindBin::Bin/..", "$FindBin::Bin/../lib", "$FindBin::Bin/../local/lib/perl5";
 
 use Bugzilla;
 use Bugzilla::Bug;
diff --git a/scripts/convert_datetime.pl b/scripts/convert_datetime.pl
index b87e3561a..b6b71546c 100755
--- a/scripts/convert_datetime.pl
+++ b/scripts/convert_datetime.pl
@@ -10,6 +10,9 @@ use 5.10.1;
 use strict;
 use warnings;
 
+use FindBin;
+use lib "$FindBin::Bin/..", "$FindBin::Bin/../lib", "$FindBin::Bin/../local/lib/perl5";
+
 use Bugzilla;
 use Bugzilla::Constants;
 use Bugzilla::DB;
diff --git a/scripts/cpanfile_fixed_versions.pl b/scripts/cpanfile_fixed_versions.pl
index fdbf25b1f..680e8ece3 100755
--- a/scripts/cpanfile_fixed_versions.pl
+++ b/scripts/cpanfile_fixed_versions.pl
@@ -10,6 +10,9 @@ use 5.10.1;
 use strict;
 use warnings;
 
+use FindBin;
+use lib "$FindBin::Bin/..", "$FindBin::Bin/../lib", "$FindBin::Bin/../local/lib/perl5";
+
 use Bugzilla::Constants;
 use Bugzilla::Install::Requirements;
 use Bugzilla::Install::Util;
diff --git a/scripts/fix-attachment-sizes.pl b/scripts/fix-attachment-sizes.pl
index a50e241ce..328c0595e 100755
--- a/scripts/fix-attachment-sizes.pl
+++ b/scripts/fix-attachment-sizes.pl
@@ -10,9 +10,8 @@
 use strict;
 use feature 'say';
 
-use FindBin qw( $RealBin );
-use lib "$RealBin/..";
-use lib "$RealBin/../lib";
+use FindBin qw($RealBin);
+use lib ("$RealBin/..", "$RealBin/../lib", "$RealBin/../local/lib/perl5");
 
 use Bugzilla;
 use Bugzilla::Constants;
diff --git a/scripts/fix_all_open_status_queries.pl b/scripts/fix_all_open_status_queries.pl
index e10fdd44d..da40cb140 100755
--- a/scripts/fix_all_open_status_queries.pl
+++ b/scripts/fix_all_open_status_queries.pl
@@ -8,7 +8,8 @@
 
 use strict;
 
-use lib qw(. lib);
+use FindBin qw($RealBin);
+use lib ("$RealBin/..", "$RealBin/../lib", "$RealBin/../local/lib/perl5");
 
 use Bugzilla;
 use Bugzilla::Constants;
diff --git a/scripts/fixgroupqueries.pl b/scripts/fixgroupqueries.pl
index 13dd0cb3e..1934561df 100755
--- a/scripts/fixgroupqueries.pl
+++ b/scripts/fixgroupqueries.pl
@@ -22,7 +22,8 @@
 
 use strict;
 
-use lib qw(. lib);
+use FindBin qw($RealBin);
+use lib ("$RealBin/..", "$RealBin/../lib", "$RealBin/../local/lib/perl5");
 
 use Bugzilla;
 use Bugzilla::Constants;
diff --git a/scripts/fixperms.pl b/scripts/fixperms.pl
index 406c149cb..f470eabe6 100755
--- a/scripts/fixperms.pl
+++ b/scripts/fixperms.pl
@@ -21,7 +21,8 @@
 
 use strict;
 use warnings;
-use lib qw(. lib);
+use FindBin qw($RealBin);
+use lib ("$RealBin/..", "$RealBin/../lib", "$RealBin/../local/lib/perl5");
 
 use Bugzilla;
 use Bugzilla::Install::Filesystem qw(fix_all_file_permissions);
diff --git a/scripts/fixqueries.pl b/scripts/fixqueries.pl
index 1fe25f261..2619081ce 100755
--- a/scripts/fixqueries.pl
+++ b/scripts/fixqueries.pl
@@ -22,7 +22,8 @@
 
 use strict;
 
-use lib qw(. lib);
+use FindBin qw($RealBin);
+use lib ("$RealBin/..", "$RealBin/../lib", "$RealBin/../local/lib/perl5");
 
 use Bugzilla;
 use Bugzilla::Constants;
diff --git a/scripts/group-set-members.pl b/scripts/group-set-members.pl
index 3271b2e24..10955b00d 100755
--- a/scripts/group-set-members.pl
+++ b/scripts/group-set-members.pl
@@ -11,8 +11,8 @@ use strict;
 use warnings;
 use feature 'say';
 use FindBin;
-use lib "$FindBin::Bin/../..";
-use lib "$FindBin::Bin/../../lib";
+use FindBin qw($RealBin);
+use lib ("$RealBin/..", "$RealBin/../lib", "$RealBin/../local/lib/perl5");
 
 use Bugzilla;
 use Bugzilla::Constants;
diff --git a/scripts/issue-api-key.pl b/scripts/issue-api-key.pl
index 334cddeaa..3e4b2c000 100755
--- a/scripts/issue-api-key.pl
+++ b/scripts/issue-api-key.pl
@@ -10,9 +10,8 @@
 use strict;
 use feature 'say';
 
-use FindBin qw( $RealBin );
-use lib "$RealBin/..";
-use lib "$RealBin/../lib";
+use FindBin qw($RealBin);
+use lib ("$RealBin/..", "$RealBin/../lib", "$RealBin/../local/lib/perl5");
 
 use Bugzilla;
 use Bugzilla::Constants;
diff --git a/scripts/merge-users.pl b/scripts/merge-users.pl
index ebe68a6a8..d2b8196b5 100755
--- a/scripts/merge-users.pl
+++ b/scripts/merge-users.pl
@@ -1,27 +1,14 @@
-#!/usr/bin/perl -wT
-# -*- Mode: perl; indent-tabs-mode: nil -*-
+#!/usr/bin/perl -T
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
 #
-# The contents of this file are subject to the Mozilla Public
-# License Version 1.1 (the "License"); you may not use this file
-# except in compliance with the License. You may obtain a copy of
-# the License at http://www.mozilla.org/MPL/
-#
-# Software distributed under the License is distributed on an "AS
-# IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
-# implied. See the License for the specific language governing
-# rights and limitations under the License.
-#
-# The Original Code is the Bugzilla Bug Tracking System.
-#
-# The Initial Developer of the Original Code is Netscape Communications
-# Corporation. Portions created by Netscape are
-# Copyright (C) 1998 Netscape Communications Corporation. All
-# Rights Reserved.
-#
-# Contributor(s): Myk Melez <myk@mozilla.org>
-#                 Frédéric Buclin <LpSolit@gmail.com>
+# This Source Code Form is "Incompatible With Secondary Licenses", as
+# defined by the Mozilla Public License, v. 2.0.
 
+use 5.10.1;
 use strict;
+use warnings;
 
 =head1 NAME
 
@@ -44,7 +31,7 @@ merge-users.pl - Merge two user accounts.
 
 =cut
 
-use lib qw(. lib);
+use lib qw(. lib local/lib/perl5);
 
 use Bugzilla;
 use Bugzilla::Constants;
diff --git a/scripts/migrate-attachments.pl b/scripts/migrate-attachments.pl
index 26cb3fb26..b514f1620 100755
--- a/scripts/migrate-attachments.pl
+++ b/scripts/migrate-attachments.pl
@@ -12,7 +12,7 @@ use warnings;
 $| = 1;
 
 use FindBin qw($RealBin);
-use lib "$RealBin/..", "$RealBin/../lib";
+use lib ("$RealBin/..", "$RealBin/../lib", "$RealBin/../local/lib/perl5");
 
 use Bugzilla;
 use Bugzilla::Attachment;
diff --git a/scripts/migrate-cab-review.pl b/scripts/migrate-cab-review.pl
index 1c33a2a0f..aa30c518f 100755
--- a/scripts/migrate-cab-review.pl
+++ b/scripts/migrate-cab-review.pl
@@ -11,7 +11,7 @@ use strict;
 use warnings;
 
 use FindBin qw($RealBin);
-use lib "$RealBin/..";
+use lib ("$RealBin/..", "$RealBin/../lib", "$RealBin/../local/lib/perl5");
 
 use Bugzilla;
 use Bugzilla::Bug;
diff --git a/scripts/migrate_whiteboard_keyword.pl b/scripts/migrate_whiteboard_keyword.pl
index aa70543c4..f31a30521 100644
--- a/scripts/migrate_whiteboard_keyword.pl
+++ b/scripts/migrate_whiteboard_keyword.pl
@@ -32,7 +32,8 @@ use 5.10.1;
 use strict;
 use warnings;
 
-use lib qw(. lib);
+use FindBin;
+use lib "$FindBin::Bin/..", "$FindBin::Bin/../lib", "$FindBin::Bin/../local/lib/perl5";
 
 use Bugzilla;
 use Bugzilla::Constants;
diff --git a/scripts/move_flag_types.pl b/scripts/move_flag_types.pl
index 1f4398be1..bf0bf0eca 100755
--- a/scripts/move_flag_types.pl
+++ b/scripts/move_flag_types.pl
@@ -82,7 +82,8 @@ Without this argument, changes are not actually committed to the database.
 use strict;
 use warnings;
 
-use lib '.';
+use FindBin qw($RealBin);
+use lib ("$RealBin/..", "$RealBin/../lib", "$RealBin/../local/lib/perl5");
 
 use Bugzilla;
 use Getopt::Long;
diff --git a/scripts/move_os.pl b/scripts/move_os.pl
index 96b58d616..48f6d0031 100755
--- a/scripts/move_os.pl
+++ b/scripts/move_os.pl
@@ -10,8 +10,8 @@ use 5.10.1;
 use strict;
 use warnings;
 
-use FindBin '$RealBin';
-use lib "$RealBin/../..", "$RealBin/../../lib";
+use FindBin qw($RealBin);
+use lib ("$RealBin/..", "$RealBin/../lib", "$RealBin/../local/lib/perl5");
 
 use Bugzilla;
 use Bugzilla::Field;
diff --git a/scripts/movebugs.pl b/scripts/movebugs.pl
index ebe41ceb4..45f329ad2 100755
--- a/scripts/movebugs.pl
+++ b/scripts/movebugs.pl
@@ -12,8 +12,8 @@ use strict;
 use Cwd 'abs_path';
 use File::Basename;
 use FindBin;
-use lib "$FindBin::Bin/../..";
-use lib "$FindBin::Bin/../../lib";
+use FindBin qw($RealBin);
+use lib ("$RealBin/..", "$RealBin/../lib", "$RealBin/../local/lib/perl5");
 
 use Bugzilla;
 use Bugzilla::Constants;
diff --git a/scripts/movecomponent.pl b/scripts/movecomponent.pl
index cb07b84fc..10fa956c4 100755
--- a/scripts/movecomponent.pl
+++ b/scripts/movecomponent.pl
@@ -8,8 +8,8 @@
 
 use strict;
 
-use FindBin '$RealBin';
-use lib "$RealBin/../..", "$RealBin/../../lib";
+use FindBin qw($RealBin);
+use lib ("$RealBin/..", "$RealBin/../lib", "$RealBin/../local/lib/perl5");
 
 use Bugzilla;
 use Bugzilla::Component;
diff --git a/scripts/nagios_blocker_checker.pl b/scripts/nagios_blocker_checker.pl
index 768053126..a6c5e5d7b 100755
--- a/scripts/nagios_blocker_checker.pl
+++ b/scripts/nagios_blocker_checker.pl
@@ -10,9 +10,8 @@
 use strict;
 use warnings;
 
-use FindBin qw($Bin);
-use lib "$Bin/..";
-use lib "$Bin/../lib";
+use FindBin qw($RealBin);
+use lib ("$RealBin/..", "$RealBin/../lib", "$RealBin/../local/lib/perl5");
 
 use Bugzilla;
 use Bugzilla::Constants;
diff --git a/scripts/nagios_push_checker.pl b/scripts/nagios_push_checker.pl
index 109f794d7..1fa28bf1d 100755
--- a/scripts/nagios_push_checker.pl
+++ b/scripts/nagios_push_checker.pl
@@ -11,7 +11,7 @@ use strict;
 use warnings;
 
 use FindBin qw($RealBin);
-use lib ("$RealBin/..", "$RealBin/../lib");
+use lib ("$RealBin/..", "$RealBin/../lib", "$RealBin/../local/lib/perl5");
 
 use Bugzilla;
 use Bugzilla::Constants;
diff --git a/scripts/nightly_group_bug_cleaner.pl b/scripts/nightly_group_bug_cleaner.pl
index d8ce4cb54..a32588673 100755
--- a/scripts/nightly_group_bug_cleaner.pl
+++ b/scripts/nightly_group_bug_cleaner.pl
@@ -8,6 +8,10 @@
 use 5.10.1;
 use strict;
 use warnings;
+
+use FindBin;
+use lib "$FindBin::Bin/..", "$FindBin::Bin/../lib", "$FindBin::Bin/../local/lib/perl5";
+
 use Bugzilla;
 use Bugzilla::Constants;
 use Bugzilla::Field;
diff --git a/scripts/nuke-bugs.pl b/scripts/nuke-bugs.pl
index 0226c1726..35774ff8d 100755
--- a/scripts/nuke-bugs.pl
+++ b/scripts/nuke-bugs.pl
@@ -8,7 +8,8 @@
 
 use strict;
 
-use lib qw(.);
+use FindBin qw($RealBin);
+use lib ("$RealBin/..", "$RealBin/../lib", "$RealBin/../local/lib/perl5");
 
 use Bugzilla;
 use Bugzilla::Constants;
diff --git a/scripts/reassign_open_bugs.pl b/scripts/reassign_open_bugs.pl
index 6496f9a95..343a99617 100755
--- a/scripts/reassign_open_bugs.pl
+++ b/scripts/reassign_open_bugs.pl
@@ -10,8 +10,8 @@ use 5.10.1;
 use strict;
 use warnings;
 
-use FindBin '$RealBin';
-use lib "$RealBin/../..", "$RealBin/../../lib";
+use FindBin qw($RealBin);
+use lib ("$RealBin/..", "$RealBin/../lib", "$RealBin/../local/lib/perl5");
 
 use Bugzilla;
 use Bugzilla::User;
diff --git a/scripts/remove-non-public-data.pl b/scripts/remove-non-public-data.pl
index 06fc693fa..8b5d2b2e7 100755
--- a/scripts/remove-non-public-data.pl
+++ b/scripts/remove-non-public-data.pl
@@ -9,7 +9,7 @@
 use strict;
 
 use FindBin qw($RealBin);
-use lib "$RealBin/..", "$RealBin/../lib";
+use lib ("$RealBin/..", "$RealBin/../lib", "$RealBin/../local/lib/perl5");
 
 use Bugzilla;
 use Bugzilla::Constants;
diff --git a/scripts/remove_idle_group_members.pl b/scripts/remove_idle_group_members.pl
index d0eda387a..510d0623b 100755
--- a/scripts/remove_idle_group_members.pl
+++ b/scripts/remove_idle_group_members.pl
@@ -10,8 +10,8 @@
 use strict;
 use warnings;
 
-use FindBin qw($Bin);
-use lib "$Bin/..";
+use FindBin qw($RealBin);
+use lib ("$RealBin/..", "$RealBin/../lib", "$RealBin/../local/lib/perl5");
 
 use Bugzilla;
 BEGIN { Bugzilla->extensions() }
diff --git a/scripts/reset_default_user.pl b/scripts/reset_default_user.pl
index 173d03849..2888df48c 100755
--- a/scripts/reset_default_user.pl
+++ b/scripts/reset_default_user.pl
@@ -8,7 +8,8 @@
 
 use strict;
 
-use lib '.';
+use FindBin qw($RealBin);
+use lib ("$RealBin/..", "$RealBin/../lib", "$RealBin/../local/lib/perl5");
 
 use Bugzilla;
 use Bugzilla::Constants;
diff --git a/scripts/sanitizeme.pl b/scripts/sanitizeme.pl
index 64178f3f3..8f241de34 100755
--- a/scripts/sanitizeme.pl
+++ b/scripts/sanitizeme.pl
@@ -24,8 +24,8 @@
 
 use strict;
 
-use FindBin '$RealBin';
-use lib "$RealBin/..", "$RealBin/lib";
+use FindBin qw($RealBin);
+use lib ("$RealBin/..", "$RealBin/../lib", "$RealBin/../local/lib/perl5");
 
 use Bugzilla;
 use Bugzilla::Bug;
diff --git a/scripts/security_remove.pl b/scripts/security_remove.pl
index 85f415218..7c01e8002 100755
--- a/scripts/security_remove.pl
+++ b/scripts/security_remove.pl
@@ -10,8 +10,8 @@ use 5.10.1;
 use strict;
 use warnings;
 
-use FindBin '$RealBin';
-use lib "$RealBin/../..", "$RealBin/../../lib";
+use FindBin qw($RealBin);
+use lib ("$RealBin/..", "$RealBin/../lib", "$RealBin/../local/lib/perl5");
 
 use Bugzilla;
 use Bugzilla::Constants;
diff --git a/scripts/sendunsentbugmail.pl b/scripts/sendunsentbugmail.pl
index eeee41ced..3dae4a341 100755
--- a/scripts/sendunsentbugmail.pl
+++ b/scripts/sendunsentbugmail.pl
@@ -1,29 +1,16 @@
-#!/usr/bin/perl -wT
-# -*- Mode: perl; indent-tabs-mode: nil -*-
+#!/usr/bin/perl -T
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
 #
-# The contents of this file are subject to the Mozilla Public
-# License Version 1.1 (the "License"); you may not use this file
-# except in compliance with the License. You may obtain a copy of
-# the License at http://www.mozilla.org/MPL/
-#
-# Software distributed under the License is distributed on an "AS
-# IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
-# implied. See the License for the specific language governing
-# rights and limitations under the License.
-#
-# The Original Code is the Bugzilla Bug Tracking System.
-#
-# The Initial Developer of the Original Code is Netscape Communications
-# Corporation. Portions created by Netscape are
-# Copyright (C) 1998 Netscape Communications Corporation. All
-# Rights Reserved.
-#
-# Contributor(s): Dave Miller <justdave@bugzilla.org>
-#                 Myk Melez <myk@mozilla.org>
+# This Source Code Form is "Incompatible With Secondary Licenses", as
+# defined by the Mozilla Public License, v. 2.0.
 
 use 5.10.1;
 use strict;
-use lib qw(. lib);
+use warnings;
+
+use lib qw(. lib local/lib/perl5);
 
 use Bugzilla;
 use Bugzilla::Constants;
diff --git a/scripts/syncflags.pl b/scripts/syncflags.pl
index 520a8305c..7250cdf89 100755
--- a/scripts/syncflags.pl
+++ b/scripts/syncflags.pl
@@ -24,7 +24,8 @@
 
 use strict;
 
-use lib qw(. lib);
+use FindBin qw($RealBin);
+use lib ("$RealBin/..", "$RealBin/../lib", "$RealBin/../local/lib/perl5");
 
 use Bugzilla;
 use Bugzilla::Constants;
diff --git a/scripts/syncmsandversions.pl b/scripts/syncmsandversions.pl
index 20e88252e..e886d9e5b 100755
--- a/scripts/syncmsandversions.pl
+++ b/scripts/syncmsandversions.pl
@@ -24,7 +24,8 @@
 
 use strict;
 
-use lib qw(. lib);
+use FindBin qw($RealBin);
+use lib ("$RealBin/..", "$RealBin/../lib", "$RealBin/../local/lib/perl5");
 
 use Bugzilla;
 use Bugzilla::Constants;
diff --git a/scripts/update-bug-groups.pl b/scripts/update-bug-groups.pl
index 173269e7c..0aed32e9b 100755
--- a/scripts/update-bug-groups.pl
+++ b/scripts/update-bug-groups.pl
@@ -12,7 +12,7 @@ use warnings;
 $| = 1;
 
 use FindBin qw($RealBin);
-use lib "$RealBin/..", "$RealBin/../lib";
+use lib ("$RealBin/..", "$RealBin/../lib", "$RealBin/../local/lib/perl5");
 
 use Bugzilla;
 use Bugzilla::CGI;
diff --git a/scripts/update-crash-signatures.pl b/scripts/update-crash-signatures.pl
index 179d0decb..f8efca7ff 100755
--- a/scripts/update-crash-signatures.pl
+++ b/scripts/update-crash-signatures.pl
@@ -12,7 +12,7 @@ use warnings;
 $| = 1;
 
 use FindBin qw($RealBin);
-use lib "$RealBin/..", "$RealBin/../lib";
+use lib ("$RealBin/..", "$RealBin/../lib", "$RealBin/../local/lib/perl5");
 
 use constant BATCH_SIZE => 100;
 
diff --git a/scripts/user-prefs.pl b/scripts/user-prefs.pl
index ee980b3eb..b7c860f48 100755
--- a/scripts/user-prefs.pl
+++ b/scripts/user-prefs.pl
@@ -10,8 +10,8 @@
 use strict;
 use 5.10.1;
 
-use FindBin qw( $RealBin );
-use lib ("$RealBin/..", "$RealBin/../lib");
+use FindBin qw($RealBin);
+use lib ("$RealBin/..", "$RealBin/../lib", "$RealBin/../local/lib/perl5");
 
 use Bugzilla;
 use Bugzilla::Constants;