summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2014-04-17 23:57:54 +0000
committerKarl Berry <karl@freefriends.org>2014-04-17 23:57:54 +0000
commit44d151448dc08df0dedc05952f9fc0aefb1c1410 (patch)
tree43eaa68d512e7faccffdbe9a2a67a6e40eb9ce6c
parentbb9dab06ad8ae35b4dc396e029913d7228d7230d (diff)
no luajittex formats yet; sync after first trial 2014 build
git-svn-id: svn://tug.org/texlive/trunk@33503 c570f23f-e606-0410-a88d-b1316a301751
-rw-r--r--Build/source/texk/tests/TeXLive/TLConfig.pm6
-rw-r--r--Build/source/texk/tests/TeXLive/TLUtils.pm4
-rwxr-xr-xBuild/source/texk/texlive/linked_scripts/texlive/tlmgr.pl15
-rw-r--r--Build/source/texk/texlive/tl_scripts/fmtutil.cnf6
-rwxr-xr-xMaster/bin/win32/psjoin.exebin0 -> 13824 bytes
-rw-r--r--Master/tlpkg/tlpsrc/latex-bin.tlpsrc8
-rw-r--r--Master/tlpkg/tlpsrc/luatex.tlpsrc7
7 files changed, 23 insertions, 23 deletions
diff --git a/Build/source/texk/tests/TeXLive/TLConfig.pm b/Build/source/texk/tests/TeXLive/TLConfig.pm
index 4e88b3aa484..df3395badbf 100644
--- a/Build/source/texk/tests/TeXLive/TLConfig.pm
+++ b/Build/source/texk/tests/TeXLive/TLConfig.pm
@@ -1,11 +1,11 @@
# TeXLive::TLConfig.pm - module exporting configuration values
-# Copyright 2007-2013 Norbert Preining
+# Copyright 2007-2014 Norbert Preining
# This file is licensed under the GNU General Public License version 2
# or any later version.
package TeXLive::TLConfig;
-my $svnrev = '$Revision: 29883 $';
+my $svnrev = '$Revision: 33475 $';
my $_modulerevision;
if ($svnrev =~ m/: ([0-9]+) /) {
$_modulerevision = $1;
@@ -53,7 +53,7 @@ BEGIN {
# the year of our release, will be used in the location of the
# network packages, and in menu names, and other places.
-$ReleaseYear = 2013;
+$ReleaseYear = 2014;
# users can upgrade from this year to the current year; maybe a spread
# of more than one year will be useful at some point, but not now.
diff --git a/Build/source/texk/tests/TeXLive/TLUtils.pm b/Build/source/texk/tests/TeXLive/TLUtils.pm
index 7dbb4a74fad..62609908024 100644
--- a/Build/source/texk/tests/TeXLive/TLUtils.pm
+++ b/Build/source/texk/tests/TeXLive/TLUtils.pm
@@ -1,11 +1,11 @@
# TeXLive::TLUtils.pm - the inevitable utilities for TeX Live.
-# Copyright 2007-2013 Norbert Preining, Reinhard Kotucha
+# Copyright 2007-2014 Norbert Preining, Reinhard Kotucha
# This file is licensed under the GNU General Public License version 2
# or any later version.
package TeXLive::TLUtils;
-my $svnrev = '$Revision: 33021 $';
+my $svnrev = '$Revision: 33475 $';
my $_modulerevision;
if ($svnrev =~ m/: ([0-9]+) /) {
$_modulerevision = $1;
diff --git a/Build/source/texk/texlive/linked_scripts/texlive/tlmgr.pl b/Build/source/texk/texlive/linked_scripts/texlive/tlmgr.pl
index b3fae46bc51..e8e0072f4ea 100755
--- a/Build/source/texk/texlive/linked_scripts/texlive/tlmgr.pl
+++ b/Build/source/texk/texlive/linked_scripts/texlive/tlmgr.pl
@@ -1,12 +1,12 @@
#!/usr/bin/env perl
-# $Id: tlmgr.pl 33356 2014-04-02 23:22:46Z preining $
+# $Id: tlmgr.pl 33493 2014-04-17 23:05:35Z karl $
#
# Copyright 2008-2014 Norbert Preining
# This file is licensed under the GNU General Public License version 2
# or any later version.
-my $svnrev = '$Revision: 33356 $';
-my $datrev = '$Date: 2014-04-03 01:22:46 +0200 (Thu, 03 Apr 2014) $';
+my $svnrev = '$Revision: 33493 $';
+my $datrev = '$Date: 2014-04-18 01:05:35 +0200 (Fri, 18 Apr 2014) $';
my $tlmgrrevision;
my $prg;
if ($svnrev =~ m/: ([0-9]+) /) {
@@ -5041,7 +5041,8 @@ sub check_depends {
}
# list of collections.
my @colls = $localtlpdb->collections;
- my @coll_deps = $localtlpdb->expand_dependencies("-no-collections",$localtlpdb,@colls);
+ my @coll_deps
+ = $localtlpdb->expand_dependencies("-no-collections", $localtlpdb, @colls);
my %coll_deps;
@coll_deps{@coll_deps} = (); # initialize hash with keys from list
@@ -5051,9 +5052,8 @@ sub check_depends {
next if $pkg =~ m/^00texlive/;
# For each package, check that it is a dependency of some collection.
- # Whatever is left in %coll_deps after this loop will be the problem
if (! exists $coll_deps{$pkg}) {
- # Except that schemes and our special .win32 packages are ok.
+ # Except that schemes and our ugly Windows packages are ok.
push (@no_dep, $pkg) unless $pkg =~/^scheme-|\.win32$/;
}
@@ -7188,9 +7188,6 @@ downgrade. Also, packages for uninstalled platforms are not installed.
=head1 USER MODE
-B<WARNING:> This is new work in TL 2013. Expect breakage, and the need
-to reinstall your user tree.
-
C<tlmgr> provides a restricted way, called ``user mode'', to manage
arbitrary texmf trees in the same way as the main installation. For
example, this allows people without write permissions on the
diff --git a/Build/source/texk/texlive/tl_scripts/fmtutil.cnf b/Build/source/texk/texlive/tl_scripts/fmtutil.cnf
index 895bb98cc36..3a51160c3ec 100644
--- a/Build/source/texk/texlive/tl_scripts/fmtutil.cnf
+++ b/Build/source/texk/texlive/tl_scripts/fmtutil.cnf
@@ -1,4 +1,5 @@
-# Generated by /home/texlive/karl/Master/bin/i386-linux/tlmgr on Wed Jun 26 03:19:14 2013
+# Generated by /home/texlive/karl/Master/bin/i386-linux/tlmgr on Fri Apr 18 01:34:20 2014
+# $Id: fmtutil-hdr.cnf 30214 2013-05-02 22:31:16Z karl $
# Originally written by Thomas Esser, 1998. Public domain.
#
# As of TeX Live 2008, the final fmtutil.cnf is generated by
@@ -44,7 +45,6 @@ amstex pdftex - -translate-file=cp227.tcx *amstex.ini
# from context:
cont-en pdftex cont-usr.tex -8bit *cont-en.mkii
cont-en xetex cont-usr.tex -8bit *cont-en.mkii
-#! cont-de pdftex cont-usr.tex -8bit *cont-de.mkii
#! cont-fr pdftex cont-usr.tex -8bit *cont-fr.mkii
#! cont-it pdftex cont-usr.tex -8bit *cont-it.mkii
#! cont-nl pdftex cont-usr.tex -8bit *cont-nl.mkii
@@ -72,10 +72,12 @@ latex pdftex language.dat -translate-file=cp227.tcx *latex.ini
pdflatex pdftex language.dat -translate-file=cp227.tcx *pdflatex.ini
dvilualatex luatex language.dat,language.dat.lua dvilualatex.ini
lualatex luatex language.dat,language.dat.lua lualatex.ini
+#! luajitlatex luajittex language.dat,language.dat.lua lualatex.ini
#
# from luatex:
luatex luatex language.def,language.dat.lua luatex.ini
dviluatex luatex language.def,language.dat.lua dviluatex.ini
+luajittex luajittex language.def,language.dat.lua luatex.ini
#
# from metafont:
mf mf-nowin - -translate-file=cp227.tcx mf.ini
diff --git a/Master/bin/win32/psjoin.exe b/Master/bin/win32/psjoin.exe
new file mode 100755
index 00000000000..be1c250adf2
--- /dev/null
+++ b/Master/bin/win32/psjoin.exe
Binary files differ
diff --git a/Master/tlpkg/tlpsrc/latex-bin.tlpsrc b/Master/tlpkg/tlpsrc/latex-bin.tlpsrc
index 40a5d7f25dc..c516a9b7be8 100644
--- a/Master/tlpkg/tlpsrc/latex-bin.tlpsrc
+++ b/Master/tlpkg/tlpsrc/latex-bin.tlpsrc
@@ -27,7 +27,7 @@ docpattern f texmf-dist/doc/man/man1/latex.*
docpattern f texmf-dist/doc/man/man1/pdflatex.*
#
# disabled luajitlatex format (just PDF until someone wants DVI?):
-binpattern f bin/${ARCH}/luajitlatex
-execute AddFormat name=luajitlatex mode=disabled engine=luajittex \
- patterns=language.dat,language.dat.lua \
- options="lualatex.ini"
+#binpattern f bin/${ARCH}/luajitlatex
+#execute AddFormat name=luajitlatex mode=disabled engine=luajittex \
+# patterns=language.dat,language.dat.lua \
+# options="lualatex.ini"
diff --git a/Master/tlpkg/tlpsrc/luatex.tlpsrc b/Master/tlpkg/tlpsrc/luatex.tlpsrc
index 7bb70fa3d13..24f5da1ddd5 100644
--- a/Master/tlpkg/tlpsrc/luatex.tlpsrc
+++ b/Master/tlpkg/tlpsrc/luatex.tlpsrc
@@ -7,9 +7,10 @@ execute AddFormat \
name=dviluatex engine=luatex patterns=language.def,language.dat.lua \
options="dviluatex.ini"
#
-execute AddFormat \
- name=luajittex engine=luajittex patterns=language.def,language.dat.lua \
- options="luatex.ini"
+# luajittex is not going to exist on all platforms. hmm.
+#execute AddFormat \
+# name=luajittex engine=luajittex patterns=language.def,language.dat.lua \
+# options="luatex.ini"
#
docpattern d texmf-dist/doc/luatex/base
docpattern f texmf-dist/doc/man/man1/luatex.*