diff options
author | Norbert Preining <preining@logic.at> | 2007-12-30 18:35:32 +0000 |
---|---|---|
committer | Norbert Preining <preining@logic.at> | 2007-12-30 18:35:32 +0000 |
commit | b937bd9c2e26cee7cc8e757d3f9665121a559f29 (patch) | |
tree | 5d1c9447420ce1d7c5e6a40f4499a37c3d649f00 /Master | |
parent | 7632b341a7efc029d661a6943e292d1ec815f32d (diff) |
implement Reinhard's suggestions:
- add a package bin-perltl.win32 which ships tlpkg/bin/perl.exe plus dll
plus tlpkg/lib/...
- adapt the installer that for win32 *always* bin-perltl.win32 is installed
- adapt the installer that it uses the bin-perltl.win32 perl.exe for
running updmap-sys.pl
git-svn-id: svn://tug.org/texlive/trunk@6000 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master')
-rwxr-xr-x | Master/install-tl.pl | 30 | ||||
-rw-r--r-- | Master/tlpkg/texlive.tlpdb | 63 | ||||
-rw-r--r-- | Master/tlpkg/tlpsrc/bin-perltl.win32.tlpsrc | 5 |
3 files changed, 61 insertions, 37 deletions
diff --git a/Master/install-tl.pl b/Master/install-tl.pl index bb8892d3399..08e6b1956e8 100755 --- a/Master/install-tl.pl +++ b/Master/install-tl.pl @@ -276,14 +276,6 @@ sub set_texlive_default_dirs { $vars{'TEXMFHOME'}="$texmfhome/texmf"; } -sub is_useful_perl_installed { - if (which("perl")) { - return 1; - } else { - return 0; - } -} - sub calc_depends { # we have to reset the install hash EVERY TIME otherwise everything will # always be installed since the default is scheme-full which selects @@ -309,8 +301,8 @@ sub calc_depends { } # we have to check for a decent perl installed - if (!is_useful_perl_installed()) { - $install{"bin-perl"} = 1; + if (win32()) { + $install{"bin-perltl.win32"} = 1; } # compute the list of archs to be installed @@ -590,30 +582,26 @@ sub do_postinst_stuff { } $ENV{'PATH'} = "$path"; # Step 3: Make Perl find the right modules - my $perlint = which("perl"); - if (dirname($perlint) =~ m;$vars{'TEXDIR'}/bin/$vars{'this_platform'};i) { + if (win32()) { # we are working with our version of perl # thus, we have to set the PERLLIB envvar right my $perllib = ""; - if (defined($ENV{'PERLLIB'})) { - $perllib = $ENV{'PERLLIB'}; - } - if (win32()) { - $perllib .= ";$vars{'TEXDIR'}/perltl/lib"; - } else { - $perllib .= ":$vars{'TEXDIR'}/perltl/lib"; + if (defined($ENV{'PERL5LIB'})) { + $perllib = $ENV{'PERL5LIB'}; } - $ENV{'PERLLIB'} = $perllib; + $perllib .= ";$vars{'TEXDIR'}/tlpkg/lib/Perl5_lib-TL_inst"; + $ENV{'PERL5LIB'} = $perllib; } # # Step 4: run the programs `generate-fmtutil`; `generate-updmap`; `generate-language`; + my $perlint = "$vars{'TEXDIR'}/tlpkg/bin/perl.exe"; my $mktexlsr = (win32() ? "mktexlsr.exe" : "mktexlsr"); my $updmap = (win32() ? "$perlint $vars{'TEXDIR'}/bin/win32/updmap-sys.pl" : "updmap-sys"); `$mktexlsr $vars{'TEXDIR'}/texmf-dist $vars{'TEXDIR'}/texmf $vars{'TEXDIR'}/texmf-local`; - `$updmap --nohash --cnffile=$vars{'TEXMFSYSVAR'}/web2c/updmap.cfg --dvipsoutputdir=$vars{'TEXMFSYSVAR'}/fonts/map/dvips/updmap \ --dvipdfmoutputdir=$vars{'TEXMFSYSVAR'}/fonts/map/dvipdfm/updmap --pdftexoutputdir=$vars{'TEXMFSYSVAR'}/fonts/map/pdftex/updmap `; + `$updmap --nohash`; `$mktexlsr $vars{'TEXMFSYSVAR'}`; # old installer: diff --git a/Master/tlpkg/texlive.tlpdb b/Master/tlpkg/texlive.tlpdb index aa5d5e169c5..98b66601e24 100644 --- a/Master/tlpkg/texlive.tlpdb +++ b/Master/tlpkg/texlive.tlpdb @@ -18469,6 +18469,38 @@ shortdesc binary files of bin-perltex for x86_64-linux binfiles arch=x86_64-linux size=4 bin/x86_64-linux/perltex +name bin-perltl.win32 +category TLCore +revision 5992 +runfiles size=435 + tlpkg/bin/perl.exe + tlpkg/bin/perl58.dll + tlpkg/lib/Perl5_lib-TL_inst/AutoLoader.pm + tlpkg/lib/Perl5_lib-TL_inst/Carp.pm + tlpkg/lib/Perl5_lib-TL_inst/Config.pm + tlpkg/lib/Perl5_lib-TL_inst/DynaLoader.pm + tlpkg/lib/Perl5_lib-TL_inst/Exporter.pm + tlpkg/lib/Perl5_lib-TL_inst/Exporter/Heavy.pm + tlpkg/lib/Perl5_lib-TL_inst/Getopt/Long.pm + tlpkg/lib/Perl5_lib-TL_inst/Tie/Hash.pm + tlpkg/lib/Perl5_lib-TL_inst/Win32/Registry.pm + tlpkg/lib/Perl5_lib-TL_inst/Win32/TieRegistry.pm + tlpkg/lib/Perl5_lib-TL_inst/Win32API/Registry.pm + tlpkg/lib/Perl5_lib-TL_inst/Win32API/Registry/cRegistry.pc + tlpkg/lib/Perl5_lib-TL_inst/auto/DynaLoader/autosplit.ix + tlpkg/lib/Perl5_lib-TL_inst/auto/DynaLoader/dl_expandspec.al + tlpkg/lib/Perl5_lib-TL_inst/auto/DynaLoader/dl_find_symbol_anywhere.al + tlpkg/lib/Perl5_lib-TL_inst/auto/DynaLoader/dl_findfile.al + tlpkg/lib/Perl5_lib-TL_inst/auto/Win32API/Registry/Registry.bs + tlpkg/lib/Perl5_lib-TL_inst/auto/Win32API/Registry/Registry.dll + tlpkg/lib/Perl5_lib-TL_inst/constant.pm + tlpkg/lib/Perl5_lib-TL_inst/newgetopt.pl + tlpkg/lib/Perl5_lib-TL_inst/overload.pm + tlpkg/lib/Perl5_lib-TL_inst/strict.pm + tlpkg/lib/Perl5_lib-TL_inst/vars.pm + tlpkg/lib/Perl5_lib-TL_inst/warnings.pm + tlpkg/lib/Perl5_lib-TL_inst/warnings/register.pm + name bin-physe category TLCore revision 5403 @@ -42730,7 +42762,7 @@ longdesc floats side by side, and to put the caption beside its float. longdesc The floatrow settings could be expanded to the floats created longdesc by packages rotating, wrapfig, subfig (in the case of rows of longdesc subfloats), and longtable. -docfiles size=234 +docfiles size=233 texmf-dist/doc/latex/floatrow/README details="Readme" texmf-dist/doc/latex/floatrow/floatrow-rus.tex texmf-dist/doc/latex/floatrow/floatrow.pdf details="Package documentation" @@ -45848,7 +45880,7 @@ docfiles size=206 runfiles size=22 texmf-dist/tex/latex/gmutils/gmutils.sty catalogue-version v0.85 -catalogue-date 2007-11-17 21:57:01 +0100 +catalogue-date 2007-11-17 20:57:01 +0000 catalogue-ctan /macros/latex/contrib/gmutils catalogue-license lppl @@ -51148,25 +51180,24 @@ catalogue-license lppl name jurarsp category Package -revision 4479 +revision 5998 shortdesc Citations of judgements and official documents in (German) juridical documents. longdesc This package should be helpful for people working on (German) longdesc law. It (ab)uses BibTeX for citations of judgements and longdesc official documents. For this purpose, a special BibTeX-style is longdesc provided. -docfiles size=198 +docfiles size=57 texmf-dist/doc/latex/jurarsp/README details="Readme" - texmf-dist/doc/latex/jurarsp/_18237.log - texmf-dist/doc/latex/jurarsp/_19046.log - texmf-dist/doc/latex/jurarsp/jurarsp.bst - texmf-dist/doc/latex/jurarsp/jurarsp.cfg - texmf-dist/doc/latex/jurarsp/jurarsp.dtx - texmf-dist/doc/latex/jurarsp/jurarsp.ins - texmf-dist/doc/latex/jurarsp/jurarsp.log texmf-dist/doc/latex/jurarsp/jurarsp.pdf details="Package documentation" language="de" - texmf-dist/doc/latex/jurarsp/jurarsp.sty texmf-dist/doc/latex/jurarsp/rsptest.bib texmf-dist/doc/latex/jurarsp/rsptest.tex +srcfiles size=31 + texmf-dist/source/latex/jurarsp/jurarsp.dtx + texmf-dist/source/latex/jurarsp/jurarsp.ins +runfiles size=17 + texmf-dist/bibtex/bst/jurarsp/jurarsp.bst + texmf-dist/tex/latex/jurarsp/jurarsp.cfg + texmf-dist/tex/latex/jurarsp/jurarsp.sty catalogue-version 0.52 catalogue-date 2007-01-08 14:12:54 +0100 catalogue-ctan /macros/latex/contrib/jurarsp @@ -71068,7 +71099,7 @@ catalogue-license lppl name pst-jtree category Package revision 5879 -docfiles size=101 +docfiles size=100 texmf-dist/doc/generic/pst-jtree/README texmf-dist/doc/generic/pst-jtree/pst-jtree-doc-source.zip texmf-dist/doc/generic/pst-jtree/pst-jtree-doc.pdf @@ -81955,7 +81986,7 @@ docfiles size=267 texmf-dist/doc/latex/texpower/tpslifonts/tpslifonts.dtx texmf-dist/doc/latex/texpower/tpslifonts/tpslifonts.ins texmf-dist/doc/latex/texpower/verbexample.tex -srcfiles size=173 +srcfiles size=172 texmf-dist/source/latex/texpower/Makefile texmf-dist/source/latex/texpower/powersem.dtx texmf-dist/source/latex/texpower/texpower-addons.dtx @@ -90142,7 +90173,7 @@ docfiles size=372 texmf-dist/doc/generic/vntex/vntex-man-print.pdf texmf-dist/doc/generic/vntex/vntex-man.pdf details="Package manual" language="vi" texmf-dist/doc/generic/vntex/vntex.txt -runfiles size=2598 +runfiles size=2579 texmf-dist/fonts/afm/vntex/chartervn/bchb8v.afm texmf-dist/fonts/afm/vntex/chartervn/bchbi8v.afm texmf-dist/fonts/afm/vntex/chartervn/bchr8v.afm @@ -91965,7 +91996,7 @@ docfiles size=1 runfiles size=2 texmf-dist/tex/xelatex/xgreek/xgreek.sty catalogue-version v1.0c -catalogue-date 2007-11-18 23:01:55 +0100 +catalogue-date 2007-11-18 22:01:55 +0000 catalogue-ctan /macros/xetex/latex/xgreek catalogue-license lppl diff --git a/Master/tlpkg/tlpsrc/bin-perltl.win32.tlpsrc b/Master/tlpkg/tlpsrc/bin-perltl.win32.tlpsrc new file mode 100644 index 00000000000..1f8d1efca21 --- /dev/null +++ b/Master/tlpkg/tlpsrc/bin-perltl.win32.tlpsrc @@ -0,0 +1,5 @@ +name bin-perltl.win32 +category TLCore +runpattern d tlpkg/lib/Perl5_lib-TL_inst +runpattern f tlpkg/bin/perl.exe +runpattern f tlpkg/bin/perl58.dll |