summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNorbert Preining <preining@logic.at>2010-05-27 10:28:41 +0000
committerNorbert Preining <preining@logic.at>2010-05-27 10:28:41 +0000
commitc4335da95075e0c78ec68e37452ec4412fcf80fd (patch)
treec5dabbc55bc27609870cc6dedbf837a93c12572e
parent64f9014bc483d6bf9855b8e0420c5eb34b4d8a63 (diff)
revert the change that texmfcnf.lua is generated at install time, but
put a file into texmf/web2c/texmfcnf.lua, and add a comment how to change the cache by copying it over to the root of the installation remove also the disappeared install-tl string in tl-update-tlnet grep check git-svn-id: svn://tug.org/texlive/trunk@18526 c570f23f-e606-0410-a88d-b1316a301751
-rwxr-xr-xMaster/install-tl22
-rw-r--r--Master/texmf/web2c/texmfcnf.lua12
-rwxr-xr-xMaster/tlpkg/bin/tl-update-tlnet1
3 files changed, 16 insertions, 19 deletions
diff --git a/Master/install-tl b/Master/install-tl
index d69c7a1b02e..67e421df7d9 100755
--- a/Master/install-tl
+++ b/Master/install-tl
@@ -812,24 +812,10 @@ operations might be disturbed.\n\n";
# we only call luatools --generate once at installation time, the
# rest must be managed by the user, Taco email 2010-05-26
if (defined($install{"context"} && $install{"context"} == 1)) {
- info("Generating luatex config file texmfcnf.lua");
- #
- # can we move that to a different place?
- if (!open(TMFCL,">$vars{'TEXDIR'}/texmfcnf.lua")) {
- tlwarn("Cannot generate texmfcnf.lua in
- $vars{'TEXDIR'}/texmfcnf.lua
-not setting up luatex cache.\n");
- } else {
- print TMFCL "
-return {
- TEXMFCACHE = '~/.texlive2010/texmf-var'
-}
-";
- info("Generating the initial ConTeXt MkIV cache, be patient ...");
- mkdirhier($TEXMFVAR);
- log(`luatools --generate 2>&1 `);
- info("done\n");
- }
+ info("Generating the initial ConTeXt MkIV cache, be patient ...");
+ mkdirhier($TEXMFVAR);
+ log(`luatools --generate 2>&1 `);
+ info("done\n");
}
# all formats option
diff --git a/Master/texmf/web2c/texmfcnf.lua b/Master/texmf/web2c/texmfcnf.lua
new file mode 100644
index 00000000000..0380ff3b1a2
--- /dev/null
+++ b/Master/texmf/web2c/texmfcnf.lua
@@ -0,0 +1,12 @@
+--
+-- texmfcnf.lua
+-- specifies the necessary TEXMFCACHE setting.
+-- if you want a different location for the cache please copy this
+-- file to the root of your installation (2 directories up) and
+-- change the setting there, as changes here will be overwritten
+-- by updates.
+
+return {
+ TEXMFCACHE = '~/.texlive2010/texmf-var'
+}
+
diff --git a/Master/tlpkg/bin/tl-update-tlnet b/Master/tlpkg/bin/tl-update-tlnet
index 81811f43834..d20a4764cfc 100755
--- a/Master/tlpkg/bin/tl-update-tlnet
+++ b/Master/tlpkg/bin/tl-update-tlnet
@@ -142,7 +142,6 @@ unexpected_output=`cat install.log \
| grep -Ev '^writing updmap.cfg to' \
| grep -Ev '^writing language.(dat|def|dat.lua) data to' \
| grep -Ev '^pre-generating all format file' \
- | grep -Ev '^Generating luatex config file texmfcnf' \
| grep -Ev '^Generating the initial ConTeXt MkIV cache' \
| grep -Ev '^running ' \
| grep -Ev '^done running ' \