projects
/
BackupPC.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
* Commit for 2.1.0.
[BackupPC.git]
/
makeDist
diff --git
a/makeDist
b/makeDist
index
e58c216
..
edc3c43
100755
(executable)
--- a/
makeDist
+++ b/
makeDist
@@
-42,8
+42,8
@@
use Getopt::Std;
umask(0022);
umask(0022);
-my $Version = "2.1.0
beta0
";
-my $ReleaseDate = "20
Mar
2004";
+my $Version = "2.1.0";
+my $ReleaseDate = "20
Jun
2004";
my $DistDir = "dist/BackupPC-$Version";
my @PerlSrc = qw(
my $DistDir = "dist/BackupPC-$Version";
my @PerlSrc = qw(
@@
-92,6
+92,7
@@
my @PerlSrc = qw(
lib/BackupPC/Lang/es.pm
lib/BackupPC/Lang/fr.pm
lib/BackupPC/Lang/it.pm
lib/BackupPC/Lang/es.pm
lib/BackupPC/Lang/fr.pm
lib/BackupPC/Lang/it.pm
+ lib/BackupPC/Lang/nl.pm
lib/BackupPC/Xfer/Archive.pm
lib/BackupPC/Xfer/Smb.pm
lib/BackupPC/Xfer/Tar.pm
lib/BackupPC/Xfer/Archive.pm
lib/BackupPC/Xfer/Smb.pm
lib/BackupPC/Xfer/Tar.pm
@@
-188,6
+189,7
@@
foreach my $file ( (@PerlSrc,
qw(
conf/config.pl
conf/hosts
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/README
init.d/src/debian-backuppc
init.d/src/gentoo-backuppc
@@
-209,6
+211,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~~");
print("Distribution written to dist/BackupPC-$Version.tar.gz\n");
unlink("pod2htmd.x~~");
unlink("pod2htmi.x~~");
+unlink("pod2htmd.tmp");
+unlink("pod2htmi.tmp");
###########################################################################
# Subroutines
###########################################################################
# Subroutines
@@
-227,28
+231,29
@@
sub InstallFile
binmode(FILE);
binmode(OUT);
while ( <FILE> ) {
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}\.?/$1
Version __VERSION__, released __RELEASEDATE__./;
s/__VERSION__/$Version/g;
s/__RELEASEDATE__/$ReleaseDate/g;
if ( $file =~ /BackupPC\.html$/ ) {
#
# fixup for perl 5.6.x
#
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/\$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>/;
#
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__/ ) {
s/^<li><\/li>/<li>/;
}
if ( /__CONFIGPOD__/ ) {
@@
-406,6
+411,7
@@
sub CheckLangUsage
s/\$Lang{([^}]*)}/
my $var = $1;
next if ( $var =~ m{^(Reason_|Status_|backupType_)} );
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++;
if ( !defined($vars->{$var}) ) {
print("Unexpected Lang var $var in $f\n");
$errors++;
@@
-437,7
+443,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) ) {
+ 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);
my($d, $dVars) = LangParse("lib/BackupPC/Lang/$lang");
foreach my $v1 ( @$en ) {
my $v2 = shift(@$d);