Skip to content

Commit 53f267b

Browse files
norbusannorbusan
committed
updating installer data
1 parent 11a0c7a commit 53f267b

2 files changed

Lines changed: 28 additions & 21 deletions

File tree

‎tlpkg/TeXLive/TLPSRC.pm‎

Lines changed: 20 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -464,11 +464,11 @@ sub make_tlpobj {
464464

465465
# for all other patterns we create the list and add the files
466466
foreach my $p (@allpospats) {
467-
ddebug("pos pattern $p\n");
467+
dddebug("pos pattern $p\n");
468468
$self->_do_normal_pattern($p,$tlp,$tltree,$pattype);
469469
}
470470
foreach my $p (@allnegpats) {
471-
ddebug("neg pattern $p\n");
471+
dddebug("neg pattern: $p\n");
472472
$self->_do_normal_pattern($p,$tlp,$tltree,$pattype,1);
473473
}
474474
}
@@ -479,12 +479,14 @@ sub make_tlpobj {
479479
# in the above loop. We only have to deal with the specialities of
480480
# the bin patterns
481481
foreach my $p (@allpospats) {
482+
#ddebug ("pos binpattern: $p\n");
482483
my @todoarchs = $tltree->architectures;
483484
my $finalp = $p;
484-
if ($p =~ m%^(\w+)/(!?[-_a-z0-9,]+)\s+(.*)$%) {
485-
my $pt = $1;
486-
my $aa = $2;
487-
my $pr = $3;
485+
if ($p =~ m%^(\w+)/(!?[-_a-z0-9,]*)\s*(.*)$%) {
486+
my $pt = $1; # pattern type
487+
my $aa = $2; # arch list (after possible !)
488+
my $pr = $3; # filename
489+
# ddebug (" pt=$pt, aa=$aa, pr=$pr\n"); #if $p=~/luajittex/;
488490
if ($aa =~ m/^!(.*)$/) {
489491
# negative specification
490492
my %negarchs;
@@ -501,6 +503,7 @@ sub make_tlpobj {
501503
}
502504
# set $p to the pattern without arch specification
503505
$finalp = "$pt $pr";
506+
#ddebug ("finalp = $pt|$pr\n");
504507
}
505508
# one final trick
506509
# if the original pattern string matches bin/windows/ then we *only*
@@ -511,8 +514,10 @@ sub make_tlpobj {
511514
# now @todoarchs contains only those archs for which we want
512515
# to match the pattern
513516
foreach my $arch (sort @todoarchs) {
517+
#ddebug (" doing arch: $arch\n");
514518
# get only those files matching the pattern
515-
my @archfiles = $tltree->get_matching_files('bin',$finalp, $pkgname, $arch);
519+
my @archfiles
520+
= $tltree->get_matching_files ('bin', $finalp, $pkgname, $arch);
516521
if (!@archfiles) {
517522
if (($arch ne "windows") || defined($::tlpsrc_pattern_warn_win)) {
518523
tlwarn("$self->{name} ($arch): no hit on binpattern $finalp\n");
@@ -522,9 +527,10 @@ sub make_tlpobj {
522527
}
523528
}
524529
foreach my $p (@allnegpats) {
530+
#ddebug ("neg binpattern: $p\n");
525531
my @todoarchs = $tltree->architectures;
526532
my $finalp = $p;
527-
if ($p =~ m%^(\w+)/(!?[-_a-z0-9,]+)\s+(.*)$%) {
533+
if ($p =~ m%^(\w+)/(!?[-_a-z0-9,]*)\s*(.*)$%) {
528534
my $pt = $1;
529535
my $aa = $2;
530536
my $pr = $3;
@@ -549,7 +555,8 @@ sub make_tlpobj {
549555
# to match the pattern
550556
foreach my $arch (sort @todoarchs) {
551557
# get only those files matching the pattern
552-
my @archfiles = $tltree->get_matching_files('bin', $finalp, $pkgname, $arch);
558+
my @archfiles
559+
= $tltree->get_matching_files('bin', $finalp, $pkgname, $arch);
553560
if (!@archfiles) {
554561
if (($arch ne "windows") || defined($::tlpsrc_pattern_warn_win)) {
555562
tlwarn("$self->{name} ($arch): no hit on negative binpattern $finalp\n")
@@ -642,16 +649,16 @@ sub find_default_patterns {
642649
for my $cat (keys %autopatterns) {
643650
ddebug ("Category $cat\n");
644651
for my $d (@{$autopatterns{$cat}{"bin"}}) {
645-
ddebug ("auto bin pattern $d\n");
652+
dddebug ("auto bin pattern $d\n");
646653
}
647654
for my $d (@{$autopatterns{$cat}{"src"}}) {
648-
ddebug ("auto src pattern $d\n");
655+
dddebug ("auto src pattern $d\n");
649656
}
650657
for my $d (@{$autopatterns{$cat}{"doc"}}) {
651-
ddebug ("auto doc pattern $d\n");
658+
dddebug ("auto doc pattern $d\n");
652659
}
653660
for my $d (@{$autopatterns{$cat}{"run"}}) {
654-
ddebug ("auto run pattern $d\n");
661+
dddebug ("auto run pattern $d\n");
655662
}
656663
}
657664

‎tlpkg/TeXLive/TLTREE.pm‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,7 @@ sub init_from_svn {
7474
my $retval = $?;
7575
if ($retval != 0) {
7676
$retval /= 256 if $retval > 0;
77-
tldie("TLTree: svn status -v returned $retval, stopping.\n");
77+
tldie("TLTREE::init_from_svn: svn status -v returned $retval, stopping.\n");
7878
}
7979
$self->_initialize_lines(@lines);
8080
}
@@ -94,7 +94,7 @@ sub init_from_files {
9494
my $retval = $?;
9595
if ($retval != 0) {
9696
$retval /= 256 if $retval > 0;
97-
tldie("TLTree: find $svnroot returned $retval, stopping.\n");
97+
tldie("TLTREE::init_from_files: find $svnroot returned $retval, stopping.\n");
9898
}
9999
@lines = grep(!/\/\.svn/ , @lines);
100100
@lines = map { s@^$svnroot@@; s@^/@@; " 1 1 dummy $_" } @lines;
@@ -114,7 +114,7 @@ sub init_from_git {
114114
my @foo = `cd $svnroot; git log --pretty=format:COMMIT=%h --no-renames --name-status`;
115115
if ($retval != 0) {
116116
$retval /= 256 if $retval > 0;
117-
tldie("TLTree: git log in $svnroot returned $retval, stopping.\n");
117+
tldie("TLTREE::init_from_git: git log in $svnroot returned $retval, stopping.\n");
118118
}
119119
chomp(@foo);
120120

@@ -174,7 +174,7 @@ sub init_from_gitsvn {
174174
my $retval = $?;
175175
if ($retval != 0) {
176176
$retval /= 256 if $retval > 0;
177-
tldie("TLTree: git log in $svnroot returned $retval, stopping.\n");
177+
tldie("TLTREE::init_from_gitsvn: git log in $svnroot returned $retval, stopping.\n");
178178
}
179179
my %com2rev;
180180
my @lines;
@@ -392,7 +392,7 @@ sub _get_matching_files {
392392
} elsif ($pattype eq "d") {
393393
@matchfiles = $self->files_under_path($patdata);
394394
} else {
395-
die "Unknown pattern type `$pattype' in $p";
395+
die "TLTREE::_get_matching_files: unknown pattern type `$pattype' in $p";
396396
}
397397
ddebug("p=$p; matchfiles=@matchfiles\n");
398398
return @matchfiles;
@@ -425,7 +425,7 @@ sub _get_files_matching_glob_pattern
425425
for my $f (@candfiles) {
426426
dddebug("matching $f in $dirpart via glob $globline\n");
427427
if ($f =~ /^$basepart$/) {
428-
dddebug("hit: globline=$globline, $dirpart/$f\n");
428+
ddebug("hit: globline=$globline, $dirpart/$f\n");
429429
if ("$dirpart" eq ".") {
430430
push @returnfiles, "$f";
431431
} else {
@@ -444,9 +444,9 @@ sub _get_files_matching_glob_pattern
444444
} else {
445445
$w32_binext = "(exe|dll)(.manifest)?|texlua|bat|cmd";
446446
}
447-
ddebug("matching $f in $dirpart via glob $globline.($w32_binext)\n");
447+
dddebug("matching $f in $dirpart via glob $globline.($w32_binext)\n");
448448
if ($f =~ /^$basepart\.($w32_binext)$/) {
449-
ddebug("hit: globline=$globline, $dirpart/$f\n");
449+
dddebug("hit: globline=$globline, $dirpart/$f\n");
450450
if ("$dirpart" eq ".") {
451451
push @returnfiles, "$f";
452452
} else {

0 commit comments

Comments
 (0)