summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--Build/source/ChangeLog4
-rw-r--r--Build/source/doc/ChangeLog13
-rw-r--r--Build/source/doc/Makefile.am4
-rw-r--r--Build/source/doc/Makefile.in7
-rw-r--r--Build/source/doc/build-tools.txt2
-rw-r--r--Build/source/doc/texlive.info135
-rw-r--r--Build/source/doc/texlive.texi2
-rw-r--r--Build/source/doc/tlbuild.texi (renamed from Build/source/doc/build.texi)14
8 files changed, 100 insertions, 81 deletions
diff --git a/Build/source/ChangeLog b/Build/source/ChangeLog
index eee5a98d947..8ae3891d7cf 100644
--- a/Build/source/ChangeLog
+++ b/Build/source/ChangeLog
@@ -15,10 +15,6 @@
* Makefile.am (ACLOCAL): Ensure aclocal.m4 is up to date.
-2013-12-14 Peter Breitenlohner <peb@mppmu.mpg.de>
-
- * doc/build.texi: Fixed some typos.
-
2013-10-08 Peter Breitenlohner <peb@mppmu.mpg.de>
* doc: New directory for texlive.info & Co.
diff --git a/Build/source/doc/ChangeLog b/Build/source/doc/ChangeLog
new file mode 100644
index 00000000000..7948264da4f
--- /dev/null
+++ b/Build/source/doc/ChangeLog
@@ -0,0 +1,13 @@
+2014-04-09 Karl Berry <karl@tug.org>
+ Peter Breitenlohner <peb@mppmu.mpg.de>
+
+ * texlive.texi: Update for Texinfo, etc.
+ * build.texi, build-tools (removed): Moved ...
+ * tlbuild.texi, build-tools.txt (new): ... to here.
+ * splitinfo.gawk (new): Awk script to generate README.* files.
+ * Makefile.am: Adapted.
+
+2013-12-14 Peter Breitenlohner <peb@mppmu.mpg.de>
+
+ * doc/build.texi: Fixed some typos.
+
diff --git a/Build/source/doc/Makefile.am b/Build/source/doc/Makefile.am
index 705b4c2a123..a734cab4f44 100644
--- a/Build/source/doc/Makefile.am
+++ b/Build/source/doc/Makefile.am
@@ -5,9 +5,9 @@
##
## The info files
info_TEXINFOS = texlive.texi
-texlive_TEXINFOS = build.texi build-tools.txt
+texlive_TEXINFOS = tlbuild.texi build-tools.txt
-EXTRA_DIST = ${PDFS}
+EXTRA_DIST = ${PDFS} splitinfo.gawk
# just for development of the doc.
readme-files: texlive.texi
diff --git a/Build/source/doc/Makefile.in b/Build/source/doc/Makefile.in
index 20ecc75a8a5..3b7b5c3435b 100644
--- a/Build/source/doc/Makefile.in
+++ b/Build/source/doc/Makefile.in
@@ -79,7 +79,8 @@ build_triplet = @build@
host_triplet = @host@
subdir = doc
DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \
- $(texlive_TEXINFOS) $(top_srcdir)/build-aux/texinfo.tex
+ $(texlive_TEXINFOS) $(top_srcdir)/build-aux/texinfo.tex \
+ ChangeLog
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
am__aclocal_m4_deps = $(top_srcdir)/m4/kpse-cairo-flags.m4 \
$(top_srcdir)/m4/kpse-common.m4 \
@@ -430,8 +431,8 @@ top_build_prefix = @top_build_prefix@
top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
info_TEXINFOS = texlive.texi
-texlive_TEXINFOS = build.texi build-tools.txt
-EXTRA_DIST = ${PDFS}
+texlive_TEXINFOS = tlbuild.texi build-tools.txt
+EXTRA_DIST = ${PDFS} splitinfo.gawk
all: all-am
.SUFFIXES:
diff --git a/Build/source/doc/build-tools.txt b/Build/source/doc/build-tools.txt
index e8a4742f527..27133180758 100644
--- a/Build/source/doc/build-tools.txt
+++ b/Build/source/doc/build-tools.txt
@@ -1,6 +1,6 @@
autoconf (GNU Autoconf) 2.69
automake (GNU automake) 1.14.1
-bison (GNU Bison) 3.0
+bison (GNU Bison) 3.0.2
flex 2.5.39
ltmain.sh (GNU libtool) 2.4.2
m4 (GNU M4) 1.4.17
diff --git a/Build/source/doc/texlive.info b/Build/source/doc/texlive.info
index 2466e7332de..10db03f2238 100644
--- a/Build/source/doc/texlive.info
+++ b/Build/source/doc/texlive.info
@@ -409,7 +409,7 @@ File: texlive.info, Node: Infrastructure and layout, Next: Configure options,
=============================
The TeX Live source tree is the subtree rooted at 'Build/source' of the
-complete TL tree and contains the sources for all executables
+complete TL distribution and contains the sources for all executables
distributed by TL, as well as 'configure' scripts and 'make' rules to
build and install them together with some of their support files.
@@ -444,7 +444,7 @@ many extra hassles, so don't do that, tempting as it may be.
autoconf (GNU Autoconf) 2.69
automake (GNU automake) 1.14.1
- bison (GNU Bison) 3.0
+ bison (GNU Bison) 3.0.2
flex 2.5.39
ltmain.sh (GNU libtool) 2.4.2
m4 (GNU M4) 1.4.17
@@ -463,9 +463,9 @@ may not be reflected by their timestamps. (For starters, be sure to set
To avoid unnecessary runs of 'bison', 'flex', or 'makeinfo' it may be
necessary to 'touch' the generated ('.c', '.h', or '.info') files. With
-'--enable-maintainer-mode' mode it may also be necessary to 'touch'
-first 'aclocal.m4', then 'configure' and 'config.h.in' (or 'c-auto.in'),
-and finally all 'Makefile.in' files. Perhaps 'make -t' will help.
+'--enable-maintainer-mode' it may also be necessary to 'touch' first
+'aclocal.m4', then 'configure' and 'config.h.in' (or 'c-auto.in'), and
+finally all 'Makefile.in' files. Perhaps 'make -t' will help.

File: texlive.info, Node: Top-level directories, Next: Autoconf macros, Prev: Build system tools, Up: Infrastructure and layout
@@ -1621,6 +1621,11 @@ useful to add the configure option '--build=HOST' to get the correct
canonical host name, but note that this should _not_ be '--host=HOST'
(*note (autoconf)Hosts and Cross-Compilation::).
+ In order to build, e.g., 32-bit binaries with 'clang' on a 64-bit OSX
+system one could use
+ './Build --build=i386-apple-darwin CC='clang -arch i386'' \
+ 'CXX='clang++ -arch i386' OBJCXX='clang++ -arch i386''
+
* Menu:
* Cross configuring:: Configuring for cross compilation.
@@ -1784,8 +1789,8 @@ that function is defined).
Variable declarations
.....................
-The declaration of global variables follow analogous rules: they are
-either declared 'static' if used in only one files or declared 'extern'
+The declaration of global variables follows analogous rules: they are
+either declared 'static' if used in only one file or declared 'extern'
in exactly one header and instantiated in exactly one file.

