X-Git-Url: http://git.rot13.org/?p=BackupPC.git;a=blobdiff_plain;f=makeDist;h=b8f4361974cdffee27cf9957a7ec24479768d7f6;hp=9b638fef40d2c8cd302eb72040138a66cd277b37;hb=caa62f13e4ab659d296afbce7bcd01c3c77cf7bb;hpb=5b3e6091d542c2e7445d5dd511cdf6e20aec8b8d

diff --git a/makeDist b/makeDist
index 9b638fe..b8f4361 100755
--- a/makeDist
+++ b/makeDist
@@ -43,11 +43,18 @@ use strict;
 use File::Path;
 use File::Copy;
 use Getopt::Std;
+use lib "./lib";
+use BackupPC::Lib;
+use BackupPC::Config::Meta qw(:all);
+
+my $bpc;
+die("BackupPC::Lib->new failed\n")
+        if ( !($bpc = BackupPC::Lib->new(".", ".", "./conf", 1)) );
 
 umask(0022);
 
-my $Version     = "3.0.0alpha";
-my $ReleaseDate = "23 Jan 2006";
+my $Version     = "3.0.0beta3";
+my $ReleaseDate = "3 Dec 2006";
 my $DistDir     = "dist/BackupPC-$Version";
 
 my @PerlSrc = qw(
@@ -92,6 +99,7 @@ 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
@@ -133,11 +141,18 @@ $errCnt += CheckConfigParams("conf/config.pl", $ConfVars, 0);
 
 $errCnt += CheckConfigParams("doc-src/BackupPC.pod", $ConfVars, 1);
 
+$errCnt += CheckMetaDataVsConfig($ConfVars, "lib/BackupPC/Config/Meta.pm");
+
+$errCnt += CheckEditorVsConfig($ConfVars, "lib/BackupPC/CGI/EditConfig.pm");
+
 #
 # These config parameters are not used in the code, so ignore them.
 #
 $ConfVars->{BackupPCUser} = 2;
 $ConfVars->{CgiDir}       = 2;
+$ConfVars->{TopDir}       = 2;
+$ConfVars->{LogDir}       = 2;
+$ConfVars->{ConfDir}      = 2;
 $ConfVars->{InstallDir}   = 2;
 $ConfVars->{CgiImageDir}  = 2;
 
@@ -201,11 +216,13 @@ pod2html("doc/BackupPC.pod",
         "--outfile=doc/BackupPC.html");
 
 foreach my $file ( (@PerlSrc,
-	    <images/*>,
+	    <images/*.gif>,
+	    <images/*.png>,
 	    qw(
 		conf/config.pl
 		conf/hosts
 		conf/BackupPC_stnd.css
+		conf/BackupPC_stnd_orig.css
 		init.d/README
 		init.d/src/debian-backuppc
 		init.d/src/gentoo-backuppc
@@ -240,7 +257,7 @@ sub InstallFile
     my($file, $dest) = @_;
 
     unlink($dest) if ( -d $dest );
-    if ( $file =~ /\.gif/ ) {
+    if ( $file =~ /\.gif/ || $file =~ /\.png/ ) {
         die("can't copy($file, $dest)\n") unless copy($file, $dest);
     } else {
 	open(FILE, $file)   || die("can't open $file for reading\n");
@@ -282,10 +299,14 @@ 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*my \$useFHS\s*=\s*)\d;/ ) {
-		print OUT "${1}__USEFHS__;\n";
-	    } elsif ( $file =~ /Lib.pm/ && /(.*Version *=> .*)'[\w\d\.]+',/ ) {
-		print OUT "$1'$Version',\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__/ ) {
+		print OUT "        ", join("\n        ", grep(/^lib\//, @PerlSrc)), "\n";
 	    } elsif ( $file =~ /BackupPC_Admin/ && /(my *\$installDir *= *)'.*'/ ) {
 		print OUT "$1'__INSTALLDIR__/lib';\n";
 	    } else {
@@ -397,6 +418,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 ( <F> ) {
+        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 ( <F> ) {
+        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
@@ -409,13 +511,15 @@ sub CheckLangUsage
 
     foreach my $file ( (
 		qw(cgi-bin/BackupPC_Admin bin/BackupPC_sendEmail),
-		<lib/BackupPC/CGI/*pm>
+		<lib/BackupPC/CGI/*pm>,
+		<lib/BackupPC/Lang/en.pm>,
 	    ) ) {
 	open(F, $file) || die("can't open $file");
 	binmode(F);
 	while ( <F> ) {
 	    next if ( /^\s*#/ );
 	    s/\$Lang->{([^}]*)}/$vars->{$1} = 1;/eg;
+	    s/(text|comment)\s*=>\s*"(CfgEdit_.*)"/$vars->{$2} = 1;/eg;
 	}
 	close(F);
     }
@@ -428,7 +532,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");
@@ -472,7 +576,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++;
 	    }
 	}