summaryrefslogtreecommitdiff
path: root/Master/tlpkg
diff options
context:
space:
mode:
authorNorbert Preining <preining@logic.at>2008-02-08 08:36:29 +0000
committerNorbert Preining <preining@logic.at>2008-02-08 08:36:29 +0000
commitac32eba506cc20d1e7c5f45dbaa10436b84e0a7f (patch)
treeccea71324156ab8bf9b8f2c49b3f034e615116a4 /Master/tlpkg
parent4fbb12efeffdffdf5a17b95f132ed4cc06300586 (diff)
generate-* move:
- put the perl scripts into Master/texmf/scripts/texlive/ - put .texlua wrappers in Build/source/texk/texlive and install these wrappers into Master/bin/$arch (without extension since we do that on unix) - add these texlua scripts to bin/i386-linux and (with .texlua) to bin/win32 - put the perl scripts and the wrappers into the bin-tetex tlpsrc - remove the rest from tlpkg/installer git-svn-id: svn://tug.org/texlive/trunk@6530 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/tlpkg')
-rwxr-xr-xMaster/tlpkg/installer/generate-fmtutil104
-rwxr-xr-xMaster/tlpkg/installer/generate-language101
-rwxr-xr-xMaster/tlpkg/installer/generate-updmap107
-rw-r--r--Master/tlpkg/tlpsrc/bin-tetex.tlpsrc7
-rw-r--r--Master/tlpkg/tlpsrc/texlive-infra.tlpsrc5
5 files changed, 7 insertions, 317 deletions
diff --git a/Master/tlpkg/installer/generate-fmtutil b/Master/tlpkg/installer/generate-fmtutil
deleted file mode 100755
index c616ec9e330..00000000000
--- a/Master/tlpkg/installer/generate-fmtutil
+++ /dev/null
@@ -1,104 +0,0 @@
-#!/usr/bin/env perl
-# $Id: generate-fmtutil 5188 2007-10-14 20:32:44Z karl $
-# Copyright 2007 Norbert Preining.
-# This file is licensed under the GNU General Public License version 2
-# or any later version.
-#
-# generate fmtutil.cnf file from the data in the tlpdb and -- if present
-# -- with TEXMFLOCAL/web2c/fmtutil-local.cnf
-
-BEGIN {
- $^W = 1;
- ($mydir = $0) =~ s,/[^/]*$,,;
- unshift (@INC, "$mydir/..");
-}
-
-use strict;
-
-use TeXLive::TLConfig;
-use TeXLive::TLPOBJ;
-use TeXLive::TLPDB;
-use TeXLive::TLUtils qw/kpsewhich tllog/;
-use Getopt::Long;
-use Pod::Usage;
-use File::Path;
-use Cwd 'abs_path';
-
-our $mydir;
-my $opt_debug = 0;
-my $help = 0;
-my $dest = "";
-my $localconf = "";
-
-GetOptions("debug!", "dest=s" => \$dest,
- "local=s" => \$localconf, "help|?" => \$help) or pod2usage(1);
-
-pod2usage(-exitstatus => 0, -verbose => 2) if $help;
-
-if ($opt_debug) {
- $::LOGLEVELFILE = $::LOG_DDDEBUG;
- $::LOGLEVELTERMINAL = $::LOG_DDDEBUG;
-}
-
-exit (&main ());
-
-sub main
-{
- # get the db.
- my $Master = abs_path("$mydir/../..");
- my $tlpdb = TeXLive::TLPDB->new ("root" => "$Master");
- if (!defined($tlpdb)) {
- die "Cannot find texlive.tlpdb below $Master: $!\n";
- }
- $dest || ($dest = kpsewhich("TEXMFSYSVAR") . "/web2c/fmtutil.cnf");
- $localconf || ($localconf = kpsewhich("TEXMFLOCAL") . "/web2c/fmtutil-local.cnf");
- tllog($::LOG_NORMAL, "writing fmtutil.cnf data to $dest\n");
- TeXLive::TLUtils::create_fmtutil($tlpdb, $dest, $localconf);
-}
-
-
-__END__
-
-=head1 NAME
-
-generate-fmtutil - generate fmtutil.cnf from a TLPDB and local additions
-
-=head1 SYNOPSIS
-
-generate-fmtutil [OPTION]...
-
-=head1 OPTIONS
-
-=over 8
-
-=item C<-dest> I<output file>
-
-specifies the output file
-
-=item C<-local> I<local conf file>
-
-specifies the local additions
-
-=back
-
-The standard options C<-help> and C<-debug> are accepted.
-See the tlpfiles documentation for details.
-
-=head1 DESCRIPTION
-
-Missing
-
-=head1 AUTHORS AND COPYRIGHT
-
-This script and its documentation were written for the TeX Live
-distribution (L<http://tug.org/texlive>) and both are licensed under the
-GNU General Public License Version 2 or later.
-
-=cut
-
-### Local Variables:
-### perl-indent-level: 2
-### tab-width: 2
-### indent-tabs-mode: nil
-### End:
-# vim:set tabstop=2 expandtab: #
diff --git a/Master/tlpkg/installer/generate-language b/Master/tlpkg/installer/generate-language
deleted file mode 100755
index dc82106aa69..00000000000
--- a/Master/tlpkg/installer/generate-language
+++ /dev/null
@@ -1,101 +0,0 @@
-#!/usr/bin/env perl
-# $Id: generate-language 5188 2007-10-14 20:32:44Z karl $
-# Copyright 2007 Norbert Preining.
-# This file is licensed under the GNU General Public License version 2
-# or any later version.
-#
-# generate language.dat file from the data in the tlpdb and -- if present
-# -- with TEXMFLOCAL/tex/generic/config/language-local.dat
-
-BEGIN {
- $^W = 1;
- ($mydir = $0) =~ s,/[^/]*$,,;
- unshift (@INC, "$mydir/..");
-}
-
-use strict;
-
-use TeXLive::TLConfig;
-use TeXLive::TLPOBJ;
-use TeXLive::TLPDB;
-use TeXLive::TLUtils qw/kpsewhich tllog/;
-use Getopt::Long;
-use Pod::Usage;
-use File::Path;
-use Cwd 'abs_path';
-
-our $mydir;
-my $opt_debug = 0;
-my $help = 0;
-my $dest = "";
-my $localconf = "";
-
-GetOptions("debug!", "dest=s" => \$dest,
- "local=s" => \$localconf, "help|?" => \$help) or pod2usage(1);
-
-pod2usage(-exitstatus => 0, -verbose => 2) if $help;
-
-if ($opt_debug) {
- $::LOGLEVELFILE = $::LOG_DDDEBUG;
- $::LOGLEVELTERMINAL = $::LOG_DDDEBUG;
-}
-
-exit (&main ());
-
-sub main
-{
- # get the db.
- my $Master = abs_path("$mydir/../..");
- my $tlpdb = TeXLive::TLPDB->new ("root" => "$Master");
- $dest || ($dest = kpsewhich("TEXMFSYSVAR") . "/tex/generic/config/language.dat");
- $localconf || ($localconf = kpsewhich("TEXMFLOCAL") . "/tex/generic/config/language-local.dat");
- tllog($::LOG_NORMAL, "writing language.dat data to $dest\n");
- TeXLive::TLUtils::create_language($tlpdb, $dest, $localconf);
-}
-
-
-__END__
-
-=head1 NAME
-
-generate-language - generate language.dat from a TLPDB and local additions
-
-=head1 SYNOPSIS
-
-generate-language [OPTION]...
-
-=head1 OPTIONS
-
-=over 8
-
-=item C<-dest> I<output file>
-
-specifies the output file
-
-=item C<-local> I<local conf file>
-
-specifies the local additions
-
-=back
-
-The standard options C<-help> and C<-debug> are accepted.
-See the tlpfiles documentation for details.
-
-=head1 DESCRIPTION
-
-Missing
-
-=head1 AUTHORS AND COPYRIGHT
-
-This script and its documentation were written for the TeX Live
-distribution (L<http://tug.org/texlive>) and both are licensed under the
-GNU General Public License Version 2 or later.
-
-=cut
-
-### Local Variables:
-### perl-indent-level: 2
-### tab-width: 2
-### indent-tabs-mode: nil
-### End:
-# vim:set tabstop=2 expandtab: #
diff --git a/Master/tlpkg/installer/generate-updmap b/Master/tlpkg/installer/generate-updmap
deleted file mode 100755
index bd4cca20038..00000000000
--- a/Master/tlpkg/installer/generate-updmap
+++ /dev/null
@@ -1,107 +0,0 @@
-#!/usr/bin/env perl
-# $Id: generate-updmap 5188 2007-10-14 20:32:44Z karl $
-# Copyright 2007 Norbert Preining.
-# This file is licensed under the GNU General Public License version 2
-# or any later version.
-#
-# generate updmap.cfg file from the data in the tlpdb and -- if present
-# -- with TEXMFLOCAL/web2c/updmap-local.cfg
-
-BEGIN {
- $^W = 1;
- ($mydir = $0) =~ s,/[^/]*$,,;
- unshift (@INC, "$mydir/..");
-}
-
-use strict;
-
-use TeXLive::TLConfig;
-use TeXLive::TLPOBJ;
-use TeXLive::TLPDB;
-use TeXLive::TLUtils qw/kpsewhich tllog/;
-use Getopt::Long;
-use Pod::Usage;
-use File::Path;
-use Cwd 'abs_path';
-
-our $mydir;
-my $opt_debug = 0;
-my $help = 0;
-my $dest = "";
-my $localconf = "";
-
-GetOptions("debug!", "dest=s" => \$dest, "local=s" => \$localconf,
- "help|?" => \$help) or pod2usage(1);
-
-pod2usage(-exitstatus => 0, -verbose => 2) if $help;
-
-if ($opt_debug) {
- $::LOGLEVELFILE = $::LOG_DDDEBUG;
- $::LOGLEVELTERMINAL = $::LOG_DDDEBUG;
-}
-
-exit (&main ());
-
-sub main
-{
- # get the db.
- my $Master = abs_path("$mydir/../..");
- my $tlpdb = TeXLive::TLPDB->new ("root" => "$Master");
- $dest || ($dest = kpsewhich("TEXMFSYSVAR") . "/web2c/updmap.cfg");
- $localconf || ($localconf = kpsewhich("TEXMFLOCAL") . "/web2c/updmap-local.cfg");
- tllog($::LOG_NORMAL, "$0: writing new updmap.cfg to $dest\n");
- TeXLive::TLUtils::create_updmap ($tlpdb, $dest, $localconf);
-}
-
-
-__END__
-
-=head1 NAME
-
-generate-updmap - generate updmap.cfg from a TeX Live db and local additions
-
-=head1 SYNOPSIS
-
-generate-updmap [OPTION]...
-
-=head1 OPTIONS
-
-=over 8
-
-=item C<-dest> I<output_file>
-
-specifies the output file; defaults to
-C<$TEXMFSYSVAR/texmf/web2c/updmap.cfg>.
-
-=item C<-local> I<local_conf_file>
-
-specifies the local additions, if any; defaults to
-C<$TEXMFLOCAL/web2c/updmap-local.cfg>.
-
-=back
-
-The standard options C<-help> and C<-debug> are accepted.
-See the tlpfiles documentation for details.
-
-=head1 DESCRIPTION
-
-B<generate-updmap> creates an updated C<updmap.cfg> file with the C<Map>
-and C<MixedMap> entries taken from the TL database, plus (optionally)
-local additions.
-
-No repository actions are performed in any case.
-
-=head1 AUTHORS AND COPYRIGHT
-
-This script and its documentation were written for the TeX Live
-distribution (L<http://tug.org/texlive>) and both are licensed under the
-GNU General Public License Version 2 or later.
-
-=cut
-
-### Local Variables:
-### perl-indent-level: 2
-### tab-width: 2
-### indent-tabs-mode: nil
-### End:
-# vim:set tabstop=2 expandtab: #
diff --git a/Master/tlpkg/tlpsrc/bin-tetex.tlpsrc b/Master/tlpkg/tlpsrc/bin-tetex.tlpsrc
index 093d0e0c45e..f1233ad1b94 100644
--- a/Master/tlpkg/tlpsrc/bin-tetex.tlpsrc
+++ b/Master/tlpkg/tlpsrc/bin-tetex.tlpsrc
@@ -8,6 +8,9 @@ runpattern f texmf/fonts/map/dvips/tetex/*
runpattern f texmf/scripts/tetex/texdoctk.pl
runpattern f texmf/scripts/tetex/texi2html.pl
runpattern f texmf/scripts/tetex/updmap.pl
+runpattern f texmf/scripts/texlive/generate-fmtutil.pl
+runpattern f texmf/scripts/texlive/generate-language.pl
+runpattern f texmf/scripts/texlive/generate-updmap.pl
runpattern f texmf/web2c/updmap.cfg
runpattern f texmf/web2c/updmap-hdr.cfg
docpattern f texmf/doc/man/man1/a2ping.*
@@ -42,6 +45,10 @@ binpattern f bin/${ARCH}/texconfig-sys
binpattern f bin/${ARCH}/texlinks
binpattern f bin/${ARCH}/updmap
binpattern f bin/${ARCH}/updmap-sys
+# on win32 these are with .texlua extension, all or texlua scripts
+binpattern f bin/${ARCH}/generate-fmtutil
+binpattern f bin/${ARCH}/generate-language
+binpattern f bin/${ARCH}/generate-updmap
# that should be removed at some point
binpattern f/win32 bin/win32/updmap-sys.pl
binpattern f bin/${ARCH}/updmap-sys.texlua
diff --git a/Master/tlpkg/tlpsrc/texlive-infra.tlpsrc b/Master/tlpkg/tlpsrc/texlive-infra.tlpsrc
index d88cea34752..918ff5f073f 100644
--- a/Master/tlpkg/tlpsrc/texlive-infra.tlpsrc
+++ b/Master/tlpkg/tlpsrc/texlive-infra.tlpsrc
@@ -3,8 +3,3 @@ category TLCore
docpattern f tlpkg/man/*
docpattern f tlpkg/doc/*
runpattern f tlpkg/TeXLive/*
-# here we should add scripts usefull for an installed system from tlpkg/bin!
-runpattern f tlpkg/bin/uninstall-tl.*
-runpattern f tlpkg/bin/generate-fmtutil
-runpattern f tlpkg/bin/generate-updmap
-runpattern f tlpkg/bin/generate-language