X-Git-Url: http://git.rot13.org/?a=blobdiff_plain;f=Makefile.PL;h=06a38263f70f5c4636b842c95ef161a6fb13f822;hb=f3aa04a408344caf7631cc0cf7b61b9f9ba2c0a5;hp=bcbc8f9dc35b8c471f6443140ac0f91b71c234d2;hpb=3efe32efc79ff726e61df723ebc8cf704c340159;p=koha.git diff --git a/Makefile.PL b/Makefile.PL index bcbc8f9dc3..06a38263f7 100644 --- a/Makefile.PL +++ b/Makefile.PL @@ -250,6 +250,7 @@ my $target_map = { './changelanguage.pl' => 'INTRANET_CGI_DIR', './check_sysprefs.pl' => 'NONE', './circ' => 'INTRANET_CGI_DIR', + './offline_circ' => 'INTRANET_CGI_DIR', './edithelp.pl' => 'INTRANET_CGI_DIR', './etc' => { target => 'KOHA_CONF_DIR', trimdir => -1 }, './etc/zebradb' => { target => 'ZEBRA_CONF_DIR', trimdir => -1 }, @@ -279,7 +280,6 @@ my $target_map = { './reviews' => 'INTRANET_CGI_DIR', './rewrite-config.PL' => 'NONE', './reviews' => 'INTRANET_CGI_DIR', - './rss' => 'MISC_DIR', './serials' => 'INTRANET_CGI_DIR', './skel' => 'NONE', './skel/var/log/koha' => { target => 'LOG_DIR', trimdir => -1 }, @@ -415,7 +415,7 @@ my %config_defaults = ( 'PATH_TO_ZEBRA' => '', ); -# set some default configuratio options based on OS +# set some default configuration options based on OS # more conditions need to be added for other OS's # this should probably also incorporate usage of Win32::GetOSName() and/or Win32::GetOSVersion() # to allow for more granular decisions based on which Win32 platform @@ -526,36 +526,42 @@ my %test_suite_override_dirs = ( WriteMakefile( NAME => 'koha', - #VERSION => strftime('2.9.%Y%m%d%H',gmtime), - VERSION_FROM => 'kohaversion.pl', + VERSION => '3.00.05', + #VERSION_FROM => 'kohaversion.pl', ABSTRACT => 'Award-winning integrated library system (ILS) and Web OPAC', - AUTHOR => 'Koha Developers ', + AUTHOR => 'Koha Developers ', NO_META => 1, PREREQ_PM => { - 'Algorithm::CheckDigits' => 0.50, + 'Algorithm::CheckDigits' => 0.50, 'Biblio::EndnoteStyle' => 0.05, 'CGI' => 3.15, 'CGI::Carp' => 1.29, - 'CGI::Session' => '4.10', + 'CGI::Session' => 4.20, + 'CGI::Session::Serialize::yaml' => 4.20, 'Class::Factory::Util' => 1.6, 'Class::Accessor' => 0.30, 'DBD::mysql' => 4.004, 'DBI' => 1.53, - 'Data::ICal' => 0.13, 'Data::Dumper' => 2.121, + 'Data::ICal' => 0.13, 'Date::Calc' => 5.4, 'Date::ICal' => 1.72, 'Date::Manip' => 5.44, 'Digest::MD5' => 2.36, + 'Digest::SHA' => 5.43, + 'Email::Date' => 1.103, 'File::Temp' => 0.16, + 'GD' => 2.39, #optional 'GD::Barcode::UPCE' => 1.1, 'Getopt::Long' => 2.35, 'Getopt::Std' => 1.05, 'HTML::Template::Pro' => 0.69, 'HTML::Scrubber' => 0.08, 'HTTP::Cookies' => 1.39, + 'HTTP::OAI' => 3.20, 'HTTP::Request::Common' => 1.26, - 'Image::Magick' => 6.2, # optional + 'IPC::Cmd' => 0.46, + 'JSON' => 2.07, # Needed by admin/item_circulation_alerts.pl 'LWP::Simple' => 1.41, 'LWP::UserAgent' => 2.033, 'Lingua::Stem' => 0.82, @@ -567,6 +573,7 @@ WriteMakefile( 'MARC::File::XML' => 0.88, 'MARC::Record' => 2.00, 'MIME::Base64' => 3.07, + 'MIME::Lite' => 3.00, 'MIME::QuotedPrint' => 3.07, 'Mail::Sendmail' => 0.79, 'Net::LDAP' => 0.33, # optional @@ -587,15 +594,18 @@ WriteMakefile( 'Test::More' => 0.62, 'Text::CSV' => 0.01, 'Text::CSV_XS' => 0.32, + 'Text::CSV::Encoded' => 0.09, 'Text::Iconv' => 1.7, 'Text::Wrap' => 2005.082401, 'Time::HiRes' => 1.86, 'Time::localtime' => 1.02, 'Unicode::Normalize' => 0.32, + 'URI::Escape' => 1.36, 'XML::Dumper' => 0.81, 'XML::LibXML' => 1.59, 'XML::LibXSLT' => 1.59, 'XML::SAX::ParserFactory' => 1.01, + 'XML::SAX::Writer' => 0.44, 'XML::Simple' => 2.14, 'XML::RSS' => 1.31, 'YAML::Syck' => 0.71, @@ -605,8 +615,9 @@ WriteMakefile( PM => $file_map, # Man pages generated from POD - INSTALLMAN1DIR => File::Spec->catdir($target_directories->{'MAN_DIR'}, 'man1'), - INSTALLMAN3DIR => File::Spec->catdir($target_directories->{'MAN_DIR'}, 'man3'), + # ExtUtils::MakeMaker already manage $(DESTDIR) + INSTALLMAN1DIR => File::Spec->catdir(_strip_destdir($target_directories->{'MAN_DIR'}), 'man1'), + INSTALLMAN3DIR => File::Spec->catdir(_strip_destdir($target_directories->{'MAN_DIR'}), 'man3'), PL_FILES => $pl_files, ); @@ -1272,6 +1283,7 @@ sub get_target_directories { _get_env_overrides(\%dirmap); _get_argv_overrides(\%dirmap); + _add_destdir(\%dirmap); return \%dirmap, \%skipdirs; } @@ -1320,6 +1332,20 @@ sub _get_argv_overrides { @ARGV = @new_argv; } +sub _strip_destdir { + my $dir = shift; + $dir =~ s/^\$\(DESTDIR\)//; + return $dir; +} + +sub _add_destdir { + my $dirmap = shift; + + foreach my $key (keys %$dirmap) { + $dirmap->{$key} = '$(DESTDIR)'.$dirmap->{$key}; + } +} + sub display_configuration { my $config = shift; my $dirmap = shift; @@ -1395,7 +1421,7 @@ sub install { # installation and uninstallation targets. # If installation is on Win32, we need to do permissions different from *nix - if ( $^O =~ /darwin|linux|cygwin|freebsd/ ) { # this value needs to be verified for each platform and modified accordingly + if ( $^O =~ /darwin|linux|cygwin|freebsd|solaris/ ) { # this value needs to be verified for each platform and modified accordingly foreach my $key (sort keys %$target_directories) { $install .= qq( KOHA_INST_$key = blib/$key @@ -1417,9 +1443,10 @@ install :: all install_koha set_koha_ownership set_koha_permissions warn_koha_en $install .= "\n"; $install .= "set_koha_ownership ::\n"; +# Do not try to change ownership if DESTDIR is set if ($config{'INSTALL_MODE'} eq 'standard' and $config{'KOHA_USER'} ne "root") { foreach my $key (sort keys %$target_directories) { - $install .= "\t\$(NOECHO) chown -R $config{'KOHA_USER'}:$config{'KOHA_GROUP'} \$(KOHA_DEST_$key)\n" + $install .= "\t\$(NOECHO) if test -z \"\$(DESTDIR)\"; then chown -R $config{'KOHA_USER'}:$config{'KOHA_GROUP'} \$(KOHA_DEST_$key); fi\n" unless ($config{'INSTALL_ZEBRA'} ne "yes" and $key =~ /ZEBRA/) or exists $skip_directories->{$key}; } } else { @@ -1567,7 +1594,7 @@ sub postamble { # these directories will be relocated to the 't' directory foreach my $dirname ( keys %$target_directories ) { - my $dir = $target_directories->{$dirname}; + my $dir = main::_strip_destdir( $target_directories->{$dirname} ); if ( exists $test_suite_override_dirs{$dirname} ) { $dir = main::get_test_dir($dirname); }