X-Git-Url: http://git.rot13.org/?p=BackupPC.git;a=blobdiff_plain;f=makeDist;h=9b638fef40d2c8cd302eb72040138a66cd277b37;hp=3e8ff3a0f42a219a7ef5dd21761a9a7441ca52eb;hb=5b3e6091d542c2e7445d5dd511cdf6e20aec8b8d;hpb=8f5625f9cdf47f8e04be654c4954838b2df3e26d diff --git a/makeDist b/makeDist index 3e8ff3a..9b638fe 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 # # 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.0beta0_CVS"; -my $ReleaseDate = "29 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 @@ -87,12 +97,17 @@ my @PerlSrc = qw( 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 @@ -163,7 +178,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 ) ) { @@ -194,6 +211,7 @@ foreach my $file ( (@PerlSrc, 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 @@ -210,6 +228,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 @@ -235,21 +255,22 @@ sub InstallFile # # fixup for perl 5.6.x # - if ( !/A NAME="item_%24Conf/i ) { + if ( !/A NAME="item_(%|_)24Conf/i ) { s/\$Conf{([^}]*)}/ defined($ConfName{$1}) ? "\L\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/ig; s/^
/

/; # - # fixup for perl 5.8.x + # Fixup for perl 5.8.x first one no longer needed after + # fix in CSS) # - if ( /^<\/dt>/ ) { - $_ .= ; - s/^(<\/dt>\n

)/$1

/s; - } +# if ( /^<\/dt>/ ) { +# $_ .= ; +# s/^(<\/dt>\n

)/$1

/s; +# } s/^

  • <\/li>/
  • /; } if ( /__CONFIGPOD__/ ) { @@ -257,14 +278,14 @@ 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/ && /^(\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}__USEFHS__;\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 =~ /BackupPC_Admin/ && /(my *\$installDir *= *)'.*'/ ) { print OUT "$1'__INSTALLDIR__/lib';\n"; } else { @@ -359,7 +380,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 { @@ -393,6 +414,7 @@ sub CheckLangUsage open(F, $file) || die("can't open $file"); binmode(F); while ( ) { + next if ( /^\s*#/ ); s/\$Lang->{([^}]*)}/$vars->{$1} = 1;/eg; } close(F); @@ -407,6 +429,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++; @@ -438,7 +461,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);