@@ -2362,63 +2367,63 @@ Node: Installation directories11216
Node: Linked scripts13040
Node: Distro builds14145
Node: Infrastructure and layout16529
-Node: Build system tools17323
-Node: Top-level directories19342
-Node: Autoconf macros21401
-Node: General setup macros22106
-Node: Macros for programs22977
-Node: Macros for compilers23793
-Node: Macros for libraries25231
-Node: Macros for library and header flags25661
-Node: Macros for Windows27534
-Node: Library modules29115
-Node: 'png' library29616
-Node: 'zlib' library31913
-Node: 'freetype' library32438
-Node: 'kpathsea' library32976
-Node: Program modules34404
-Node: 't1utils' package34844
-Node: 'xindy' package35415
-Node: 'xdvik' package36598
-Node: 'asymptote'37681
-Node: Extending TeX Live38140
-Node: Adding a new program module38512
-Node: Adding a new generic library module40035
-Node: Adding a new TeX-specific library module42252
-Node: Configure options42943
-Node: Global configure options44347
-Node: '--disable-native-texlive-build'44919
-Node: '--prefix' '--bindir' ...45919
-Node: '--disable-largefile'46471
-Node: '--disable-missing'47242
-Node: '--enable-compiler-warnings='LEVEL47653
-Node: '--enable-cxx-runtime-hack'48402
-Node: '--enable-maintainer-mode'48839
-Node: '--enable-multiplatform'49378
-Node: '--enable-shared'49943
-Node: '--enable-silent-rules'50324
-Node: '--without-ln-s'50790
-Node: '--without-x'51151
-Node: Program-specific configure options51347
-Node: '--enable-PROG' '--disable-PROG'52014
-Node: '--disable-all-pkgs'52301
-Node: Configure options for 'texk/web2c'52758
-Node: Configure options for 'texk/bibtex-x'55429
-Node: Configure options for 'texk/dvipdfm-x'56009
-Node: Configure options for 'texk/dvisvgm'56623
-Node: Configure options for 'texk/texlive'57517
-Node: Configure options for 'texk/xdvik'57948
-Node: Configure options for 'utils/xindy'58441
-Node: Library-specific configure options59507
-Node: Configure options for 'kpathsea'60525
-Node: Configure options for system 'poppler'61242
-Node: Variables for configure62013
-Node: Cross compilation64523
-Node: Cross configuring65579
-Node: Cross problems67256
-Node: Coding conventions68901
-Node: Declarations and definitions69564
-Node: Const71751
-Node: Index73618
+Node: Build system tools17331
+Node: Top-level directories19347
+Node: Autoconf macros21406
+Node: General setup macros22111
+Node: Macros for programs22982
+Node: Macros for compilers23798
+Node: Macros for libraries25236
+Node: Macros for library and header flags25666
+Node: Macros for Windows27539
+Node: Library modules29120
+Node: 'png' library29621
+Node: 'zlib' library31918
+Node: 'freetype' library32443
+Node: 'kpathsea' library32981
+Node: Program modules34409
+Node: 't1utils' package34849
+Node: 'xindy' package35420
+Node: 'xdvik' package36603
+Node: 'asymptote'37686
+Node: Extending TeX Live38145
+Node: Adding a new program module38517
+Node: Adding a new generic library module40040
+Node: Adding a new TeX-specific library module42257
+Node: Configure options42948
+Node: Global configure options44352
+Node: '--disable-native-texlive-build'44924
+Node: '--prefix' '--bindir' ...45924
+Node: '--disable-largefile'46476
+Node: '--disable-missing'47247
+Node: '--enable-compiler-warnings='LEVEL47658
+Node: '--enable-cxx-runtime-hack'48407
+Node: '--enable-maintainer-mode'48844
+Node: '--enable-multiplatform'49383
+Node: '--enable-shared'49948
+Node: '--enable-silent-rules'50329
+Node: '--without-ln-s'50795
+Node: '--without-x'51156
+Node: Program-specific configure options51352
+Node: '--enable-PROG' '--disable-PROG'52019
+Node: '--disable-all-pkgs'52306
+Node: Configure options for 'texk/web2c'52763
+Node: Configure options for 'texk/bibtex-x'55434
+Node: Configure options for 'texk/dvipdfm-x'56014
+Node: Configure options for 'texk/dvisvgm'56628
+Node: Configure options for 'texk/texlive'57522
+Node: Configure options for 'texk/xdvik'57953
+Node: Configure options for 'utils/xindy'58446
+Node: Library-specific configure options59512
+Node: Configure options for 'kpathsea'60530
+Node: Configure options for system 'poppler'61247
+Node: Variables for configure62018
+Node: Cross compilation64528
+Node: Cross configuring65806
+Node: Cross problems67483
+Node: Coding conventions69128
+Node: Declarations and definitions69791
+Node: Const71978
+Node: Index73845

