summaryrefslogtreecommitdiff
path: root/Master/tlpkg
diff options
context:
space:
mode:
authorNorbert Preining <preining@logic.at>2008-06-01 10:52:49 +0000
committerNorbert Preining <preining@logic.at>2008-06-01 10:52:49 +0000
commitd72679b37000477e79293508f485c464fb006636 (patch)
treebad06840fa3b22961b65617b758ffa17094e2cc9 /Master/tlpkg
parent2c0d469786e50a50b2e4de5f4f3c3d15913b4e38 (diff)
- rename the fields where options are saved to opt_....
- adapt the TLPDB.pm to use option_xxx_xxx instead - fix install-tl and all related files to use the changed name of the functions - fix a small bug in install-tl gui mode that didn't honor the initial setting of the options - install-tl now takes the initial setting of the opt_ stuff (paper, srcfiles, docfiles, create formats, links) from the installation source's texlive.tlpdb, and not hard code it into the installer - adjust the 00texlive-installation.config.tlpsrc file to ship new names Bottom line of that: If we want to change some defaults in the installer we have to change the 00texlive-installation.config.tlpsrc git-svn-id: svn://tug.org/texlive/trunk@8448 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/tlpkg')
-rw-r--r--Master/tlpkg/TeXLive/TLMedia.pm4
-rw-r--r--Master/tlpkg/TeXLive/TLPDB.pm50
-rwxr-xr-xMaster/tlpkg/bin/tlpsrc2tlpdb2
-rw-r--r--Master/tlpkg/installer/install-menu-perltk.pl8
-rw-r--r--Master/tlpkg/tlpsrc/00texlive-installation.config.tlpsrc16
5 files changed, 40 insertions, 40 deletions
diff --git a/Master/tlpkg/TeXLive/TLMedia.pm b/Master/tlpkg/TeXLive/TLMedia.pm
index decf8303a6d..271eed0a4a7 100644
--- a/Master/tlpkg/TeXLive/TLMedia.pm
+++ b/Master/tlpkg/TeXLive/TLMedia.pm
@@ -104,8 +104,8 @@ sub install_package {
my $container_src_split = $fromtlpdb->config_src_container;
my $container_doc_split = $fromtlpdb->config_doc_container;
# get options about src/doc splitting from $totlpdb
- my $opt_src = $totlpdb->option_srcfiles;
- my $opt_doc = $totlpdb->option_docfiles;
+ my $opt_src = $totlpdb->option_install_srcfiles;
+ my $opt_doc = $totlpdb->option_install_docfiles;
my $real_opt_doc = $opt_doc;
if ($tlpobj->category =~ m/documentation/i) {
# we do install documenation files for category Documentation
diff --git a/Master/tlpkg/TeXLive/TLPDB.pm b/Master/tlpkg/TeXLive/TLPDB.pm
index 93226a49fab..a8e00e67f65 100644
--- a/Master/tlpkg/TeXLive/TLPDB.pm
+++ b/Master/tlpkg/TeXLive/TLPDB.pm
@@ -285,13 +285,13 @@ sub save {
=item C<< $tlpdb->available_architectures >>
The C<available_architectures> functions returns the list of available
-architectures as set in the options section (i.e., using option_archs)
+architectures as set in the options section (i.e., using option_available_archs)
=cut
sub available_architectures {
my $self = shift;
- my @archs = $self->option_archs;
+ my @archs = $self->option_available_archs;
if (! @archs) {
# fall back to the old method checking bin-tex\.*
my @packs = $self->list_packages;
@@ -828,36 +828,36 @@ sub _option_value {
return;
}
-sub option_archs {
+sub option_available_archs {
my $self = shift;
- if (@_) { $self->_set_option_value("archs","@_"); }
- my @archs = split ' ', $self->_option_value("archs");
+ if (@_) { $self->_set_option_value("available_archs","@_"); }
+ my @archs = split ' ', $self->_option_value("available_archs");
return @archs;
}
-sub option_symlinks {
+sub option_create_symlinks {
my $self = shift;
- if (@_) { $self->_set_option_value("symlinks", shift); }
- return $self->_option_value("symlinks");
+ if (@_) { $self->_set_option_value("opt_create_symlinks", shift); }
+ return $self->_option_value("opt_create_symlinks");
}
-sub option_docfiles {
+sub option_install_docfiles {
my $self = shift;
- if (@_) { $self->_set_option_value("docfiles", shift); }
- return $self->_option_value("docfiles");
+ if (@_) { $self->_set_option_value("opt_install_docfiles", shift); }
+ return $self->_option_value("opt_install_docfiles");
}
-sub option_srcfiles {
+sub option_install_srcfiles {
my $self = shift;
- if (@_) { $self->_set_option_value("srcfiles", shift); }
- return $self->_option_value("srcfiles");
+ if (@_) { $self->_set_option_value("opt_install_srcfiles", shift); }
+ return $self->_option_value("opt_install_srcfiles");
}
-sub option_formats {
+sub option_create_formats {
my $self = shift;
- if (@_) { $self->_set_option_value("formats", shift); }
- return $self->_option_value("formats");
+ if (@_) { $self->_set_option_value("opt_create_formats", shift); }
+ return $self->_option_value("opt_create_formats");
}
sub option_paper {
my $self = shift;
- if (@_) { $self->_set_option_value("paper", shift); }
- return $self->_option_value("paper");
+ if (@_) { $self->_set_option_value("opt_paper", shift); }
+ return $self->_option_value("opt_paper");
}
sub option_location {
my $self = shift;
@@ -870,18 +870,18 @@ sub option_location {
}
sub option_sys_bin {
my $self = shift;
- if (@_) { $self->_set_option_value("sys_bin", shift); }
- return $self->_option_value("sys_bin");
+ if (@_) { $self->_set_option_value("opt_sys_bin", shift); }
+ return $self->_option_value("opt_sys_bin");
}
sub option_sys_man {
my $self = shift;
- if (@_) { $self->_set_option_value("sys_man", shift); }
- return $self->_option_value("sys_man");
+ if (@_) { $self->_set_option_value("opt_sys_man", shift); }
+ return $self->_option_value("opt_sys_man");
}
sub option_sys_info {
my $self = shift;
- if (@_) { $self->_set_option_value("sys_info", shift); }
- return $self->_option_value("sys_info");
+ if (@_) { $self->_set_option_value("opt_sys_info", shift); }
+ return $self->_option_value("opt_sys_info");
}
sub option_platform {
my $self = shift;
diff --git a/Master/tlpkg/bin/tlpsrc2tlpdb b/Master/tlpkg/bin/tlpsrc2tlpdb
index 4b67856f0b0..f0db6132b6f 100755
--- a/Master/tlpkg/bin/tlpsrc2tlpdb
+++ b/Master/tlpkg/bin/tlpsrc2tlpdb
@@ -116,7 +116,7 @@ sub main
if ($opt_all) {
$tldb->root("$opt_master");
# do set the option_archs from the dirs in Master/bin
- $tldb->option_archs($tltree->architectures);
+ $tldb->option_available_archs($tltree->architectures);
$tldb->save;
info("$0: wrote $src_count packages to ". $tldb->root . ".\n");
} else {
diff --git a/Master/tlpkg/installer/install-menu-perltk.pl b/Master/tlpkg/installer/install-menu-perltk.pl
index 2b72870873b..00bb281d222 100644
--- a/Master/tlpkg/installer/install-menu-perltk.pl
+++ b/Master/tlpkg/installer/install-menu-perltk.pl
@@ -190,10 +190,10 @@ if (($::lang ne "en") && ($::lang ne "C")) {
}
}
-my $letteryesno = $text{'no'};
-my $fmtyesno = $text{'no'};
-my $srcyesno = $text{'yes'};
-my $docyesno = $text{'yes'};
+my $letteryesno = ( $vars{'option_letter'} ? $text{'yes'} : $text{'no'} );
+my $fmtyesno = ( $vars{'option_fmt'} ? $text{'yes'} : $text{'no'} );
+my $srcyesno = ( $vars{'option_src'} ? $text{'yes'} : $text{'no'} );
+my $docyesno = ( $vars{'option_doc'} ? $text{'yes'} : $text{'no'} );
sub run_menu {
# computing $a:
diff --git a/Master/tlpkg/tlpsrc/00texlive-installation.config.tlpsrc b/Master/tlpkg/tlpsrc/00texlive-installation.config.tlpsrc
index ceedb22e802..200007d3098 100644
--- a/Master/tlpkg/tlpsrc/00texlive-installation.config.tlpsrc
+++ b/Master/tlpkg/tlpsrc/00texlive-installation.config.tlpsrc
@@ -2,11 +2,11 @@ name 00texlive-installation.config
category TLCore
depend platform:
depend location:__MASTER__
-depend paper:a4
-depend formats:0
-depend symlinks:0
-depend sys_bin:/usr/local/bin
-depend sys_info:/usr/local/info
-depend sys_man:/usr/local/man
-depend docfiles:0
-depend srcfiles:0
+depend opt_paper:a4
+depend opt_create_formats:0
+depend opt_create_symlinks:0
+depend opt_sys_bin:/usr/local/bin
+depend opt_sys_info:/usr/local/info
+depend opt_sys_man:/usr/local/man
+depend opt_install_docfiles:1
+depend opt_install_srcfiles:1