Changeset 42746

Timestamp:

Dec 6, 2024, 12:45:24 PM (20 months ago)

Author:

eugene

Message:

Build.PL and Server.pm have Ubuntu / Gentoo differences; uncomment for Ubuntu as default

Location:

trunk/Nebulous-Server

Files:

• Build.PL (modified) (2 diffs)
• lib/Nebulous/Server.pm (modified) (1 diff)

trunk/Nebulous-Server/Build.PL

@@ -15 +15 @@
         'DBD::mysql'            => '3.0007',
         'DBI'                   => '1.53',
-        'Digest::SHA1'          => 0,
         'File::Basename'        => 0,
         'File::ExtAttr'         => '1.03',
-        'File::Mountpoint'      => '0.01',
+# needed for Ubuntu, not Gentoo
+        'Digest::SHA'           => 0,
+# not needed for Ubuntu
+#       'Digest::SHA1'          => 0,
+#       'File::Mountpoint'      => '0.01',
+#       'Filesys::Df'           => '0.92',
         'File::Path'            => '1.08',
         'File::Spec'            => 0,
         'File::Spec::Functions' => 0,
         'File::Temp'            => 0,
-        'Filesys::Df'           => '0.92',
         'Log::Dispatch::Email::MailSend' => 0,
         'Log::Log4perl'         => '0.48',
@@ -34 +37 @@
     build_requires      => {
         'Test::More'            => '0.49',
-        'Test::URI'             => '1.06',
-        'Test::DBUnit'          => '0.20',
+#        'Test::URI'             => '1.06',
+#        'Test::DBUnit'          => '0.20',
     },
     recommends          => {
         'Test::Distribution'    => '1.22',
-        'Apache2::SOAP'         => 0,
+# needed for Gentoo, not Ubuntu
+#       'Apache2::SOAP'         => 0,
+# needed for Ubuntu, not Gentoo
+        'Apache::SOAP'         => 0,
         'Apache::DBI'           => '1.05',
     },

trunk/Nebulous-Server/lib/Nebulous/Server.pm

@@ -19 +19 @@
 
 ## for gentoo:
-use Digest::SHA1 qw( sha1_hex );
+# use Digest::SHA1 qw( sha1_hex );
 
 ## for ubuntu:
-# use Digest::SHA qw( sha1_hex );
+use Digest::SHA qw( sha1_hex );
 
 use Fcntl ':mode';