X-Git-Url: http://git.rot13.org/?p=BackupPC.git;a=blobdiff_plain;f=makeDist;h=8c547a495678834f7d194db739a1850edf276cae;hp=c6ebf3d4be1c422f12312174584efa6c830b12b6;hb=72b87b178ae8dcc10f1ae0f441d13e30d5f1ecf1;hpb=3dc33e5f39430031766adf3c5bb2ffc649ee9100

diff --git a/makeDist b/makeDist
index c6ebf3d..8c547a4 100755
--- a/makeDist
+++ b/makeDist
@@ -41,12 +41,15 @@ use File::Copy;
 
 umask(0022);
 
-my $Version     = "2.0.0_CVS";
-my $ReleaseDate = "18 Jan 2003";
+my $Version     = "2.1.0_CVS";
+my $ReleaseDate = "3 Jul 2003";
 my $DistDir     = "dist/BackupPC-$Version";
 
 my @PerlSrc = qw(
     bin/BackupPC
+    bin/BackupPC_archive
+    bin/BackupPC_archivecd
+    bin/BackupPC_archivetape
     bin/BackupPC_dump
     bin/BackupPC_link
     bin/BackupPC_nightly
@@ -62,10 +65,33 @@ my @PerlSrc = qw(
     lib/BackupPC/Attrib.pm
     lib/BackupPC/FileZIO.pm
     lib/BackupPC/Lib.pm
-    lib/BackupPC/Lang/en.pm
-    lib/BackupPC/Lang/fr.pm
     lib/BackupPC/PoolWrite.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/EmailSummary.pm
+    lib/BackupPC/CGI/GeneralInfo.pm
+    lib/BackupPC/CGI/HostInfo.pm
+    lib/BackupPC/CGI/Lib.pm
+    lib/BackupPC/CGI/LOGlist.pm
+    lib/BackupPC/CGI/Queue.pm
+    lib/BackupPC/CGI/ReloadServer.pm
+    lib/BackupPC/CGI/RestoreFile.pm
+    lib/BackupPC/CGI/RestoreInfo.pm
+    lib/BackupPC/CGI/Restore.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/Lang/de.pm
+    lib/BackupPC/Lang/en.pm
+    lib/BackupPC/Lang/es.pm
+    lib/BackupPC/Lang/fr.pm
+    lib/BackupPC/Xfer/Archive.pm
     lib/BackupPC/Xfer/Smb.pm
     lib/BackupPC/Xfer/Tar.pm
     lib/BackupPC/Xfer/Rsync.pm
@@ -91,6 +117,7 @@ foreach my $file ( @PerlSrc ) {
 $errCnt += CheckLangUsage();
 exit(1) if ( $errCnt );
 
+$errCnt = 0;
 foreach my $var ( sort(keys(%$ConfVars) ) ) {
     next if ( $ConfVars->{$var} >= 2 || $var =~ /^\$/ );
     printf("Unused config parameter $var\n");
@@ -101,8 +128,12 @@ exit(1) if ( $errCnt );
 rmtree($DistDir, 0, 0);
 mkpath($DistDir, 0, 0777);
 
-foreach my $dir ( qw(bin lib/BackupPC/Xfer lib/BackupPC/Zip lib/BackupPC/Lang
-		     doc conf images init.d/src cgi-bin) ) {
+foreach my $dir ( qw(bin doc conf images init.d/src cgi-bin
+		     lib/BackupPC/CGI
+		     lib/BackupPC/Lang
+		     lib/BackupPC/Xfer
+		     lib/BackupPC/Zip
+		) ) {
     mkpath("$DistDir/$dir", 0, 0777);
 }
 
@@ -126,8 +157,11 @@ foreach my $file ( (@PerlSrc,
 		conf/hosts
 		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/solaris-backuppc
+		init.d/src/suse-backuppc
 		doc/BackupPC.pod
 		doc/BackupPC.html
 		README
@@ -157,6 +191,8 @@ sub InstallFile
     } else {
 	open(FILE, $file)   || die("can't open $file for reading\n");
 	open(OUT, ">$dest") || die("can't open $dest for writing\n");
+	binmode(FILE);
+	binmode(OUT);
 	while ( <FILE> ) {
 	    s/^# *Version \d+\.\d+[\.\w]*, released \d+ \w+ \d{4}\.?/# Version __VERSION__, released __RELEASEDATE__./;
 	    s/__VERSION__/$Version/g;
@@ -197,6 +233,7 @@ sub InstallFile
 sub config2pod
 {
     open(C, "conf/config.pl") || die("can't open conf/config.pl");
+    binmode(C);
     my($str, $out, $getHdr, @conf);
     my $first = 1;
     while ( <C> ) {
@@ -256,6 +293,7 @@ sub CheckConfigParams
     my $errors;
 
     open(F, $file) || die("can't open $file\n");
+    binmode(F);
     if ( $check ) {
         while ( <F> ) {
             s/\$(self|bpc)->{Conf}{([^}\$]+)}/if ( !defined($vars->{$2}) ) {
@@ -297,20 +335,30 @@ sub CheckLangUsage
     my $errors;
     my $vars = {};
 
-    open(F, "cgi-bin/BackupPC_Admin")
-                || die("can't open cgi-bin/BackupPC_Admin\n");
-    while ( <F> ) {
-        s/\$Lang->{([^}]*)}/$vars->{$1} = 1;/eg;
+    foreach my $file ( (
+		qw(cgi-bin/BackupPC_Admin bin/BackupPC_sendEmail),
+		<lib/BackupPC/CGI/*pm>
+	    ) ) {
+	open(F, $file) || die("can't open $file");
+	binmode(F);
+	while ( <F> ) {
+	    s/\$Lang->{([^}]*)}/$vars->{$1} = 1;/eg;
+	}
+	close(F);
     }
-    close(F);
-    foreach my $f ( <lib/BackupPC/Lang/*.pm> ) {
+    # CB: disable other lang checks for now
+    #
+    # foreach my $f ( <lib/BackupPC/Lang/*.pm> ) {
+    #
+    foreach my $f ( <lib/BackupPC/Lang/en.pm> ) {
         my $done = {};
         open(F, $f) || die("can't open $f\n");
+	binmode(F);
         while ( <F> ) {
             s/#.*//g;
             s/\$Lang{([^}]*)}/
 		    my $var = $1;
-		    next if ( $var =~ m{^(Reason_|Status_)} );
+		    next if ( $var =~ m{^(Reason_|Status_|backupType_)} );
                     if ( !defined($vars->{$var}) ) {
                         print("Unexpected Lang var $var in $f\n");
                         $errors++;