summaryrefslogtreecommitdiff
path: root/Master/tlpkg
diff options
context:
space:
mode:
authorNorbert Preining <preining@logic.at>2008-05-21 23:18:04 +0000
committerNorbert Preining <preining@logic.at>2008-05-21 23:18:04 +0000
commit1bca669c556326981846feaadf1c0fd944a89d10 (patch)
treeccf40d95690e9387005b1f1a1d7f7778477e0a1c /Master/tlpkg
parent4673081b37c6a8dbdfaf605eaa35d0a6496e1459 (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
Diffstat (limited to 'Master/tlpkg')
-rw-r--r--Master/tlpkg/TeXLive/TLUtils.pm10
-rwxr-xr-xMaster/tlpkg/installer/lzma/lzma.alpha-linux (renamed from Master/tlpkg/installer/lzma.alpha-linux)bin120888 -> 120888 bytes
-rwxr-xr-xMaster/tlpkg/installer/lzma/lzma.amd64-freebsd7 (renamed from Master/tlpkg/installer/lzma.amd64-freebsd7)bin107048 -> 107048 bytes
-rw-r--r--Master/tlpkg/installer/lzma/lzma.exe (renamed from Master/tlpkg/installer/lzma.exe)bin69632 -> 69632 bytes
-rwxr-xr-xMaster/tlpkg/installer/lzma/lzma.i386-darwin (renamed from Master/tlpkg/installer/lzma.i386-darwin)bin109144 -> 109144 bytes
-rwxr-xr-xMaster/tlpkg/installer/lzma/lzma.i386-linux (renamed from Master/tlpkg/installer/lzma.i386-linux)bin78568 -> 78568 bytes
-rwxr-xr-xMaster/tlpkg/installer/lzma/lzma.i386-solaris (renamed from Master/tlpkg/installer/lzma.i386-solaris)bin133140 -> 133140 bytes
-rwxr-xr-xMaster/tlpkg/installer/lzma/lzma.powerpc-aix (renamed from Master/tlpkg/installer/lzma.powerpc-aix)bin207772 -> 207772 bytes
-rwxr-xr-xMaster/tlpkg/installer/lzma/lzma.powerpc-darwin (renamed from Master/tlpkg/installer/lzma.powerpc-darwin)bin463952 -> 463952 bytes
-rwxr-xr-xMaster/tlpkg/installer/lzma/lzma.sparc-solaris (renamed from Master/tlpkg/installer/lzma.sparc-solaris)bin141340 -> 141340 bytes
-rwxr-xr-xMaster/tlpkg/installer/lzma/lzmadec.alpha-linux (renamed from Master/tlpkg/installer/lzmadec.alpha-linux)bin14320 -> 14320 bytes
-rwxr-xr-xMaster/tlpkg/installer/lzma/lzmadec.amd64-freebsd7 (renamed from Master/tlpkg/installer/lzmadec.amd64-freebsd7)bin12456 -> 12456 bytes
-rwxr-xr-xMaster/tlpkg/installer/lzma/lzmadec.i386-darwin (renamed from Master/tlpkg/installer/lzmadec.i386-darwin)bin21624 -> 21624 bytes
-rwxr-xr-xMaster/tlpkg/installer/lzma/lzmadec.i386-linux (renamed from Master/tlpkg/installer/lzmadec.i386-linux)bin10032 -> 10032 bytes
-rwxr-xr-xMaster/tlpkg/installer/lzma/lzmadec.i386-solaris (renamed from Master/tlpkg/installer/lzmadec.i386-solaris)bin10956 -> 10956 bytes
-rwxr-xr-xMaster/tlpkg/installer/lzma/lzmadec.powerpc-aix (renamed from Master/tlpkg/installer/lzmadec.powerpc-aix)bin11099 -> 11099 bytes
-rwxr-xr-xMaster/tlpkg/installer/lzma/lzmadec.powerpc-darwin (renamed from Master/tlpkg/installer/lzmadec.powerpc-darwin)bin17992 -> 17992 bytes
-rwxr-xr-xMaster/tlpkg/installer/lzma/lzmadec.sparc-solaris (renamed from Master/tlpkg/installer/lzmadec.sparc-solaris)bin15152 -> 15152 bytes
-rwxr-xr-xMaster/tlpkg/installer/lzma/lzmadec.win32.exe (renamed from Master/tlpkg/installer/lzmadec.win32.exe)bin12288 -> 12288 bytes
-rwxr-xr-xMaster/tlpkg/installer/lzma/lzmadec.x86_64-linux (renamed from Master/tlpkg/installer/lzmadec.x86_64-linux)bin14728 -> 14728 bytes
-rw-r--r--Master/tlpkg/tlpsrc/00texlive.installer.tlpsrc4
-rw-r--r--Master/tlpkg/tlpsrc/0texlive.support.tlpsrc7
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
index 57a33f4ff8d..57a33f4ff8d 100755
--- a/Master/tlpkg/installer/lzma.alpha-linux
+++ b/Master/tlpkg/installer/lzma/lzma.alpha-linux
Binary files differ
diff --git a/Master/tlpkg/installer/lzma.amd64-freebsd7 b/Master/tlpkg/installer/lzma/lzma.amd64-freebsd7
index bc8d0e33166..bc8d0e33166 100755
--- a/Master/tlpkg/installer/lzma.amd64-freebsd7
+++ b/Master/tlpkg/installer/lzma/lzma.amd64-freebsd7
Binary files differ
diff --git a/Master/tlpkg/installer/lzma.exe b/Master/tlpkg/installer/lzma/lzma.exe
index f3f81891bfb..f3f81891bfb 100644
--- a/Master/tlpkg/installer/lzma.exe
+++ b/Master/tlpkg/installer/lzma/lzma.exe
Binary files differ
diff --git a/Master/tlpkg/installer/lzma.i386-darwin b/Master/tlpkg/installer/lzma/lzma.i386-darwin
index f455d8f5ffb..f455d8f5ffb 100755
--- a/Master/tlpkg/installer/lzma.i386-darwin
+++ b/Master/tlpkg/installer/lzma/lzma.i386-darwin
Binary files differ
diff --git a/Master/tlpkg/installer/lzma.i386-linux b/Master/tlpkg/installer/lzma/lzma.i386-linux
index 8cf5efbf978..8cf5efbf978 100755
--- a/Master/tlpkg/installer/lzma.i386-linux
+++ b/Master/tlpkg/installer/lzma/lzma.i386-linux
Binary files differ
diff --git a/Master/tlpkg/installer/lzma.i386-solaris b/Master/tlpkg/installer/lzma/lzma.i386-solaris
index b80c86c30fb..b80c86c30fb 100755
--- a/Master/tlpkg/installer/lzma.i386-solaris
+++ b/Master/tlpkg/installer/lzma/lzma.i386-solaris
Binary files differ
diff --git a/Master/tlpkg/installer/lzma.powerpc-aix b/Master/tlpkg/installer/lzma/lzma.powerpc-aix
index 47e90df49c3..47e90df49c3 100755
--- a/Master/tlpkg/installer/lzma.powerpc-aix
+++ b/Master/tlpkg/installer/lzma/lzma.powerpc-aix
Binary files differ
diff --git a/Master/tlpkg/installer/lzma.powerpc-darwin b/Master/tlpkg/installer/lzma/lzma.powerpc-darwin
index 0b35ea36d35..0b35ea36d35 100755
--- a/Master/tlpkg/installer/lzma.powerpc-darwin
+++ b/Master/tlpkg/installer/lzma/lzma.powerpc-darwin
Binary files differ
diff --git a/Master/tlpkg/installer/lzma.sparc-solaris b/Master/tlpkg/installer/lzma/lzma.sparc-solaris
index 78318ee771a..78318ee771a 100755
--- a/Master/tlpkg/installer/lzma.sparc-solaris
+++ b/Master/tlpkg/installer/lzma/lzma.sparc-solaris
Binary files differ
diff --git a/Master/tlpkg/installer/lzmadec.alpha-linux b/Master/tlpkg/installer/lzma/lzmadec.alpha-linux
index 7d79085fa35..7d79085fa35 100755
--- a/Master/tlpkg/installer/lzmadec.alpha-linux
+++ b/Master/tlpkg/installer/lzma/lzmadec.alpha-linux
Binary files differ
diff --git a/Master/tlpkg/installer/lzmadec.amd64-freebsd7 b/Master/tlpkg/installer/lzma/lzmadec.amd64-freebsd7
index 732abc31f01..732abc31f01 100755
--- a/Master/tlpkg/installer/lzmadec.amd64-freebsd7
+++ b/Master/tlpkg/installer/lzma/lzmadec.amd64-freebsd7
Binary files differ
diff --git a/Master/tlpkg/installer/lzmadec.i386-darwin b/Master/tlpkg/installer/lzma/lzmadec.i386-darwin
index ef5d45aa370..ef5d45aa370 100755
--- a/Master/tlpkg/installer/lzmadec.i386-darwin
+++ b/Master/tlpkg/installer/lzma/lzmadec.i386-darwin
Binary files differ
diff --git a/Master/tlpkg/installer/lzmadec.i386-linux b/Master/tlpkg/installer/lzma/lzmadec.i386-linux
index 236c96924f9..236c96924f9 100755
--- a/Master/tlpkg/installer/lzmadec.i386-linux
+++ b/Master/tlpkg/installer/lzma/lzmadec.i386-linux
Binary files differ
diff --git a/Master/tlpkg/installer/lzmadec.i386-solaris b/Master/tlpkg/installer/lzma/lzmadec.i386-solaris
index 42eac5e4554..42eac5e4554 100755
--- a/Master/tlpkg/installer/lzmadec.i386-solaris
+++ b/Master/tlpkg/installer/lzma/lzmadec.i386-solaris
Binary files differ
diff --git a/Master/tlpkg/installer/lzmadec.powerpc-aix b/Master/tlpkg/installer/lzma/lzmadec.powerpc-aix
index 7204970d7f9..7204970d7f9 100755
--- a/Master/tlpkg/installer/lzmadec.powerpc-aix
+++ b/Master/tlpkg/installer/lzma/lzmadec.powerpc-aix
Binary files differ
diff --git a/Master/tlpkg/installer/lzmadec.powerpc-darwin b/Master/tlpkg/installer/lzma/lzmadec.powerpc-darwin
index 932b622e934..932b622e934 100755
--- a/Master/tlpkg/installer/lzmadec.powerpc-darwin
+++ b/Master/tlpkg/installer/lzma/lzmadec.powerpc-darwin
Binary files differ
diff --git a/Master/tlpkg/installer/lzmadec.sparc-solaris b/Master/tlpkg/installer/lzma/lzmadec.sparc-solaris
index c276f77052d..c276f77052d 100755
--- a/Master/tlpkg/installer/lzmadec.sparc-solaris
+++ b/Master/tlpkg/installer/lzma/lzmadec.sparc-solaris
Binary files differ
diff --git a/Master/tlpkg/installer/lzmadec.win32.exe b/Master/tlpkg/installer/lzma/lzmadec.win32.exe
index f91c8eb26b5..f91c8eb26b5 100755
--- a/Master/tlpkg/installer/lzmadec.win32.exe
+++ b/Master/tlpkg/installer/lzma/lzmadec.win32.exe
Binary files differ
diff --git a/Master/tlpkg/installer/lzmadec.x86_64-linux b/Master/tlpkg/installer/lzma/lzmadec.x86_64-linux
index 884723f350c..884723f350c 100755
--- a/Master/tlpkg/installer/lzmadec.x86_64-linux
+++ b/Master/tlpkg/installer/lzma/lzmadec.x86_64-linux
Binary files differ
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}