diff options
author | Norbert Preining <preining@logic.at> | 2008-05-21 23:18:04 +0000 |
---|---|---|
committer | Norbert Preining <preining@logic.at> | 2008-05-21 23:18:04 +0000 |
commit | 1bca669c556326981846feaadf1c0fd944a89d10 (patch) | |
tree | ccf40d95690e9387005b1f1a1d7f7778477e0a1c | |
parent | 4673081b37c6a8dbdfaf605eaa35d0a6496e1459 (diff) |
move the lzma* binaries to tlpkg/installer/lzma and adjust the tlpsrc and
TLUtils.pm
git-svn-id: svn://tug.org/texlive/trunk@8277 c570f23f-e606-0410-a88d-b1316a301751
-rw-r--r-- | Master/tlpkg/TeXLive/TLUtils.pm | 10 | ||||
-rwxr-xr-x | Master/tlpkg/installer/lzma/lzma.alpha-linux (renamed from Master/tlpkg/installer/lzma.alpha-linux) | bin | 120888 -> 120888 bytes | |||
-rwxr-xr-x | Master/tlpkg/installer/lzma/lzma.amd64-freebsd7 (renamed from Master/tlpkg/installer/lzma.amd64-freebsd7) | bin | 107048 -> 107048 bytes | |||
-rw-r--r-- | Master/tlpkg/installer/lzma/lzma.exe (renamed from Master/tlpkg/installer/lzma.exe) | bin | 69632 -> 69632 bytes | |||
-rwxr-xr-x | Master/tlpkg/installer/lzma/lzma.i386-darwin (renamed from Master/tlpkg/installer/lzma.i386-darwin) | bin | 109144 -> 109144 bytes | |||
-rwxr-xr-x | Master/tlpkg/installer/lzma/lzma.i386-linux (renamed from Master/tlpkg/installer/lzma.i386-linux) | bin | 78568 -> 78568 bytes | |||
-rwxr-xr-x | Master/tlpkg/installer/lzma/lzma.i386-solaris (renamed from Master/tlpkg/installer/lzma.i386-solaris) | bin | 133140 -> 133140 bytes | |||
-rwxr-xr-x | Master/tlpkg/installer/lzma/lzma.powerpc-aix (renamed from Master/tlpkg/installer/lzma.powerpc-aix) | bin | 207772 -> 207772 bytes | |||
-rwxr-xr-x | Master/tlpkg/installer/lzma/lzma.powerpc-darwin (renamed from Master/tlpkg/installer/lzma.powerpc-darwin) | bin | 463952 -> 463952 bytes | |||
-rwxr-xr-x | Master/tlpkg/installer/lzma/lzma.sparc-solaris (renamed from Master/tlpkg/installer/lzma.sparc-solaris) | bin | 141340 -> 141340 bytes | |||
-rwxr-xr-x | Master/tlpkg/installer/lzma/lzmadec.alpha-linux (renamed from Master/tlpkg/installer/lzmadec.alpha-linux) | bin | 14320 -> 14320 bytes | |||
-rwxr-xr-x | Master/tlpkg/installer/lzma/lzmadec.amd64-freebsd7 (renamed from Master/tlpkg/installer/lzmadec.amd64-freebsd7) | bin | 12456 -> 12456 bytes | |||
-rwxr-xr-x | Master/tlpkg/installer/lzma/lzmadec.i386-darwin (renamed from Master/tlpkg/installer/lzmadec.i386-darwin) | bin | 21624 -> 21624 bytes | |||
-rwxr-xr-x | Master/tlpkg/installer/lzma/lzmadec.i386-linux (renamed from Master/tlpkg/installer/lzmadec.i386-linux) | bin | 10032 -> 10032 bytes | |||
-rwxr-xr-x | Master/tlpkg/installer/lzma/lzmadec.i386-solaris (renamed from Master/tlpkg/installer/lzmadec.i386-solaris) | bin | 10956 -> 10956 bytes | |||
-rwxr-xr-x | Master/tlpkg/installer/lzma/lzmadec.powerpc-aix (renamed from Master/tlpkg/installer/lzmadec.powerpc-aix) | bin | 11099 -> 11099 bytes | |||
-rwxr-xr-x | Master/tlpkg/installer/lzma/lzmadec.powerpc-darwin (renamed from Master/tlpkg/installer/lzmadec.powerpc-darwin) | bin | 17992 -> 17992 bytes | |||
-rwxr-xr-x | Master/tlpkg/installer/lzma/lzmadec.sparc-solaris (renamed from Master/tlpkg/installer/lzmadec.sparc-solaris) | bin | 15152 -> 15152 bytes | |||
-rwxr-xr-x | Master/tlpkg/installer/lzma/lzmadec.win32.exe (renamed from Master/tlpkg/installer/lzmadec.win32.exe) | bin | 12288 -> 12288 bytes | |||
-rwxr-xr-x | Master/tlpkg/installer/lzma/lzmadec.x86_64-linux (renamed from Master/tlpkg/installer/lzmadec.x86_64-linux) | bin | 14728 -> 14728 bytes | |||
-rw-r--r-- | Master/tlpkg/tlpsrc/00texlive.installer.tlpsrc | 4 | ||||
-rw-r--r-- | Master/tlpkg/tlpsrc/0texlive.support.tlpsrc | 7 |
22 files changed, 11 insertions, 10 deletions
diff --git a/Master/tlpkg/TeXLive/TLUtils.pm b/Master/tlpkg/TeXLive/TLUtils.pm index 8e65670ea37..5b09bfd6c5f 100644 --- a/Master/tlpkg/TeXLive/TLUtils.pm +++ b/Master/tlpkg/TeXLive/TLUtils.pm @@ -771,14 +771,14 @@ sub setup_programs { $::installerdir = "$bindir/../.."; $platform = platform(); } - $::progs{'lzmadec'} = "$bindir/lzmadec.$platform"; - $::progs{'lzma'} = "$bindir/lzma.$platform"; + $::progs{'lzmadec'} = "$bindir/lzma/lzmadec.$platform"; + $::progs{'lzma'} = "$bindir/lzma/lzma.$platform"; $::progs{'tar'} = "tar"; if (win32()) { $::progs{'wget'} = conv_to_win_path("$bindir/wget.exe"); $::progs{'tar'} = conv_to_win_path("$bindir/tar.exe"); - $::progs{'lzmadec'} = conv_to_win_path("$bindir/lzmadec.win32.exe"); - $::progs{'lzma'} = conv_to_win_path("$bindir/lzma.exe"); + $::progs{'lzmadec'} = conv_to_win_path("$bindir/lzma/lzmadec.win32.exe"); + $::progs{'lzma'} = conv_to_win_path("$bindir/lzma/lzma.exe"); } } @@ -891,7 +891,7 @@ sub install_package_old { my $tar="/bin/tar -xf - -C"; my $wget="wget -nv -O-"; if (win32) { - $lzmadec="$bindir/lzma.exe -si -so"; + $lzmadec="$bindir/lzma/lzma.exe -si -so"; $tar="$bindir/tar.exe -xf - -C"; $wget="$bindir/wget.exe -nv -O-"; } diff --git a/Master/tlpkg/installer/lzma.alpha-linux b/Master/tlpkg/installer/lzma/lzma.alpha-linux Binary files differindex 57a33f4ff8d..57a33f4ff8d 100755 --- a/Master/tlpkg/installer/lzma.alpha-linux +++ b/Master/tlpkg/installer/lzma/lzma.alpha-linux diff --git a/Master/tlpkg/installer/lzma.amd64-freebsd7 b/Master/tlpkg/installer/lzma/lzma.amd64-freebsd7 Binary files differindex bc8d0e33166..bc8d0e33166 100755 --- a/Master/tlpkg/installer/lzma.amd64-freebsd7 +++ b/Master/tlpkg/installer/lzma/lzma.amd64-freebsd7 diff --git a/Master/tlpkg/installer/lzma.exe b/Master/tlpkg/installer/lzma/lzma.exe Binary files differindex f3f81891bfb..f3f81891bfb 100644 --- a/Master/tlpkg/installer/lzma.exe +++ b/Master/tlpkg/installer/lzma/lzma.exe diff --git a/Master/tlpkg/installer/lzma.i386-darwin b/Master/tlpkg/installer/lzma/lzma.i386-darwin Binary files differindex f455d8f5ffb..f455d8f5ffb 100755 --- a/Master/tlpkg/installer/lzma.i386-darwin +++ b/Master/tlpkg/installer/lzma/lzma.i386-darwin diff --git a/Master/tlpkg/installer/lzma.i386-linux b/Master/tlpkg/installer/lzma/lzma.i386-linux Binary files differindex 8cf5efbf978..8cf5efbf978 100755 --- a/Master/tlpkg/installer/lzma.i386-linux +++ b/Master/tlpkg/installer/lzma/lzma.i386-linux diff --git a/Master/tlpkg/installer/lzma.i386-solaris b/Master/tlpkg/installer/lzma/lzma.i386-solaris Binary files differindex b80c86c30fb..b80c86c30fb 100755 --- a/Master/tlpkg/installer/lzma.i386-solaris +++ b/Master/tlpkg/installer/lzma/lzma.i386-solaris diff --git a/Master/tlpkg/installer/lzma.powerpc-aix b/Master/tlpkg/installer/lzma/lzma.powerpc-aix Binary files differindex 47e90df49c3..47e90df49c3 100755 --- a/Master/tlpkg/installer/lzma.powerpc-aix +++ b/Master/tlpkg/installer/lzma/lzma.powerpc-aix diff --git a/Master/tlpkg/installer/lzma.powerpc-darwin b/Master/tlpkg/installer/lzma/lzma.powerpc-darwin Binary files differindex 0b35ea36d35..0b35ea36d35 100755 --- a/Master/tlpkg/installer/lzma.powerpc-darwin +++ b/Master/tlpkg/installer/lzma/lzma.powerpc-darwin diff --git a/Master/tlpkg/installer/lzma.sparc-solaris b/Master/tlpkg/installer/lzma/lzma.sparc-solaris Binary files differindex 78318ee771a..78318ee771a 100755 --- a/Master/tlpkg/installer/lzma.sparc-solaris +++ b/Master/tlpkg/installer/lzma/lzma.sparc-solaris diff --git a/Master/tlpkg/installer/lzmadec.alpha-linux b/Master/tlpkg/installer/lzma/lzmadec.alpha-linux Binary files differindex 7d79085fa35..7d79085fa35 100755 --- a/Master/tlpkg/installer/lzmadec.alpha-linux +++ b/Master/tlpkg/installer/lzma/lzmadec.alpha-linux diff --git a/Master/tlpkg/installer/lzmadec.amd64-freebsd7 b/Master/tlpkg/installer/lzma/lzmadec.amd64-freebsd7 Binary files differindex 732abc31f01..732abc31f01 100755 --- a/Master/tlpkg/installer/lzmadec.amd64-freebsd7 +++ b/Master/tlpkg/installer/lzma/lzmadec.amd64-freebsd7 diff --git a/Master/tlpkg/installer/lzmadec.i386-darwin b/Master/tlpkg/installer/lzma/lzmadec.i386-darwin Binary files differindex ef5d45aa370..ef5d45aa370 100755 --- a/Master/tlpkg/installer/lzmadec.i386-darwin +++ b/Master/tlpkg/installer/lzma/lzmadec.i386-darwin diff --git a/Master/tlpkg/installer/lzmadec.i386-linux b/Master/tlpkg/installer/lzma/lzmadec.i386-linux Binary files differindex 236c96924f9..236c96924f9 100755 --- a/Master/tlpkg/installer/lzmadec.i386-linux +++ b/Master/tlpkg/installer/lzma/lzmadec.i386-linux diff --git a/Master/tlpkg/installer/lzmadec.i386-solaris b/Master/tlpkg/installer/lzma/lzmadec.i386-solaris Binary files differindex 42eac5e4554..42eac5e4554 100755 --- a/Master/tlpkg/installer/lzmadec.i386-solaris +++ b/Master/tlpkg/installer/lzma/lzmadec.i386-solaris diff --git a/Master/tlpkg/installer/lzmadec.powerpc-aix b/Master/tlpkg/installer/lzma/lzmadec.powerpc-aix Binary files differindex 7204970d7f9..7204970d7f9 100755 --- a/Master/tlpkg/installer/lzmadec.powerpc-aix +++ b/Master/tlpkg/installer/lzma/lzmadec.powerpc-aix diff --git a/Master/tlpkg/installer/lzmadec.powerpc-darwin b/Master/tlpkg/installer/lzma/lzmadec.powerpc-darwin Binary files differindex 932b622e934..932b622e934 100755 --- a/Master/tlpkg/installer/lzmadec.powerpc-darwin +++ b/Master/tlpkg/installer/lzma/lzmadec.powerpc-darwin diff --git a/Master/tlpkg/installer/lzmadec.sparc-solaris b/Master/tlpkg/installer/lzma/lzmadec.sparc-solaris Binary files differindex c276f77052d..c276f77052d 100755 --- a/Master/tlpkg/installer/lzmadec.sparc-solaris +++ b/Master/tlpkg/installer/lzma/lzmadec.sparc-solaris diff --git a/Master/tlpkg/installer/lzmadec.win32.exe b/Master/tlpkg/installer/lzma/lzmadec.win32.exe Binary files differindex f91c8eb26b5..f91c8eb26b5 100755 --- a/Master/tlpkg/installer/lzmadec.win32.exe +++ b/Master/tlpkg/installer/lzma/lzmadec.win32.exe diff --git a/Master/tlpkg/installer/lzmadec.x86_64-linux b/Master/tlpkg/installer/lzma/lzmadec.x86_64-linux Binary files differindex 884723f350c..884723f350c 100755 --- a/Master/tlpkg/installer/lzmadec.x86_64-linux +++ b/Master/tlpkg/installer/lzma/lzmadec.x86_64-linux diff --git a/Master/tlpkg/tlpsrc/00texlive.installer.tlpsrc b/Master/tlpkg/tlpsrc/00texlive.installer.tlpsrc index c372bbd553d..4239a8b1826 100644 --- a/Master/tlpkg/tlpsrc/00texlive.installer.tlpsrc +++ b/Master/tlpkg/tlpsrc/00texlive.installer.tlpsrc @@ -16,9 +16,9 @@ binpattern f/win32 tlpkg/installer/*.bat runpattern !f tlpkg/installer/*.exe runpattern !f tlpkg/installer/*.dll runpattern !f tlpkg/installer/*.bat -binpattern f tlpkg/installer/lzmadec.${ARCH} +binpattern f tlpkg/installer/lzma/lzmadec.${ARCH} # we don't want lzmadec binaries in the runpatterns -runpattern !f tlpkg/installer/lzmadec.* +runpattern !f tlpkg/installer/lzma/lzmadec.* binpattern f/win32 install-tl.bat binpattern f/win32 tl-portable.bat binpattern f/win32 install-tl.bat.manifest diff --git a/Master/tlpkg/tlpsrc/0texlive.support.tlpsrc b/Master/tlpkg/tlpsrc/0texlive.support.tlpsrc index 100e1d6aba3..c8049ea37b0 100644 --- a/Master/tlpkg/tlpsrc/0texlive.support.tlpsrc +++ b/Master/tlpkg/tlpsrc/0texlive.support.tlpsrc @@ -4,7 +4,8 @@ depend texlive-infra # package installer runpattern f tlpkg/installer/wgetrc binpattern f/win32 tlpkg/installer/tar.exe -binpattern f/win32 tlpkg/installer/lzmadec.win32.exe +binpattern f/win32 tlpkg/installer/lzma/lzmadec.win32.exe binpattern f/win32 tlpkg/installer/wget.exe -binpattern f tlpkg/installer/lzmadec.${ARCH} -binpattern f tlpkg/installer/lzma.${ARCH} +binpattern f/win32 tlpkg/installer/lzma/lzma.exe +binpattern f tlpkg/installer/lzma/lzmadec.${ARCH} +binpattern f tlpkg/installer/lzma/lzma.${ARCH} |