X-Git-Url: http://git.rot13.org/?p=BackupPC.git;a=blobdiff_plain;f=makeDist;h=edc3c437c1fdc37ba653851959adc4757587b0fa;hp=8c547a495678834f7d194db739a1850edf276cae;hb=e951f787a66c5bd9e9955c3f657a5b44289c0fe1;hpb=a7e968ce327855f2ba2624ca8517069a936c9b5b diff --git a/makeDist b/makeDist index 8c547a4..edc3c43 100755 --- a/makeDist +++ b/makeDist @@ -16,7 +16,7 @@ # Craig Barratt # # COPYRIGHT -# Copyright (C) 2001-2003 Craig Barratt +# Copyright (C) 2001-2004 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 @@ -38,18 +38,18 @@ use strict; use File::Path; use File::Copy; +use Getopt::Std; umask(0022); -my $Version = "2.1.0_CVS"; -my $ReleaseDate = "3 Jul 2003"; +my $Version = "2.1.0"; +my $ReleaseDate = "20 Jun 2004"; my $DistDir = "dist/BackupPC-$Version"; my @PerlSrc = qw( bin/BackupPC bin/BackupPC_archive - bin/BackupPC_archivecd - bin/BackupPC_archivetape + bin/BackupPC_archiveHost bin/BackupPC_dump bin/BackupPC_link bin/BackupPC_nightly @@ -91,15 +91,24 @@ my @PerlSrc = qw( 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/Xfer/Archive.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 ); +my %opts; +if ( !getopts("l", \%opts) || @ARGV != 0 ) { + print("usage: $0 [-l]\n"); + exit(1); +} + # # Check config parameters # @@ -107,15 +116,37 @@ my $ConfVars = {}; 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. +# $ConfVars->{BackupPCUser} = 2; -$ConfVars->{CgiDir} = 2; -$ConfVars->{InstallDir} = 2; -$ConfVars->{CgiImageDir} = 2; +$ConfVars->{CgiDir} = 2; +$ConfVars->{InstallDir} = 2; +$ConfVars->{CgiImageDir} = 2; + +# +# These config parameters are used in the code to be backward compatible, +# but are not present in the current config file, so ignore them. +# +$ConfVars->{BlackoutHourBegin} = 2; +$ConfVars->{BlackoutHourEnd} = 2; +$ConfVars->{BlackoutWeekDays} = 2; +$ConfVars->{RsyncLogLevel} = 2; + foreach my $file ( @PerlSrc ) { $errCnt += CheckConfigParams($file, $ConfVars, 1); } -$errCnt += CheckLangUsage(); -exit(1) if ( $errCnt ); +if ( !$opts{l} ) { + $errCnt += CheckLangUsage(); + $errCnt += CheckLangTags(); +} +if ( $errCnt ) { + print("Exiting because of errors\n"); + exit(1) +} $errCnt = 0; foreach my $var ( sort(keys(%$ConfVars) ) ) { @@ -123,7 +154,10 @@ foreach my $var ( sort(keys(%$ConfVars) ) ) { printf("Unused config parameter $var\n"); $errCnt++; } -exit(1) if ( $errCnt ); +if ( $errCnt ) { + print("Exiting because of errors\n"); + exit(1) +} rmtree($DistDir, 0, 0); mkpath($DistDir, 0, 0777); @@ -155,6 +189,7 @@ 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 @@ -176,6 +211,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 @@ -194,14 +231,30 @@ 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; @@ -216,6 +269,8 @@ sub InstallFile print OUT "$1'__INSTALLDIR__',\n"; } elsif ( $file =~ /Lib.pm/ && /(.*LibDir *=> .*)'.*',/ ) { print OUT "$1'__INSTALLDIR__',\n"; + } elsif ( $file =~ /BackupPC_Admin/ && /(my *\$installDir *= *)'.*'/ ) { + print OUT "$1'__INSTALLDIR__/lib';\n"; } else { print OUT; } @@ -263,7 +318,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); @@ -346,11 +401,8 @@ sub CheckLangUsage } close(F); } - # CB: disable other lang checks for now - # - # foreach my $f ( ) { - # - foreach my $f ( ) { + + foreach my $f ( ) { my $done = {}; open(F, $f) || die("can't open $f\n"); binmode(F); @@ -359,6 +411,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++; @@ -380,3 +433,107 @@ sub CheckLangUsage } return $errors; } + +# +# Pedantically check that all the html tags in each language file +# match. +# +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) ) { + my($d, $dVars) = LangParse("lib/BackupPC/Lang/$lang"); + foreach my $v1 ( @$en ) { + my $v2 = shift(@$d); + if ( $v1->{var} ne $v2->{var} ) { + print("Botch: got $lang var $v2->{var} vs en.pm $v1->{var}\n"); + exit; + } + 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"); + $errors++; + } + } + } + return $errors; +} + +sub LangTextStrip +{ + my($t) = @_; + + $t = "" if ( $t !~ /<.*>/ ); + $t =~ s/^[^<]*])[^<]*[^<]*$/>/; + $t =~ s/(value=)"[^"]*"/$1""/sg; + $t =~ s/({h[12]\()"[^"]*"/$1""/g; + $t =~ s/ENG[\s\n]*//sg; + $t =~ s/^(< ) { + if ( /^#/ && !defined($endLine) ) { + if ( $comment ) { + $out .= $_; + } else { + if ( $out ne "" ) { + $allVars->{$var} = @lang if ( defined($var) ); + push(@lang, { + text => $out, + var => $var, + }); + } + $var = undef; + $comment = 1; + $out = $_; + } + } elsif ( /^\s*\$Lang\{([^}]*)/ ) { + $comment = 0; + if ( defined($var) ) { + $allVars->{$var} = @lang if ( defined($var) ); + push(@lang, { + text => $out, + var => $var, + }); + $out = $_; + } else { + $out .= $_; + } + $var = $1; + $endLine = $1 if ( /^\s*\$Lang\{[^}]*} *= *<<(.*);/ ); + $endLine = $1 if ( /^\s*\$Lang\{[^}]*} *= *<<'(.*)';/ ); + } else { + $endLine = undef if ( defined($endLine) && /^\Q$endLine[\n\r]*$/ ); + $out .= $_; + } + } + if ( $out ne "" ) { + $allVars->{$var} = @lang if ( defined($var) ); + push(@lang, { + text => $out, + var => $var, + }); + } + close(C); + foreach my $v ( @lang ) { + if ( $v->{text} =~ /\$Lang{$v->{var}}\s*=\s*(.*)/s ) { + $v->{val} = $1; + } + } + return (\@lang, $allVars); +}