summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNorbert Preining <preining@logic.at>2009-05-16 22:23:55 +0000
committerNorbert Preining <preining@logic.at>2009-05-16 22:23:55 +0000
commitadd62efa97755286e456d0b80fcde84b6b59e788 (patch)
tree02fbe197f475ca9d01cb94c967f6b1a9bc8ed427
parent304dc81c731e7e61f01dc85d4d2b427861113903 (diff)
allow installation of TeX Works in text/gui/wizard installer
git-svn-id: svn://tug.org/texlive/trunk@13139 c570f23f-e606-0410-a88d-b1316a301751
-rwxr-xr-xMaster/install-tl6
-rw-r--r--Master/tlpkg/installer/install-menu-perltk.pl7
-rwxr-xr-xMaster/tlpkg/installer/install-menu-text.pl8
-rw-r--r--Master/tlpkg/installer/install-menu-wizard.pl4
-rw-r--r--Master/tlpkg/installer/install-translations.pl1
5 files changed, 26 insertions, 0 deletions
diff --git a/Master/install-tl b/Master/install-tl
index ecc989cce22..a396fc4068b 100755
--- a/Master/install-tl
+++ b/Master/install-tl
@@ -985,6 +985,12 @@ sub calc_depends {
}
}
+ #
+ # work through the addon settings in the %vars hash
+ if ($vars{'addon_editor'}) {
+ $install{"texworks"} = 1;
+ }
+
# if programs for arch=win32 are installed we also have to install
# bin-tlperl.win32 which provides the "hidden" perl that will be used
# to run all the perl scripts.
diff --git a/Master/tlpkg/installer/install-menu-perltk.pl b/Master/tlpkg/installer/install-menu-perltk.pl
index 93c3ba90b5a..70643eb3594 100644
--- a/Master/tlpkg/installer/install-menu-perltk.pl
+++ b/Master/tlpkg/installer/install-menu-perltk.pl
@@ -71,6 +71,7 @@ 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 $deskintyesno = ( $vars{'option_desktop_integration'} ? $text{'yes'} : $text{'no'} );
+my $editoryesno = ( $vars{'addon_editor'} ? $text{'yes'} : $text{'no'} );
my $docyesno = ( $vars{'option_doc'} ? $text{'yes'} : $text{'no'} );
$::run_menu = \&run_menu_perltk;
@@ -268,6 +269,12 @@ sub run_menu_perltk {
$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");
}
+ $row++;
+ $fr->Label(-text => $labels{'addon_editor'}, -anchor => 'w')->grid(-row => $row, -column => 1, -sticky => 'w');
+ $fr->Label(-anchor => 'w', -textvariable => \$editoryesno)->grid(-row => $row, -column => 2, -padx => "2m");
+ $fr->Button(-text => $text{'toggle'}, -command => sub { toggle_and_set_opt_variable(\$vars{'addon_editor'}, \$editoryesno); })->grid(-row => $row, -column => 3, -sticky => "ew", -padx => "2m");
+
+
# install/cancel buttons
my $f3 = $fr->Frame;
$f3->Button(
diff --git a/Master/tlpkg/installer/install-menu-text.pl b/Master/tlpkg/installer/install-menu-text.pl
index f87a0924fb1..bec29497c9d 100755
--- a/Master/tlpkg/installer/install-menu-text.pl
+++ b/Master/tlpkg/installer/install-menu-text.pl
@@ -696,6 +696,7 @@ sub options_menu {
my $b_deskint=button($vars{'option_desktop_integration'});
my $b_fileassocs=button($vars{'option_file_assocs'});
my $b_admin=button($vars{'option_w32_multi_user'});
+ my $b_addoneditor=button($vars{'addon_editor'});
my $sys_bin=$vars{'sys_bin'};
my $sys_man=$vars{'sys_man'};
@@ -748,6 +749,7 @@ EOF
print " <U> make installation available to all users: $b_admin\n";
}
}
+ print " <E> install TeX Works editor: $b_addoneditor\n";
}
other_options qw(R Q diskspace);
my $answer = prompt 'Enter command';
@@ -822,6 +824,10 @@ EOF
} elsif (defined $command{"\u$answer"}) {
return $command{"\u$answer"};
+ } elsif ("\u$answer" eq 'E') {
+ toggle 'addon_editor';
+ return $command{'self'};
+
} else {
print "Unknown command: $answer\n\n";
return $command{'self'};
@@ -860,6 +866,7 @@ sub main_menu {
my $b_deskint=button($vars{'option_desktop_integration'});
my $b_fileassocs=button($vars{'option_file_assocs'});
my $b_admin=button($vars{'option_w32_multi_user'});
+ my $b_addoneditor=button($vars{'addon_editor'});
my $warn_nobin;
@@ -976,6 +983,7 @@ EOF
} else {
print " $b_path create symlinks to standard directories\n";
}
+ print" $b_addoneditor install TeX Works Editor\n";
}
if ($vars{'from_dvd'}) {
diff --git a/Master/tlpkg/installer/install-menu-wizard.pl b/Master/tlpkg/installer/install-menu-wizard.pl
index f5e779d64a8..b62bcb0aa91 100644
--- a/Master/tlpkg/installer/install-menu-wizard.pl
+++ b/Master/tlpkg/installer/install-menu-wizard.pl
@@ -184,6 +184,9 @@ sub ask_path {
my $pa = $fmain->Checkbutton(-text => $labels{'optletter'},
-variable => \$vars{"option_letter"});
+ my $but_tw = $fmain->Checkbutton(-text => $labels{'addon_editor'},
+ -variable => \$vars{"addon_editor"});
+
#
# disable the "Advanced Configuration" button switching to the
# perltk installer
@@ -216,6 +219,7 @@ sub ask_path {
$pa->place(-x => 0, -y => $ytmp + 30);
+ $but_tw->place(-x => 0, -y => $ytmp + 60);
#$cb->place(-x => $INNERWIDTH, -y => $INNERHEIGHT, -anchor => "se");
diff --git a/Master/tlpkg/installer/install-translations.pl b/Master/tlpkg/installer/install-translations.pl
index d05f78cce73..c4fc0841649 100644
--- a/Master/tlpkg/installer/install-translations.pl
+++ b/Master/tlpkg/installer/install-translations.pl
@@ -122,6 +122,7 @@ our %labels = (binsys => 'Binary System(s)',
optsrc => 'Install font/macro source tree',
symlink => 'Create symlinks in system directories',
desktop_integration => 'Desktop Integration',
+ addon_editor => 'Install TeX Works Editor',
);
if (($::lang ne "en") && ($::lang ne "C")) {