modular: Changes to 'master'
Gaetan Nadon
gnadon at kemper.freedesktop.org
Thu Dec 16 18:16:18 PST 2010
build.sh | 89 ++++++++++++++++++++++++++++++++++-----------------------------
1 file changed, 49 insertions(+), 40 deletions(-)
New commits:
commit d9cc2242e21ef86b6a4a44492e65b05282cf4cce
Author: Gaetan Nadon <memsize at videotron.ca>
Date: Sat Dec 11 20:36:20 2010 -0500
build.sh: another pass at the env variable help text
Thanks to prior work, this opens the door to another attempt
at improving the help text. Even until now, I was confused at what
some of the variables were used for.
These are the organizing principles I used in the hope of helping
new contributors use build.sh and long time users who may have
overlooked some of the available features.
1- The variables are group by category, meaning the "owner" of the
variables.
2- The first line is the definition of the variable
3- The second line is a hint as to what build.sh does with it
4- Use the Autotools help text where it applies rather than inventing your own
------------------------------------------------------------------------------
Environment variables specific to build.sh:
QUIET Do not print messages saying which checks are being made
Each module/components is invoked with --quite
GITROOT Source code repository path [git://anongit.freedesktop.org/git]
Optional when using --clone to update source code before building
CONFFLAGS Configure options to pass to all Autoconf configure scripts
Refer to 'configure --help' from any module/components
LIBDIR Path segment under $PREFIX for libraries (e.g., lib64) [lib]
Used to build the font path, search libraries and packages
FONTPATH Path to fonts directories [$PREFIX/$LIBDIR/X11/fonts/misc/, ...]
Picked-up by the xserver as a value for --with-default-font-path
Environment variables defined by the GNU Build System:
DESTDIR Path to the staging area where installed objects are relocated
MAKE The name of the make command [make]
MAKEFLAGS: Options to pass to all $(MAKE) invocations
CC C compiler command
CFLAGS C compiler flags
LDFLAGS linker flags, e.g. -L<lib dir> if you have libraries in a
nonstandard directory <lib dir>
CPPFLAGS C/C++/Objective C preprocessor flags, e.g. -I<include dir> if
you have headers in a nonstandard directory <include dir>
CPP C preprocessor
Environment variables defined by the shell:
PATH List of directories that the shell searches for commands
$DESTDIR/$PREFIX/bin is prepended
Environment variables defined by the dynamic linker:
LD_LIBRARY_PATH List directories that the linker searches for shared objects
$DESTDIR/$PREFIX/$LIBDIR is prepended
Environment variables defined by the pkg-config system:
PKG_CONFIG_PATH List directories that pkg-config searches for libraries
$DESTDIR/$PREFIX/share/pkgconfig and
$DESTDIR/$PREFIX/$LIBDIR/pkgconfig are prepended
Reviewed-by: Trevor Woerner <twoerner at gmail.com>
Signed-off-by: Gaetan Nadon <memsize at videotron.ca>
commit 44604e4ba20b6ecc971e51662feac7c5165f893c
Author: Gaetan Nadon <memsize at videotron.ca>
Date: Tue Dec 14 10:52:50 2010 -0500
build.sh: new layout and updated text for options usage
------------------------------------------------------------------------------
Usage: build.sh [options] prefix
Options:
-a Do NOT run auto config tools (autogen.sh, configure)
-b Use .build.unknown build directory
-c Run make clean in addition to "all install"
-D Run make dist in addition to "all install"
-d Run make distcheck in addition "all install"
-g Compile and link with debug information
-h, --help Display this help and exit successfully
-n Do not quit after error; just print error message
-o <module/component> Build just this <module/component>
-p Update source code before building (git pull --rebase)
-s <sudo> The command name providing superuser privilege
--autoresume <file> Append module being built to, and autoresume from, <file>
--check Run make check in addition "all install"
--clone Clone non-existing repositories (uses $GITROOT if set)
--cmd <cmd> Execute arbitrary git, gmake, or make command <cmd>
--modfile <file> Only process the module/components specified in <file>
Usage: build.sh -L
-L List the components to build to stdout
------------------------------------------------------------------------------
Reviewed-by: Trevor Woerner <twoerner at gmail.com>
Signed-off-by: Gaetan Nadon <memsize at videotron.ca>
commit 7649929b72157a2d28505efb226bedbb9efbdd55
Author: Gaetan Nadon <memsize at videotron.ca>
Date: Sun Dec 5 17:27:47 2010 -0500
build.sh: use the script name only, not the path in usage statement
If invoked from $PREFIX you currently you get:
Usage: util/modular/build.sh [options] prefix
Where you should always get:
Usage: build.sh [options] prefix
The path name is not part of the usage. The GNU compiler and
associated tools do not use the path.
Autoconf recommends using "expr" rather than "basename" for portability.
Signed-off-by: Gaetan Nadon <memsize at videotron.ca>
More information about the xorg-commit
mailing list