X-Git-Url: http://git.rot13.org/?p=BackupPC.git;a=blobdiff_plain;f=makeDist;h=fc16eef86f4402e44e60e9131ae833b18072bb2a;hp=55ae42c8e17f916c35553cfd68d9201f76bedb0d;hb=dcb39df8e33e09eabfb4eae471c2e6447094d0e2;hpb=3ae3b7557db4829ebfc6f580ceac30376717db6a;ds=sidebyside

diff --git a/makeDist b/makeDist
index 55ae42c..fc16eef 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 <cbarratt@users.sourceforge.net>
 #
 # COPYRIGHT
-#   Copyright (C) 2001-2004  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 = "13 Mar 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
@@ -82,17 +92,23 @@ 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/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
@@ -118,11 +134,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;
 
@@ -163,7 +186,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
 		) ) {
@@ -188,11 +213,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
@@ -209,6 +236,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
@@ -227,28 +256,29 @@ sub InstallFile
 	binmode(FILE);
 	binmode(OUT);
 	while ( <FILE> ) {
-	    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$/ ) {
 		#
 		# fixup for perl 5.6.x
 		#
-		if ( !/A NAME="item_%24Conf/i ) {
+		if ( !/A NAME="item_(%|_)24Conf/i ) {
 		    s/\$Conf{([^}]*)}/
 			defined($ConfName{$1})
 			    ? "\L<A HREF=\"#$ConfName{$1}\">\E\$Conf{$1}<\/A>"
 			    : "\$Conf{$1}"/eg;
 		}
-		s/<(A NAME="item_%24Conf%7B.*?%7D).*?">/\L<$1">/ig;
+		s/<(A NAME="item_(%|_)24Conf(%|_)7B(.*?)(%|_)7D).*?">/\L<A NAME="item_%24Conf%7b$4%7d">/ig;
 		s/^<DD>/<DD><P>/;
 		#
-		# fixup for perl 5.8.x
+		# Fixup for perl 5.8.x first one no longer needed after
+		# fix in CSS)
 		#
-		if ( /^<\/dt>/ ) {
-		    $_ .= <FILE>;
-		    s/^(<\/dt>\n<dd>)/$1<p>/s;
-		}
+#		if ( /^<\/dt>/ ) {
+#		    $_ .= <FILE>;
+#		    s/^(<\/dt>\n<dd>)/$1<p>/s;
+#		}
 		s/^<li><\/li>/<li>/;
 	    }
 	    if ( /__CONFIGPOD__/ ) {
@@ -256,14 +286,16 @@ sub InstallFile
 	    } 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 {
@@ -358,7 +390,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 {
@@ -375,6 +407,68 @@ 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++;
+    }
+    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
@@ -392,7 +486,9 @@ sub CheckLangUsage
 	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);
     }
@@ -406,6 +502,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++;
@@ -437,7 +534,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);
@@ -448,7 +545,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++;
 	    }
 	}