projects
/
BackupPC.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
3.1.0 changes:
[BackupPC.git]
/
makeDist
diff --git
a/makeDist
b/makeDist
index
6c081e5
..
c247b84
100755
(executable)
--- a/
makeDist
+++ b/
makeDist
@@
-20,7
+20,7
@@
# Craig Barratt <cbarratt@users.sourceforge.net>
#
# COPYRIGHT
# Craig Barratt <cbarratt@users.sourceforge.net>
#
# COPYRIGHT
-# Copyright (C) 2001-200
6
Craig Barratt
+# Copyright (C) 2001-200
7
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
#
# 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
@@
-53,14
+53,15
@@
die("BackupPC::Lib->new failed\n")
umask(0022);
umask(0022);
-my $Version = "3.
0.0beta
0";
-my $ReleaseDate = "
11 Jul 2006
";
+my $Version = "3.
1.
0";
+my $ReleaseDate = "
25 Nov 2007
";
my $DistDir = "dist/BackupPC-$Version";
my @PerlSrc = qw(
bin/BackupPC
bin/BackupPC_archive
bin/BackupPC_archiveHost
my $DistDir = "dist/BackupPC-$Version";
my @PerlSrc = qw(
bin/BackupPC
bin/BackupPC_archive
bin/BackupPC_archiveHost
+ bin/BackupPC_archiveStart
bin/BackupPC_attribPrint
bin/BackupPC_dump
bin/BackupPC_fixupBackupSummary
bin/BackupPC_attribPrint
bin/BackupPC_dump
bin/BackupPC_fixupBackupSummary
@@
-112,7
+113,9
@@
my @PerlSrc = qw(
lib/BackupPC/Lang/fr.pm
lib/BackupPC/Lang/it.pm
lib/BackupPC/Lang/nl.pm
lib/BackupPC/Lang/fr.pm
lib/BackupPC/Lang/it.pm
lib/BackupPC/Lang/nl.pm
+ lib/BackupPC/Lang/pl.pm
lib/BackupPC/Lang/pt_br.pm
lib/BackupPC/Lang/pt_br.pm
+ lib/BackupPC/Lang/zh_CN.pm
lib/BackupPC/Storage/Text.pm
lib/BackupPC/Xfer/Archive.pm
lib/BackupPC/Xfer/BackupPCd.pm
lib/BackupPC/Storage/Text.pm
lib/BackupPC/Xfer/Archive.pm
lib/BackupPC/Xfer/BackupPCd.pm
@@
-155,6
+158,7
@@
$ConfVars->{LogDir} = 2;
$ConfVars->{ConfDir} = 2;
$ConfVars->{InstallDir} = 2;
$ConfVars->{CgiImageDir} = 2;
$ConfVars->{ConfDir} = 2;
$ConfVars->{InstallDir} = 2;
$ConfVars->{CgiImageDir} = 2;
+$ConfVars->{ClientCharsetLegacy} = 2; # actually used
#
# These config parameters are used in the code to be backward compatible,
#
# These config parameters are used in the code to be backward compatible,
@@
-216,13
+220,17
@@
pod2html("doc/BackupPC.pod",
"--outfile=doc/BackupPC.html");
foreach my $file ( (@PerlSrc,
"--outfile=doc/BackupPC.html");
foreach my $file ( (@PerlSrc,
- <images/*>,
+ <images/*.gif>,
+ <images/*.png>,
qw(
conf/config.pl
conf/hosts
conf/BackupPC_stnd.css
qw(
conf/config.pl
conf/hosts
conf/BackupPC_stnd.css
+ conf/BackupPC_stnd_orig.css
+ conf/sorttable.js
init.d/README
init.d/src/debian-backuppc
init.d/README
init.d/src/debian-backuppc
+ init.d/src/freebsd-backuppc
init.d/src/gentoo-backuppc
init.d/src/gentoo-backuppc.conf
init.d/src/linux-backuppc
init.d/src/gentoo-backuppc
init.d/src/gentoo-backuppc.conf
init.d/src/linux-backuppc
@@
-255,7
+263,7
@@
sub InstallFile
my($file, $dest) = @_;
unlink($dest) if ( -d $dest );
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");
die("can't copy($file, $dest)\n") unless copy($file, $dest);
} else {
open(FILE, $file) || die("can't open $file for reading\n");
@@
-268,24
+276,15
@@
sub InstallFile
s/__RELEASEDATE__/$ReleaseDate/g;
if ( $file =~ /BackupPC\.html$/ ) {
#
s/__RELEASEDATE__/$ReleaseDate/g;
if ( $file =~ /BackupPC\.html$/ ) {
#
- # fixup for
perl 5.6.x
+ # fixup for
conf links
#
#
- if ( !/A NAME="item_(%|_)
24C
onf/i ) {
+ if ( !/A NAME="item_(%|_)
c
onf/i ) {
s/\$Conf{([^}]*)}/
defined($ConfName{$1})
s/\$Conf{([^}]*)}/
defined($ConfName{$1})
- ? "\L<
A HREF
=\"#$ConfName{$1}\">\E\$Conf{$1}<\/A>"
+ ? "\L<
a href
=\"#$ConfName{$1}\">\E\$Conf{$1}<\/A>"
: "\$Conf{$1}"/eg;
}
: "\$Conf{$1}"/eg;
}
- s/<(A NAME="item_(%|_)24Conf(%|_)7B(.*?)(%|_)7D).*?">/\L<A NAME="item_%24Conf%7b$4%7d">/ig;
s/^<DD>/<DD><P>/;
s/^<DD>/<DD><P>/;
- #
- # 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;
-# }
s/^<li><\/li>/<li>/;
}
if ( /__CONFIGPOD__/ ) {
s/^<li><\/li>/<li>/;
}
if ( /__CONFIGPOD__/ ) {
@@
-297,6
+296,8
@@
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";
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*ConfDir\s*=\>\s*\$confDir eq.*)'.*'(.*)/ ) {
+ print OUT "$1'__CONFDIR__'$2\n";
} elsif ( $file =~ /Lib.pm/ && /^(\s*my \$useFHS\s*=\s*)\d;/ ) {
print OUT "${1}0;\n";
} elsif ( $file =~ /Lib.pm/ && /(.*Version *=> .*)'[\w\d\.]+',/ ) {
} elsif ( $file =~ /Lib.pm/ && /^(\s*my \$useFHS\s*=\s*)\d;/ ) {
print OUT "${1}0;\n";
} elsif ( $file =~ /Lib.pm/ && /(.*Version *=> .*)'[\w\d\.]+',/ ) {
@@
-354,10
+355,8
@@
sub config2pod
s/([^;])\s*$/$1 .../;
}
push(@conf, $_);
s/([^;])\s*$/$1 .../;
}
push(@conf, $_);
- my $text = "\$Conf{$var}";
- $text =~ s/\s+/_/sg;
- $text =~ s{(\W)}{sprintf("%%%02X", ord($1) )}gxe;
- $text = substr($text, 0, 50);
+ my $text = "_conf_${var}_";
+ $text =~ s{[\W\s]}{_}g;
$ConfName{$var} = "item_$text";
} elsif ( /^$/ ) {
if ( $str ne "" && @conf ) {
$ConfName{$var} = "item_$text";
} elsif ( /^$/ ) {
if ( $str ne "" && @conf ) {
@@
-530,7
+529,7
@@
sub CheckLangUsage
s/#.*//g;
s/\$Lang{([^}]*)}/
my $var = $1;
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");
next if ( $var eq "Documentation" );
if ( !defined($vars->{$var}) ) {
print("Unexpected Lang var $var in $f\n");
@@
-563,7
+562,7
@@
sub CheckLangTags
my($en, $enVars) = LangParse("lib/BackupPC/Lang/en.pm");
my($errors);
my($en, $enVars) = LangParse("lib/BackupPC/Lang/en.pm");
my($errors);
- foreach my $lang ( qw(fr.pm de.pm es.pm it.pm nl.pm) ) {
+ foreach my $lang ( qw(fr.pm de.pm es.pm it.pm nl.pm
pl.pm pt_br.pm zh_CN.pm
) ) {
my($d, $dVars) = LangParse("lib/BackupPC/Lang/$lang");
foreach my $v1 ( @$en ) {
my $v2 = shift(@$d);
my($d, $dVars) = LangParse("lib/BackupPC/Lang/$lang");
foreach my $v1 ( @$en ) {
my $v2 = shift(@$d);