summaryrefslogtreecommitdiff
path: root/Master
diff options
context:
space:
mode:
Diffstat (limited to 'Master')
-rwxr-xr-xMaster/install-tl6
-rw-r--r--Master/tlpkg/installer/install-menu-perltk.pl10
-rwxr-xr-xMaster/tlpkg/installer/install-menu-text.pl8
-rw-r--r--Master/tlpkg/tlpsrc/collection-binextra.tlpsrc1
-rw-r--r--Master/tlpkg/tlpsrc/collection-texworks.tlpsrc5
-rw-r--r--Master/tlpkg/tlpsrc/scheme-full.tlpsrc1
6 files changed, 18 insertions, 13 deletions
diff --git a/Master/install-tl b/Master/install-tl
index 2b2a8833ae8..e519307c2f3 100755
--- a/Master/install-tl
+++ b/Master/install-tl
@@ -1067,9 +1067,9 @@ sub calc_depends {
#
# work through the addon settings in the %vars hash
- if ($vars{'addon_editor'}) {
- $install{"texworks"} = 1;
- }
+ #if ($vars{'addon_editor'}) {
+ # $install{"texworks"} = 1;
+ #}
# if programs for arch=win32 are installed we also have to install
# tlperl.win32 which provides the "hidden" perl that will be used
diff --git a/Master/tlpkg/installer/install-menu-perltk.pl b/Master/tlpkg/installer/install-menu-perltk.pl
index 8312cedaef6..2e0cbea1901 100644
--- a/Master/tlpkg/installer/install-menu-perltk.pl
+++ b/Master/tlpkg/installer/install-menu-perltk.pl
@@ -77,7 +77,7 @@ my $srcyesno = ( $vars{'option_src'} ? __("Yes") : __("No") );
my $deskintyesno = ( $vars{'option_desktop_integration'} ? __("Yes") : __("No") );
my $pathadjyesno = ( $vars{'option_path'} ? __("Yes") : __("No") );
my $fileassocyesno = $::fileassocdesc[$vars{'option_file_assocs'}];
-my $editoryesno = ( $vars{'addon_editor'} ? __("Yes") : __("No") );
+#my $editoryesno = ( $vars{'addon_editor'} ? __("Yes") : __("No") );
my $adminallyesno = ( $vars{'option_w32_multi_user'} ? __("Yes") : __("No") );
my $docyesno = ( $vars{'option_doc'} ? __("Yes") : __("No") );
my $restrictedyesno = ( $vars{'option_write18_restricted'} ? __("Yes") : __("No") );
@@ -302,10 +302,10 @@ sub run_menu_perltk {
$fr->Button(-text => __("Toggle"), -command => sub { toggle_and_set_opt_variable(\$vars{'option_w32_multi_user'}, \$adminallyesno); })->grid(-row => $row, -column => 3, -sticky => "ew", -padx => "2m");
}
- $row++;
- $fr->Label(-text => __('Install TeXworks front end'), -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 => __("Toggle"), -command => sub { toggle_and_set_opt_variable(\$vars{'addon_editor'}, \$editoryesno); })->grid(-row => $row, -column => 3, -sticky => "ew", -padx => "2m");
+ # $row++;
+ # $fr->Label(-text => __('Install TeXworks front end'), -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 => __("Toggle"), -command => sub { toggle_and_set_opt_variable(\$vars{'addon_editor'}, \$editoryesno); })->grid(-row => $row, -column => 3, -sticky => "ew", -padx => "2m");
}
# install/cancel buttons
diff --git a/Master/tlpkg/installer/install-menu-text.pl b/Master/tlpkg/installer/install-menu-text.pl
index ba14da66d2e..cc9780eefda 100755
--- a/Master/tlpkg/installer/install-menu-text.pl
+++ b/Master/tlpkg/installer/install-menu-text.pl
@@ -699,7 +699,7 @@ sub options_menu {
my $b_letter=button($vars{'option_letter'});
my $b_deskint=button($vars{'option_desktop_integration'});
my $b_admin=button($vars{'option_w32_multi_user'});
- my $b_addoneditor=button($vars{'addon_editor'});
+ #my $b_addoneditor=button($vars{'addon_editor'});
my $b_restricted = button($vars{'option_write18_restricted'});
my $sys_bin=$vars{'option_sys_bin'};
@@ -753,7 +753,7 @@ EOF
# if we are admin we allow normal user installation, too
print " <U> make installation available to all users: $b_admin\n";
}
- print " <E> install TeXworks front end: $b_addoneditor\n";
+ #print " <E> install TeXworks front end: $b_addoneditor\n";
}
}
other_options qw(R Q diskspace);
@@ -885,7 +885,7 @@ sub main_menu {
my $b_letter=button($vars{'option_letter'});
my $b_deskint=button($vars{'option_desktop_integration'});
my $b_admin=button($vars{'option_w32_multi_user'});
- my $b_addoneditor=button($vars{'addon_editor'});
+ #my $b_addoneditor=button($vars{'addon_editor'});
my $b_restricted = button($vars{'option_write18_restricted'});
my $warn_nobin;
@@ -1001,7 +1001,7 @@ EOF
if (admin()) {
print " $b_admin make installation available to all users\n";
}
- print" $b_addoneditor install TeXworks front end\n";
+ #print" $b_addoneditor install TeXworks front end\n";
} else {
print " $b_path create symlinks to standard directories\n";
}
diff --git a/Master/tlpkg/tlpsrc/collection-binextra.tlpsrc b/Master/tlpkg/tlpsrc/collection-binextra.tlpsrc
index 5b27ab9f206..ce70a53e85e 100644
--- a/Master/tlpkg/tlpsrc/collection-binextra.tlpsrc
+++ b/Master/tlpkg/tlpsrc/collection-binextra.tlpsrc
@@ -43,7 +43,6 @@ depend texdirflatten
depend texdoc
depend texloganalyser
depend texware
-depend texworks
depend tie
depend tpic2pdftex
depend web
diff --git a/Master/tlpkg/tlpsrc/collection-texworks.tlpsrc b/Master/tlpkg/tlpsrc/collection-texworks.tlpsrc
new file mode 100644
index 00000000000..16b5aa44890
--- /dev/null
+++ b/Master/tlpkg/tlpsrc/collection-texworks.tlpsrc
@@ -0,0 +1,5 @@
+category Collection
+shortdesc The TeXworks Editor
+depend collection-basic
+
+depend texworks
diff --git a/Master/tlpkg/tlpsrc/scheme-full.tlpsrc b/Master/tlpkg/tlpsrc/scheme-full.tlpsrc
index a9e9ac6a98f..ee8354c635a 100644
--- a/Master/tlpkg/tlpsrc/scheme-full.tlpsrc
+++ b/Master/tlpkg/tlpsrc/scheme-full.tlpsrc
@@ -83,4 +83,5 @@ depend collection-pstricks
depend collection-publishers
depend collection-science
depend collection-texinfo
+depend collection-texworks
depend collection-xetex