diff options
Diffstat (limited to 'Build')
16 files changed, 41 insertions, 24 deletions
diff --git a/Build/source/utils/biber/ChangeLog b/Build/source/utils/biber/ChangeLog index a0a164db4c2..51590a05fcc 100644 --- a/Build/source/utils/biber/ChangeLog +++ b/Build/source/utils/biber/ChangeLog @@ -1,3 +1,14 @@ +2011-03-16 Karl Berry <karl@tug.org> + + * configure.ac (BIBER_EXE): AC_SUBST this, after detecting it. + Call AC_CANONICAL_HOST and AC_EXEEXT to prepare for + cross-compilation, maybe. + * Makefile.am (bin_SCRIPTS): simplify to defining this + as $(BIBER_EXE), which requires also defining this: + (EXTRA_SCRIPTS): as empty, in our case. + (EXTRA_DIST): TeXLive bin. + * bin: new directory for binaries. + 2011-03-11 Karl Berry <karl@tug.org> * directory created. diff --git a/Build/source/utils/biber/Makefile.am b/Build/source/utils/biber/Makefile.am index 0f461e34e97..432cc2e0d5d 100644 --- a/Build/source/utils/biber/Makefile.am +++ b/Build/source/utils/biber/Makefile.am @@ -7,14 +7,11 @@ # with or without modifications, as long as this notice is preserved. if TL_HAVE_BIBER_BINARY -# -bin_SCRIPTS = biber -tl_platform = $(TL_PLATFORM) -# -biber: biber.$(tl_platform) - rm -f biber - cp "$(srcdir)/biber.$(tl_platform)" biber +bin_SCRIPTS = $(BIBER_EXE) -# if the biber binary for the current platform is not present, -# nothing to do. +# this EXTRA_ variable must be defined when bin_SCRIPTS refers to a +# configure-substituted value. +EXTRA_SCRIPTS = endif + +EXTRA_DIST = TeXLive bin diff --git a/Build/source/utils/biber/TeXLive/TLUtils.pm b/Build/source/utils/biber/TeXLive/TLUtils.pm index 0c687b1a707..e88f0c51529 100644 --- a/Build/source/utils/biber/TeXLive/TLUtils.pm +++ b/Build/source/utils/biber/TeXLive/TLUtils.pm @@ -1,4 +1,4 @@ -# $Id: TLUtils.pm 21304 2011-02-05 00:26:35Z reinhardk $ +# $Id: TLUtils.pm 21714 2011-03-14 21:27:26Z karl $ # TeXLive::TLUtils.pm - the inevitable utilities for TeX Live. # Copyright 2007, 2008, 2009, 2010 Norbert Preining, Reinhard Kotucha # This file is licensed under the GNU General Public License version 2 @@ -6,7 +6,7 @@ package TeXLive::TLUtils; -my $svnrev = '$Revision: 21304 $'; +my $svnrev = '$Revision: 21714 $'; my $_modulerevision; if ($svnrev =~ m/: ([0-9]+) /) { $_modulerevision = $1; @@ -221,12 +221,12 @@ subsequent calls just return that value. =cut -sub platform -{ +sub platform { unless (defined $::_platform_) { - if ($^O=~/^MSWin(32|64)$/i) { - $::_platform_="win32"; + if ($^O =~ /^MSWin/i) { + $::_platform_ = "win32"; } else { + # the copy of this file in biber uses a different config.guess dir. my $config_guess_dir = $TeXLive::TLConfig::Config_Guess_Dir || "$::installerdir/tlpkg/installer"; my $config_guess = "$config_guess_dir/config.guess"; diff --git a/Build/source/utils/biber/biber.i386-linux b/Build/source/utils/biber/biber.i386-linux deleted file mode 100755 index e69de29bb2d..00000000000 --- a/Build/source/utils/biber/biber.i386-linux +++ /dev/null diff --git a/Build/source/utils/biber/biber.x86_64-linux b/Build/source/utils/biber/biber.x86_64-linux deleted file mode 100755 index e69de29bb2d..00000000000 --- a/Build/source/utils/biber/biber.x86_64-linux +++ /dev/null diff --git a/Build/source/utils/biber/bin/i386-cygwin/biber b/Build/source/utils/biber/bin/i386-cygwin/biber Binary files differnew file mode 100755 index 00000000000..e2ba13b631a --- /dev/null +++ b/Build/source/utils/biber/bin/i386-cygwin/biber diff --git a/Build/source/utils/biber/bin/i386-freebsd/biber b/Build/source/utils/biber/bin/i386-freebsd/biber Binary files differnew file mode 100755 index 00000000000..2ac7174b763 --- /dev/null +++ b/Build/source/utils/biber/bin/i386-freebsd/biber diff --git a/Build/source/utils/biber/bin/i386-linux/biber b/Build/source/utils/biber/bin/i386-linux/biber Binary files differnew file mode 100755 index 00000000000..4249b58bc1a --- /dev/null +++ b/Build/source/utils/biber/bin/i386-linux/biber diff --git a/Build/source/utils/biber/bin/i386-solaris/biber b/Build/source/utils/biber/bin/i386-solaris/biber Binary files differnew file mode 100755 index 00000000000..f7c99911bfd --- /dev/null +++ b/Build/source/utils/biber/bin/i386-solaris/biber diff --git a/Build/source/utils/biber/bin/universal-darwin/biber b/Build/source/utils/biber/bin/universal-darwin/biber Binary files differnew file mode 100755 index 00000000000..a3da74900d8 --- /dev/null +++ b/Build/source/utils/biber/bin/universal-darwin/biber diff --git a/Build/source/utils/biber/bin/win32/biber.exe b/Build/source/utils/biber/bin/win32/biber.exe Binary files differnew file mode 100755 index 00000000000..179809530f1 --- /dev/null +++ b/Build/source/utils/biber/bin/win32/biber.exe diff --git a/Build/source/utils/biber/biber.x86_64-darwin b/Build/source/utils/biber/bin/x86_64-darwin/biber Binary files differindex 1b53c86c92e..aa289ca56c5 100755 --- a/Build/source/utils/biber/biber.x86_64-darwin +++ b/Build/source/utils/biber/bin/x86_64-darwin/biber diff --git a/Build/source/utils/biber/bin/x86_64-freebsd/biber b/Build/source/utils/biber/bin/x86_64-freebsd/biber Binary files differnew file mode 100755 index 00000000000..f67133a3103 --- /dev/null +++ b/Build/source/utils/biber/bin/x86_64-freebsd/biber diff --git a/Build/source/utils/biber/bin/x86_64-linux/biber b/Build/source/utils/biber/bin/x86_64-linux/biber Binary files differnew file mode 100755 index 00000000000..5e81ffe8a52 --- /dev/null +++ b/Build/source/utils/biber/bin/x86_64-linux/biber diff --git a/Build/source/utils/biber/bin/x86_64-solaris/biber b/Build/source/utils/biber/bin/x86_64-solaris/biber Binary files differnew file mode 100755 index 00000000000..63dd402575f --- /dev/null +++ b/Build/source/utils/biber/bin/x86_64-solaris/biber diff --git a/Build/source/utils/biber/configure.ac b/Build/source/utils/biber/configure.ac index 3b7da920ce6..f2ea05ad55f 100644 --- a/Build/source/utils/biber/configure.ac +++ b/Build/source/utils/biber/configure.ac @@ -8,15 +8,18 @@ dnl with or without modifications, as long as this notice is preserved. dnl AC_INIT([Biber], [TeX Live], [tex-k@tug.org]) AC_PREREQ([2.65]) -AC_CONFIG_SRCDIR([biber.i386-linux]) +AC_CONFIG_SRCDIR([TeXLive/TLConfig.pm]) AC_CONFIG_AUX_DIR([../../build-aux]) AC_CONFIG_MACRO_DIR([../../m4]) AM_INIT_AUTOMAKE([foreign]) AM_MAINTAINER_MODE -dnl Checks for programs. -AC_PROG_INSTALL +# System type for cross-compilation. +AC_CANONICAL_HOST +AC_EXEEXT + +# Checks for programs. AC_PROG_MAKE_SET AC_MSG_CHECKING([for TeX Live platform name]) @@ -29,16 +32,22 @@ TL_platform=`perl -e ' use TeXLive::TLUtils; print TeXLive::TLUtils::platform();'` # -AC_MSG_RESULT($TL_platform) +AC_MSG_RESULT([$TL_platform]) if test -z "$TL_platform"; then AC_MSG_ERROR("cannot determine TeX Live platform name") fi -# -AC_SUBST([TL_PLATFORM], [$TL_platform]) -# Check if we have an executable for the current platform. -AM_CONDITIONAL([TL_HAVE_BIBER_BINARY], - [test -r "$srcdir/biber.$TL_platform"]) +biber_exe=$srcdir/bin/$TL_platform/biber$ac_exeext +AC_MSG_CHECKING([for executable in $biber_exe]) +if test -r "$biber_exe"; then + AC_SUBST([BIBER_EXE], [$biber_exe]) + AC_MSG_RESULT([yes]) +else + AC_MSG_RESULT([no]) +fi + +# Check for having an executable for the needed platform. +AM_CONDITIONAL([TL_HAVE_BIBER_BINARY], [test -r "$biber_exe"]) AC_CONFIG_FILES([Makefile]) AC_OUTPUT |