X-Git-Url: http://git.rot13.org/?p=BackupPC.git;a=blobdiff_plain;f=makeDist;h=26799479eaef30bfbc31e07e5d8a0c6102122417;hp=7492a032456625c6e141f492337a8eef26d6299b;hb=523fdef21f0ca0d691a0b8c95ca76b18a1adb60a;hpb=bd6334a9c72e7fa75f13fd6426f5a8a8cd4ab8b1;ds=sidebyside diff --git a/makeDist b/makeDist index 7492a03..2679947 100755 --- a/makeDist +++ b/makeDist @@ -12,11 +12,15 @@ # # dist/BackupPC-$Version.tar.gz. # +# Often the language files are not up to date, and makeDist +# exits after complaining about the lang files being inconsistent. +# Use the -l option to turn off that behavior. +# # AUTHOR # Craig Barratt # # COPYRIGHT -# Copyright (C) 2001-2003 Craig Barratt +# Copyright (C) 2001-2006 Craig Barratt # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -42,15 +46,17 @@ use Getopt::Std; umask(0022); -my $Version = "2.1.0_CVS"; -my $ReleaseDate = "8 Feb 2004"; +my $Version = "3.0.0alpha"; +my $ReleaseDate = "23 Jan 2006"; my $DistDir = "dist/BackupPC-$Version"; my @PerlSrc = qw( bin/BackupPC bin/BackupPC_archive bin/BackupPC_archiveHost + bin/BackupPC_attribPrint bin/BackupPC_dump + bin/BackupPC_fixupBackupSummary bin/BackupPC_link bin/BackupPC_nightly bin/BackupPC_restore @@ -59,19 +65,23 @@ my @PerlSrc = qw( bin/BackupPC_trashClean bin/BackupPC_tarExtract bin/BackupPC_tarCreate + bin/BackupPC_tarPCCopy bin/BackupPC_compressPool bin/BackupPC_zipCreate bin/BackupPC_zcat lib/BackupPC/Attrib.pm + lib/BackupPC/Config.pm lib/BackupPC/FileZIO.pm lib/BackupPC/Lib.pm lib/BackupPC/PoolWrite.pm + lib/BackupPC/Storage.pm lib/BackupPC/View.pm lib/BackupPC/CGI/AdminOptions.pm lib/BackupPC/CGI/Archive.pm lib/BackupPC/CGI/ArchiveInfo.pm lib/BackupPC/CGI/Browse.pm lib/BackupPC/CGI/DirHistory.pm + lib/BackupPC/CGI/EditConfig.pm lib/BackupPC/CGI/EmailSummary.pm lib/BackupPC/CGI/GeneralInfo.pm lib/BackupPC/CGI/HostInfo.pm @@ -87,15 +97,21 @@ my @PerlSrc = qw( lib/BackupPC/CGI/StopServer.pm lib/BackupPC/CGI/Summary.pm lib/BackupPC/CGI/View.pm + lib/BackupPC/Config/Meta.pm lib/BackupPC/Lang/de.pm lib/BackupPC/Lang/en.pm lib/BackupPC/Lang/es.pm lib/BackupPC/Lang/fr.pm lib/BackupPC/Lang/it.pm + lib/BackupPC/Lang/nl.pm + lib/BackupPC/Lang/pt_br.pm + lib/BackupPC/Storage/Text.pm lib/BackupPC/Xfer/Archive.pm + lib/BackupPC/Xfer/BackupPCd.pm lib/BackupPC/Xfer/Smb.pm lib/BackupPC/Xfer/Tar.pm lib/BackupPC/Xfer/Rsync.pm + lib/BackupPC/Xfer/RsyncDigest.pm lib/BackupPC/Xfer/RsyncFileIO.pm lib/BackupPC/Zip/FileMember.pm cgi-bin/BackupPC_Admin @@ -115,6 +131,8 @@ my $errCnt; $errCnt += CheckConfigParams("conf/config.pl", $ConfVars, 0); +$errCnt += CheckConfigParams("doc-src/BackupPC.pod", $ConfVars, 1); + # # These config parameters are not used in the code, so ignore them. # @@ -130,6 +148,7 @@ $ConfVars->{CgiImageDir} = 2; $ConfVars->{BlackoutHourBegin} = 2; $ConfVars->{BlackoutHourEnd} = 2; $ConfVars->{BlackoutWeekDays} = 2; +$ConfVars->{RsyncLogLevel} = 2; foreach my $file ( @PerlSrc ) { $errCnt += CheckConfigParams($file, $ConfVars, 1); @@ -159,7 +178,9 @@ mkpath($DistDir, 0, 0777); foreach my $dir ( qw(bin doc conf images init.d/src cgi-bin lib/BackupPC/CGI + lib/BackupPC/Config lib/BackupPC/Lang + lib/BackupPC/Storage lib/BackupPC/Xfer lib/BackupPC/Zip ) ) { @@ -184,11 +205,13 @@ foreach my $file ( (@PerlSrc, qw( conf/config.pl conf/hosts + conf/BackupPC_stnd.css init.d/README init.d/src/debian-backuppc init.d/src/gentoo-backuppc init.d/src/gentoo-backuppc.conf init.d/src/linux-backuppc + init.d/src/slackware-backuppc init.d/src/solaris-backuppc init.d/src/suse-backuppc doc/BackupPC.pod @@ -205,6 +228,8 @@ system("cd dist ; tar zcf BackupPC-$Version.tar.gz BackupPC-$Version"); print("Distribution written to dist/BackupPC-$Version.tar.gz\n"); unlink("pod2htmd.x~~"); unlink("pod2htmi.x~~"); +unlink("pod2htmd.tmp"); +unlink("pod2htmi.tmp"); ########################################################################### # Subroutines @@ -223,28 +248,46 @@ sub InstallFile binmode(FILE); binmode(OUT); while ( ) { - s/^# *Version \d+\.\d+[\.\w]*, released \d+ \w+ \d{4}\.?/# Version __VERSION__, released __RELEASEDATE__./; + s/^([#*\s]+)Version \d+\.\d+[\.\w]*, released \d+ \w+ \d{4}\.?/$1Version __VERSION__, released __RELEASEDATE__./; s/__VERSION__/$Version/g; s/__RELEASEDATE__/$ReleaseDate/g; - if ( $file =~ /BackupPC\.html$/ && !/A NAME="item_%24Conf/ ) { - s/\$Conf{([^}]*)}/ + if ( $file =~ /BackupPC\.html$/ ) { + # + # fixup for perl 5.6.x + # + if ( !/A NAME="item_(%|_)24Conf/i ) { + s/\$Conf{([^}]*)}/ defined($ConfName{$1}) - ? "\$Conf{$1}<\/A>" + ? "\L\E\$Conf{$1}<\/A>" : "\$Conf{$1}"/eg; + } + s/<(A NAME="item_(%|_)24Conf(%|_)7B(.*?)(%|_)7D).*?">/\L/ig; + s/^
/

