diff options
author | Norbert Preining <preining@logic.at> | 2007-06-16 16:30:21 +0000 |
---|---|---|
committer | Norbert Preining <preining@logic.at> | 2007-06-16 16:30:21 +0000 |
commit | 4e696440566b8dc5101c0a4d341b8445423e1f84 (patch) | |
tree | 1b99cd6a3e21956e66ee61337fedaf459360b607 | |
parent | d4eefe7213116b2b11dbfa09d39b54d6470203ca (diff) |
delete various old stuff
git-svn-id: svn://tug.org/texlive/trunk@4440 c570f23f-e606-0410-a88d-b1316a301751
75 files changed, 227 insertions, 507 deletions
diff --git a/new-infra/Perl-API.txt b/new-infra/Perl-API.txt deleted file mode 100644 index 616c7eab40f..00000000000 --- a/new-infra/Perl-API.txt +++ /dev/null @@ -1,240 +0,0 @@ -API for Perl Modules for new infra -================================== - -Module TLSRC ------------- - -Constructor: - TLSRC->new; - TLSRC->new( name => "foobar", shortdesc => "The foobar package", ...); - -Input/Output - $tlsrc->from_file("package.tlsrc"); - $tlsrc->writeout - without arg to stdout - with arg to filehandle - -Read/Write functions (with argument set, without arg read) - - $tlsrc->name - $tlsrc->category - $tlsrc->shortdesc - $tlsrc->longdesc - $tlsrc->catalogue - $tlsrc->srcpatterns - $tlsrc->docpatterns - $tlsrc->runpatterns - $tlsrc->binpatterns - $tlsrc->depends - $tlsrc->executes - -Generation function - $tlp = $tlsrc->make_tlp($tltree); - generates a TLP object from itself (a TLSRC obj) and - a TLTREE object (see below) - - -Module TLP ----------- - -Package variables: - &TLP->zipdir - set/returns the default location for created zip files - -Constructur: - TLP->new; - TLP->new( name => "foobar", ...); - -Input/Output - $tlp->from_file("package.tlp"); - reads from file, only one tlp allowed in file - $tlp->from_fh($filehandle [, $multi] ); - reads from $filehandle - if $multi is undefined (ie not given) then multiple tlp - in the same file are treated as errors - if $multi is defined then returns after reading one - tlp - returns 1 if it found a tlp, otherwise 0 - $tlp->writeout - without arg to stdout - with arg to filehandle - $tlp->writeout_simple - for comparison with tpm/tlps, will go away - - $tlp->make_zip($tltree[,$destdir[,$zipname]]); - creates a zip file of the arch INDEPENDENT files in tlp - in $destdir (if not defined then TLP->zipdir is used). - The file name of the created zipfile is $zipname (if not - present $tlp->name.zip) - - If the package contains "binfiles"; then zip files for - all archs containing ONLY the binfiles are created, and - the zipfile name is - $zipname.$arch.zip - - (Compatibility with the scheme used before) - - $tlp->make_list($location) - create list files in $location (could be more than one for - packages with binary files) - WARNING: not completely implemented, I need someone who - explains me the list format, I cannot read the - foo2lists.xsl stuff arrggggg - -Utilities: - $tlp->recompute_sizes($tltree) - recomputes all the *size fields, see below - $tlp->recompute_revision($tltree) - recomputes the revision of the package - $tlp->is_arch_dependent - true if it contains bin files, otherwise false - $tlp->total_size - if no arguments given this is - srcsize + docsize + runsize - if args are given then this is - srcsize + docsize + runsize + - + sum_{i in args} binsize{$i} - -Read/Write functions (with argument set, without arg read) - - $tlp->name - $tlp->category - $tlp->revision - $tlp->shortdesc - $tlp->longdesc - $tlp->catalogue - reads/returns scalar - $tlp->srcfiles - $tlp->srcsize - $tlp->docfiles - $tlp->docsize - $tlp->runfiles - $tlp->runsize - *files reads/returns array of files - *size reads/returns scalar - $tlp->binfiles - $tlp->binsize - note that this gives/returns a HASH of architectures!! - $tlp->depends - $tlp->executes - reads/returns array - - $tlp->add_srcfiles(@files) - $tlp->remove_srcfiles(@files) - adds @files to the list of srcfiles - $tlp->add_docfiles(@files) - $tlp->remove_docfiles(@files) - adds @files to the list of docfiles - $tlp->add_runfiles(@files) - $tlp->remove_runfiles(@files) - adds/removes @files to the list of runfiles - - $tlp->add_binfiles($arch,@files) - $tlp->remove_binfiles($arch,@files) - adds/removes @files to the list of binfiles for arch=$arch - - $tlp->add_files($type,@files) - $tlp->remove_files($type,@files) - adds/removes @files to the list of $type = (run|doc|src)files - NOT FOR binfiles! - - -Module TLTREE -------------- -(this one is still quite hacky) - -Constructor - - TLTREE->new; - TLTREE->new( svnroot => "path/to/svn/managed/dir" ); - -Init functions - - $tltree->init_from_svn - changes to svnroot, calls svn status -v and builds - up all the necessary information - $tltree->init_from_statusfile($file) - does the same as init_from_svn, but from a pre-made - output of svn status -v - -Input/Ouput - - $tltree->print - to stdout, more or less for hacking only not usefull - -Pattern matching functions - - $ref = $tltree->get_matching_files($type,$pattern) - for $type = bin - returns a ref to a hash of keys = architectures - otherwise - returns a ref to an array - (see specification) - -Other functions - - $tltree->file_svn_lastrevision($file) - returns the revision of the last change of file - as given by svn status -v - undef if file is not contained in $tltree - - $tltree->size_of($file) - returns the size of $file, or undef if not in tree - - &$tlsrc->architectures - sets/reads the list of architectures, - predefined to .... - - -Module TLDB ------------ - -Constructore - - TLDB->new; - TLDB->new ( location => "path/to/tldb/file" ); - -Read/Write functions (with argument set, without arg read) - - $tldb->location - -Input/Output - - $tldb->from_file($filename); - reads a tldb file (tlp descriptions separated by newlines) - - $tldb->writeout - without arg to stdout - with arg to filehandle - - $tldb->save - saves to $self->location; - - $tldb->generate_packagelist - outputs list of "package revision" for web delivery - without arg to stdout - with arg to filehandle - -TLP interface - - $tldb->add_tlp($tlp) - adds a TLP to the TLDB (or replaces an already present) - - $tlp = $tldb->get_package("packagename"); - returns undef if not installed - - $rev = $tldb->package_revision("packagename"); - returns undef if not installed, otherwise the - revision of "packagename" - - -Package TLUtils ---------------- - -exported functions: - sort_uniq(@list) - push_uniq(\@list,@list) - dirname($file) - basename($file) - - diff --git a/new-infra/README b/new-infra/README deleted file mode 100644 index 729ab601740..00000000000 --- a/new-infra/README +++ /dev/null @@ -1,25 +0,0 @@ -README of new infra -=================== - -Current status as of 2007-05-27 - -- modules work, but need more testing - -- tlp generation from trivial tlsrc: - I have generated tlsrc files for all texmf-dist/tpm/*.tpm files containing - only the name, executes, and depends, and from these I generated tlp files - The automatic procedure works quiet well: - tlsrc files with manual patterns: 16 - buggy packages: 22 - Buggy packages are packages where the files currently in the tpm and - those in the generated tlp differ. (one package is probably a false error: - arabxetex) - - The list of tlsrc files which had to be adjusted is (not surpising): - bibtex, context, dvips, fontinst, groff, lambda, latex, makeindex, - metafont, metapost, mex, mft, omega, plain, tex4ht, xetex - - Generation time on my small laptop for all texmf-dist tlp is around 40sec - -- updater is there as skeleton - diff --git a/new-infra/TLDB.pm b/new-infra/TLDB.pm index c04df256721..5084f3febcf 100644 --- a/new-infra/TLDB.pm +++ b/new-infra/TLDB.pm @@ -11,6 +11,8 @@ package TLDB; use TLUtils; use TLP; +my $_listdir; + sub new { my $class = shift; my %params = @_; @@ -18,10 +20,11 @@ sub new { location => $params{'location'}, tlps => $params{'tlps'} }; + $_listdir = $params{'listdir'} if defined($params{'listdir'}); + bless $self, $class; if (defined($self->{'location'})) { $self->from_file($self->{'location'}); } - bless $self, $class; return $self; } @@ -97,12 +100,120 @@ sub generate_packagelist { } } +sub generate_listfiles { + my ($self,$destdir) = @_; + if (not(defined($destdir))) { + $destdir = TLDB->listdir; + } + foreach (sort keys %{$self->{'tlps'}}) { + $tlp = $self->{'tlps'}{$_}; + $self->_generate_listfile($tlp, $destdir, "all"); + if ($tlp->is_arch_dependent) { + foreach my $a (keys %{$tlp->binfiles}) { + $self->_generate_listfile($tlp, $destdir, $a); + } + } + } +} + +sub _generate_listfile { + my ($self,$tlp,$destdir,$arch) = @_; + my @files = (); + my $listname; + if ($arch ne "all") { + my %foo = %{$tlp->binfiles}; + push @files, @{$foo{$arch}}; + $listname = $tlp->name . ".$arch"; + } else { + $listname = $tlp->name; + push @files, $tlp->runfiles; + push @files, $tlp->docfiles; + push @files, $tlp->srcfiles; + } + @files = TLUtils::sort_uniq(@files); + &mkpath("$destdir") if (! -d "$destdir"); + my (@lop, @lot); + foreach my $d ($tlp->depends) { + if ($d =~ m/^Package\/(.*)$/) { + push @lop, $1; + } elsif ($d =~ m/^(TLCore|Documentation)\/(.*)$/) { + push @lot, $2; + } else { + warn "strange depends line: $d\n"; + } + } + open(TMP, ">$destdir/$listname") or die "Cannot open $destdir/$listname!"; + # title and size information for collections and schemes in the + # first two lines, marked with * + if ($listname =~ m/^collection-/) { + print TMP "*Title: ", $tlp->shortdesc, "\n"; + # collections references Packages, we have to collect the sizes of + # all the Package-tlps included + # What is unclear for me is HOW the size is computed for bin-* + # packages. The collection-basicbin contains quite a lot of + # bin-files, but the sizes for the different archs differ. + # I guess we have to take the maximum? + my $s = 0; + foreach my $p (@lop) { + my $subtlp = $self->get_package($p); + if (!defined($subtlp)) { + warn "Strange: $listname references $p, but it is not in tldb"; + } + $s += $subtlp->runsize + $subtlp->srcsize + $subtlp->docsize; + if ($subtlp->is_arch_dependent) { + my %foo = %{$subtlp->binsizes}; + my $max = 0; + foreach $k (keys %foo) { + $max = $foo{$k} if ($foo{$k} > $max); + } + $s += $max; + } + } + # in case the collection itself ships files ... + $s += $tlp->runsize + $tlp->srcsize + $tlp->docsize; + print TMP "*Size: $s\n"; + } elsif ($listname =~ m/^scheme-/) { + print TMP "*Title: ", $tlp->shortdesc, "\n"; + warn "TODO: need computation of sizes for schemes!"; + #print TMP "*Size: ", $tlp->total_size, "\n"; + } + # dependencies and inclusion of packages + foreach my $t (@lot) { + # strange, schemes mark included collections via -, while collections + # themself mark deps on other collections with +. collection are + # never referenced in Packages + if ($listname =~ m/^scheme/) { + print TMP "-"; + } else { + print TMP "+"; + } + print TMP "$t\n"; + } + foreach my $t (@lop) { print TMP "+$t\n"; } + # included files + foreach my $f (@files) { print TMP "$f\n"; } + # also print the listfile itself + print TMP "$destdir/$listname\n"; + # execute statements + foreach my $e ($tlp->executes) { + print TMP "!$e\n"; + } + # finish + close(TMP); +} + sub location { my $self = shift; if (@_) { $self->{'location'} = shift } return $self->{'location'}; } +sub listdir { + my @self = shift; + if (@_) { $_listdir = $_[0] } + return $_listdir; +} + 1; diff --git a/new-infra/TLP.pm b/new-infra/TLP.pm index 190d9f2b116..915c0506c21 100644 --- a/new-infra/TLP.pm +++ b/new-infra/TLP.pm @@ -100,10 +100,11 @@ sub from_fh { $lastcmd = "shortdesc"; next; } elsif ($line =~ /^longdesc(continued)?\s+(.*)$/) { - if ("$1" eq "continued") { - $self->{'longdesc'} .= " "; + if (defined($1) && ("$1" eq "continued")) { + $self->{'longdesc'} .= " $2"; + } else { + $self->{'longdesc'} = "$2"; } - $self->{'longdesc'} .= "$2"; $lastcmd = "longdesc"; next; } elsif ($line =~ /^category\s+(Package|TLCore|Documentation)$/) { @@ -338,16 +339,14 @@ sub make_zip { $self->_make_zip($tltree,$destdir,$zipname,"all"); # now the $pkg.$arch.zip if ($self->is_arch_dependent) { - foreach my $t ($tltree->architectures) { - if (defined($self->{'binfiles'}{$t})) { - &TLUtils::debug("arch=$t\n"); - if ($zipname =~ /^(.*)\.zip$/) { - $zipn = "$1.$t.zip"; - } else { - $zipn = "$zipname.$t.zip"; - } - $self->_make_zip($tltree,$destdir,$zipn,$t); + foreach my $t (keys %{$self->{'binfiles'}}) { + &TLUtils::debug("arch=$t\n"); + if ($zipname =~ /^(.*)\.zip$/) { + $zipn = "$1.$t.zip"; + } else { + $zipn = "$zipname.$t.zip"; } + $self->_make_zip($tltree,$destdir,$zipn,$t); } } } @@ -399,31 +398,6 @@ sub _make_zip { print "Done $zipname\n" if ($::opt_debug); } -sub make_list { - my ($self,$loc) = @_; - warn "TODO: make_list format of list file is not right!"; - my $nam = $self->name; - mkpath("$loc") if (! -d "$loc"); - open(TMP,">$loc/$nam") or die("Cannot open $loc/$nam"); - foreach (@{$self->depends}) { - print TMP "+$_\n"; - } - foreach (@{$self->runfiles}, @{$self->docfiles}, @{$self->srcfiles}) { - print TMP $_,"\n"; - } - foreach (@{$self->executes}) { - print TMP "!$_\n"; - } - close TMP; - foreach my $t (keys %{$self->{'binfiles'}}) { - open(TMP,">$loc/$nam.$t") or die "Cannot open $loc/$nam.$t"; - foreach (@{$self->{'binfiles'}{$t}}) { - print TMP "$_\n"; - } - close TMP; - } -} - sub is_arch_dependent { my $self = shift; if (keys %{$self->{'binfiles'}}) { @@ -487,8 +461,8 @@ sub srcfiles { } sub srcsize { my $self = shift; - if (@_) { @{ $self->{'srcsize'} } = @_ } - return @{ $self->{'srcsize'} }; + if (@_) { $self->{'srcsize'} = shift } + return ( defined($self->{'srcsize'}) ? $self->{'srcsize'} : 0 ); } sub add_srcfiles { my ($self,@files) = @_; @@ -505,8 +479,8 @@ sub docfiles { } sub docsize { my $self = shift; - if (@_) { @{ $self->{'docsize'} } = @_ } - return @{ $self->{'docsize'} }; + if (@_) { $self->{'docsize'} = shift } + return ( defined($self->{'docsize'}) ? $self->{'docsize'} : 0 ); } sub add_docfiles { my ($self,@files) = @_; @@ -549,8 +523,8 @@ sub runfiles { } sub runsize { my $self = shift; - if (@_) { @{ $self->{'runsize'} } = @_ } - return @{ $self->{'runsize'} }; + if (@_) { $self->{'runsize'} = shift } + return ( defined($self->{'runsize'}) ? $self->{'runsize'} : 0 ); } sub add_runfiles { my ($self,@files) = @_; diff --git a/new-infra/TODO b/new-infra/TODO index 7aad077c054..840ad915698 100644 --- a/new-infra/TODO +++ b/new-infra/TODO @@ -1,8 +1,6 @@ TODO for new-infra ================== -- create tlsrc file for *all* tpms and write a tpm/tlp comparer so that - we can check that the right files etc are included. - partly done, needs fixes for the problematic cases +- create tlsrc files for missing tpms, should be only the scheme-* stuff - update.pl: implement more of the 'updater' - Shell librarys . test the tlp_ and the tldb_tlp_ functions @@ -11,7 +9,6 @@ TODO for new-infra - rewrite install-* scripts to use the shell library (or rewrite it in perl?) - install scripts =============== collection of usage of list files etc in the install scripts diff --git a/new-infra/bin/i386-linux/exe1 b/new-infra/bin/i386-linux/exe1 deleted file mode 100644 index e69de29bb2d..00000000000 --- a/new-infra/bin/i386-linux/exe1 +++ /dev/null diff --git a/new-infra/bin/i386-linux/exe2 b/new-infra/bin/i386-linux/exe2 deleted file mode 100644 index e69de29bb2d..00000000000 --- a/new-infra/bin/i386-linux/exe2 +++ /dev/null diff --git a/new-infra/bin/win32/exe1.exe b/new-infra/bin/win32/exe1.exe deleted file mode 100644 index e69de29bb2d..00000000000 --- a/new-infra/bin/win32/exe1.exe +++ /dev/null diff --git a/new-infra/bin/win32/exe2.exe b/new-infra/bin/win32/exe2.exe deleted file mode 100644 index e69de29bb2d..00000000000 --- a/new-infra/bin/win32/exe2.exe +++ /dev/null diff --git a/new-infra/specification.txt b/new-infra/specification.txt deleted file mode 100644 index 4c24ce56b8e..00000000000 --- a/new-infra/specification.txt +++ /dev/null @@ -1,141 +0,0 @@ -Specifications -============== - -1) tlsrc --------- -one file *WITHOUT* empty lines (but beginning and end) -every line looks like - key value -possible keys are - name (must be first) - category - shortdesc - longdesc - catalogue - runpatterns - srcpatterns - docpatterns - binpatterns - execute - depend - -Interpretation: -name - name of the package - -category - TLCore Package Documentation - as well known from tpms - if none specified it is Package - -catalogue - name of the respective Catalogue entry, if missing, same as name - -(run|src|doc|bin)patterns - (cheap/expensive means working time) - - current status: - [PREFIX]TYPE PAT - TYPE = t f d r - PREFIX = + | +! | ! - t word1 ... wordN wordL - include all files below all dirs of the form - word1/.../wordN/.../wordL/... - (cheap) - f string - include file "string" where the LAST(!!!) entry (basename) - of string can contain glob characters * and ? (but no other!) - (cheap) - d string - include all files in and below the directory "string" - (cheap) - r regexp - include all files matching /^regexp$/ - (expensive) - - Note that if one of the patterns section is empty OR (!!!) all - provided patterns have the prefix "+" (eg "+f ...."), then - the following patterns are added: - for runpatterns: - t texmf-dist topdir $tlp for type = Package - (with topdir = bibtex, context, ... see tlsrc2tlp.pl) - for docpatterns: - t texmf-dist doc $tlp for type = Package - t texmf-doc doc $tlp for type = Documentation - for srcpatterns: - t texmf-dist source $tlp for type = Package - t texmf-doc source $tlp for type = Documentation - for binpatterns: - NONE!! - - If the prefix contains a ! the pattern is negated, ie after all the - files for positive patterns have been added, those matching the - negative patterns are removed. - -execute free form - is taken one to one into the tlp file - -depend - is taken one to one into the tlp file - made up of - Type/Package - where - Type ::= TLCore | Documentation | Package - -shortdesc - short one line desc - is taken one to one into the tlp file - if missing can be taken from Catalogue - -longdesc - longer multiline dscription - is taken one to one into the tlp file - if missing can be taken from Catalogue - -2) tlp file ------------ -same format as tlsrc, but the keys are - name - category - revision - shortdesc - longdesc - catalogue - runfiles - docfiles - srcfiles - binfiles - execute - depend - ??? what am I missing ??? - -Interpretation - bin|src|doc|runfiles MUST be saved in multi line entries with - continuation lines intended by one (1) space. all of them - can have (must have?) the size tag size=......, in addition - binfiles can have the arch tag arch=... - /---------- - |docfiles size=.... - | file1 - | file2 - | ... - For binfiles the architecture can be given on the binfile line: - /------------ - |binfiles arch=i386-solaris size=.... - | file1 - | file2 - | file3 - | ... - Note that only *ONE* *files entry per tlp is allowed - - rest obvious - - revision - maxmimum of all the last_changed_revisions of all - contained files - -3) tldb file ------------- -concatenation of all the tlp files, separated by empty line(s) - - diff --git a/new-infra/test-tlp.pl b/new-infra/test-tlp.pl index f9f21af1e68..b709f49cf0a 100644 --- a/new-infra/test-tlp.pl +++ b/new-infra/test-tlp.pl @@ -11,3 +11,5 @@ $tlp->from_file("tlp/bar.tlp"); $tlp->writeout(); +print "executes: " , $tlp->executes, "...\n"; + diff --git a/new-infra/texmf-dist/fonts/map/bar/file1 b/new-infra/texmf-dist/fonts/map/bar/file1 deleted file mode 100644 index e69de29bb2d..00000000000 --- a/new-infra/texmf-dist/fonts/map/bar/file1 +++ /dev/null diff --git a/new-infra/texmf-dist/fonts/map/bar/file2 b/new-infra/texmf-dist/fonts/map/bar/file2 deleted file mode 100644 index e69de29bb2d..00000000000 --- a/new-infra/texmf-dist/fonts/map/bar/file2 +++ /dev/null diff --git a/new-infra/texmf-dist/fonts/map/bar/file3 b/new-infra/texmf-dist/fonts/map/bar/file3 deleted file mode 100644 index e69de29bb2d..00000000000 --- a/new-infra/texmf-dist/fonts/map/bar/file3 +++ /dev/null diff --git a/new-infra/texmf-dist/fonts/map/baz/file1 b/new-infra/texmf-dist/fonts/map/baz/file1 deleted file mode 100644 index e69de29bb2d..00000000000 --- a/new-infra/texmf-dist/fonts/map/baz/file1 +++ /dev/null diff --git a/new-infra/texmf-dist/fonts/map/baz/file2 b/new-infra/texmf-dist/fonts/map/baz/file2 deleted file mode 100644 index e69de29bb2d..00000000000 --- a/new-infra/texmf-dist/fonts/map/baz/file2 +++ /dev/null diff --git a/new-infra/texmf-dist/fonts/map/baz/file3 b/new-infra/texmf-dist/fonts/map/baz/file3 deleted file mode 100644 index e69de29bb2d..00000000000 --- a/new-infra/texmf-dist/fonts/map/baz/file3 +++ /dev/null diff --git a/new-infra/texmf-dist/fonts/map/foo/file1 b/new-infra/texmf-dist/fonts/map/foo/file1 deleted file mode 100644 index e69de29bb2d..00000000000 --- a/new-infra/texmf-dist/fonts/map/foo/file1 +++ /dev/null diff --git a/new-infra/texmf-dist/fonts/map/foo/file2 b/new-infra/texmf-dist/fonts/map/foo/file2 deleted file mode 100644 index e69de29bb2d..00000000000 --- a/new-infra/texmf-dist/fonts/map/foo/file2 +++ /dev/null diff --git a/new-infra/texmf-dist/fonts/map/foo/file3 b/new-infra/texmf-dist/fonts/map/foo/file3 deleted file mode 100644 index e69de29bb2d..00000000000 --- a/new-infra/texmf-dist/fonts/map/foo/file3 +++ /dev/null diff --git a/new-infra/texmf-dist/fonts/tfm/bar/file1 b/new-infra/texmf-dist/fonts/tfm/bar/file1 deleted file mode 100644 index e69de29bb2d..00000000000 --- a/new-infra/texmf-dist/fonts/tfm/bar/file1 +++ /dev/null diff --git a/new-infra/texmf-dist/fonts/tfm/bar/file2 b/new-infra/texmf-dist/fonts/tfm/bar/file2 deleted file mode 100644 index e69de29bb2d..00000000000 --- a/new-infra/texmf-dist/fonts/tfm/bar/file2 +++ /dev/null diff --git a/new-infra/texmf-dist/fonts/tfm/bar/file3 b/new-infra/texmf-dist/fonts/tfm/bar/file3 deleted file mode 100644 index e69de29bb2d..00000000000 --- a/new-infra/texmf-dist/fonts/tfm/bar/file3 +++ /dev/null diff --git a/new-infra/texmf-dist/fonts/tfm/baz/file1 b/new-infra/texmf-dist/fonts/tfm/baz/file1 deleted file mode 100644 index e69de29bb2d..00000000000 --- a/new-infra/texmf-dist/fonts/tfm/baz/file1 +++ /dev/null diff --git a/new-infra/texmf-dist/fonts/tfm/baz/file2 b/new-infra/texmf-dist/fonts/tfm/baz/file2 deleted file mode 100644 index e69de29bb2d..00000000000 --- a/new-infra/texmf-dist/fonts/tfm/baz/file2 +++ /dev/null diff --git a/new-infra/texmf-dist/fonts/tfm/baz/file3 b/new-infra/texmf-dist/fonts/tfm/baz/file3 deleted file mode 100644 index e69de29bb2d..00000000000 --- a/new-infra/texmf-dist/fonts/tfm/baz/file3 +++ /dev/null diff --git a/new-infra/texmf-dist/fonts/tfm/foo/file1 b/new-infra/texmf-dist/fonts/tfm/foo/file1 deleted file mode 100644 index e69de29bb2d..00000000000 --- a/new-infra/texmf-dist/fonts/tfm/foo/file1 +++ /dev/null diff --git a/new-infra/texmf-dist/fonts/tfm/foo/file2 b/new-infra/texmf-dist/fonts/tfm/foo/file2 deleted file mode 100644 index e69de29bb2d..00000000000 --- a/new-infra/texmf-dist/fonts/tfm/foo/file2 +++ /dev/null diff --git a/new-infra/texmf-dist/fonts/tfm/foo/file3 b/new-infra/texmf-dist/fonts/tfm/foo/file3 deleted file mode 100644 index e69de29bb2d..00000000000 --- a/new-infra/texmf-dist/fonts/tfm/foo/file3 +++ /dev/null diff --git a/new-infra/texmf-dist/fonts/vf/bar/file1 b/new-infra/texmf-dist/fonts/vf/bar/file1 deleted file mode 100644 index e69de29bb2d..00000000000 --- a/new-infra/texmf-dist/fonts/vf/bar/file1 +++ /dev/null diff --git a/new-infra/texmf-dist/fonts/vf/bar/file2 b/new-infra/texmf-dist/fonts/vf/bar/file2 deleted file mode 100644 index e69de29bb2d..00000000000 --- a/new-infra/texmf-dist/fonts/vf/bar/file2 +++ /dev/null diff --git a/new-infra/texmf-dist/fonts/vf/bar/file3 b/new-infra/texmf-dist/fonts/vf/bar/file3 deleted file mode 100644 index e69de29bb2d..00000000000 --- a/new-infra/texmf-dist/fonts/vf/bar/file3 +++ /dev/null diff --git a/new-infra/texmf-dist/fonts/vf/baz/file1 b/new-infra/texmf-dist/fonts/vf/baz/file1 deleted file mode 100644 index e69de29bb2d..00000000000 --- a/new-infra/texmf-dist/fonts/vf/baz/file1 +++ /dev/null diff --git a/new-infra/texmf-dist/fonts/vf/baz/file2 b/new-infra/texmf-dist/fonts/vf/baz/file2 deleted file mode 100644 index e69de29bb2d..00000000000 --- a/new-infra/texmf-dist/fonts/vf/baz/file2 +++ /dev/null diff --git a/new-infra/texmf-dist/fonts/vf/baz/file3 b/new-infra/texmf-dist/fonts/vf/baz/file3 deleted file mode 100644 index e69de29bb2d..00000000000 --- a/new-infra/texmf-dist/fonts/vf/baz/file3 +++ /dev/null diff --git a/new-infra/texmf-dist/fonts/vf/foo/file1 b/new-infra/texmf-dist/fonts/vf/foo/file1 deleted file mode 100644 index e69de29bb2d..00000000000 --- a/new-infra/texmf-dist/fonts/vf/foo/file1 +++ /dev/null diff --git a/new-infra/texmf-dist/fonts/vf/foo/file2 b/new-infra/texmf-dist/fonts/vf/foo/file2 deleted file mode 100644 index e69de29bb2d..00000000000 --- a/new-infra/texmf-dist/fonts/vf/foo/file2 +++ /dev/null diff --git a/new-infra/texmf-dist/fonts/vf/foo/file3 b/new-infra/texmf-dist/fonts/vf/foo/file3 deleted file mode 100644 index e69de29bb2d..00000000000 --- a/new-infra/texmf-dist/fonts/vf/foo/file3 +++ /dev/null diff --git a/new-infra/texmf-dist/tex/latex/bar/file1 b/new-infra/texmf-dist/tex/latex/bar/file1 deleted file mode 100644 index e69de29bb2d..00000000000 --- a/new-infra/texmf-dist/tex/latex/bar/file1 +++ /dev/null diff --git a/new-infra/texmf-dist/tex/latex/bar/file2 b/new-infra/texmf-dist/tex/latex/bar/file2 deleted file mode 100644 index e69de29bb2d..00000000000 --- a/new-infra/texmf-dist/tex/latex/bar/file2 +++ /dev/null diff --git a/new-infra/texmf-dist/tex/latex/bar/file3 b/new-infra/texmf-dist/tex/latex/bar/file3 deleted file mode 100644 index e69de29bb2d..00000000000 --- a/new-infra/texmf-dist/tex/latex/bar/file3 +++ /dev/null diff --git a/new-infra/texmf-dist/tex/latex/baz/file1 b/new-infra/texmf-dist/tex/latex/baz/file1 deleted file mode 100644 index e69de29bb2d..00000000000 --- a/new-infra/texmf-dist/tex/latex/baz/file1 +++ /dev/null diff --git a/new-infra/texmf-dist/tex/latex/baz/file2 b/new-infra/texmf-dist/tex/latex/baz/file2 deleted file mode 100644 index e69de29bb2d..00000000000 --- a/new-infra/texmf-dist/tex/latex/baz/file2 +++ /dev/null diff --git a/new-infra/texmf-dist/tex/latex/baz/file3 b/new-infra/texmf-dist/tex/latex/baz/file3 deleted file mode 100644 index e69de29bb2d..00000000000 --- a/new-infra/texmf-dist/tex/latex/baz/file3 +++ /dev/null diff --git a/new-infra/texmf-dist/tex/latex/foo/file1 b/new-infra/texmf-dist/tex/latex/foo/file1 deleted file mode 100644 index e69de29bb2d..00000000000 --- a/new-infra/texmf-dist/tex/latex/foo/file1 +++ /dev/null diff --git a/new-infra/texmf-dist/tex/latex/foo/file2 b/new-infra/texmf-dist/tex/latex/foo/file2 deleted file mode 100644 index e69de29bb2d..00000000000 --- a/new-infra/texmf-dist/tex/latex/foo/file2 +++ /dev/null diff --git a/new-infra/texmf-dist/tex/latex/foo/file3 b/new-infra/texmf-dist/tex/latex/foo/file3 deleted file mode 100644 index e69de29bb2d..00000000000 --- a/new-infra/texmf-dist/tex/latex/foo/file3 +++ /dev/null diff --git a/new-infra/texmf-doc/doc/bar/file1 b/new-infra/texmf-doc/doc/bar/file1 deleted file mode 100644 index e69de29bb2d..00000000000 --- a/new-infra/texmf-doc/doc/bar/file1 +++ /dev/null diff --git a/new-infra/texmf-doc/doc/bar/file2 b/new-infra/texmf-doc/doc/bar/file2 deleted file mode 100644 index e69de29bb2d..00000000000 --- a/new-infra/texmf-doc/doc/bar/file2 +++ /dev/null diff --git a/new-infra/texmf-doc/doc/bar/file3 b/new-infra/texmf-doc/doc/bar/file3 deleted file mode 100644 index e69de29bb2d..00000000000 --- a/new-infra/texmf-doc/doc/bar/file3 +++ /dev/null diff --git a/new-infra/texmf-doc/doc/baz/file1 b/new-infra/texmf-doc/doc/baz/file1 deleted file mode 100644 index e69de29bb2d..00000000000 --- a/new-infra/texmf-doc/doc/baz/file1 +++ /dev/null diff --git a/new-infra/texmf-doc/doc/baz/file2 b/new-infra/texmf-doc/doc/baz/file2 deleted file mode 100644 index e69de29bb2d..00000000000 --- a/new-infra/texmf-doc/doc/baz/file2 +++ /dev/null diff --git a/new-infra/texmf-doc/doc/baz/file3 b/new-infra/texmf-doc/doc/baz/file3 deleted file mode 100644 index e69de29bb2d..00000000000 --- a/new-infra/texmf-doc/doc/baz/file3 +++ /dev/null diff --git a/new-infra/texmf-doc/doc/foo/file1 b/new-infra/texmf-doc/doc/foo/file1 deleted file mode 100644 index e69de29bb2d..00000000000 --- a/new-infra/texmf-doc/doc/foo/file1 +++ /dev/null diff --git a/new-infra/texmf-doc/doc/foo/file2 b/new-infra/texmf-doc/doc/foo/file2 deleted file mode 100644 index e69de29bb2d..00000000000 --- a/new-infra/texmf-doc/doc/foo/file2 +++ /dev/null diff --git a/new-infra/texmf-doc/doc/foo/file3 b/new-infra/texmf-doc/doc/foo/file3 deleted file mode 100644 index e69de29bb2d..00000000000 --- a/new-infra/texmf-doc/doc/foo/file3 +++ /dev/null diff --git a/new-infra/texmf/test/bar/aaa/file1 b/new-infra/texmf/test/bar/aaa/file1 deleted file mode 100644 index b750bc36736..00000000000 --- a/new-infra/texmf/test/bar/aaa/file1 +++ /dev/null @@ -1,3 +0,0 @@ -Hello -Hello World -Hello diff --git a/new-infra/texmf/test/bar/aaa/file2 b/new-infra/texmf/test/bar/aaa/file2 deleted file mode 100644 index 557db03de99..00000000000 --- a/new-infra/texmf/test/bar/aaa/file2 +++ /dev/null @@ -1 +0,0 @@ -Hello World diff --git a/new-infra/texmf/test/bar/aaa/file3 b/new-infra/texmf/test/bar/aaa/file3 deleted file mode 100644 index ed7b2ef70aa..00000000000 --- a/new-infra/texmf/test/bar/aaa/file3 +++ /dev/null @@ -1 +0,0 @@ -Hello World foobbar diff --git a/new-infra/texmf/tmp1/tmp2/bar/file1 b/new-infra/texmf/tmp1/tmp2/bar/file1 deleted file mode 100644 index e69de29bb2d..00000000000 --- a/new-infra/texmf/tmp1/tmp2/bar/file1 +++ /dev/null diff --git a/new-infra/texmf/tmp1/tmp2/bar/file2 b/new-infra/texmf/tmp1/tmp2/bar/file2 deleted file mode 100644 index e69de29bb2d..00000000000 --- a/new-infra/texmf/tmp1/tmp2/bar/file2 +++ /dev/null diff --git a/new-infra/texmf/tmp1/tmp2/bar/file3 b/new-infra/texmf/tmp1/tmp2/bar/file3 deleted file mode 100644 index e69de29bb2d..00000000000 --- a/new-infra/texmf/tmp1/tmp2/bar/file3 +++ /dev/null diff --git a/new-infra/texmf/tmp1/tmp2/baz/file1 b/new-infra/texmf/tmp1/tmp2/baz/file1 deleted file mode 100644 index e69de29bb2d..00000000000 --- a/new-infra/texmf/tmp1/tmp2/baz/file1 +++ /dev/null diff --git a/new-infra/texmf/tmp1/tmp2/baz/file2 b/new-infra/texmf/tmp1/tmp2/baz/file2 deleted file mode 100644 index e69de29bb2d..00000000000 --- a/new-infra/texmf/tmp1/tmp2/baz/file2 +++ /dev/null diff --git a/new-infra/texmf/tmp1/tmp2/baz/file3 b/new-infra/texmf/tmp1/tmp2/baz/file3 deleted file mode 100644 index e69de29bb2d..00000000000 --- a/new-infra/texmf/tmp1/tmp2/baz/file3 +++ /dev/null diff --git a/new-infra/texmf/tmp1/tmp2/foo/file1 b/new-infra/texmf/tmp1/tmp2/foo/file1 deleted file mode 100644 index e69de29bb2d..00000000000 --- a/new-infra/texmf/tmp1/tmp2/foo/file1 +++ /dev/null diff --git a/new-infra/texmf/tmp1/tmp2/foo/file2 b/new-infra/texmf/tmp1/tmp2/foo/file2 deleted file mode 100644 index e69de29bb2d..00000000000 --- a/new-infra/texmf/tmp1/tmp2/foo/file2 +++ /dev/null diff --git a/new-infra/texmf/tmp1/tmp2/foo/file3 b/new-infra/texmf/tmp1/tmp2/foo/file3 deleted file mode 100644 index e69de29bb2d..00000000000 --- a/new-infra/texmf/tmp1/tmp2/foo/file3 +++ /dev/null diff --git a/new-infra/tldb2list.pl b/new-infra/tldb2list.pl new file mode 100644 index 00000000000..68c2fe73c67 --- /dev/null +++ b/new-infra/tldb2list.pl @@ -0,0 +1,95 @@ +#!/usr/bin/env perl -w +# +# tldb2list.pl +# create list file from tldb +# Copyright 2007 Norbert Preining +# +# This file is licensed under the GNU General Public Licence version 2 +# or any later version +# + +BEGIN { + ($mydir = $0) =~ s,/[^/]*$,,; + unshift (@INC, $mydir); +} + +use strict; + +use TLP; +use TLDB; +use Getopt::Long; +use Pod::Usage; +use File::Path; + + +my $opt_outputdir = "new-list"; +our $opt_debug = 0; +my $man = 0; +my $help = 0; + +GetOptions("debug!", # debug mode + "outputdir=s" => \$opt_outputdir, + 'help|?' => \$help, man => \$man + ) or pod2usage(2); + +pod2usage(1) if $help; +pod2usage(1) if ($#ARGV<0); +pod2usage(-exitstatus => 0, -verbose => 2) if $man; + +if (! -d "$opt_outputdir") { + mkpath("$opt_outputdir") or die "Cannot mkdir $opt_outputdir!"; +} + + +die "Cannot read tldb file $ARGV[0]." if (! -r "$ARGV[0]"); + +my $tldb = new TLDB ( location => "$ARGV[0]" ); + +$tldb->generate_listfiles($opt_outputdir); + +__END__ + +=head1 NAME + +tldb2list - Generates list files from a TeX Live Database + +=head1 SYNOPSIS + +tldb2list [options] texlive.tldb + + Options: + -help brief help message + -man full documentation + -outputdir=s specify the directory where list files are created + -debug get debug messages from TL* modules + +=head1 OPTIONS + +=over 8 + +=item B<-help> + +Print a brief help message and exits. + +=item B<-man> + +Prints the manual page and exits. + +=item B<-outputdir> + +Specifies the location where list files are created. Defaults to ./new-list + +=item B<-debug> + +Give debug messages from the TeX Live modules + +=back + +=head1 DESCRIPTION + +B<tldb2list> generates list files necessary for the installer from the +TeX Live Database. + +=cut + + diff --git a/new-infra/tlsrc/bar.tlsrc b/new-infra/tlsrc/bar.tlsrc deleted file mode 100644 index db471ff6642..00000000000 --- a/new-infra/tlsrc/bar.tlsrc +++ /dev/null @@ -1,14 +0,0 @@ -name bar -shortdesc the bar ckage -longdesc the bar package is used for doing useless - stuff as here we want to show - continued lines aof i opidf poi posidpfo ispodf posdf posopd fj - o sdpjf poj pdsjf pjdsf pjsodfj opkjsdf jsokdfjopksjf pojsdpfj s - oj spodfj kj okfjsdof jsodkjf opksjdf kjsdfkj skdfjsdf jsjdf ojksdf - js odfj oskjdf oksjfokjsdokfjsodkfj oskdjf oksjdfokjsdokfjsdokf - jksopjdfo sj dfokj sdokjf oksdjf ksdojfosd fjosdjf osdokfj -depend othercoll -depend another collection -depend foo -runpatterns t texmf-dist bar -docpatterns r texmf/.*/bar/.* diff --git a/new-infra/tlsrc/baz.tlsrc b/new-infra/tlsrc/baz.tlsrc deleted file mode 100644 index 338a2fe1251..00000000000 --- a/new-infra/tlsrc/baz.tlsrc +++ /dev/null @@ -1,9 +0,0 @@ -name baz -shortdesc the baz package -longdesc the baz -depend othercoll -depend another collection -depend foo -runpatterns t texmf-dist baz -docpatterns t texmf-doc baz -srcpatterns t texmf baz diff --git a/new-infra/tlsrc/binaries-a.tlsrc b/new-infra/tlsrc/binaries-a.tlsrc deleted file mode 100644 index aa3838bc8d0..00000000000 --- a/new-infra/tlsrc/binaries-a.tlsrc +++ /dev/null @@ -1,6 +0,0 @@ -name binaries-a -shortdesc binaries for the world -longdesc we provide nice binaries for the world -longdesc and we want them to rule the world. -binpatterns t bin ${ARCH} -docpatterns r texmf/.*/bar/.* diff --git a/new-infra/tlsrc/binaries-b.tlsrc b/new-infra/tlsrc/binaries-b.tlsrc deleted file mode 100644 index d7db11fcbb5..00000000000 --- a/new-infra/tlsrc/binaries-b.tlsrc +++ /dev/null @@ -1,5 +0,0 @@ -name binaries-b -shortdesc binaries for the world -longdesc we provide nice binaries for the world -longdesc and we want them to rule the world. -binpatterns r bin/${ARCH}/.* diff --git a/new-infra/tlsrc/foo.tlsrc b/new-infra/tlsrc/foo.tlsrc deleted file mode 100644 index 51e15740980..00000000000 --- a/new-infra/tlsrc/foo.tlsrc +++ /dev/null @@ -1,7 +0,0 @@ -name foo -shortdesc the foo package -longdesc the foo package is used for doing useless - stuff as here we want to show - continued lines -execute addMap foo.map -runpatterns +f texmf-dist/fonts/vf/bar/file1 diff --git a/new-infra/tlsrc/rrr.tlsrc b/new-infra/tlsrc/rrr.tlsrc deleted file mode 100644 index 25052ce44a1..00000000000 --- a/new-infra/tlsrc/rrr.tlsrc +++ /dev/null @@ -1,7 +0,0 @@ -name rrr -shortdesc the baz package -longdesc the baz -depend othercoll -depend another collection -depend foo -runpatterns d texmf-dist |