summaryrefslogtreecommitdiff
path: root/Master
diff options
context:
space:
mode:
authorNorbert Preining <preining@logic.at>2008-02-20 08:58:25 +0000
committerNorbert Preining <preining@logic.at>2008-02-20 08:58:25 +0000
commita4ac519c3bef050828a4459af8d3995b4585f68d (patch)
tree974d1200797bf447f6af87c27c630a8bad5d06f8 /Master
parent9b9dce356c40852f73b2eda471cf90535e99ee84 (diff)
remove the various generate-* wrappers, and thex texlua-perl-runner.
The installer now copies the code from the generate-*.pl scripts and texconfig has an interface for calling these scripts git-svn-id: svn://tug.org/texlive/trunk@6687 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master')
l---------Master/bin/i386-linux/generate-fmtutil1
l---------Master/bin/i386-linux/generate-language1
l---------Master/bin/i386-linux/generate-updmap1
-rwxr-xr-xMaster/bin/i386-linux/texlua-perl-runner53
-rwxr-xr-xMaster/bin/win32/generate-fmtutil.texlua55
-rwxr-xr-xMaster/bin/win32/generate-language.texlua55
-rwxr-xr-xMaster/bin/win32/generate-updmap.texlua55
-rwxr-xr-xMaster/bin/x86_64-linux/generate-fmtutil55
-rwxr-xr-xMaster/bin/x86_64-linux/generate-language55
-rwxr-xr-xMaster/bin/x86_64-linux/generate-updmap55
-rwxr-xr-xMaster/install-tl.pl34
11 files changed, 21 insertions, 399 deletions
diff --git a/Master/bin/i386-linux/generate-fmtutil b/Master/bin/i386-linux/generate-fmtutil
deleted file mode 120000
index 331c9dd59df..00000000000
--- a/Master/bin/i386-linux/generate-fmtutil
+++ /dev/null
@@ -1 +0,0 @@
-texlua-perl-runner \ No newline at end of file
diff --git a/Master/bin/i386-linux/generate-language b/Master/bin/i386-linux/generate-language
deleted file mode 120000
index 331c9dd59df..00000000000
--- a/Master/bin/i386-linux/generate-language
+++ /dev/null
@@ -1 +0,0 @@
-texlua-perl-runner \ No newline at end of file
diff --git a/Master/bin/i386-linux/generate-updmap b/Master/bin/i386-linux/generate-updmap
deleted file mode 120000
index 331c9dd59df..00000000000
--- a/Master/bin/i386-linux/generate-updmap
+++ /dev/null
@@ -1 +0,0 @@
-texlua-perl-runner \ No newline at end of file
diff --git a/Master/bin/i386-linux/texlua-perl-runner b/Master/bin/i386-linux/texlua-perl-runner
deleted file mode 100755
index ca2bfbf7418..00000000000
--- a/Master/bin/i386-linux/texlua-perl-runner
+++ /dev/null
@@ -1,53 +0,0 @@
-#!/usr/bin/env texlua
---*-Lua-*-
--- $Id: texlua-perl-runner 6485 2008-02-01 20:15:06Z reinhardk $
-
--- Copyright (C) 2007 2008 Reinhard Kotucha, Norbert Preining
--- You may freely use, modify and/or distribute this file.
-
--- Wrapper for Perl scripts.
--- Support for -sys variants
-
-
-if string.find(arg[0], "/") then -- UNIX path
- filename=select(1, string.gsub(arg[0], ".*/", ""))
-elseif string.find(arg[0], "\\") then -- Windows path
- filename=select(1, string.gsub(arg[0], ".*\\", ""))
-else -- no path
- filename=arg[0]
-end
-
-basename=select(1, string.gsub(filename, "\.texlua$", ""))
-
-kpse.set_program_name(filename)
-
-TEXDIR=kpse.var_value("SELFAUTOPARENT")
-
--- if we are on win32 we have to use the shipped perl
-perlbin="perl"
-if (os.type == "windows") then
- os.setenv("PERL5LIB", TEXDIR.."/tlpkg/tlperl/lib")
- perlbin=TEXDIR.."/tlpkg/tlperl/bin/perl.exe"
-end
-
-script=kpse.find_file(basename..".pl", "texmfscripts")
-
-if (not(script)) then
- print ("Cannot find "..basename..".pl".." using kpse, exiting!")
- os.exit(1)
-end
-
-if (os.type == "windows") then
- command={'"'..perlbin..'"', '"'..script..'"'}
-else
- command={ perlbin, script }
-end
-command[0] = perlbin
-
-for i=1, #arg do
- command[#command+1]=arg[i]
-end
-
-ret=os.spawn(command)
-os.exit(ret)
-
diff --git a/Master/bin/win32/generate-fmtutil.texlua b/Master/bin/win32/generate-fmtutil.texlua
deleted file mode 100755
index 1e16295e411..00000000000
--- a/Master/bin/win32/generate-fmtutil.texlua
+++ /dev/null
@@ -1,55 +0,0 @@
-#!/usr/bin/env texlua
---*-Lua-*-
--- $Id: texlua-perl-runner 6485 2008-02-01 20:15:06Z reinhardk $
-
--- Copyright (C) 2007 2008 Reinhard Kotucha, Norbert Preining
--- You may freely use, modify and/or distribute this file.
-
--- Wrapper for Perl scripts.
--- Support for -sys variants
-
-
-if string.find(arg[0], "/") then -- UNIX path
- filename=select(1, string.gsub(arg[0], ".*/", ""))
-elseif string.find(arg[0], "\\") then -- Windows path
- filename=select(1, string.gsub(arg[0], ".*\\", ""))
-else -- no path
- filename=arg[0]
-end
-
-basename=select(1, string.gsub(filename, "\.texlua$", ""))
-
--- basename="generate-fmtutil"
-
-kpse.set_program_name(filename)
-
-TEXDIR=kpse.var_value("SELFAUTOPARENT")
-
--- if we are on win32 we have to use the shipped perl
-perlbin="perl"
-if (os.type == "windows") then
- os.setenv("PERL5LIB", TEXDIR.."/tlpkg/tlperl/lib")
- perlbin=TEXDIR.."/tlpkg/tlperl/bin/perl.exe"
-end
-
-script=kpse.find_file(basename..".pl", "texmfscripts")
-
-if (not(script)) then
- print ("Cannot find "..basename..".pl".." using kpse, exiting!")
- os.exit(1)
-end
-
-if (os.type == "windows") then
- command={'"'..perlbin..'"', '"'..script..'"'}
-else
- command={ perlbin, script }
-end
-command[0] = perlbin
-
-for i=1, #arg do
- command[#command+1]=arg[i]
-end
-
-ret=os.spawn(command)
-os.exit(ret)
-
diff --git a/Master/bin/win32/generate-language.texlua b/Master/bin/win32/generate-language.texlua
deleted file mode 100755
index 1ecc6d507f4..00000000000
--- a/Master/bin/win32/generate-language.texlua
+++ /dev/null
@@ -1,55 +0,0 @@
-#!/usr/bin/env texlua
---*-Lua-*-
--- $Id: texlua-perl-runner 6485 2008-02-01 20:15:06Z reinhardk $
-
--- Copyright (C) 2007 2008 Reinhard Kotucha, Norbert Preining
--- You may freely use, modify and/or distribute this file.
-
--- Wrapper for Perl scripts.
--- Support for -sys variants
-
-
-if string.find(arg[0], "/") then -- UNIX path
- filename=select(1, string.gsub(arg[0], ".*/", ""))
-elseif string.find(arg[0], "\\") then -- Windows path
- filename=select(1, string.gsub(arg[0], ".*\\", ""))
-else -- no path
- filename=arg[0]
-end
-
-basename=select(1, string.gsub(filename, "\.texlua$", ""))
-
--- basename="generate-language"
-
-kpse.set_program_name(filename)
-
-TEXDIR=kpse.var_value("SELFAUTOPARENT")
-
--- if we are on win32 we have to use the shipped perl
-perlbin="perl"
-if (os.type == "windows") then
- os.setenv("PERL5LIB", TEXDIR.."/tlpkg/tlperl/lib")
- perlbin=TEXDIR.."/tlpkg/tlperl/bin/perl.exe"
-end
-
-script=kpse.find_file(basename..".pl", "texmfscripts")
-
-if (not(script)) then
- print ("Cannot find "..basename..".pl".." using kpse, exiting!")
- os.exit(1)
-end
-
-if (os.type == "windows") then
- command={'"'..perlbin..'"', '"'..script..'"'}
-else
- command={ perlbin, script }
-end
-command[0] = perlbin
-
-for i=1, #arg do
- command[#command+1]=arg[i]
-end
-
-ret=os.spawn(command)
-os.exit(ret)
-
diff --git a/Master/bin/win32/generate-updmap.texlua b/Master/bin/win32/generate-updmap.texlua
deleted file mode 100755
index 221f8f085df..00000000000
--- a/Master/bin/win32/generate-updmap.texlua
+++ /dev/null
@@ -1,55 +0,0 @@
-#!/usr/bin/env texlua
---*-Lua-*-
--- $Id: texlua-perl-runner 6485 2008-02-01 20:15:06Z reinhardk $
-
--- Copyright (C) 2007 2008 Reinhard Kotucha, Norbert Preining
--- You may freely use, modify and/or distribute this file.
-
--- Wrapper for Perl scripts.
--- Support for -sys variants
-
-
-if string.find(arg[0], "/") then -- UNIX path
- filename=select(1, string.gsub(arg[0], ".*/", ""))
-elseif string.find(arg[0], "\\") then -- Windows path
- filename=select(1, string.gsub(arg[0], ".*\\", ""))
-else -- no path
- filename=arg[0]
-end
-
-basename=select(1, string.gsub(filename, "\.texlua$", ""))
-
--- basename="generate-updmap"
-
-kpse.set_program_name(filename)
-
-TEXDIR=kpse.var_value("SELFAUTOPARENT")
-
--- if we are on win32 we have to use the shipped perl
-perlbin="perl"
-if (os.type == "windows") then
- os.setenv("PERL5LIB", TEXDIR.."/tlpkg/tlperl/lib")
- perlbin=TEXDIR.."/tlpkg/tlperl/bin/perl.exe"
-end
-
-script=kpse.find_file(basename..".pl", "texmfscripts")
-
-if (not(script)) then
- print ("Cannot find "..basename..".pl".." using kpse, exiting!")
- os.exit(1)
-end
-
-if (os.type == "windows") then
- command={'"'..perlbin..'"', '"'..script..'"'}
-else
- command={ perlbin, script }
-end
-command[0] = perlbin
-
-for i=1, #arg do
- command[#command+1]=arg[i]
-end
-
-ret=os.spawn(command)
-os.exit(ret)
-
diff --git a/Master/bin/x86_64-linux/generate-fmtutil b/Master/bin/x86_64-linux/generate-fmtutil
deleted file mode 100755
index 269e078003b..00000000000
--- a/Master/bin/x86_64-linux/generate-fmtutil
+++ /dev/null
@@ -1,55 +0,0 @@
-#!/usr/bin/env texlua
---*-Lua-*-
--- $Id$
-
--- Copyright (C) 2007 2008 Reinhard Kotucha, Norbert Preining
--- You may freely use, modify and/or distribute this file.
-
--- Wrapper for Perl scripts.
--- Support for -sys variants
-
-
-if string.find(arg[0], "/") then -- UNIX path
- filename=select(1, string.gsub(arg[0], ".*/", ""))
-elseif string.find(arg[0], "\\") then -- Windows path
- filename=select(1, string.gsub(arg[0], ".*\\", ""))
-else -- no path
- filename=arg[0]
-end
-
-basename=select(1, string.gsub(filename, "\.texlua$", ""))
-
-basename="generate-fmtutil"
-
-kpse.set_program_name(filename)
-
-TEXDIR=kpse.var_value("SELFAUTOPARENT")
-
--- if we are on win32 we have to use the shipped perl
-perlbin="perl"
-if (os.type == "windows") then
- os.setenv("PERL5LIB", TEXDIR.."/tlpkg/tlperl/lib")
- perlbin=TEXDIR.."/tlpkg/tlperl/bin/perl.exe"
-end
-
-script=kpse.find_file(basename..".pl", "texmfscripts")
-
-if (not(script)) then
- print ("Cannot find "..basename..".pl".." using kpse, exiting!")
- os.exit(1)
-end
-
-if (os.type == "windows") then
- command={'"'..perlbin..'"', '"'..script..'"'}
-else
- command={ perlbin, script }
-end
-command[0] = perlbin
-
-for i=1, #arg do
- command[#command+1]=arg[i]
-end
-
-ret=os.spawn(command)
-os.exit(ret)
-
diff --git a/Master/bin/x86_64-linux/generate-language b/Master/bin/x86_64-linux/generate-language
deleted file mode 100755
index 352b85ccab3..00000000000
--- a/Master/bin/x86_64-linux/generate-language
+++ /dev/null
@@ -1,55 +0,0 @@
-#!/usr/bin/env texlua
---*-Lua-*-
--- $Id: texlua-perl-runner 6485 2008-02-01 20:15:06Z reinhardk $
-
--- Copyright (C) 2007 2008 Reinhard Kotucha, Norbert Preining
--- You may freely use, modify and/or distribute this file.
-
--- Wrapper for Perl scripts.
--- Support for -sys variants
-
-
-if string.find(arg[0], "/") then -- UNIX path
- filename=select(1, string.gsub(arg[0], ".*/", ""))
-elseif string.find(arg[0], "\\") then -- Windows path
- filename=select(1, string.gsub(arg[0], ".*\\", ""))
-else -- no path
- filename=arg[0]
-end
-
-basename=select(1, string.gsub(filename, "\.texlua$", ""))
-
-basename="generate-language"
-
-kpse.set_program_name(filename)
-
-TEXDIR=kpse.var_value("SELFAUTOPARENT")
-
--- if we are on win32 we have to use the shipped perl
-perlbin="perl"
-if (os.type == "windows") then
- os.setenv("PERL5LIB", TEXDIR.."/tlpkg/tlperl/lib")
- perlbin=TEXDIR.."/tlpkg/tlperl/bin/perl.exe"
-end
-
-script=kpse.find_file(basename..".pl", "texmfscripts")
-
-if (not(script)) then
- print ("Cannot find "..basename..".pl".." using kpse, exiting!")
- os.exit(1)
-end
-
-if (os.type == "windows") then
- command={'"'..perlbin..'"', '"'..script..'"'}
-else
- command={ perlbin, script }
-end
-command[0] = perlbin
-
-for i=1, #arg do
- command[#command+1]=arg[i]
-end
-
-ret=os.spawn(command)
-os.exit(ret)
-
diff --git a/Master/bin/x86_64-linux/generate-updmap b/Master/bin/x86_64-linux/generate-updmap
deleted file mode 100755
index 382a39f89da..00000000000
--- a/Master/bin/x86_64-linux/generate-updmap
+++ /dev/null
@@ -1,55 +0,0 @@
-#!/usr/bin/env texlua
---*-Lua-*-
--- $Id$
-
--- Copyright (C) 2007 2008 Reinhard Kotucha, Norbert Preining
--- You may freely use, modify and/or distribute this file.
-
--- Wrapper for Perl scripts.
--- Support for -sys variants
-
-
-if string.find(arg[0], "/") then -- UNIX path
- filename=select(1, string.gsub(arg[0], ".*/", ""))
-elseif string.find(arg[0], "\\") then -- Windows path
- filename=select(1, string.gsub(arg[0], ".*\\", ""))
-else -- no path
- filename=arg[0]
-end
-
-basename=select(1, string.gsub(filename, "\.texlua$", ""))
-
-basename="generate-updmap"
-
-kpse.set_program_name(filename)
-
-TEXDIR=kpse.var_value("SELFAUTOPARENT")
-
--- if we are on win32 we have to use the shipped perl
-perlbin="perl"
-if (os.type == "windows") then
- os.setenv("PERL5LIB", TEXDIR.."/tlpkg/tlperl/lib")
- perlbin=TEXDIR.."/tlpkg/tlperl/bin/perl.exe"
-end
-
-script=kpse.find_file(basename..".pl", "texmfscripts")
-
-if (not(script)) then
- print ("Cannot find "..basename..".pl".." using kpse, exiting!")
- os.exit(1)
-end
-
-if (os.type == "windows") then
- command={'"'..perlbin..'"', '"'..script..'"'}
-else
- command={ perlbin, script }
-end
-command[0] = perlbin
-
-for i=1, #arg do
- command[#command+1]=arg[i]
-end
-
-ret=os.spawn(command)
-os.exit(ret)
-
diff --git a/Master/install-tl.pl b/Master/install-tl.pl
index f25b072d832..1a1da55b7b0 100755
--- a/Master/install-tl.pl
+++ b/Master/install-tl.pl
@@ -103,8 +103,8 @@ our $trynet=0;
#$::texlive_url = 'http://tug.org/svn/texlive/trunk/Master';
# for my own testing in the virtual machine
#$::texlive_url = 'http://localhost/norbert/tltesting';
-#$::texlive_url = 'http://10.0.2.2/norbert/tltesting';
-$::texlive_url = 'http://tug.org/~preining/tltesting';
+$::texlive_url = 'http://10.0.2.2/norbert/tltesting';
+#$::texlive_url = 'http://tug.org/~preining/tltesting';
# the default scheme to be installed
my $default_scheme='scheme-full';
# some arrays where the lists of collections to be installed are saved
@@ -709,6 +709,7 @@ sub do_install_packages {
sub do_postinst_stuff {
my $TEXDIR="$vars{'TEXDIR'}";
my $TEXMFSYSVAR="$vars{'TEXMFSYSVAR'}";
+ my $TEXMFLOCAL="$vars{'TEXMFLOCAL'}";
# install some copies from texmf(-dist) into texmf-var
copy ("$TEXDIR/texmf-dist/tex/plain/config/language.def",
@@ -784,20 +785,27 @@ sub do_postinst_stuff {
# Step 4: run the programs
-
tllog($::LOG_NORMAL, "running mktexlsr $TEXDIR/texmf-dist $TEXDIR/texmf\n");
system('mktexlsr', "$TEXDIR/texmf-dist", "$TEXDIR/texmf");
- # these 3 are texlua wrappers calling the respective perl scripts
- # on win32 they have .texlua extensions so that should work ;-)
- tllog($::LOG_NORMAL, "running generate-fmtutil\n");
- system('generate-fmtutil');
-
- tllog($::LOG_NORMAL, "running generate-updmap\n");
- system("generate-updmap");
-
- tllog($::LOG_NORMAL, "running generate-language\n");
- system("generate-language");
+ # we have to generate the various config file. That could be done with
+ # texconfig generate * but Win32 does not have texconfig. But we have
+ # $localtlpdb and this is simple code, so do it directly, i.e., duplicate
+ # the code from the various generate-*.pl scripts
+ tllog($::LOG_NORMAL, "writing fmtutil.cnf data to $TEXMFSYSVAR/web2c/fmtutil.cnf\n");
+ TeXLive::TLUtils::create_fmtutil($localtlpdb,
+ "$TEXMFSYSVAR/web2c/fmtutil.cnf",
+ "$TEXMFLOCAL/web2c/fmtutil-local.cnf");
+
+ tllog($::LOG_NORMAL, "writing updmap.cfg to $TEXMFSYSVAR/web2c/updmap.cfg\n");
+ TeXLive::TLUtils::create_updmap ($localtlpdb,
+ "$TEXMFSYSVAR/web2c/updmap.cfg",
+ "$TEXMFLOCAL/web2c/updmap-local.cfg");
+
+ tllog($::LOG_NORMAL, "writing language.dat data to $TEXMFSYSVAR/tex/generic/config/language.dat\n");
+ TeXLive::TLUtils::create_language($localtlpdb,
+ "$TEXMFSYSVAR/tex/generic/config/language.dat",
+ "$TEXMFLOCAL/tex/generic/config/language-local.dat");
tllog($::LOG_NORMAL, "running updmap-sys\n");
system('updmap-sys', '--nohash');