summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNorbert Preining <preining@logic.at>2008-09-27 21:35:56 +0000
committerNorbert Preining <preining@logic.at>2008-09-27 21:35:56 +0000
commit0cdc57f63c5542d006f469156432c76ba1b63026 (patch)
tree6962b8b9a7236c8a7298796f25fdeb83abc6e8c3
parent4862f93b27569138d004ad623699442c23980ee8 (diff)
update the check-on-supported-arch.diff patch
git-svn-id: svn://tug.org/texlive/trunk@10751 c570f23f-e606-0410-a88d-b1316a301751
-rw-r--r--Master/tlpkg/etc/check-on-supported-arch.diff104
1 files changed, 75 insertions, 29 deletions
diff --git a/Master/tlpkg/etc/check-on-supported-arch.diff b/Master/tlpkg/etc/check-on-supported-arch.diff
index e6cc4a6f0ca..0a8e308bbdc 100644
--- a/Master/tlpkg/etc/check-on-supported-arch.diff
+++ b/Master/tlpkg/etc/check-on-supported-arch.diff
@@ -1,44 +1,90 @@
+Index: tlpkg/TeXLive/TLUtils.pm
+===================================================================
+--- tlpkg/TeXLive/TLUtils.pm (revision 10739)
++++ tlpkg/TeXLive/TLUtils.pm (working copy)
+@@ -1017,7 +1017,9 @@
+ to the location of the C<lzmadec> binaries, the C<$platform> gives the
+ TeX Live platform name, used as the extension on the executables.
+
+-Returns true if successfull, otherwise false.
++Returns -1 if the architecture is not supported (i.e., there is no
++lzmadec binary for that arch present), 0 for programs don't work,
++and 1 for success.
+
+ =cut
+
+@@ -1041,10 +1043,10 @@
+ $::progs{'tar'} = conv_to_win_path("$bindir/tar.exe");
+ $::progs{'lzmadec'} = conv_to_win_path("$bindir/lzma/lzmadec.win32.exe");
+ $::progs{'lzma'} = conv_to_win_path("$bindir/lzma/lzma.exe");
+-
+ } elsif (-r "$bindir/wget/wget.$platform") {
+ $::progs{'wget'} = "$bindir/wget/wget.$platform";
+ }
++ return(-1) if (! -r $::progs{'lzmadec'});
+ #
+ # check that the programs are actually working
+ my $nul = "/dev/null";
Index: install-tl
===================================================================
--- install-tl (revision 10739)
+++ install-tl (working copy)
-@@ -308,6 +308,17 @@
+@@ -308,7 +308,14 @@
# initialize the correct platform
platform();
-+# before calling setup_programs we check for the existence of
-+# $::installerdir/tlpkg/installer/lzmadec.$::_platform_
-+# and if that does not exist we terminate here and tell the user that
-+# this platform is not supported ATM
-+# first setup the programs without actually checking
-+setup_programs ("$::installerdir/tlpkg/installer", "$::_platform_", 1);
-+if (! -r $::progs{"lzmadec"}) {
+-if (!setup_programs ("$::installerdir/tlpkg/installer", "$::_platform_")) {
++my $setupret = setup_programs ("$::installerdir/tlpkg/installer", "$::_platform_");
++if ($setupret == -1) {
+ # that arch seems to be unsupported
+ tlwarn("It seems that your architecture-operating system combination\n\t$::_platform_\nis not supported at the moment!\nIf you plan to build binaries for it please contact us at tlbuild\@tug.org.\n");
+ exit 1;
+}
- if (!setup_programs ("$::installerdir/tlpkg/installer", "$::_platform_")) {
++# now $setupret can only be 0 or 1
++if (!$setupret) {
tlwarn("Couldn't set up the necessary programs.\nCannot continue with installation.\nPlease report to texlive\@tug.org.\n");
exit 1;
-Index: tlpkg/TeXLive/TLUtils.pm
+ }
+Index: tlpkg/bin/tl-update-containers
===================================================================
---- tlpkg/TeXLive/TLUtils.pm (revision 10739)
-+++ tlpkg/TeXLive/TLUtils.pm (working copy)
-@@ -1022,7 +1022,8 @@
- =cut
-
- sub setup_programs {
-- my ($bindir, $platform) = @_;
-+ my ($bindir, $platform, $nocheck) = @_;
-+ $nocheck = 0 if !defined($nocheck);
- $::progs{'wget'} = "wget";
- if (!defined($platform) || ($platform eq "")) {
- # we assume that we run from the DVD, so we can call platform() and
-@@ -1045,6 +1046,7 @@
- } elsif (-r "$bindir/wget/wget.$platform") {
- $::progs{'wget'} = "$bindir/wget/wget.$platform";
+--- tlpkg/bin/tl-update-containers (revision 10744)
++++ tlpkg/bin/tl-update-containers (working copy)
+@@ -163,7 +163,15 @@
+ $::progs{'tar'} = "tar";
+ } else {
+ # do a full setup
+- &TeXLive::TLUtils::setup_programs("$Master/tlpkg/installer");
++ my $ret = &TeXLive::TLUtils::setup_programs("$Master/tlpkg/installer");
++ if ($ret == -1) {
++ tlwarn("no binary of lzmadec for $::_platform_ detected, aborting!\n");
++ exit 1;
++ }
++ if (!$ret) {
++ tlwarn("binaries could not be set up, aborting!\n");
++ exit 1;
++ }
}
-+ return(1) if $nocheck;
- #
- # check that the programs are actually working
- my $nul = "/dev/null";
+
+ # get list of packages.
+Index: texmf/scripts/texlive/tlmgr.pl
+===================================================================
+--- texmf/scripts/texlive/tlmgr.pl (revision 10750)
++++ texmf/scripts/texlive/tlmgr.pl (working copy)
+@@ -1133,7 +1133,16 @@
+ die("cannot find tlpdb at $Master!") unless (defined($localtlpdb));
+ # setup the programs, for win32 we need the shipped wget/lzma etc, so we
+ # pass the location of these files to setup_programs.
+- if (!setup_programs("$Master/tlpkg/installer", $localtlpdb->option_platform)) {
++ my $ret = setup_programs("$Master/tlpkg/installer", $localtlpdb->option_platform);
++ if ($ret == -1) {
++ tlwarn("no binary of lzmadec for $::_platform_ detected!\n");
++ if (defined($should_i_die) && $should_i_die) {
++ exit 1;
++ } else {
++ tlwarn("Continuing anyway ...\n");
++ }
++ }
++ if (!$ret) {
+ tlwarn("Couldn't set up the necessary programs.\nInstallation of packages is not supported.\nPlease report to texlive\@tug.org.\n");
+ if (defined($should_i_die) && $should_i_die) {
+ exit 1;