diff options
author | Norbert Preining <preining@logic.at> | 2007-06-04 08:48:42 +0000 |
---|---|---|
committer | Norbert Preining <preining@logic.at> | 2007-06-04 08:48:42 +0000 |
commit | b8912b2ce322764d1f48d79ad55333024986b42f (patch) | |
tree | 91e84308cd99ea6a17ae4950b8c25a19d5225181 /new-infra | |
parent | f93bd715fca0ffe63bcc244eaf909eef746fddf9 (diff) |
more fixes, adaptions for win32
git-svn-id: svn://tug.org/texlive/trunk@4409 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'new-infra')
-rw-r--r-- | new-infra/TLSRC.pm | 4 | ||||
-rw-r--r-- | new-infra/TLTREE.pm | 12 | ||||
-rwxr-xr-x | new-infra/etc/create-tlsrc-from-tpm.pl | 24 |
3 files changed, 32 insertions, 8 deletions
diff --git a/new-infra/TLSRC.pm b/new-infra/TLSRC.pm index db3d641756d..4229bc6f8ad 100644 --- a/new-infra/TLSRC.pm +++ b/new-infra/TLSRC.pm @@ -56,7 +56,7 @@ sub from_file { if ($line =~ /^\s*$/) { if (!$started) { next; } if ($finished) { next; } - die("No empty line allowed in tlsrc files!"); + die("No empty line allowed in tlsrc file $_[0]!"); } if ($line =~ /^ /) { if ( ($lastcmd eq "longdesc") || @@ -115,7 +115,7 @@ sub from_file { $lastcmd = "depend"; next; } else { - die("Unknown directive ...$line... in $tlsrc, please fix it!"); + die("Unknown directive ...$line... in $_[0], please fix it!"); } } } diff --git a/new-infra/TLTREE.pm b/new-infra/TLTREE.pm index c45192b526d..685a1562dc6 100644 --- a/new-infra/TLTREE.pm +++ b/new-infra/TLTREE.pm @@ -167,6 +167,13 @@ sub get_matching_files { # we first substitute arch for ${ARCH} my %returnfiles; foreach $a (@Architectures) { + # return empty list of arch!=win32 and pattern matches bin/win32 + # this is a special case to treat with tlsrc files auto generated + # from tpm files + if (($p =~ m@f bin/win32/@) && ($a ne "win32")) { + $returnfiles{$a} = [ ]; + next; + } my $ARCH = $a; my $newp; eval "\$newp = \"$p\""; @@ -185,6 +192,7 @@ sub _get_matching_files { my ($self, $type, $p) = @_; my ($pattype,$patdata,@rest) = split ' ',$p; my @matchfiles; + &TLUtils::debug("check on $pattype,$patdata,@rest\n"); if ($pattype eq "t") { @matchfiles = $self->_get_files_matching_dir_pattern($type,$patdata,@rest); } elsif ($pattype eq "f") { @@ -196,6 +204,7 @@ sub _get_matching_files { } else { die "Unknown pattern $p"; } + TLUtils::debug("DEBUG: p=$p, matchfiles=@matchfiles\n"); return @matchfiles; } @@ -221,7 +230,8 @@ sub _get_files_matching_glob_pattern { foreach my $f (@candfiles) { &TLUtils::debug("matching $f in $dirpart via glob $globline\n"); if ($f =~ /^$basepart$/) { - push @returnfiles, $f; + &TLUtils::debug("hit: globline=$globline, $dirpart/$f\n"); + push @returnfiles, "$dirpart/$f"; } } return(@returnfiles); diff --git a/new-infra/etc/create-tlsrc-from-tpm.pl b/new-infra/etc/create-tlsrc-from-tpm.pl index bbb76137c28..0315815925b 100755 --- a/new-infra/etc/create-tlsrc-from-tpm.pl +++ b/new-infra/etc/create-tlsrc-from-tpm.pl @@ -14,6 +14,8 @@ no strict 'refs'; # use warnings; # no warnings 'uninitialized'; +my $_tmp; + my $opt_master; our $opt_nosrcpkg; our $opt_noremove; @@ -226,7 +228,9 @@ sub create_tlsrc_files { open (FOO,">tlsrc/$p.tlsrc") || die("Cannot open tlsrc/$p.tlsrc!"); print FOO "name $p\n"; print FOO "shortdesc $TpmData{$t}{$p}{'Title'}\n"; - print FOO "longdesc $TpmData{$t}{$p}{'Description'}\n"; + $_tmp = "longdesc $TpmData{$t}{$p}{'Description'}"; + write FOO; + #print FOO "longdesc $TpmData{$t}{$p}{'Description'}\n"; foreach my $foo (@{$TpmData{$t}{$p}{'Package'}}) { print FOO "depend $foo\n"; } @@ -234,16 +238,16 @@ sub create_tlsrc_files { print FOO "depend $foo\n"; } foreach my $foo (@{$TpmData{$t}{$p}{'SourcePatterns'}}) { - print FOO "SourcePatterns $foo\n"; + print FOO "SourcePatterns f $foo\n"; } foreach my $foo (@{$TpmData{$t}{$p}{'BinPatterns'}}) { - print FOO "binpatterns $foo\n"; + print FOO "binpatterns f $foo\n"; } foreach my $foo (@{$TpmData{$t}{$p}{'DocPatterns'}}) { - print FOO "docpatterns $foo\n"; + print FOO "docpatterns f $foo\n"; } foreach my $foo (@{$TpmData{$t}{$p}{'RunPatterns'}}) { - print FOO "runpatterns $foo\n"; + print FOO "runpatterns f $foo\n"; } foreach my $ex (@{$TpmData{$t}{$p}{'Installation'}}) { my %foo = %{$ex}; @@ -296,6 +300,16 @@ sub main { create_tlsrc_files(); } +##################################### +# +# Formats +# +format FOO = +^<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<< +$_tmp + ^<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<< +$_tmp +. ### Local Variables: ### perl-indent-level: 4 |