Skip to content

Commit 2dd880d

Browse files
brongbrong
authored
Merge pull request #5805 from brong/make-perl-packages-install
Make perl packages install
2 parents ec4bd44 + 4ee96e0 commit 2dd880d

23 files changed

Lines changed: 34 additions & 21 deletions

‎cassandane/Cassandane/Cyrus/Conversations.pm‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ use Cassandane::Util::DateTime qw(to_iso8601 from_iso8601
5151
from_rfc822
5252
to_rfc3501 from_rfc3501);
5353

54-
use lib '../perl/imap';
54+
use lib '../perl/imap/lib';
5555
use Cyrus::IndexFile;
5656

5757
sub new

‎cassandane/Cassandane/Cyrus/CyrusDB.pm‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ use base qw(Cassandane::Cyrus::TestCase);
4848
use Cassandane::Util::Log;
4949
use Cassandane::Instance;
5050

51-
use lib '../perl/imap';
51+
use lib '../perl/imap/lib';
5252
use Cyrus::DList;
5353
use Cyrus::HeaderFile;
5454

‎cassandane/Cassandane/Cyrus/JMAPMailbox.pm‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ use Cwd qw(abs_path getcwd);
5252
use base qw(Cassandane::Cyrus::TestCase);
5353
use Cassandane::Util::Log;
5454

55-
use lib '../perl/imap';
55+
use lib '../perl/imap/lib';
5656
use Cyrus::DList;
5757

5858
use charnames ':full';

‎cassandane/Cassandane/Cyrus/JMAPNote.pm‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ use Cwd qw(abs_path getcwd);
5050
use base qw(Cassandane::Cyrus::TestCase);
5151
use Cassandane::Util::Log;
5252

53-
use lib '../perl/imap';
53+
use lib '../perl/imap/lib';
5454
use Cyrus::DList;
5555

5656
use charnames ':full';

‎cassandane/Cassandane/Cyrus/Metadata.pm‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ use Config;
4747
use base qw(Cassandane::Cyrus::TestCase);
4848
use Cassandane::Util::Log;
4949

50-
use lib '../perl/imap';
50+
use lib '../perl/imap/lib';
5151
use Cyrus::DList;
5252

5353
sub new

‎cassandane/Cassandane/Cyrus/Reconstruct.pm‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ use base qw(Cassandane::Cyrus::TestCase);
5050
use Cassandane::Util::Log;
5151
use Cassandane::Instance;
5252

53-
use lib '../perl/imap';
53+
use lib '../perl/imap/lib';
5454
use Cyrus::DList;
5555
use Cyrus::HeaderFile;
5656
use Cyrus::IndexFile;

‎cassandane/Cassandane/Instance.pm‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,7 @@ use Cassandane::Cassini;
8383
use Cassandane::PortManager;
8484
use Cassandane::BuildInfo;
8585

86-
use lib '../perl/imap';
86+
use lib '../perl/imap/lib';
8787
require Cyrus::DList;
8888

8989
my $__cached_rootdir;

‎cassandane/utils/cyr-easycd‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
use strict;
44
use warnings;
55

6-
use lib 'perl/imap';
6+
use lib 'perl/imap/lib';
77

88
use feature 'signatures';
99