/; + # + # Fixup for perl 5.8.x first one no longer needed after + # fix in CSS) + # +# if ( /^<\/dt>/ ) { +# $_ .= ; +# s/^(<\/dt>\n

)/$1

/s; +# } + s/^

  • <\/li>/
  • /; } if ( /__CONFIGPOD__/ ) { print OUT $ConfPod; } elsif ( /^use lib ".*BackupPC\/lib";/ || /^use lib "\/home\/pcbackup\/install\/lib";/ ) { print OUT "use lib \"__INSTALLDIR__/lib\";\n"; - } elsif ( $file =~ /Lib.pm/ && /(.*TopDir *=> .*)'.*',/ ) { - print OUT "$1'__TOPDIR__',\n"; - } elsif ( $file =~ /Lib.pm/ && /(.*Version *=> .*)'[\w\d\.]+',/ ) { - print OUT "$1'$Version',\n"; - } elsif ( $file =~ /Lib.pm/ && /(.*BinDir *=> .*)'.*',/ ) { - print OUT "$1'__INSTALLDIR__',\n"; - } elsif ( $file =~ /Lib.pm/ && /(.*LibDir *=> .*)'.*',/ ) { - print OUT "$1'__INSTALLDIR__',\n"; + } elsif ( $file =~ /Lib.pm/ && /^(\s*\$topDir\s*=\s*)'.*'(\s*if\s.*)/ ) { + print OUT "$1'__TOPDIR__'$2\n"; + } elsif ( $file =~ /Lib.pm/ && /^(\s*\$installDir\s*=\s*)'.*'(\s*if\s.*)/ ) { + print OUT "$1'__INSTALLDIR__'$2\n"; + } elsif ( $file =~ /Lib.pm/ && /^(\s*my \$useFHS\s*=\s*)\d;/ ) { + print OUT "${1}0;\n"; + } elsif ( $file =~ /configure.pl/ && /__CONFIGURE_BIN_LIST__/ ) { + print OUT " ", join("\n ", grep(/^bin\//, @PerlSrc)), "\n"; + } elsif ( $file =~ /configure.pl/ && /__CONFIGURE_LIB_LIST__/ ) { + print OUT " ", join("\n ", grep(/^lib\//, @PerlSrc)), "\n"; } elsif ( $file =~ /BackupPC_Admin/ && /(my *\$installDir *= *)'.*'/ ) { print OUT "$1'__INSTALLDIR__/lib';\n"; } else { @@ -294,7 +337,7 @@ sub config2pod s/([^;])\s*$/$1 .../; } push(@conf, $_); - my $text = $_; + my $text = "\$Conf{$var}"; $text =~ s/\s+/_/sg; $text =~ s{(\W)}{sprintf("%%%02X", ord($1) )}gxe; $text = substr($text, 0, 50); @@ -339,7 +382,7 @@ sub CheckConfigParams } else { $vars->{$1}++; }/eg; - s/UserCommandRun\("([^"]*)"\)/if ( !defined($vars->{$1}) ) { + s/UserCommandRun\("([^"]*)"/if ( !defined($vars->{$1}) ) { print("Unexpected Conf var $1 in $file\n"); $errors++; } else { @@ -373,6 +416,7 @@ sub CheckLangUsage open(F, $file) || die("can't open $file"); binmode(F); while ( ) { + next if ( /^\s*#/ ); s/\$Lang->{([^}]*)}/$vars->{$1} = 1;/eg; } close(F); @@ -387,6 +431,7 @@ sub CheckLangUsage s/\$Lang{([^}]*)}/ my $var = $1; next if ( $var =~ m{^(Reason_|Status_|backupType_)} ); + next if ( $var eq "Documentation" ); if ( !defined($vars->{$var}) ) { print("Unexpected Lang var $var in $f\n"); $errors++; @@ -418,7 +463,7 @@ sub CheckLangTags my($en, $enVars) = LangParse("lib/BackupPC/Lang/en.pm"); my($errors); - foreach my $lang ( qw(fr.pm de.pm es.pm it.pm) ) { + foreach my $lang ( qw(fr.pm de.pm es.pm it.pm nl.pm) ) { my($d, $dVars) = LangParse("lib/BackupPC/Lang/$lang"); foreach my $v1 ( @$en ) { my $v2 = shift(@$d);