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

1 files changed, 21 insertions, 13 deletions

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');