‎configure.ac‎

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1888,19 +1888,19 @@ dnl Make sure perl modules are in the build directory (which isn't necessarily
18881888
dnl the source directory)
18891889
AC_CONFIG_LINKS([perl/sieve/managesieve/managesieve.pm:perl/sieve/managesieve/managesieve.pm])
18901890
AC_CONFIG_FILES([perl/sieve/managesieve/MANIFEST])
1891-
AC_CONFIG_LINKS([perl/imap/Cyrus/AccountSync.pm:perl/imap/Cyrus/AccountSync.pm])
1892-
AC_CONFIG_LINKS([perl/imap/Cyrus/Backup.pm:perl/imap/Cyrus/Backup.pm])
1893-
AC_CONFIG_LINKS([perl/imap/Cyrus/Backup/State.pm:perl/imap/Cyrus/Backup/State.pm])
1894-
AC_CONFIG_LINKS([perl/imap/Cyrus/Backup/Restore.pm:perl/imap/Cyrus/Backup/Restore.pm])
1895-
AC_CONFIG_LINKS([perl/imap/Cyrus/Backup/Tar.pm:perl/imap/Cyrus/Backup/Tar.pm])
1896-
AC_CONFIG_LINKS([perl/imap/Cyrus/CacheFile.pm:perl/imap/Cyrus/CacheFile.pm])
1897-
AC_CONFIG_LINKS([perl/imap/Cyrus/DList.pm:perl/imap/Cyrus/DList.pm])
1898-
AC_CONFIG_LINKS([perl/imap/Cyrus/HeaderFile.pm:perl/imap/Cyrus/HeaderFile.pm])
1899-
AC_CONFIG_LINKS([perl/imap/Cyrus/ImapClone.pm:perl/imap/Cyrus/ImapClone.pm])
1900-
AC_CONFIG_LINKS([perl/imap/Cyrus/IndexFile.pm:perl/imap/Cyrus/IndexFile.pm])
1901-
AC_CONFIG_LINKS([perl/imap/Cyrus/Mbentry.pm:perl/imap/Cyrus/Mbentry.pm])
1902-
AC_CONFIG_LINKS([perl/imap/Cyrus/Mbname.pm:perl/imap/Cyrus/Mbname.pm])
1903-
AC_CONFIG_LINKS([perl/imap/Cyrus/SyncProto.pm:perl/imap/Cyrus/SyncProto.pm])
1891+
AC_CONFIG_LINKS([perl/imap/lib/Cyrus/AccountSync.pm:perl/imap/lib/Cyrus/AccountSync.pm])
1892+
AC_CONFIG_LINKS([perl/imap/lib/Cyrus/Backup.pm:perl/imap/lib/Cyrus/Backup.pm])
1893+
AC_CONFIG_LINKS([perl/imap/lib/Cyrus/Backup/State.pm:perl/imap/lib/Cyrus/Backup/State.pm])
1894+
AC_CONFIG_LINKS([perl/imap/lib/Cyrus/Backup/Restore.pm:perl/imap/lib/Cyrus/Backup/Restore.pm])
1895+
AC_CONFIG_LINKS([perl/imap/lib/Cyrus/Backup/Tar.pm:perl/imap/lib/Cyrus/Backup/Tar.pm])
1896+
AC_CONFIG_LINKS([perl/imap/lib/Cyrus/CacheFile.pm:perl/imap/lib/Cyrus/CacheFile.pm])
1897+
AC_CONFIG_LINKS([perl/imap/lib/Cyrus/DList.pm:perl/imap/lib/Cyrus/DList.pm])
1898+
AC_CONFIG_LINKS([perl/imap/lib/Cyrus/HeaderFile.pm:perl/imap/lib/Cyrus/HeaderFile.pm])
1899+
AC_CONFIG_LINKS([perl/imap/lib/Cyrus/ImapClone.pm:perl/imap/lib/Cyrus/ImapClone.pm])
1900+
AC_CONFIG_LINKS([perl/imap/lib/Cyrus/IndexFile.pm:perl/imap/lib/Cyrus/IndexFile.pm])
1901+
AC_CONFIG_LINKS([perl/imap/lib/Cyrus/Mbentry.pm:perl/imap/lib/Cyrus/Mbentry.pm])
1902+
AC_CONFIG_LINKS([perl/imap/lib/Cyrus/Mbname.pm:perl/imap/lib/Cyrus/Mbname.pm])
1903+
AC_CONFIG_LINKS([perl/imap/lib/Cyrus/SyncProto.pm:perl/imap/lib/Cyrus/SyncProto.pm])
19041904
AC_CONFIG_LINKS([perl/imap/IMAP/Shell.pm:perl/imap/IMAP/Shell.pm])
19051905
AC_CONFIG_LINKS([perl/imap/IMAP/Admin.pm:perl/imap/IMAP/Admin.pm])
19061906
AC_CONFIG_LINKS([perl/imap/IMAP.pm:perl/imap/IMAP.pm])

‎perl/imap/MANIFEST.in‎

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,5 +11,18 @@ xsutil.c Callback and utility functions for Cyrus interface
1111
typemap Typemap defining IMAP_Cyrus Perl "class"
1212
cyradm.sh Shell script wrapper for Cyrus::IMAP::Shell
1313
examples/auditmbox.pl (lame) Example of Cyrus::IMAP::Admin
14+
lib/Cyrus/AccountSync.pm Tool to manage cyrus users via repliation protocol mapping to Apple's test data format
15+
lib/Cyrus/CacheFile.pm Interface to the cyrus.cache data format
16+
lib/Cyrus/Backup.pm Tooling for Fastmail style backups
17+
lib/Cyrus/Backup/Tar.pm Tar file management for Fastmail style backups
18+
lib/Cyrus/Backup/State.pm State file (sqlite) management for Fastmail style backups
19+
lib/Cyrus/Backup/Restore.pm Restoration support for Fastmail style backups
20+
lib/Cyrus/DList.pm Perl library for the DList data format used in Cyrus
21+
lib/Cyrus/HeaderFile.pm Interface to the cyrus.header data format
22+
lib/Cyrus/ImapClone.pm Tool to replicate from IMAP into Cyrus via repliation protocol
23+
lib/Cyrus/IndexFile.pm Interface to the cyrus.index data format
24+
lib/Cyrus/Mbentry.pm Interface to the mailboxes.db entry format
25+
lib/Cyrus/Mbname.pm Methods for managing all the different mailbox name formats
26+
lib/Cyrus/SyncProto.pm Wrapper for Cyrus replication protocol
1427
t/01-imclient.t Test script for Cyrus::IMAP
1528
t/02-admin.t (lame) Test script for Cyrus::IMAP::Admin

0 commit comments

Comments
 (0)