diff options
-rwxr-xr-x | Master/texmf/scripts/texlive/tlmgr.pl | 55 | ||||
-rw-r--r-- | Master/tlpkg/TeXLive/TLConfig.pm | 11 | ||||
-rw-r--r-- | Master/tlpkg/TeXLive/TLMedia.pm | 12 | ||||
-rw-r--r-- | Master/tlpkg/TeXLive/TLPDB.pm | 11 | ||||
-rw-r--r-- | Master/tlpkg/TeXLive/TLPOBJ.pm | 11 | ||||
-rw-r--r-- | Master/tlpkg/TeXLive/TLPSRC.pm | 11 | ||||
-rw-r--r-- | Master/tlpkg/TeXLive/TLPaper.pm | 11 | ||||
-rw-r--r-- | Master/tlpkg/TeXLive/TLPostActions.pm | 11 | ||||
-rw-r--r-- | Master/tlpkg/TeXLive/TLTREE.pm | 11 | ||||
-rw-r--r-- | Master/tlpkg/TeXLive/TLUtils.pm | 11 | ||||
-rw-r--r-- | Master/tlpkg/TeXLive/TLWinGoo.pm | 11 | ||||
-rw-r--r-- | Master/tlpkg/TeXLive/TeXCatalogue.pm | 11 |
12 files changed, 165 insertions, 12 deletions
diff --git a/Master/texmf/scripts/texlive/tlmgr.pl b/Master/texmf/scripts/texlive/tlmgr.pl index 407860f3e13..17ffb660f10 100755 --- a/Master/texmf/scripts/texlive/tlmgr.pl +++ b/Master/texmf/scripts/texlive/tlmgr.pl @@ -6,9 +6,6 @@ # or any later version. # # TODO: -# - in GUI mode updating texlive.infra DOES work without -# the warning, but it does NOT force to restart the GUI. THAT IS BAD!!! -# # - tlmgr should have a "progress" bar for the update --all and install # etc options, echoing number of total packages etc etc. # @@ -164,6 +161,7 @@ sub main { "arch" => { "dry-run|n" => 1 }, "generate" => { "localcfg" => "=s", "dest" => "=s" }, + "path" => { "w32mode" => "=s" }, "postaction" => {"w32mode" => "=s", "all" => 1, "fileassocmode" => "=i" }, @@ -322,6 +320,19 @@ sub give_version { close (REL_TL); } } + # + # add the list of revisions + if ($::opt_verbosity > 0) { + $::version_string .= "Revision of modules:"; + $::version_string .= "\nTLConfig: " . TeXLive::TLConfig->module_revision(); + $::version_string .= "\nTLUtils: " . TeXLive::TLUtils->module_revision(); + $::version_string .= "\nTLPOBJ: " . TeXLive::TLPOBJ->module_revision(); + $::version_string .= "\nTLPDB: " . TeXLive::TLPDB->module_revision(); + $::version_string .= "\nTLMedia: " . TeXLive::TLMedia->module_revision(); + $::version_string .= "\nTLPaper: " . TeXLive::TLPaper->module_revision(); + $::version_string .= "\nTLWinGoo: " . TeXLive::TLWinGoo->module_revision(); + $::version_string .= "\n"; + } return $::version_string; } @@ -3618,6 +3629,8 @@ Gives this help information (same as C<--help>). Gives version information (same as C<--version>). +If B<-v> has been given the revisions of the used modules are reported, too. + =head2 gui Start the graphical user interface. @@ -3960,16 +3973,33 @@ a general feature of option parsing.) This option to tlmgr mimicks the B<texconfig conf> call, but works on all supported platforms. -=head2 path [add|remove] +=head2 path [--w32mode=user|admin] [add|remove] On unix adds or removes symlinks for binaries, man pages, and info pages in the directories specified by the respective options (see above). -On W32 based systems it adds or removes the binary dir to the system or -user registry path entry, depending on being admin and the setting -$tlpdb->option("w32_multi_user"). +On W32 based systems the registry part where the binary directory is +added or removed is determined in the following way: + +If the user has admin rights, and the option B<--w32mode> is not given, +the setting I<w32_multi_user> determines the location (i.e., if it is +on then the system path, otherwise the user path is changed). + +If the user has admin rights, and the option B<--w32mode> is given, this +option determines the path to be adjusted. + +If the user does not have admin rights, and the option B<--w32mode> +is not given, and the setting I<w32_multi_user> is off, the user path +is changed, while if the setting I<w32_multi_user> is on, a warning is +issued that the caller does not have enough privileges. + +If the user does not have admin rights, and the option B<--w32mode> +is given, it must be B<user> and the user path will be adjusted. If a +user without admin rights uses the option B<--w32mode admin> a warning +is issued that the caller does not have enough provileges. + -=head2 postaction [-w32mode=user|admin] [-fileassocmode=1|2] [-all] +=head2 postaction [--w32mode=user|admin] [--fileassocmode=1|2] [-all] [install|remove] [shortcut|fileassoc|script] [<package> <package> ...] Carry out the postaction C<shortcut>, C<fileassoc>, or C<script> as @@ -3977,13 +4007,13 @@ given as second obligatory argument in install or remove mode (first obligatory argument), for either the packages given on the command line, or for all if C<-all> is given. -The option C<-w32mode> is C<user> all actions will only carried out in +The option C<--w32mode> is C<user> all actions will only carried out in the user accessible parts of the registry/filesystem, while the C<admin> mode selects the system wide parts of the registry for the file associations. -Note that if you do not have enough permissions using C<-w32mode=admin> +Note that if you do not have enough permissions using C<--w32mode=admin> will not succeed. -For the postaction C<fileassoc> the mode can be set with <-fileassocmode>. +For the postaction C<fileassoc> the mode can be set with <--fileassocmode>. If it is set to 1, only new assocations are added, if it is set to 2, all associations are set to the TeX Live programs. @@ -4260,7 +4290,8 @@ packages that need updating or installing (which are listed subseqently). Then comes a line with only the literal string C<end-of-header>. -Each following line until EOF reports on one package. The fields on +Each following line until a line with literal string C<end-of-updates> +reports on one package. The fields on each line are separated by a tab. Here are the fields. =over 4 diff --git a/Master/tlpkg/TeXLive/TLConfig.pm b/Master/tlpkg/TeXLive/TLConfig.pm index 73703489569..d5d8c9d314a 100644 --- a/Master/tlpkg/TeXLive/TLConfig.pm +++ b/Master/tlpkg/TeXLive/TLConfig.pm @@ -6,6 +6,17 @@ package TeXLive::TLConfig; +my $svnrev = '$Revision: 14542 $'; +my $_modulerevision; +if ($svnrev =~ m/: ([0-9]+) /) { + $_modulerevision = $1; +} else { + $_modulerevision = "unknown"; +} +sub module_revision { + return $_modulerevision; +} + BEGIN { use Exporter (); use vars qw( @ISA @EXPORT_OK @EXPORT ); diff --git a/Master/tlpkg/TeXLive/TLMedia.pm b/Master/tlpkg/TeXLive/TLMedia.pm index d705991fcd4..af7b7dd3027 100644 --- a/Master/tlpkg/TeXLive/TLMedia.pm +++ b/Master/tlpkg/TeXLive/TLMedia.pm @@ -7,6 +7,18 @@ package TeXLive::TLMedia; +my $svnrev = '$Revision: 14408 $'; +my $_modulerevision; +if ($svnrev =~ m/: ([0-9]+) /) { + $_modulerevision = $1; +} else { + $_modulerevision = "unknown"; +} +sub module_revision { + return $_modulerevision; +} + + use TeXLive::TLConfig; use TeXLive::TLUtils qw(copy win32 dirname mkdirhier basename download_file merge_into debug ddebug info tlwarn log); diff --git a/Master/tlpkg/TeXLive/TLPDB.pm b/Master/tlpkg/TeXLive/TLPDB.pm index c9024d7e113..55f01b32fed 100644 --- a/Master/tlpkg/TeXLive/TLPDB.pm +++ b/Master/tlpkg/TeXLive/TLPDB.pm @@ -7,6 +7,17 @@ package TeXLive::TLPDB; +my $svnrev = '$Revision: 14542 $'; +my $_modulerevision; +if ($svnrev =~ m/: ([0-9]+) /) { + $_modulerevision = $1; +} else { + $_modulerevision = "unknown"; +} +sub module_revision { + return $_modulerevision; +} + =pod =head1 NAME diff --git a/Master/tlpkg/TeXLive/TLPOBJ.pm b/Master/tlpkg/TeXLive/TLPOBJ.pm index 87a19e70377..edcbceb279a 100644 --- a/Master/tlpkg/TeXLive/TLPOBJ.pm +++ b/Master/tlpkg/TeXLive/TLPOBJ.pm @@ -15,6 +15,17 @@ use TeXLive::TLTREE; our $_tmp; my $_containerdir; +my $svnrev = '$Revision: 14264 $'; +my $_modulerevision; +if ($svnrev =~ m/: ([0-9]+) /) { + $_modulerevision = $1; +} else { + $_modulerevision = "unknown"; +} +sub module_revision { + return $_modulerevision; +} + sub new { my $class = shift; my %params = @_; diff --git a/Master/tlpkg/TeXLive/TLPSRC.pm b/Master/tlpkg/TeXLive/TLPSRC.pm index 7894ffbfaa6..3bf13e20e51 100644 --- a/Master/tlpkg/TeXLive/TLPSRC.pm +++ b/Master/tlpkg/TeXLive/TLPSRC.pm @@ -16,6 +16,17 @@ use TeXLive::TLTREE; my $_tmp; my %autopatterns; # computed once internally +my $svnrev = '$Revision: 14408 $'; +my $_modulerevision; +if ($svnrev =~ m/: ([0-9]+) /) { + $_modulerevision = $1; +} else { + $_modulerevision = "unknown"; +} +sub module_revision { + return $_modulerevision; +} + sub new { my $class = shift; diff --git a/Master/tlpkg/TeXLive/TLPaper.pm b/Master/tlpkg/TeXLive/TLPaper.pm index c1e4a00d08b..10afb886e17 100644 --- a/Master/tlpkg/TeXLive/TLPaper.pm +++ b/Master/tlpkg/TeXLive/TLPaper.pm @@ -13,6 +13,17 @@ package TeXLive::TLPaper; +my $svnrev = '$Revision: 11574 $'; +my $_modulerevision; +if ($svnrev =~ m/: ([0-9]+) /) { + $_modulerevision = $1; +} else { + $_modulerevision = "unknown"; +} +sub module_revision { + return $_modulerevision; +} + =pod =head1 NAME diff --git a/Master/tlpkg/TeXLive/TLPostActions.pm b/Master/tlpkg/TeXLive/TLPostActions.pm index f1e1f2da76c..a6cec66f8bd 100644 --- a/Master/tlpkg/TeXLive/TLPostActions.pm +++ b/Master/tlpkg/TeXLive/TLPostActions.pm @@ -6,6 +6,17 @@ package TeXLive::TLPostActions; +my $svnrev = '$Revision: 14262 $'; +my $_modulerevision; +if ($svnrev =~ m/: ([0-9]+) /) { + $_modulerevision = $1; +} else { + $_modulerevision = "unknown"; +} +sub module_revision { + return $_modulerevision; +} + BEGIN { use Exporter (); use vars qw( @ISA @EXPORT_OK @EXPORT ); diff --git a/Master/tlpkg/TeXLive/TLTREE.pm b/Master/tlpkg/TeXLive/TLTREE.pm index d0897d20885..54b6678f34e 100644 --- a/Master/tlpkg/TeXLive/TLTREE.pm +++ b/Master/tlpkg/TeXLive/TLTREE.pm @@ -7,6 +7,17 @@ package TeXLive::TLTREE; +my $svnrev = '$Revision: 14264 $'; +my $_modulerevision; +if ($svnrev =~ m/: ([0-9]+) /) { + $_modulerevision = $1; +} else { + $_modulerevision = "unknown"; +} +sub module_revision { + return $_modulerevision; +} + use TeXLive::TLUtils; sub new { diff --git a/Master/tlpkg/TeXLive/TLUtils.pm b/Master/tlpkg/TeXLive/TLUtils.pm index cd4246f6c0f..f9d649fe753 100644 --- a/Master/tlpkg/TeXLive/TLUtils.pm +++ b/Master/tlpkg/TeXLive/TLUtils.pm @@ -7,6 +7,17 @@ package TeXLive::TLUtils; +my $svnrev = '$Revision: 14416 $'; +my $_modulerevision; +if ($svnrev =~ m/: ([0-9]+) /) { + $_modulerevision = $1; +} else { + $_modulerevision = "unknown"; +} +sub module_revision { + return $_modulerevision; +} + =pod =head1 NAME diff --git a/Master/tlpkg/TeXLive/TLWinGoo.pm b/Master/tlpkg/TeXLive/TLWinGoo.pm index d1f773f87d6..852a6127b69 100644 --- a/Master/tlpkg/TeXLive/TLWinGoo.pm +++ b/Master/tlpkg/TeXLive/TLWinGoo.pm @@ -12,6 +12,17 @@ package TeXLive::TLWinGoo; +my $svnrev = '$Revision: 14264 $'; +my $_modulerevision; +if ($svnrev =~ m/: ([0-9]+) /) { + $_modulerevision = $1; +} else { + $_modulerevision = "unknown"; +} +sub module_revision { + return $_modulerevision; +} + =pod =head1 NAME diff --git a/Master/tlpkg/TeXLive/TeXCatalogue.pm b/Master/tlpkg/TeXLive/TeXCatalogue.pm index b35bbeba8e1..80b6e55b6b2 100644 --- a/Master/tlpkg/TeXLive/TeXCatalogue.pm +++ b/Master/tlpkg/TeXLive/TeXCatalogue.pm @@ -14,6 +14,17 @@ use Encode; package TeXLive::TeXCatalogue::Entry; +my $svnrev = '$Revision: 14264 $'; +my $_modulerevision; +if ($svnrev =~ m/: ([0-9]+) /) { + $_modulerevision = $1; +} else { + $_modulerevision = "unknown"; +} +sub module_revision { + return $_modulerevision; +} + my $_parser = XML::Parser->new( ErrorContext => 2, ParseParamEnt => 1, |