X-Git-Url: http://git.rot13.org/?p=BackupPC.git;a=blobdiff_plain;f=makeDist;h=ebc7a66352625b107758c91d65ac5277b21e3773;hp=26799479eaef30bfbc31e07e5d8a0c6102122417;hb=d1bfa4d92bec24954f2e7877f6531644bb84e8f3;hpb=523fdef21f0ca0d691a0b8c95ca76b18a1adb60a diff --git a/makeDist b/makeDist index 2679947..ebc7a66 100755 --- a/makeDist +++ b/makeDist @@ -1,4 +1,4 @@ -#!/bin/perl +#!/usr/bin/env perl # # makeDist: Build a BackupPC distribution # @@ -14,13 +14,13 @@ # # 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. +# Use the -nolangCheck option to turn off that behavior. # # AUTHOR # Craig Barratt # # COPYRIGHT -# Copyright (C) 2001-2006 Craig Barratt +# Copyright (C) 2001-2010 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 @@ -37,23 +37,28 @@ # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA # #======================================================================== -# use strict; use File::Path; use File::Copy; -use Getopt::Std; +use Getopt::Long; +use Data::Dumper; -umask(0022); +use lib "./lib"; +use BackupPC::Lib; +use BackupPC::Config::Meta qw(:all); -my $Version = "3.0.0alpha"; -my $ReleaseDate = "23 Jan 2006"; -my $DistDir = "dist/BackupPC-$Version"; +my $bpc; +die("BackupPC::Lib->new failed\n") + if ( !($bpc = BackupPC::Lib->new(".", ".", "./conf", 1)) ); + +umask(0022); my @PerlSrc = qw( bin/BackupPC bin/BackupPC_archive bin/BackupPC_archiveHost + bin/BackupPC_archiveStart bin/BackupPC_attribPrint bin/BackupPC_dump bin/BackupPC_fixupBackupSummary @@ -66,7 +71,6 @@ my @PerlSrc = qw( bin/BackupPC_tarExtract bin/BackupPC_tarCreate bin/BackupPC_tarPCCopy - bin/BackupPC_compressPool bin/BackupPC_zipCreate bin/BackupPC_zcat lib/BackupPC/Attrib.pm @@ -92,37 +96,66 @@ my @PerlSrc = qw( lib/BackupPC/CGI/RestoreFile.pm lib/BackupPC/CGI/RestoreInfo.pm lib/BackupPC/CGI/Restore.pm + lib/BackupPC/CGI/RSS.pm lib/BackupPC/CGI/StartServer.pm lib/BackupPC/CGI/StartStopBackup.pm lib/BackupPC/CGI/StopServer.pm lib/BackupPC/CGI/Summary.pm lib/BackupPC/CGI/View.pm lib/BackupPC/Config/Meta.pm + lib/BackupPC/Lang/cz.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/pl.pm lib/BackupPC/Lang/pt_br.pm + lib/BackupPC/Lang/zh_CN.pm lib/BackupPC/Storage/Text.pm + lib/BackupPC/Xfer.pm lib/BackupPC/Xfer/Archive.pm - lib/BackupPC/Xfer/BackupPCd.pm - lib/BackupPC/Xfer/Smb.pm - lib/BackupPC/Xfer/Tar.pm + lib/BackupPC/Xfer/Ftp.pm + lib/BackupPC/Xfer/Protocol.pm lib/BackupPC/Xfer/Rsync.pm lib/BackupPC/Xfer/RsyncDigest.pm lib/BackupPC/Xfer/RsyncFileIO.pm + lib/BackupPC/Xfer/Smb.pm + lib/BackupPC/Xfer/Tar.pm lib/BackupPC/Zip/FileMember.pm + lib/Net/FTP/AutoReconnect.pm + lib/Net/FTP/RetrHandle.pm cgi-bin/BackupPC_Admin ); my %opts; -if ( !getopts("l", \%opts) || @ARGV != 0 ) { - print("usage: $0 [-l]\n"); +$opts{langCheck} = 1; +$opts{syntaxCheck} = 1; +if ( !GetOptions( + \%opts, + "langCheck!", + "syntaxCheck!", + "version=s", + "releasedate=s", + ) || @ARGV != 0 + || !defined($opts{version}) + ) { + print STDERR <{BackupPCUser} = 2; $ConfVars->{CgiDir} = 2; +$ConfVars->{TopDir} = 2; +$ConfVars->{LogDir} = 2; +$ConfVars->{ConfDir} = 2; $ConfVars->{InstallDir} = 2; $ConfVars->{CgiImageDir} = 2; +$ConfVars->{ClientCharsetLegacy} = 2; # actually used # # These config parameters are used in the code to be backward compatible, @@ -150,10 +191,23 @@ $ConfVars->{BlackoutHourEnd} = 2; $ConfVars->{BlackoutWeekDays} = 2; $ConfVars->{RsyncLogLevel} = 2; +if ( $opts{syntaxCheck} ) { + system("perl -Ilib -c conf/config.pl >& /dev/null") + && die("$0: conf/config.pl contains a syntax error (or someone killed me)\n"); +} foreach my $file ( @PerlSrc ) { + if ( $opts{syntaxCheck} ) { + system("perl -Ilib -c $file >& /dev/null") + && die("$0: $file contains a syntax error (or someone killed me)\n"); + } + # + # Skip checking of bundled libraries not explicitly part of + # BackupPC + # + next if ( $file =~ m/lib\/Net\/FTP/ ); $errCnt += CheckConfigParams($file, $ConfVars, 1); } -if ( !$opts{l} ) { +if ( !$opts{langCheck} ) { $errCnt += CheckLangUsage(); $errCnt += CheckLangTags(); } @@ -176,19 +230,21 @@ if ( $errCnt ) { rmtree($DistDir, 0, 0); mkpath($DistDir, 0, 0777); -foreach my $dir ( qw(bin doc conf images init.d/src cgi-bin +foreach my $dir ( qw(bin doc conf images init.d/src cgi-bin httpd/src lib/BackupPC/CGI lib/BackupPC/Config lib/BackupPC/Lang lib/BackupPC/Storage lib/BackupPC/Xfer lib/BackupPC/Zip + lib/Net/FTP ) ) { mkpath("$DistDir/$dir", 0, 0777); } my %ConfName; my $ConfPod = config2pod(); + rmtree("doc", 0, 0); mkpath("doc", 0, 0777); InstallFile("doc-src/BackupPC.pod", "doc/BackupPC.pod"); @@ -201,19 +257,26 @@ pod2html("doc/BackupPC.pod", "--outfile=doc/BackupPC.html"); foreach my $file ( (@PerlSrc, - , + , + , + , qw( conf/config.pl conf/hosts conf/BackupPC_stnd.css + conf/BackupPC_stnd_orig.css + conf/sorttable.js init.d/README init.d/src/debian-backuppc + init.d/src/freebsd-backuppc + init.d/src/freebsd-backuppc2 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 + httpd/src/BackupPC.conf doc/BackupPC.pod doc/BackupPC.html README @@ -240,7 +303,7 @@ sub InstallFile my($file, $dest) = @_; unlink($dest) if ( -d $dest ); - if ( $file =~ /\.gif/ ) { + if ( $file =~ /\.gif/ || $file =~ /\.png/ || $file =~ /\.ico/ ) { die("can't copy($file, $dest)\n") unless copy($file, $dest); } else { open(FILE, $file) || die("can't open $file for reading\n"); @@ -253,24 +316,15 @@ sub InstallFile s/__RELEASEDATE__/$ReleaseDate/g; if ( $file =~ /BackupPC\.html$/ ) { # - # fixup for perl 5.6.x + # fixup for conf links # - if ( !/A NAME="item_(%|_)24Conf/i ) { + if ( !/a name="_conf/i ) { s/\$Conf{([^}]*)}/ defined($ConfName{$1}) - ? "\L\E\$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__/ ) { @@ -282,8 +336,12 @@ sub InstallFile 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*ConfDir\s*=\>\s*\$confDir eq.*)'.*'(.*)/ ) { + print OUT "$1'__CONFDIR__'$2\n"; } elsif ( $file =~ /Lib.pm/ && /^(\s*my \$useFHS\s*=\s*)\d;/ ) { print OUT "${1}0;\n"; + } elsif ( $file =~ /Lib.pm/ && /(.*Version *=> .*)'[\w\d\.]+',/ ) { + print OUT "$1'$Version',\n"; } elsif ( $file =~ /configure.pl/ && /__CONFIGURE_BIN_LIST__/ ) { print OUT " ", join("\n ", grep(/^bin\//, @PerlSrc)), "\n"; } elsif ( $file =~ /configure.pl/ && /__CONFIGURE_LIB_LIST__/ ) { @@ -337,11 +395,9 @@ sub config2pod s/([^;])\s*$/$1 .../; } push(@conf, $_); - my $text = "\$Conf{$var}"; - $text =~ s/\s+/_/sg; - $text =~ s{(\W)}{sprintf("%%%02X", ord($1) )}gxe; - $text = substr($text, 0, 50); - $ConfName{$var} = "item_$text"; + my $text = "_conf_${var}_"; + $text =~ s{[\W\s]}{_}g; + $ConfName{$var} = "$text"; } elsif ( /^$/ ) { if ( $str ne "" && @conf ) { $out .= "=item " . join("\n\n=item ", @conf) . "\n\n"; @@ -399,6 +455,87 @@ sub CheckConfigParams return $errors; } +sub CheckMetaDataVsConfig +{ + my($confVars, $file) = @_; + my $done = {}; + my $errors; + + # + # Check that the meta file mentions all the config + # parameters + # + open(F, $file) || die("can't open $file"); + + while ( ) { + next if ( !/^\s{4}(\w+)\s+=>/ ); + if ( $confVars->{$1} ) { + $done->{$1} = 1; + next; + } + next if ( $1 eq "Hosts" ); + print("$file has $1 but missing from conf/config.pl\n"); + $errors++; + } + close(F); + foreach my $v ( keys(%$confVars) ) { + next if ( $done->{$v} ); + print("$file missing $v from conf/config.pl\n"); + $errors++; + } + + # + # Do extra checks that the CgiUserConfigEdit hash in the Meta + # file matches the config file + # + foreach my $p ( keys(%{$ConfigMeta{CgiUserConfigEdit}{child}}) ) { + if ( !defined($bpc->{Conf}{CgiUserConfigEdit}{$p}) ) { + print("lib/BackupPC/Config/Meta.pm has $p in CgiUserConfigEdit," + . " but conf/config.pl CgiUserConfigEdit does not\n"); + $errors++; + } + } + foreach my $p ( keys(%{$bpc->{Conf}{CgiUserConfigEdit}}) ) { + if ( !defined($ConfigMeta{CgiUserConfigEdit}{child}{$p}) ) { + print("conf/config.pl CgiUserConfigEdit has $p, but" + . " lib/BackupPC/Config/Meta.pm does not\n"); + $errors++; + } + } + return $errors; +} + +sub CheckEditorVsConfig +{ + my($confVars, $file) = @_; + my $done = {}; + my $errors; + + # + # Check that the config editor file mentions all the config + # parameters + # + open(F, $file) || die("can't open $file"); + + while ( ) { + next if ( !/name\s*=>\s*"(\w+)"/ ); + if ( $confVars->{$1} ) { + $done->{$1} = 1; + next; + } + next if ( $1 eq "Hosts" ); + print("$file has $1 but missing from conf/config.pl\n"); + $errors++; + } + close(F); + foreach my $v ( keys(%$confVars) ) { + next if ( $done->{$v} ); + print("$file missing $v from conf/config.pl\n"); + $errors++; + } + return $errors; +} + # # Make sure that every lang variable in cgi-bin/BackupPC_Admin matches # the strings in each lib/BackupPC/Lang/*.pm file. This makes sure @@ -411,13 +548,15 @@ sub CheckLangUsage foreach my $file ( ( qw(cgi-bin/BackupPC_Admin bin/BackupPC_sendEmail), - + , + , ) ) { open(F, $file) || die("can't open $file"); binmode(F); while ( ) { next if ( /^\s*#/ ); s/\$Lang->{([^}]*)}/$vars->{$1} = 1;/eg; + s/(text|comment)\s*=>\s*"(CfgEdit_.*)"/$vars->{$2} = 1;/eg; } close(F); } @@ -430,7 +569,7 @@ sub CheckLangUsage s/#.*//g; s/\$Lang{([^}]*)}/ my $var = $1; - next if ( $var =~ m{^(Reason_|Status_|backupType_)} ); + next if ( $var =~ m{^(Reason_|Status_|backupType_|Disabled_)} ); next if ( $var eq "Documentation" ); if ( !defined($vars->{$var}) ) { print("Unexpected Lang var $var in $f\n"); @@ -463,7 +602,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 nl.pm) ) { + foreach my $lang ( qw(cz.pm fr.pm de.pm es.pm it.pm nl.pm pl.pm pt_br.pm zh_CN.pm) ) { my($d, $dVars) = LangParse("lib/BackupPC/Lang/$lang"); foreach my $v1 ( @$en ) { my $v2 = shift(@$d); @@ -474,7 +613,11 @@ sub CheckLangTags my $t1 = LangTextStrip($v1->{val}); my $t2 = LangTextStrip($v2->{val}); if ( $t1 ne $t2 ) { - print("$v1->{var}: got en.pm $t1\nvs $lang $t2\n\n"); + my $i; + for ( $i = 0 ; $i < length($t1) ; $i++ ) { + last if ( substr($t1, 0, $i) ne substr($t2, 0, $i) ); + } + print("$v1->{var}: ($i) got en.pm $t1\nvs $lang $t2\n\n"); $errors++; } }