From fd0b0388052142e91b9d5ae0464fc054ee89bc1c Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Mon, 24 May 2010 00:05:35 +0000 Subject: x86_64-darwin 2010 pretest 1 binaries for snow leopard (koch) git-svn-id: svn://tug.org/texlive/trunk@18441 c570f23f-e606-0410-a88d-b1316a301751 --- Master/tlpkg/TeXLive/TLUtils.pm | 6 +++++- Master/tlpkg/bin/tl-update-bindir | 6 ++++++ Master/tlpkg/doc/packages.txt | 13 +++++++------ Master/tlpkg/installer/wget/wget.x86_64-darwin | Bin 0 -> 453664 bytes Master/tlpkg/installer/xz/xz.x86_64-darwin | Bin 0 -> 310376 bytes Master/tlpkg/installer/xz/xzdec.x86_64-darwin | Bin 0 -> 161820 bytes Master/tlpkg/tlpsrc/00texlive.installer.tlpsrc | 3 ++- Master/tlpkg/tlpsrc/xetex.tlpsrc | 4 ++-- Master/tlpkg/tlpsrc/xindy.tlpsrc | 2 +- 9 files changed, 23 insertions(+), 11 deletions(-) create mode 100755 Master/tlpkg/installer/wget/wget.x86_64-darwin create mode 100755 Master/tlpkg/installer/xz/xz.x86_64-darwin create mode 100755 Master/tlpkg/installer/xz/xzdec.x86_64-darwin (limited to 'Master/tlpkg') diff --git a/Master/tlpkg/TeXLive/TLUtils.pm b/Master/tlpkg/TeXLive/TLUtils.pm index 96b801ee46e..26e36185573 100644 --- a/Master/tlpkg/TeXLive/TLUtils.pm +++ b/Master/tlpkg/TeXLive/TLUtils.pm @@ -233,7 +233,10 @@ sub platform $OS = $os if $guessed_platform =~ /\b$os/; } if ($OS eq "darwin") { - $CPU = "universal"; # TL provides universal binaries + # We never want to guess x86_64-darwin even if config.guess + # does, because Leopard can be 64-bit but our x86_64-darwin + # binaries will only run on Snow Leopard. + $CPU = "universal"; } elsif ($CPU =~ /^i.86$/) { $CPU = "i386"; # 586, 686, whatever } @@ -278,6 +281,7 @@ sub platform_desc { 'sparc-solaris' => 'Sparc with Solaris', 'universal-darwin' => 'universal binaries for MacOSX/Darwin', 'win32' => 'Windows', + 'x86_64-darwin' => 'x86_64 with MacOSX/Darwin' 'x86_64-linux' => 'x86_64 with GNU/Linux' ); diff --git a/Master/tlpkg/bin/tl-update-bindir b/Master/tlpkg/bin/tl-update-bindir index 4934f5e33ad..850d11d3271 100755 --- a/Master/tlpkg/bin/tl-update-bindir +++ b/Master/tlpkg/bin/tl-update-bindir @@ -136,12 +136,18 @@ for tlname in $tlnames; do win32) default_bin_loc=${TMPDIR-$tmpdir}/tl.$tlname.zip $grab http://members2.jcom.home.ne.jp/wt1357ak/tl2009w32-02.zip;; + x86_64-darwin) + download_loc=${TMPDIR-$tmpdir}/tl.$tlname.tar.xz + default_bin_loc=$download_loc + grab="$download -O $download_loc" + $grab http://members2.jcom.home.ne.jp/wt1357ak/tl2009w32-02.zip;; x86_64-linux) default_bin_loc=$download_loc $grab ftp://ftpth.mppmu.mpg.de/pub/peb/TLtests/Build-x86_64-linux.tar.bz2;; esac fi + # test -z "$bin_loc" && test -n "$default_bin_loc" \ && bin_loc=$default_bin_loc if test -z "$bin_loc"; then diff --git a/Master/tlpkg/doc/packages.txt b/Master/tlpkg/doc/packages.txt index dbd34db3efe..5fdb6010882 100644 --- a/Master/tlpkg/doc/packages.txt +++ b/Master/tlpkg/doc/packages.txt @@ -1,21 +1,22 @@ $Id$ Public domain. -See http://tug.org/texlive/pkgupdate.html for what information there is +See http://tug.org/texlive/pkgupdate.html (and scripts) for information on the CTAN-to-TL update process. -To add a new architecture: +To add a new platform: - check that the config.guess output maps to our architecture name in the `platform' routine in TeXLive/TLUtils.pm. - add the abbreviation to the full-name mapping in `platform_desc'. - create directory in Master/bin and add at least one file. - add xz, xzdec, maybe wget binaries in Master/tlpkg/installer. +- update .tlpsrc files if necessary. - regenerate tlpdb. -To remove an architecture: -- remove directory in Master/bin -- remove xz, xzdec, maybe wget binaries in Master/tlpkg/installer -- remove any special cases in Master/tlpkg/tlpsrc +To remove an platform: +- remove directory in Master/bin. +- remove xz, xzdec, maybe wget binaries in Master/tlpkg/installer. +- remove any special cases in Master/tlpkg/tlpsrc. - rebuild. When switching the release version, the default network directory diff --git a/Master/tlpkg/installer/wget/wget.x86_64-darwin b/Master/tlpkg/installer/wget/wget.x86_64-darwin new file mode 100755 index 00000000000..56f879e1bc1 Binary files /dev/null and b/Master/tlpkg/installer/wget/wget.x86_64-darwin differ diff --git a/Master/tlpkg/installer/xz/xz.x86_64-darwin b/Master/tlpkg/installer/xz/xz.x86_64-darwin new file mode 100755 index 00000000000..f66657b8388 Binary files /dev/null and b/Master/tlpkg/installer/xz/xz.x86_64-darwin differ diff --git a/Master/tlpkg/installer/xz/xzdec.x86_64-darwin b/Master/tlpkg/installer/xz/xzdec.x86_64-darwin new file mode 100755 index 00000000000..aeec7386f0d Binary files /dev/null and b/Master/tlpkg/installer/xz/xzdec.x86_64-darwin differ diff --git a/Master/tlpkg/tlpsrc/00texlive.installer.tlpsrc b/Master/tlpkg/tlpsrc/00texlive.installer.tlpsrc index 0ef468ea54b..eb97170088a 100644 --- a/Master/tlpkg/tlpsrc/00texlive.installer.tlpsrc +++ b/Master/tlpkg/tlpsrc/00texlive.installer.tlpsrc @@ -31,7 +31,8 @@ binpattern f tlpkg/installer/xz/xzdec.${ARCH} # # list the platforms for which we provide wget: binpattern f/powerpc-aix,sparc-solaris,\ -universal-darwin,win32 tlpkg/installer/wget/wget.${ARCH} +universal-darwin,win32,x86_64-darwin \ + tlpkg/installer/wget/wget.${ARCH} # # Our ${ARCH} (probably) only works as a directory companent, not # extensions, so annoyingly list explicit exe's: diff --git a/Master/tlpkg/tlpsrc/xetex.tlpsrc b/Master/tlpkg/tlpsrc/xetex.tlpsrc index 8b11f97bac0..42ec0a957d6 100644 --- a/Master/tlpkg/tlpsrc/xetex.tlpsrc +++ b/Master/tlpkg/tlpsrc/xetex.tlpsrc @@ -14,8 +14,8 @@ binpattern f bin/win32/icu*.dll binpattern d/win32 tlpkg/tlpostcode/xetex # # these are only needed for darwin only. -binpattern f/universal-darwin bin/universal-darwin/T1Wrap -binpattern f/universal-darwin bin/universal-darwin/xdv2pdf +binpattern f/universal-darwin,x86_64-darwin bin/universal-darwin/T1Wrap +binpattern f/universal-darwin,x86_64-darwin bin/universal-darwin/xdv2pdf # docpattern d texmf-dist/doc/xetex/base # diff --git a/Master/tlpkg/tlpsrc/xindy.tlpsrc b/Master/tlpkg/tlpsrc/xindy.tlpsrc index 174a3e16b74..3b517dbafe7 100644 --- a/Master/tlpkg/tlpsrc/xindy.tlpsrc +++ b/Master/tlpkg/tlpsrc/xindy.tlpsrc @@ -11,7 +11,7 @@ binpattern f/!mips-irix,i386-kfreebsd bin/${ARCH}/xindy binpattern f/!mips-irix,i386-kfreebsd,i386-cygwin bin/${ARCH}/xindy.run binpattern f/i386-cygwin,win32 bin/${ARCH}/xindy-lisp.exe # -# darwin has to split the mem file by architecture. +# universaldarwin has to split the mem file by architecture. binpattern f/!universal-darwin,mips-irix,i386-kfreebsd bin/${ARCH}/xindy.mem binpattern f/universal-darwin bin/universal-darwin/xindy-i386.mem binpattern f/universal-darwin bin/universal-darwin/xindy-ppc.mem -- cgit v1.2.3