X-Git-Url: http://git.rot13.org/?p=BackupPC.git;a=blobdiff_plain;f=makeDist;h=7492a032456625c6e141f492337a8eef26d6299b;hp=8c547a495678834f7d194db739a1850edf276cae;hb=613c6ee622bcfc96a126d8df00b1455f4cdb4b97;hpb=a7e968ce327855f2ba2624ca8517069a936c9b5b

diff --git a/makeDist b/makeDist
index 8c547a4..7492a03 100755
--- a/makeDist
+++ b/makeDist
@@ -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 $ReleaseDate = "8 Feb 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,6 +91,7 @@ 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/Xfer/Archive.pm
     lib/BackupPC/Xfer/Smb.pm
     lib/BackupPC/Xfer/Tar.pm
@@ -100,6 +101,12 @@ my @PerlSrc = qw(
     cgi-bin/BackupPC_Admin
 );
 
+my %opts;
+if ( !getopts("l", \%opts) || @ARGV != 0 ) {
+    print("usage: $0 [-l]\n");
+    exit(1);
+}
+
 #
 # Check config parameters
 #
@@ -107,15 +114,34 @@ my $ConfVars = {};
 my $errCnt;
 
 $errCnt += CheckConfigParams("conf/config.pl", $ConfVars, 0);
+
+#
+# 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;
+
 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 +149,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);
@@ -216,6 +245,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;
 	    }
@@ -346,11 +377,8 @@ sub CheckLangUsage
 	}
 	close(F);
     }
-    # CB: disable other lang checks for now
-    #
-    # foreach my $f ( <lib/BackupPC/Lang/*.pm> ) {
-    #
-    foreach my $f ( <lib/BackupPC/Lang/en.pm> ) {
+
+    foreach my $f ( <lib/BackupPC/Lang/*.pm> ) {
         my $done = {};
         open(F, $f) || die("can't open $f\n");
 	binmode(F);
@@ -380,3 +408,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) ) {
+	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/^[^<]*</</s;
+    $t =~ s/([}>])[^<]*</$1</g;
+    $t =~ s/>[^<]*$/>/;
+    $t =~ s/(value=)"[^"]*"/$1""/sg;
+    $t =~ s/({h[12]\()"[^"]*"/$1""/g;
+    $t =~ s/ENG[\s\n]*//sg;
+    $t =~ s/^(<<EOF;\n)[^<]*/$1/g;
+    return $t;
+}
+
+sub LangParse
+{
+    my($file) = @_;
+    open(C, $file) || die("can't open $file");
+    binmode(C);
+    my($out, @lang, $var);
+    my $comment = 1;
+    my $allVars = {};
+    my $endLine = undef;
+    while ( <C> ) {
+        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);
+}