summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNorbert Preining <preining@logic.at>2009-03-16 13:36:56 +0000
committerNorbert Preining <preining@logic.at>2009-03-16 13:36:56 +0000
commit2bc953aa468bc8852fe93203c7d4e46794ec14da (patch)
tree2e54840742fa162e14f717207d33eb3d39653624
parent632acb75ebbf52319364f0d81803d87b240e30c7 (diff)
rename sysint and system_integration to desktop_integration, and carry those
changes through into as many files as possible ;-) git-svn-id: svn://tug.org/texlive/branches/branch2009-dev@12399 c570f23f-e606-0410-a88d-b1316a301751
-rwxr-xr-xMaster/install-tl16
-rw-r--r--Master/tlpkg/TeXLive/TLPDB.pm6
-rw-r--r--Master/tlpkg/installer/install-menu-perltk.pl14
-rwxr-xr-xMaster/tlpkg/installer/install-menu-text.pl14
-rw-r--r--Master/tlpkg/installer/install-translations.pl4
-rw-r--r--Master/tlpkg/installer/lang/perltk-cs2
-rw-r--r--Master/tlpkg/installer/lang/perltk-de2
-rw-r--r--Master/tlpkg/installer/lang/perltk-en.sample2
-rw-r--r--Master/tlpkg/installer/lang/perltk-fr2
-rw-r--r--Master/tlpkg/installer/lang/perltk-it2
-rw-r--r--Master/tlpkg/installer/lang/perltk-nl2
-rw-r--r--Master/tlpkg/installer/lang/perltk-pl2
-rw-r--r--Master/tlpkg/installer/lang/perltk-sl2
-rw-r--r--Master/tlpkg/installer/lang/perltk-vi2
-rw-r--r--Master/tlpkg/installer/lang/perltk-zh-cn2
-rw-r--r--Master/tlpkg/installer/lang/perltk-zh-tw2
-rw-r--r--Master/tlpkg/tlpsrc/00texlive.installation.tlpsrc2
17 files changed, 40 insertions, 38 deletions
diff --git a/Master/install-tl b/Master/install-tl
index ad3b51045ac..c8fcef0bd22 100755
--- a/Master/install-tl
+++ b/Master/install-tl
@@ -734,12 +734,12 @@ operations might be disturbed.\n\n";
# on unix this means setting up symlinks
# on w32 this means adding to path, settting registry values
# on both, we run the postaction directives of the tlp
- do_system_integration() if $vars{'option_sysint'};
+ do_desktop_integration() if $vars{'option_desktop_integration'};
}
-sub do_system_integration {
- info ("running system integration actions\n");
+sub do_desktop_integration {
+ info ("running desktop integration actions\n");
# Run the post installation code in the postaction tlpsrc entries
my $usedtlpdb = $vars{'from_dvd'} ? $tlpdb : $localtlpdb;
foreach my $package (sort keys %install) {
@@ -1081,8 +1081,8 @@ sub load_tlpdb {
$vars{'option_fmt'} = $tlpdb->option_create_formats;
$vars{'option_letter'} = defined($tlpdb->option_paper)
&& ($tlpdb->option_paper eq "letter" ? 1 : 0);
- $vars{'option_sysint'} = $tlpdb->option_system_integration;
- $vars{'option_sysint'} = 1 if win32();
+ $vars{'option_desktop_integration'} = $tlpdb->option_desktop_integration;
+ $vars{'option_desktop_integration'} = 1 if win32();
$vars{'option_path'} = $tlpdb->option_path;
$vars{'option_path'} = 1 if win32();
$vars{'option_w32_multi_user'} = $tlpdb->option_w32_multi_user;
@@ -1191,8 +1191,8 @@ sub create_profile {
print $fh "$key $vars{$key}\n" if $key=~/^option_doc/;
print $fh "$key $vars{$key}\n" if $key=~/^option_fmt/;
print $fh "$key $vars{$key}\n" if $key=~/^option_src/;
- print $fh "$key $vars{$key}\n" if $key=~/^option_sysint/;
- if ($vars{'option_sysint'} && unix()) {
+ print $fh "$key $vars{$key}\n" if $key=~/^option_desktop_integration/;
+ if ($vars{'option_desktop_integration'} && unix()) {
print $fh "sys_bin ", $vars{'sys_bin'}, "\n" if $key =~ /^sys_bin/;
print $fh "sys_man ", $vars{'sys_man'}, "\n" if $key =~ /^sys_man/;
print $fh "sys_info ", $vars{'sys_info'}, "\n" if $key =~ /^sys_info/;
@@ -1289,7 +1289,7 @@ sub save_options_into_tlpdb {
$localtlpdb->option_location($location);
$localtlpdb->option_paper($vars{'option_letter'} ? "letter" : "a4");
$localtlpdb->option_create_formats($vars{'option_fmt'} ? "1" : "0");
- $localtlpdb->option_system_integration($vars{'option_sysint'} ? "1" : "0");
+ $localtlpdb->option_desktop_integration($vars{'option_desktop_integration'} ? "1" : "0");
$localtlpdb->option_sys_bin($vars{'sys_bin'});
$localtlpdb->option_sys_info($vars{'sys_info'});
$localtlpdb->option_sys_man($vars{'sys_man'});
diff --git a/Master/tlpkg/TeXLive/TLPDB.pm b/Master/tlpkg/TeXLive/TLPDB.pm
index b9d11518f02..e55bb4f15f5 100644
--- a/Master/tlpkg/TeXLive/TLPDB.pm
+++ b/Master/tlpkg/TeXLive/TLPDB.pm
@@ -1179,10 +1179,10 @@ sub option_create_symlinks {
if (@_) { $self->_set_option_value("opt_create_symlinks", shift); }
return $self->_option_value("opt_create_symlinks");
}
-sub option_system_integration {
+sub option_desktop_integration {
my $self = shift;
- if (@_) { $self->_set_option_value("opt_system_integration", shift); }
- return $self->_option_value("opt_system_integration");
+ if (@_) { $self->_set_option_value("opt_desktop_integration", shift); }
+ return $self->_option_value("opt_desktop_integration");
}
sub option_path {
my $self = shift;
diff --git a/Master/tlpkg/installer/install-menu-perltk.pl b/Master/tlpkg/installer/install-menu-perltk.pl
index cc67555a787..93c3ba90b5a 100644
--- a/Master/tlpkg/installer/install-menu-perltk.pl
+++ b/Master/tlpkg/installer/install-menu-perltk.pl
@@ -70,7 +70,7 @@ my $optdocstate;
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 $sysintyesno = ( $vars{'option_sysint'} ? $text{'yes'} : $text{'no'} );
+my $deskintyesno = ( $vars{'option_desktop_integration'} ? $text{'yes'} : $text{'no'} );
my $docyesno = ( $vars{'option_doc'} ? $text{'yes'} : $text{'no'} );
$::run_menu = \&run_menu_perltk;
@@ -260,12 +260,12 @@ sub run_menu_perltk {
}
$row++;
- $fr->Label(-text => $labels{'sysint'}, -anchor => 'w')->grid(-row => $row, -column => 1, -sticky => 'w');
- $fr->Label(-anchor => 'w', -textvariable => \$sysintyesno)->grid(-row => $row, -column => 2, -padx => "2m");
+ $fr->Label(-text => $labels{'desktop_integration'}, -anchor => 'w')->grid(-row => $row, -column => 1, -sticky => 'w');
+ $fr->Label(-anchor => 'w', -textvariable => \$deskintyesno)->grid(-row => $row, -column => 2, -padx => "2m");
if (unix()) {
$fr->Button(-text => $text{'change'}, -command => sub { menu_select_symlink(); })->grid(-row => $row, -column => 3, -sticky => "ew", -padx => "2m");
} else {
- $fr->Button(-text => $text{'toggle'}, -command => sub { toggle_and_set_opt_variable(\$vars{'option_sysint'}, \$sysintyesno); })->grid(-row => $row, -column => 3, -sticky => "ew", -padx => "2m");
+ $fr->Button(-text => $text{'toggle'}, -command => sub { toggle_and_set_opt_variable(\$vars{'option_desktop_integration'}, \$deskintyesno); })->grid(-row => $row, -column => 3, -sticky => "ew", -padx => "2m");
}
# install/cancel buttons
@@ -595,7 +595,7 @@ sub menu_select_lang_collections {
sub menu_select_symlink {
our ($lbin,$lman,$linfo);
- our $osym = $vars{'option_sysint'};
+ our $osym = $vars{'option_desktop_integration'};
our ($binlab,$binb,$manlab,$manb,$infolab,$infob);
sub set_unset_buttons {
$lbin = ($osym ? $vars{'sys_bin'} : '');
@@ -629,8 +629,8 @@ sub menu_select_symlink {
$vars{'sys_info'} = $linfo;
$vars{'sys_man'} = $lman;
}
- $vars{'option_sysint'} = $osym;
- toggle_and_set_opt_variable(\$vars{'option_sysint'}, \$sysintyesno);
+ $vars{'option_desktop_integration'} = $osym;
+ toggle_and_set_opt_variable(\$vars{'option_desktop_integration'}, \$deskintyesno);
}
my $sw = $mainwindow->Toplevel(-title => $labels{'symlink'});
$sw->transient($mainwindow);
diff --git a/Master/tlpkg/installer/install-menu-text.pl b/Master/tlpkg/installer/install-menu-text.pl
index a68f7ddf1fc..e73e9ef1342 100755
--- a/Master/tlpkg/installer/install-menu-text.pl
+++ b/Master/tlpkg/installer/install-menu-text.pl
@@ -685,7 +685,7 @@ sub options_menu {
my $b_src=button($vars{'option_src'});
my $b_fmt=button($vars{'option_fmt'});
my $b_letter=button($vars{'option_letter'});
- my $b_sysint=button($vars{'option_sysint'});
+ my $b_deskint=button($vars{'option_desktop_integration'});
my $b_admin=button($vars{'option_w32_multi_user'});
my $sys_bin=$vars{'sys_bin'};
@@ -732,7 +732,7 @@ EOF
;
}
if (win32()) {
- print " <M> install menu items, shortcuts, etc: $b_sysint\n";
+ print " <M> install menu items, shortcuts, etc: $b_deskint\n";
if (admin()) {
# if we are admin we allow normal user installation, too
print " <U> installation for all users: $b_admin\n";
@@ -782,7 +782,7 @@ EOF
}
}
if ("\u$answer" eq 'M') {
- toggle 'option_sysint';
+ toggle 'option_desktop_integration';
return $command{'self'};
} elsif ("\u$answer" eq 'U') {
@@ -843,7 +843,7 @@ sub main_menu {
my $b_src=button($vars{'option_src'});
my $b_fmt=button($vars{'option_fmt'});
my $b_letter=button($vars{'option_letter'});
- my $b_sysint=button($vars{'option_sysint'});
+ my $b_deskint=button($vars{'option_desktop_integration'});
my $b_admin=button($vars{'option_w32_multi_user'});
my $warn_nobin;
@@ -951,12 +951,14 @@ EOF
if ($vars{'src_splitting_supported'}) {
print " $b_src install macro/font source tree\n";
}
- print " $b_path path adjustments\n";
if (win32()) {
- print " $b_sysint menu items, shortcuts, etc.\n";
+ print " $b_path path adjustments\n";
+ print " $b_deskint menu items, shortcuts, etc.\n";
if (admin()) {
print " $b_admin installation for all users\n";
}
+ } else {
+ print " $b_path symlinks to system directories\n";
}
}
diff --git a/Master/tlpkg/installer/install-translations.pl b/Master/tlpkg/installer/install-translations.pl
index 8973cf8696b..d05f78cce73 100644
--- a/Master/tlpkg/installer/install-translations.pl
+++ b/Master/tlpkg/installer/install-translations.pl
@@ -57,7 +57,7 @@ our %text = (title => 'TeX Live 2009 Installation',
custom => 'Further Customization',
dirsetup => "Directory setup",
options => 'Options',
- sysint => 'System Integration',
+ desktop_integration => 'Desktop Integration',
change => 'Change',
toggle => 'Toggle',
install => 'Install TeX Live',
@@ -121,7 +121,7 @@ our %labels = (binsys => 'Binary System(s)',
optdoc => 'Install font/macro doc tree',
optsrc => 'Install font/macro source tree',
symlink => 'Create symlinks in system directories',
- sysint => 'System integration',
+ desktop_integration => 'Desktop Integration',
);
if (($::lang ne "en") && ($::lang ne "C")) {
diff --git a/Master/tlpkg/installer/lang/perltk-cs b/Master/tlpkg/installer/lang/perltk-cs
index 60d0273fe72..7057eeadaba 100644
--- a/Master/tlpkg/installer/lang/perltk-cs
+++ b/Master/tlpkg/installer/lang/perltk-cs
@@ -14,7 +14,7 @@ text.basicinfo: Základní informace
text.custom: Další úpravy
text.dirsetup: Nastavení adresářové struktury
text.options: Volby
-text.sysint: Systémová integrace
+text.desktop_integration: Systémová integrace
text.change: Změnit
text.toggle: Přepnout
text.install: Instalovat TeX Live
diff --git a/Master/tlpkg/installer/lang/perltk-de b/Master/tlpkg/installer/lang/perltk-de
index 90f36040dad..43767c40003 100644
--- a/Master/tlpkg/installer/lang/perltk-de
+++ b/Master/tlpkg/installer/lang/perltk-de
@@ -7,7 +7,7 @@ text.custom: Weitere Einstellungen
text.basicinfo: Grundlegende Informationen
text.dirsetup: Setup der Ordner
text.options: Optionen
-text.sysint: Systemintegration
+text.desktop_integration: Systemintegration
text.change: Ändern
text.toggle: Ändern
text.install: TeX Live installieren
diff --git a/Master/tlpkg/installer/lang/perltk-en.sample b/Master/tlpkg/installer/lang/perltk-en.sample
index 857edfef7a8..eb846ae006d 100644
--- a/Master/tlpkg/installer/lang/perltk-en.sample
+++ b/Master/tlpkg/installer/lang/perltk-en.sample
@@ -46,7 +46,7 @@ text.selectscheme: Select a scheme
text.selectstdcol: Select the collections to be installed
text.selectsys: Select arch-os
text.status: Status output
-text.sysint: System Integration
+text.desktop_integration: Desktop Integration
text.title: TeX Live 2008 Installation
text.toggle: Toggle
text.welcome: Welcome to TeX Live!
diff --git a/Master/tlpkg/installer/lang/perltk-fr b/Master/tlpkg/installer/lang/perltk-fr
index 7f7fbe1d668..df7a20c275a 100644
--- a/Master/tlpkg/installer/lang/perltk-fr
+++ b/Master/tlpkg/installer/lang/perltk-fr
@@ -8,7 +8,7 @@ text.basicinfo: Informations générales
text.custom: Personnalisation avancée
text.dirsetup: Choix des répertoires
text.options: Options
-text.sysint: Intégration du système
+text.desktop_integration: Intégration du système
text.change: Changer
text.toggle: (Dé)sélectionner
text.install: Installer TeX Live
diff --git a/Master/tlpkg/installer/lang/perltk-it b/Master/tlpkg/installer/lang/perltk-it
index 16c7791137f..fc7123c8ba2 100644
--- a/Master/tlpkg/installer/lang/perltk-it
+++ b/Master/tlpkg/installer/lang/perltk-it
@@ -22,7 +22,7 @@ text.basicinfo: Informazioni di Base
text.custom: Ulteriore Personalizzazione
text.dirsetup: Configurazione delle directory
text.options: Opzioni
-text.sysint: Integrazione con il Sistema
+text.desktop_integration: Integrazione con il Sistema
text.change: Cambia
text.toggle: Inverti
text.install: Installa TeX Live
diff --git a/Master/tlpkg/installer/lang/perltk-nl b/Master/tlpkg/installer/lang/perltk-nl
index 03c0284fae3..210ef439286 100644
--- a/Master/tlpkg/installer/lang/perltk-nl
+++ b/Master/tlpkg/installer/lang/perltk-nl
@@ -7,7 +7,7 @@ text.basicinfo: Basisinformatie
text.custom: Verfijning
text.dirsetup: Folders
text.options: Opties
-text.sysint: Systeem-integratie
+text.desktop_integration: Systeem-integratie
text.change: Wijzig
text.toggle: Wijzig
text.install: Installeer TeX Live
diff --git a/Master/tlpkg/installer/lang/perltk-pl b/Master/tlpkg/installer/lang/perltk-pl
index 5b913aec03a..0650d97cc7a 100644
--- a/Master/tlpkg/installer/lang/perltk-pl
+++ b/Master/tlpkg/installer/lang/perltk-pl
@@ -6,7 +6,7 @@ text.custom: Dalsze ustawienia
text.basicinfo: Informacje podstawowe
text.dirsetup: Wybór folderów
text.options: Opcje
-text.sysint: Integracja systemu
+text.desktop_integration: Integracja systemu
text.change: Zmień
text.toggle: Zmień
text.install: Zainstaluj TeX Live
diff --git a/Master/tlpkg/installer/lang/perltk-sl b/Master/tlpkg/installer/lang/perltk-sl
index bf0b0efb1d9..c63d6e6ecd0 100644
--- a/Master/tlpkg/installer/lang/perltk-sl
+++ b/Master/tlpkg/installer/lang/perltk-sl
@@ -8,7 +8,7 @@ text.basicinfo: Osnovne nastavitve
text.custom: Napredne nastavitve
text.dirsetup: Nastavitve imenikov
text.options: Ostale možnosti
-text.sysint: Integracija v sistem
+text.desktop_integration: Integracija v sistem
text.change: Spremeni
text.toggle: Vključi/Izključi
text.install: Namesti TeX Live
diff --git a/Master/tlpkg/installer/lang/perltk-vi b/Master/tlpkg/installer/lang/perltk-vi
index 982ae6d0ef2..ffa2609fa0e 100644
--- a/Master/tlpkg/installer/lang/perltk-vi
+++ b/Master/tlpkg/installer/lang/perltk-vi
@@ -17,7 +17,7 @@ text.basicinfo: Thông tin cơ bản
text.custom: Tinh chỉnh khác
text.dirsetup: Thư mục cài đặt
text.options: Tùy chọn
-text.sysint: Tích hợp hệ thống
+text.desktop_integration: Tích hợp hệ thống
text.change: Đổi
text.toggle: Toggle
text.install: Cài đặt TeX Live
diff --git a/Master/tlpkg/installer/lang/perltk-zh-cn b/Master/tlpkg/installer/lang/perltk-zh-cn
index 82e31cb29a9..3568de8289f 100644
--- a/Master/tlpkg/installer/lang/perltk-zh-cn
+++ b/Master/tlpkg/installer/lang/perltk-zh-cn
@@ -8,7 +8,7 @@ text.basicinfo: 基本信息
text.custom: 进一步定制
text.dirsetup: 目录设置
text.options: 选项
-text.sysint: 系统集成
+text.desktop_integration: 系统集成
text.change: 改变
text.toggle: 切换
text.install: 安装 TeX Live
diff --git a/Master/tlpkg/installer/lang/perltk-zh-tw b/Master/tlpkg/installer/lang/perltk-zh-tw
index ce6a1ce5415..7c1d89339a2 100644
--- a/Master/tlpkg/installer/lang/perltk-zh-tw
+++ b/Master/tlpkg/installer/lang/perltk-zh-tw
@@ -8,7 +8,7 @@ text.basicinfo: 基本資訊
text.custom: 進一步定制
text.dirsetup: 目錄設置
text.options: 選項
-text.sysint: 系統集成
+text.desktop_integration: 系統集成
text.change: 改變
text.toggle: 切換
text.install: 安裝 TeX Live
diff --git a/Master/tlpkg/tlpsrc/00texlive.installation.tlpsrc b/Master/tlpkg/tlpsrc/00texlive.installation.tlpsrc
index 749887b1acf..3a9140e34de 100644
--- a/Master/tlpkg/tlpsrc/00texlive.installation.tlpsrc
+++ b/Master/tlpkg/tlpsrc/00texlive.installation.tlpsrc
@@ -22,7 +22,7 @@ depend platform:
depend location:__MASTER__
depend opt_paper:a4
depend opt_create_formats:1
-depend opt_system_integration:0
+depend opt_desktop_integration:0
depend opt_w32_multi_user:1
depend opt_path:0
depend opt_sys_bin:/usr/local/bin