diff options
-rwxr-xr-x | Master/tlpkg/bin/tlpsrc2tlpdb | 34 |
1 files changed, 19 insertions, 15 deletions
diff --git a/Master/tlpkg/bin/tlpsrc2tlpdb b/Master/tlpkg/bin/tlpsrc2tlpdb index 784f030ade5..a61ddd303ca 100755 --- a/Master/tlpkg/bin/tlpsrc2tlpdb +++ b/Master/tlpkg/bin/tlpsrc2tlpdb @@ -72,39 +72,43 @@ sub main my $tldb = TeXLive::TLPDB->new; my $src_count = 0; foreach my $f (@ARGV) { - if ($opt_all) { # progress report - $src_count++; - } + $src_count++ if $opt_all; + my $tlsrc = new TeXLive::TLPSRC; $tlsrc->from_file ($f); my $tlp = $tlsrc->make_tlpobj ($tltree); + warn "$f.tlpsrc: package name " . $tlp->name . " does not match filename\n" + if $tlp->name ne $f; + if ($tlc) { # merge TeX Catalogue information $tlp->update_from_catalogue ($tlc); } - # split bin packages off - if (not($opt_nobinsplit)) { + # split bin packages off unless requested otherwise (no reason to so + # request these days). + unless ($opt_nobinsplit) { # packages which have already a .win32 extension or the # 00texlive.something package are NOT split, never! - if ( ($tlp->name !~ m/\.win32/) && ($tlp->name !~ m/^00texlive\./) ) { + if ($tlp->name !~ m/\.win32/ + && $tlp->name !~ m/^00texlive\./) { my @binobjs = $tlp->split_bin_package; foreach my $binobj (@binobjs) { # we recompute the revision numbers of the binary packages # since that might be much smaller, and we don't want to # update every package only because one binary for one arch # was changed - $binobj->revision(0); + $binobj->revision (0); $binobj->recompute_revision ($tltree, $tltree->file_svn_lastrevision("tlpkg/tlpsrc/$f")); - $tldb->add_tlpobj($binobj); + $tldb->add_tlpobj ($binobj); } } } if ($tlp->name eq "00texlive.config") { my @bar = $tlp->depends; push @bar, "revision/".$tltree->revision; - $tlp->depends(@bar); + $tlp->depends (@bar); } $tldb->add_tlpobj ($tlp); } @@ -145,17 +149,17 @@ live database in C<Master/tlpkg/texlive.tlpdb>. =item B<-catalogue> I<Catalogue_dir> The location given by B<-catalogue> must point to a valid TeX Catalogue. -No default value. If given, the generated tlpobj files will contain information -gathered from the TeX Catalogue. +No default value. If given, the generated tlpobj files will contain +information gathered from the TeX Catalogue. -=item B<-master> I<Master_dir> -The location given by B<-master> must point to a valid svn repository -of TeX Live's Master direcory. Defaults to C<../..> of C<$0>. +=item B<-master> I<Master/dir> +The location I<Master/dir> must point to a valid svn repository of TeX +Live's Master directory. Defaults to C<../..> of C<$0>. =item B<-no-bin-split> Do NOT split files with binaries into several packages (one for the arch independent and one for each of the architectures with only the respective -binaries). +binaries). There is no reason to use this option. =back |