texlive[43927] exec,sync,doc
commits+karl at tug.org
commits+karl at tug.org
Thu Apr 20 00:27:13 CEST 2017
Revision: 43927
http://tug.org/svn/texlive?view=revision&revision=43927
Author: karl
Date: 2017-04-20 00:27:13 +0200 (Thu, 20 Apr 2017)
Log Message:
-----------
exec,sync,doc
Modified Paths:
--------------
trunk/Build/source/texk/README
trunk/Build/source/texk/tests/TeXLive/TLConfig.pm
trunk/Build/source/texk/tests/TeXLive/TLUtils.pm
Property Changed:
----------------
trunk/Master/tlpkg/tlperl/bin/perl5.24.1.exe
Modified: trunk/Build/source/texk/README
===================================================================
--- trunk/Build/source/texk/README 2017-04-19 22:23:53 UTC (rev 43926)
+++ trunk/Build/source/texk/README 2017-04-19 22:27:13 UTC (rev 43927)
@@ -108,9 +108,9 @@
aleph - maintained here
ctie - CTAN
cweb - knuth, ftp://ftp.cs.stanford.edu/pub/cweb/
- eptex - https://osdn.jp/projects/eptex/
+ eptex - https://osdn.jp/projects/eptex,https://texwiki.texjp.org/?e-pTeX
etex - maintained here
- euptex - https://texwiki.texjp.org/?e-pTeX
+ euptex - https://texwiki.texjp.org/?upTeX%2CupLaTeX
mflua[jit] - https://foundry.supelec.fr/projects/mflua/
mplibdir - http://tug.org/metapost
luatex - http://luatex.org
Modified: trunk/Build/source/texk/tests/TeXLive/TLConfig.pm
===================================================================
--- trunk/Build/source/texk/tests/TeXLive/TLConfig.pm 2017-04-19 22:23:53 UTC (rev 43926)
+++ trunk/Build/source/texk/tests/TeXLive/TLConfig.pm 2017-04-19 22:27:13 UTC (rev 43927)
@@ -5,7 +5,7 @@
package TeXLive::TLConfig;
-my $svnrev = '$Revision: 43775 $';
+my $svnrev = '$Revision: 43872 $';
my $_modulerevision = ($svnrev =~ m/: ([0-9]+) /) ? $1 : "unknown";
sub module_revision { return $_modulerevision; }
@@ -208,14 +208,14 @@
# The length of a checksum generated by tlchecksum and contained in
# texlive.tlpdb.checksum. Needs to be in agreement with the hash
# method used in TLCrypto::tlchecksum and TLCrypto::tldigest
-$ChecksumLength = 128;
+our $ChecksumLength = 128;
# The program generating the checksum for the file given as first
# argument
-$ChecksumProgram = "sha512sum";
+our $ChecksumProgram = "sha512sum";
# The extension of the checksum file
-$ChecksumExtension = "sha512";
+our $ChecksumExtension = "sha512";
1;
Modified: trunk/Build/source/texk/tests/TeXLive/TLUtils.pm
===================================================================
--- trunk/Build/source/texk/tests/TeXLive/TLUtils.pm 2017-04-19 22:23:53 UTC (rev 43926)
+++ trunk/Build/source/texk/tests/TeXLive/TLUtils.pm 2017-04-19 22:27:13 UTC (rev 43927)
@@ -5,7 +5,7 @@
package TeXLive::TLUtils;
-my $svnrev = '$Revision: 43793 $';
+my $svnrev = '$Revision: 43903 $';
my $_modulerevision = ($svnrev =~ m/: ([0-9]+) /) ? $1 : "unknown";
sub module_revision { return $_modulerevision; }
@@ -106,12 +106,11 @@
our $PERL_SINGLE_QUOTE; # we steal code from Text::ParseWords
use vars qw(
$::LOGFILENAME @::LOGLINES
- @::debug_hook @::ddebug_hook @::dddebug_hook @::info_hook @::warn_hook
- @::install_packages_hook
- $::machinereadable
- $::no_execute_actions
- $::regenerate_all_formats
+ @::debug_hook @::ddebug_hook @::dddebug_hook @::info_hook
+ @::install_packages_hook @::warn_hook
$TeXLive::TLDownload::net_lib_avail
+ $::checksum_method $::gui_mode $::machinereadable $::no_execute_actions
+ $::regenerate_all_formats
);
BEGIN {
@@ -286,17 +285,45 @@
}
if ($OS eq "darwin") {
- # We want to guess x86_64-darwin on new-enough systems.
- # Most robust approach is to check sw_vers (os version)
- # and sysctl (processor hardware).
+ # We have a variety of Mac binary sets.
+ # 10.10/Yosemite and newer:
+ # -> x86_64-darwin [MacTeX]
+ # 10.6/Snow Leopard through 10.9/Mavericks:
+ # -> x86_64-darwinlegacy if 64-bit
+ # -> i386-darwin otherwise
+ # 10.5/Leopard:
+ # -> i386-darwin if x86
+ # -> powerpc-darwin if ppc
+ #
+ # (BTW, uname -r numbers are larger by 4 than the minor version.
+ # We don't use uname numbers here.)
+ #
+ my $mactex_darwin = 10; # the minor 10; this will change in the future.
+ #
+ # Most robust approach is apparently to check sw_vers (os version,
+ # returns "10.x" values), and sysctl (processor hardware).
chomp (my $sw_vers = `sw_vers -productVersion`);
my ($os_major,$os_minor) = split (/\./, $sw_vers);
- #
- chomp (my $sysctl = `PATH=/usr/sbin:\$PATH sysctl hw.cpu64bit_capable`);
- my (undef,$hw_64_bit) = split (" ", $sysctl);
- #
- $CPU = ($os_major >= 10 && $os_minor >= 6 && $hw_64_bit >= 1)
- ? "x86_64" : "universal";
+ if ($os_major != 10) {
+ warn "$0: only MacOSX is supported, not $OS $os_major.$os_minor "
+ . " (from sw_vers -productVersion: $sw_vers)\n";
+ return "unknown-unknown";
+ }
+ if ($os_minor >= $mactex_darwin) {
+ ; # current version, default is ok (x86_64-darwin).
+ } elsif ($os_minor >= 6 && $os_minor < $mactex_darwin) {
+ # in between, x86 hardware only. On 10.6 only, must check if 64-bit,
+ # since if later than that, always 64-bit.
+ my $is64 = $os_minor == 6
+ ? `/usr/sbin/sysctl -n hw.cpu64bit_capable` >= 1
+ : 1;
+ if ($is64) {
+ $CPU = "x86_64";
+ $OS = "darwinlegacy";
+ } # if not 64-bit, default is ok (i386-darwin).
+ } else {
+ ; # older version, default is ok (i386-darwin, powerpc-darwin).
+ }
} elsif ($CPU =~ /^i.86$/) {
$CPU = "i386"; # 586, 686, whatever
@@ -328,24 +355,25 @@
'armhf-linux' => 'GNU/Linux on ARMhf',
'hppa-hpux' => 'HP-UX',
'i386-cygwin' => 'Cygwin on Intel x86',
- 'i386-darwin' => 'MacOSX/Darwin on Intel x86',
+ 'i386-darwin' => 'MacOSX legacy (10.5-10.6) on Intel x86',
'i386-freebsd' => 'FreeBSD on Intel x86',
'i386-kfreebsd' => 'GNU/kFreeBSD on Intel x86',
+ 'i386-linux' => 'GNU/Linux on Intel x86',
+ 'i386-netbsd' => 'NetBSD on Intel x86',
'i386-openbsd' => 'OpenBSD on Intel x86',
- 'i386-netbsd' => 'NetBSD on Intel x86',
- 'i386-linux' => 'GNU/Linux on Intel x86',
'i386-solaris' => 'Solaris on Intel x86',
'mips-irix' => 'SGI IRIX',
'mipsel-linux' => 'GNU/Linux on MIPSel',
'powerpc-aix' => 'AIX on PowerPC',
- 'powerpc-darwin' => 'MacOSX/Darwin on PowerPC',
+ 'powerpc-darwin' => 'MacOSX legacy (10.5) on PowerPC',
'powerpc-linux' => 'GNU/Linux on PowerPC',
'sparc-linux' => 'GNU/Linux on Sparc',
'sparc-solaris' => 'Solaris on Sparc',
- 'universal-darwin' => 'MacOSX/Darwin universal binaries',
+ 'universal-darwin' => 'MacOSX universal binaries',
'win32' => 'Windows',
'x86_64-cygwin' => 'Cygwin on x86_64',
- 'x86_64-darwin' => 'MacOSX/Darwin on x86_64',
+ 'x86_64-darwin' => 'MacOSX current on x86_64',
+ 'x86_64-darwinlegacy' => 'MacOSX legacy (10.6-10.9) on x86_64',
'x86_64-linux' => 'GNU/Linux on x86_64',
'x86_64-solaris' => 'Solaris on x86_64',
);
@@ -4025,7 +4053,7 @@
$texmfvar = $TEXMFVAR;
} else {
print STDERR "$prg [ERROR]: Either -user or -sys mode is required.\n" .
- "See $TeXLive::TLConfig::SYSUSERURL for details!\n";
+ "See http://tug.org/texlive/scripts-sys-user.html for details.\n";
exit(1);
}
return ($texmfconfig, $texmfvar);
Index: trunk/Master/tlpkg/tlperl/bin/perl5.24.1.exe
===================================================================
--- trunk/Master/tlpkg/tlperl/bin/perl5.24.1.exe 2017-04-19 22:23:53 UTC (rev 43926)
+++ trunk/Master/tlpkg/tlperl/bin/perl5.24.1.exe 2017-04-19 22:27:13 UTC (rev 43927)
Property changes on: trunk/Master/tlpkg/tlperl/bin/perl5.24.1.exe
___________________________________________________________________
Added: svn:executable
## -0,0 +1 ##
+*
\ No newline at end of property
More information about the tex-live-commits
mailing list