End Tag Table
diff --git a/Build/source/doc/texlive.texi b/Build/source/doc/texlive.texi
index dc6ef468f0d..0c752813516 100644
--- a/Build/source/doc/texlive.texi
+++ b/Build/source/doc/texlive.texi
@@ -121,7 +121,7 @@ The same text is available online (linked from
the program (or look at the end of the source file).
@end ignore
-@include build.texi
+@include tlbuild.texi
@node Index
@unnumbered Index
diff --git a/Build/source/doc/build.texi b/Build/source/doc/tlbuild.texi
index 17351d962c3..8b26d72b10e 100644
--- a/Build/source/doc/build.texi
+++ b/Build/source/doc/tlbuild.texi
@@ -436,7 +436,7 @@ document.)
@cindex source tree
The @TL{} source tree is the subtree rooted at @file{Build/source} of
-the complete TL tree and contains the sources for all executables
+the complete TL distribution and contains the sources for all executables
distributed by TL, as well as @code{configure} scripts and @code{make}
rules to build and install them together with some of their support
files.
@@ -500,7 +500,7 @@ starters, be sure to set @file{use-commit-times=yes} in
To avoid unnecessary runs of @code{bison}, @code{flex}, or
@code{makeinfo} it may be necessary to @code{touch} the generated
(@file{.c}, @file{.h}, or @file{.info}) files. With
-@code{--enable-maintainer-mode} mode it may also be necessary to
+@code{--enable-maintainer-mode} it may also be necessary to
@code{touch} first @file{aclocal.m4}, then @file{configure} and
@file{config.h.in} (or @file{c-auto.in}), and finally all
@file{Makefile.in} files. Perhaps @code{make -t} will help.
@@ -1772,7 +1772,6 @@ newer) of @code{poppler} for Lua@TeX{} and Xe@TeX{}, and use
of @code{poppler} (and @file{pkg-config}) for pdf@TeX{} instead of
@code{xpdf} from the TL tree. @xref{@code{--disable-largefile}}.
-
@node Variables for configure
@subsection Variables for configure
@@ -1876,6 +1875,11 @@ option @code{--build=@var{host}} to get the correct canonical host
name, but note that this should @emph{not} be @code{--host=@var{host}}
(@pxref{Hosts and Cross-Compilation,,, autoconf, GNU Autoconf}).
+In order to build, e.g., 32-bit binaries with @command{clang} on a 64-bit
+OSX system one could use @* @ @ @ @code{./Build --build=i386-apple-darwin
+CC='clang -arch i386'} @backslashchar{} @* @ @ @ @ @ @ @ @ @
+@code{CXX='clang++ -arch i386' OBJCXX='clang++ -arch i386'}
+
@menu
* Cross configuring:: Configuring for cross compilation.
* Cross problems:: Cross compilation problems.
@@ -2079,8 +2083,8 @@ without comments as to where that function is defined).
@subsubheading Variable declarations
@cindex variable declarations, in source code
-The declaration of global variables follow analogous rules: they are
-either declared @code{static} if used in only one files or declared
+The declaration of global variables follows analogous rules: they are
+either declared @code{static} if used in only one file or declared
@code{extern} in exactly one header and instantiated in exactly one
file.