summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--Build/source/utils/README9
-rw-r--r--Build/source/utils/biber/TeXLive/TLUtils.pm84
-rwxr-xr-xMaster/tlpkg/bin/check-files-by-format1
-rw-r--r--Master/tlpkg/tlpsrc/texlive.infra.tlpsrc2
4 files changed, 83 insertions, 13 deletions
diff --git a/Build/source/utils/README b/Build/source/utils/README
index 7407d9c23ef..9bd6d1651a5 100644
--- a/Build/source/utils/README
+++ b/Build/source/utils/README
@@ -72,7 +72,14 @@ cd $clisp_basedir
wget http://ftp.gnu.org/gnu/clisp/release/2.49/clisp-2.49.tar.gz
gzip -dc clisp-2.49.tar.gz | tar xf -
cd clisp-2.49
-# On FreeBSD/amd64, add --disable-mmap.
+
+# On Cygwin:
+# mv modules/syscalls/configure modules/syscalls/configure.orig
+# sed -e '{s%-luuid%-L/usr/lib/w32api -luuid%}' \
+# modules/syscalls/configure.orig > modules/syscalls/configure
+
+# On FreeBSD/amd64: add --disable-mmap.
+
./configure --with-libsigsegv-prefix=$clisp_toolsdir --without-readline \
--disable-nls \
$clisp_builddir \
diff --git a/Build/source/utils/biber/TeXLive/TLUtils.pm b/Build/source/utils/biber/TeXLive/TLUtils.pm
index 3cbdd59eac2..db61693f40f 100644
--- a/Build/source/utils/biber/TeXLive/TLUtils.pm
+++ b/Build/source/utils/biber/TeXLive/TLUtils.pm
@@ -1,4 +1,4 @@
-# $Id: TLUtils.pm 22010 2011-04-07 12:49:51Z siepo $
+# $Id: TLUtils.pm 22350 2011-05-08 00:12:42Z reinhardk $
# TeXLive::TLUtils.pm - the inevitable utilities for TeX Live.
# Copyright 2007, 2008, 2009, 2010, 2011 Norbert Preining, Reinhard Kotucha
# This file is licensed under the GNU General Public License version 2
@@ -6,7 +6,7 @@
package TeXLive::TLUtils;
-my $svnrev = '$Revision: 22010 $';
+my $svnrev = '$Revision: 22350 $';
my $_modulerevision;
if ($svnrev =~ m/: ([0-9]+) /) {
$_modulerevision = $1;
@@ -222,7 +222,7 @@ sub platform {
# We cannot rely on #! in config.guess but have to call /bin/sh
# explicitly because sometimes the 'noexec' flag is set in
# /etc/fstab for ISO9660 file systems.
- chomp (my $guessed_platform = `/bin/sh $config_guess`);
+ chomp (my $guessed_platform = `/bin/sh '$config_guess'`);
# For example, if the disc or reader has hardware problems.
die "$0: could not run $config_guess, cannot proceed, sorry"
@@ -1515,6 +1515,9 @@ sub do_postaction {
} elsif ($pa =~ m/\s*fileassoc\s+(.*)\s*$/) {
$ret &&= _do_postaction_fileassoc($how, $do_fileassocs, $tlpobj, $1);
next;
+ } elsif ($pa =~ m/\s*appreg\s+(.*)\s*$/) {
+ next unless $do_fileassocs;
+ $ret &&= _do_postaction_application($how, $tlpobj, $1);
} elsif ($pa =~ m/\s*script\s+(.*)\s*$/) {
next unless $do_script;
$ret &&= _do_postaction_script($how, $tlpobj, $1);
@@ -1564,6 +1567,7 @@ sub _do_postaction_fileassoc {
}
return 1;
}
+
sub _do_postaction_filetype {
my ($how, $tlpobj, $pa) = @_;
return 1 unless win32();
@@ -1607,6 +1611,70 @@ sub _do_postaction_filetype {
return 1;
}
+sub _do_postaction_application {
+ my ($how, $tlpobj, $pa) = @_;
+ return 1 unless win32();
+ my ($errors, %keyval) =
+ parse_into_keywords($pa, qw/prog cmd exts/);
+
+ if ($errors) {
+ tlwarn("parsing the postaction line >>$pa<< did not succeed!\n");
+ return 0;
+ }
+
+ # prog
+ if (!defined($keyval{'prog'})) {
+ tlwarn("prog of appreg postaction not given\n");
+ return 0;
+ }
+ my $prog = $keyval{'prog'};
+
+ if (!defined($keyval{'cmd'})) {
+ tlwarn("cmd of appreg postaction not given\n");
+ return 0;
+ }
+ my $cmd = $keyval{'cmd'};
+
+ my $exts_arr = [];
+ my $e;
+ my $exts = '';
+ if (!defined($keyval{'exts'})) {
+ tlwarn("exts of appreg postaction not given\n");
+ } else {
+ $exts = $keyval{'exts'};
+ foreach $e (split /\|/, $exts) {
+ if ($e =~ /^\./) {
+ push @$exts_arr, $e;
+ } else {
+ tlwarn("Invalid extension $e for $prog ignored\n");
+ }
+ }
+ }
+
+ my $texdir = `kpsewhich -var-value=SELFAUTOPARENT`;
+ chomp($texdir);
+ my $texdir_bsl = conv_to_w32_path($texdir);
+ $cmd =~ s!^("?)TEXDIR/!$1$texdir/!g;
+
+ &log("postaction $how appreg for " . $tlpobj->name .
+ ": $prog, $cmd, $exts\n");
+ if ($how eq "install") {
+ TeXLive::TLWinGoo::register_application($prog, $cmd, $exts_arr);
+ foreach $e (@$exts_arr) {
+ TeXLive::TLWinGoo::add_to_openwithlist($e, $prog);
+ }
+ } elsif ($how eq "remove") {
+ TeXLive::TLWinGoo::unregister_application($prog);
+ foreach $e (@$exts_arr) {
+ TeXLive::TLWinGoo::remove_from_openwithlist($e, $prog);
+ }
+ } else {
+ tlwarn("Unknown mode $how\n");
+ return 0;
+ }
+ return 1;
+}
+
sub _do_postaction_script {
my ($how, $tlpobj, $pa) = @_;
my ($errors, %keyval) =
@@ -2797,14 +2865,8 @@ in the list of the remaining arguments.
=cut
sub member {
- my ($e, @l) = @_;
- my ($f);
- foreach $f (@l) {
- if ($e eq $f) {
- return 1;
- }
- }
- return 0;
+ my $what = shift;
+ return scalar grep($_ eq $what, @_);
}
diff --git a/Master/tlpkg/bin/check-files-by-format b/Master/tlpkg/bin/check-files-by-format
index 0b08389d4d1..182e5f14153 100755
--- a/Master/tlpkg/bin/check-files-by-format
+++ b/Master/tlpkg/bin/check-files-by-format
@@ -75,6 +75,7 @@ my $exclude_pfb = { '*base*' => 'texmf-dist/fonts/type1',
'public/cs/' => 1,
'public/doublestroke/' => 1,
'public/epiolmec/' => 1,
+ 'public/esstix/' => 1, # 12may11 author fixed some, others will remain
'public/ethiop-t1/' => 1,
'public/eurosym/' => 1,
'public/foekfont/' => 1,
diff --git a/Master/tlpkg/tlpsrc/texlive.infra.tlpsrc b/Master/tlpkg/tlpsrc/texlive.infra.tlpsrc
index 9fc9df29efa..e2305cbd728 100644
--- a/Master/tlpkg/tlpsrc/texlive.infra.tlpsrc
+++ b/Master/tlpkg/tlpsrc/texlive.infra.tlpsrc
@@ -29,7 +29,7 @@ runpattern f texmf/web2c/updmap-hdr.cfg
runpattern f tlpkg/installer/config.guess
#
binpattern f bin/${ARCH}/tlmgr
-binpattern f/win32 tl-menu.exe
+binpattern f/win32 tl-tray-menu.exe
binpattern f/win32 bin/win32/tlmgr-gui.exe
binpattern f/win32 bin/win32/tlmgr-gui.vbs
binpattern f/win32 tlpkg/installer/tar.exe