mirror of
https://github.com/gflags/gflags.git
synced 2025-04-05 13:35:04 +00:00
Mon Jan 4 18:09:30 2010 Google Inc. <opensource@google.com>
* google-gflags: version 1.3 * PORTABILITY: can now build and run tests under MSVC (csilvers) * Remove the python gflags code, which is now its own package (tansell) * Clarify that "last flag wins" in the docs (csilvers) * Comment danger of using GetAllFlags in validators (wojtekm) * PORTABILITY: Some fixes necessary for c++0x (mboerger) * Makefile fix: $(srcdir) -> $(top_srcdir) in one place (csilvres) * INSTALL: autotools to autoconf v2.64 + automake v1.11 (csilvers) git-svn-id: https://gflags.googlecode.com/svn/trunk@35 6586e3c6-dcc4-952a-343f-ff74eb82781d
This commit is contained in:
Craig Silverstein
parent
ab3d7650dc
commit
31c8edc53e
23 changed files with 484 additions and 5566 deletions
11
ChangeLog
11
ChangeLog
|
|
@ -1,3 +1,14 @@
|
|||
Mon Jan 4 18:09:30 2010 Google Inc. <opensource@google.com>
|
||||
|
||||
* google-gflags: version 1.3
|
||||
* PORTABILITY: can now build and run tests under MSVC (csilvers)
|
||||
* Remove the python gflags code, which is now its own package (tansell)
|
||||
* Clarify that "last flag wins" in the docs (csilvers)
|
||||
* Comment danger of using GetAllFlags in validators (wojtekm)
|
||||
* PORTABILITY: Some fixes necessary for c++0x (mboerger)
|
||||
* Makefile fix: $(srcdir) -> $(top_srcdir) in one place (csilvres)
|
||||
* INSTALL: autotools to autoconf v2.64 + automake v1.11 (csilvers)
|
||||
|
||||
Thu Sep 10 12:53:04 2009 Google Inc. <opensource@google.com>
|
||||
|
||||
* google-gflags: version 1.2
|
||||
|
|
|
|||
11
Makefile.am
11
Makefile.am
|
|
@ -141,15 +141,6 @@ gflags_nc_test4: $(gflagsinclude_HEADERS) src/gflags_nc.cc
|
|||
# This file isn't covered under any rule that would cause it to be distributed.
|
||||
dist_noinst_DATA += src/gflags_nc.cc
|
||||
|
||||
# These aren't part of the c++ source, but we want them to be distributed
|
||||
PYTHON = python/setup.py \
|
||||
python/gflags.py \
|
||||
python/gflags2man.py \
|
||||
python/gflags_unittest.py \
|
||||
python/gflags_helpxml_test.py \
|
||||
python/test_module_foo.py \
|
||||
python/test_module_bar.py
|
||||
|
||||
|
||||
## ^^^^ END OF RULES TO MAKE THE LIBRARIES, BINARIES, AND UNITTESTS
|
||||
|
||||
|
|
@ -167,7 +158,7 @@ deb: dist-gzip packages/deb.sh packages/deb/*
|
|||
libtool: $(LIBTOOL_DEPS)
|
||||
$(SHELL) ./config.status --recheck
|
||||
EXTRA_DIST = packages/rpm.sh packages/rpm/rpm.spec packages/deb.sh packages/deb \
|
||||
libtool $(SCRIPTS) $(PYTHON) \
|
||||
libtool $(SCRIPTS) \
|
||||
src/windows/config.h src/windows/port.h src/windows/port.cc \
|
||||
src/windows/gflags/gflags.h src/windows/gflags/gflags_completions.h \
|
||||
$(WINDOWS_PROJECTS) \
|
||||
|
|
|
|||
14
Makefile.in
14
Makefile.in
|
|
@ -368,18 +368,8 @@ gflags_unittest3_LDADD = libgflags_nothreads.la
|
|||
|
||||
# This file isn't covered under any rule that would cause it to be distributed.
|
||||
dist_noinst_DATA = src/gflags_unittest_flagfile src/gflags_nc.cc
|
||||
|
||||
# These aren't part of the c++ source, but we want them to be distributed
|
||||
PYTHON = python/setup.py \
|
||||
python/gflags.py \
|
||||
python/gflags2man.py \
|
||||
python/gflags_unittest.py \
|
||||
python/gflags_helpxml_test.py \
|
||||
python/test_module_foo.py \
|
||||
python/test_module_bar.py
|
||||
|
||||
EXTRA_DIST = packages/rpm.sh packages/rpm/rpm.spec packages/deb.sh packages/deb \
|
||||
libtool $(SCRIPTS) $(PYTHON) \
|
||||
libtool $(SCRIPTS) \
|
||||
src/windows/config.h src/windows/port.h src/windows/port.cc \
|
||||
src/windows/gflags/gflags.h src/windows/gflags/gflags_completions.h \
|
||||
$(WINDOWS_PROJECTS) \
|
||||
|
|
@ -834,7 +824,7 @@ check-TESTS: $(TESTS)
|
|||
distdir: $(DISTFILES)
|
||||
$(am__remove_distdir)
|
||||
mkdir $(distdir)
|
||||
$(mkdir_p) $(distdir)/doc $(distdir)/m4 $(distdir)/packages $(distdir)/packages/rpm $(distdir)/python $(distdir)/src $(distdir)/src/gflags $(distdir)/src/google $(distdir)/src/solaris $(distdir)/src/windows $(distdir)/src/windows/gflags $(distdir)/vsprojects/gflags_unittest $(distdir)/vsprojects/libgflags
|
||||
$(mkdir_p) $(distdir)/doc $(distdir)/m4 $(distdir)/packages $(distdir)/packages/rpm $(distdir)/src $(distdir)/src/gflags $(distdir)/src/google $(distdir)/src/solaris $(distdir)/src/windows $(distdir)/src/windows/gflags $(distdir)/vsprojects/gflags_unittest $(distdir)/vsprojects/libgflags
|
||||
@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
|
||||
topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
|
||||
list='$(DISTFILES)'; for file in $$list; do \
|
||||
|
|
|
|||
17
README
17
README
|
|
@ -1,19 +1,10 @@
|
|||
This repository contains both a C++ and a python implementation of the
|
||||
Google commandline flags module. Documentation for the C++
|
||||
implementation is in doc/. Documentation for the python
|
||||
implementation is at the top of gflags/flags.py.
|
||||
This repository contains a C++ of the Google commandline flags module.
|
||||
Documentation for the C++ implementation is in doc/. The python version of
|
||||
gflags is now shipped seperately as it is completely independent of this
|
||||
module.
|
||||
|
||||
See INSTALL for (generic) installation instructions for C++: basically
|
||||
./configure && make && make install
|
||||
|
||||
To install the python module, run
|
||||
cd python; python ./setup.py install
|
||||
|
||||
You can also compile this under Windows, if you want. The solution
|
||||
file (for VC 7.1 and later) is in this directory.
|
||||
|
||||
When you install the python library, you also get a helper
|
||||
application, gflags2man.py, installed into /usr/local/bin. You can
|
||||
run gflags2man.py to create an instant man page, with all the
|
||||
commandline flags and their docs, for any C++ or python program you've
|
||||
written using the gflags library.
|
||||
|
|
|
|||
31
autogen.sh
31
autogen.sh
|
|
@ -17,22 +17,21 @@ rm -rf autom4te.cache
|
|||
|
||||
trap 'rm -f aclocal.m4.tmp' EXIT
|
||||
|
||||
# Returns the first binary in $* that exists, or the last arg, if none exists.
|
||||
WhichOf() {
|
||||
for candidate in "$@"; do
|
||||
if "$candidate" --version >/dev/null 2>&1; then
|
||||
echo "$candidate"
|
||||
return
|
||||
fi
|
||||
done
|
||||
echo "$candidate" # the last one in $@
|
||||
}
|
||||
|
||||
# Use version 1.9 of aclocal and automake if available.
|
||||
ACLOCAL=aclocal-1.9
|
||||
if test -z `which "$ACLOCAL"`; then
|
||||
ACLOCAL=aclocal
|
||||
fi
|
||||
|
||||
AUTOMAKE=automake-1.9
|
||||
if test -z `which "$AUTOMAKE"`; then
|
||||
AUTOMAKE=automake
|
||||
fi
|
||||
|
||||
# glibtoolize is used for Mac OS X
|
||||
LIBTOOLIZE=libtoolize
|
||||
if test -z `which "$LIBTOOLIZE"`; then
|
||||
LIBTOOLIZE=glibtoolize
|
||||
fi
|
||||
ACLOCAL=`WhichOf aclocal-1.9 aclocal`
|
||||
AUTOMAKE=`WhichOf automake-1.9 automake`
|
||||
LIBTOOLIZE=`WhichOf glibtoolize libtoolize15 libtoolize14 libtoolize`
|
||||
|
||||
# aclocal tries to overwrite aclocal.m4 even if the contents haven't
|
||||
# changed, which is annoying when the file is not open for edit (in
|
||||
|
|
@ -46,7 +45,7 @@ else
|
|||
mv aclocal.m4.tmp aclocal.m4 # we did set -e above, so we die if this fails
|
||||
fi
|
||||
|
||||
grep -q LIBTOOL configure.ac && "$LIBTOOLIZE" -c -f
|
||||
grep -q '^[^#]*AC_PROG_LIBTOOL' configure.ac && "$LIBTOOLIZE" -c -f
|
||||
autoconf -f -W all,no-obsolete
|
||||
autoheader -f -W all
|
||||
"$AUTOMAKE" -a -c -f -W all
|
||||
|
|
|
|||
80
config.guess
vendored
80
config.guess
vendored
|
|
@ -1,9 +1,10 @@
|
|||
#! /bin/sh
|
||||
# Attempt to guess a canonical system name.
|
||||
# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
|
||||
# 2000, 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
|
||||
# 2000, 2001, 2002, 2003, 2004, 2005, 2006 Free Software Foundation,
|
||||
# Inc.
|
||||
|
||||
timestamp='2005-08-03'
|
||||
timestamp='2007-07-22'
|
||||
|
||||
# This file is free software; you can redistribute it and/or modify it
|
||||
# under the terms of the GNU General Public License as published by
|
||||
|
|
@ -106,7 +107,7 @@ set_cc_for_build='
|
|||
trap "exitcode=\$?; (rm -f \$tmpfiles 2>/dev/null; rmdir \$tmp 2>/dev/null) && exit \$exitcode" 0 ;
|
||||
trap "rm -f \$tmpfiles 2>/dev/null; rmdir \$tmp 2>/dev/null; exit 1" 1 2 13 15 ;
|
||||
: ${TMPDIR=/tmp} ;
|
||||
{ tmp=`(umask 077 && mktemp -d -q "$TMPDIR/cgXXXXXX") 2>/dev/null` && test -n "$tmp" && test -d "$tmp" ; } ||
|
||||
{ tmp=`(umask 077 && mktemp -d "$TMPDIR/cgXXXXXX") 2>/dev/null` && test -n "$tmp" && test -d "$tmp" ; } ||
|
||||
{ test -n "$RANDOM" && tmp=$TMPDIR/cg$$-$RANDOM && (umask 077 && mkdir $tmp) ; } ||
|
||||
{ tmp=$TMPDIR/cg-$$ && (umask 077 && mkdir $tmp) && echo "Warning: creating insecure temp directory" >&2 ; } ||
|
||||
{ echo "$me: cannot create a temporary directory in $TMPDIR" >&2 ; exit 1 ; } ;
|
||||
|
|
@ -160,6 +161,7 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
|
|||
arm*) machine=arm-unknown ;;
|
||||
sh3el) machine=shl-unknown ;;
|
||||
sh3eb) machine=sh-unknown ;;
|
||||
sh5el) machine=sh5le-unknown ;;
|
||||
*) machine=${UNAME_MACHINE_ARCH}-unknown ;;
|
||||
esac
|
||||
# The Operating System including object format, if it has switched
|
||||
|
|
@ -206,8 +208,11 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
|
|||
*:ekkoBSD:*:*)
|
||||
echo ${UNAME_MACHINE}-unknown-ekkobsd${UNAME_RELEASE}
|
||||
exit ;;
|
||||
*:SolidBSD:*:*)
|
||||
echo ${UNAME_MACHINE}-unknown-solidbsd${UNAME_RELEASE}
|
||||
exit ;;
|
||||
macppc:MirBSD:*:*)
|
||||
echo powerppc-unknown-mirbsd${UNAME_RELEASE}
|
||||
echo powerpc-unknown-mirbsd${UNAME_RELEASE}
|
||||
exit ;;
|
||||
*:MirBSD:*:*)
|
||||
echo ${UNAME_MACHINE}-unknown-mirbsd${UNAME_RELEASE}
|
||||
|
|
@ -325,7 +330,7 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
|
|||
sun4*:SunOS:5.*:* | tadpole*:SunOS:5.*:*)
|
||||
echo sparc-sun-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
|
||||
exit ;;
|
||||
i86pc:SunOS:5.*:*)
|
||||
i86pc:SunOS:5.*:* | i86xen:SunOS:5.*:*)
|
||||
echo i386-pc-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
|
||||
exit ;;
|
||||
sun4*:SunOS:6*:*)
|
||||
|
|
@ -764,12 +769,19 @@ EOF
|
|||
echo ${UNAME_MACHINE}-unknown-bsdi${UNAME_RELEASE}
|
||||
exit ;;
|
||||
*:FreeBSD:*:*)
|
||||
echo ${UNAME_MACHINE}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`
|
||||
case ${UNAME_MACHINE} in
|
||||
pc98)
|
||||
echo i386-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;;
|
||||
amd64)
|
||||
echo x86_64-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;;
|
||||
*)
|
||||
echo ${UNAME_MACHINE}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;;
|
||||
esac
|
||||
exit ;;
|
||||
i*:CYGWIN*:*)
|
||||
echo ${UNAME_MACHINE}-pc-cygwin
|
||||
exit ;;
|
||||
i*:MINGW*:*)
|
||||
*:MINGW*:*)
|
||||
echo ${UNAME_MACHINE}-pc-mingw32
|
||||
exit ;;
|
||||
i*:windows32*:*)
|
||||
|
|
@ -779,9 +791,15 @@ EOF
|
|||
i*:PW*:*)
|
||||
echo ${UNAME_MACHINE}-pc-pw32
|
||||
exit ;;
|
||||
x86:Interix*:[34]*)
|
||||
echo i586-pc-interix${UNAME_RELEASE}|sed -e 's/\..*//'
|
||||
exit ;;
|
||||
*:Interix*:[3456]*)
|
||||
case ${UNAME_MACHINE} in
|
||||
x86)
|
||||
echo i586-pc-interix${UNAME_RELEASE}
|
||||
exit ;;
|
||||
EM64T | authenticamd)
|
||||
echo x86_64-unknown-interix${UNAME_RELEASE}
|
||||
exit ;;
|
||||
esac ;;
|
||||
[345]86:Windows_95:* | [345]86:Windows_98:* | [345]86:Windows_NT:*)
|
||||
echo i${UNAME_MACHINE}-pc-mks
|
||||
exit ;;
|
||||
|
|
@ -817,6 +835,9 @@ EOF
|
|||
arm*:Linux:*:*)
|
||||
echo ${UNAME_MACHINE}-unknown-linux-gnu
|
||||
exit ;;
|
||||
avr32*:Linux:*:*)
|
||||
echo ${UNAME_MACHINE}-unknown-linux-gnu
|
||||
exit ;;
|
||||
cris:Linux:*:*)
|
||||
echo cris-axis-linux-gnu
|
||||
exit ;;
|
||||
|
|
@ -851,7 +872,11 @@ EOF
|
|||
#endif
|
||||
#endif
|
||||
EOF
|
||||
eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^CPU=`
|
||||
eval "`$CC_FOR_BUILD -E $dummy.c 2>/dev/null | sed -n '
|
||||
/^CPU/{
|
||||
s: ::g
|
||||
p
|
||||
}'`"
|
||||
test x"${CPU}" != x && { echo "${CPU}-unknown-linux-gnu"; exit; }
|
||||
;;
|
||||
mips64:Linux:*:*)
|
||||
|
|
@ -870,7 +895,11 @@ EOF
|
|||
#endif
|
||||
#endif
|
||||
EOF
|
||||
eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^CPU=`
|
||||
eval "`$CC_FOR_BUILD -E $dummy.c 2>/dev/null | sed -n '
|
||||
/^CPU/{
|
||||
s: ::g
|
||||
p
|
||||
}'`"
|
||||
test x"${CPU}" != x && { echo "${CPU}-unknown-linux-gnu"; exit; }
|
||||
;;
|
||||
or32:Linux:*:*)
|
||||
|
|
@ -919,9 +948,15 @@ EOF
|
|||
sparc:Linux:*:* | sparc64:Linux:*:*)
|
||||
echo ${UNAME_MACHINE}-unknown-linux-gnu
|
||||
exit ;;
|
||||
vax:Linux:*:*)
|
||||
echo ${UNAME_MACHINE}-dec-linux-gnu
|
||||
exit ;;
|
||||
x86_64:Linux:*:*)
|
||||
echo x86_64-unknown-linux-gnu
|
||||
exit ;;
|
||||
xtensa:Linux:*:*)
|
||||
echo xtensa-unknown-linux-gnu
|
||||
exit ;;
|
||||
i*86:Linux:*:*)
|
||||
# The BFD linker knows what the default object file format is, so
|
||||
# first see if it will tell us. cd to the root directory to prevent
|
||||
|
|
@ -964,7 +999,7 @@ EOF
|
|||
LIBC=gnulibc1
|
||||
# endif
|
||||
#else
|
||||
#ifdef __INTEL_COMPILER
|
||||
#if defined(__INTEL_COMPILER) || defined(__PGI) || defined(__SUNPRO_C) || defined(__SUNPRO_CC)
|
||||
LIBC=gnu
|
||||
#else
|
||||
LIBC=gnuaout
|
||||
|
|
@ -974,7 +1009,11 @@ EOF
|
|||
LIBC=dietlibc
|
||||
#endif
|
||||
EOF
|
||||
eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^LIBC=`
|
||||
eval "`$CC_FOR_BUILD -E $dummy.c 2>/dev/null | sed -n '
|
||||
/^LIBC/{
|
||||
s: ::g
|
||||
p
|
||||
}'`"
|
||||
test x"${LIBC}" != x && {
|
||||
echo "${UNAME_MACHINE}-pc-linux-${LIBC}"
|
||||
exit
|
||||
|
|
@ -1176,6 +1215,15 @@ EOF
|
|||
SX-6:SUPER-UX:*:*)
|
||||
echo sx6-nec-superux${UNAME_RELEASE}
|
||||
exit ;;
|
||||
SX-7:SUPER-UX:*:*)
|
||||
echo sx7-nec-superux${UNAME_RELEASE}
|
||||
exit ;;
|
||||
SX-8:SUPER-UX:*:*)
|
||||
echo sx8-nec-superux${UNAME_RELEASE}
|
||||
exit ;;
|
||||
SX-8R:SUPER-UX:*:*)
|
||||
echo sx8r-nec-superux${UNAME_RELEASE}
|
||||
exit ;;
|
||||
Power*:Rhapsody:*:*)
|
||||
echo powerpc-apple-rhapsody${UNAME_RELEASE}
|
||||
exit ;;
|
||||
|
|
@ -1185,7 +1233,6 @@ EOF
|
|||
*:Darwin:*:*)
|
||||
UNAME_PROCESSOR=`uname -p` || UNAME_PROCESSOR=unknown
|
||||
case $UNAME_PROCESSOR in
|
||||
*86) UNAME_PROCESSOR=i686 ;;
|
||||
unknown) UNAME_PROCESSOR=powerpc ;;
|
||||
esac
|
||||
echo ${UNAME_PROCESSOR}-apple-darwin${UNAME_RELEASE}
|
||||
|
|
@ -1264,6 +1311,9 @@ EOF
|
|||
i*86:skyos:*:*)
|
||||
echo ${UNAME_MACHINE}-pc-skyos`echo ${UNAME_RELEASE}` | sed -e 's/ .*$//'
|
||||
exit ;;
|
||||
i*86:rdos:*:*)
|
||||
echo ${UNAME_MACHINE}-pc-rdos
|
||||
exit ;;
|
||||
esac
|
||||
|
||||
#echo '(No uname command or uname output not recognized.)' 1>&2
|
||||
|
|
|
|||
117
config.sub
vendored
117
config.sub
vendored
|
|
@ -1,9 +1,10 @@
|
|||
#! /bin/sh
|
||||
# Configuration validation subroutine script.
|
||||
# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
|
||||
# 2000, 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
|
||||
# 2000, 2001, 2002, 2003, 2004, 2005, 2006 Free Software Foundation,
|
||||
# Inc.
|
||||
|
||||
timestamp='2005-07-08'
|
||||
timestamp='2007-06-28'
|
||||
|
||||
# This file is (in principle) common to ALL GNU software.
|
||||
# The presence of a machine in this file suggests that SOME GNU software
|
||||
|
|
@ -119,8 +120,9 @@ esac
|
|||
# Here we must recognize all the valid KERNEL-OS combinations.
|
||||
maybe_os=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\2/'`
|
||||
case $maybe_os in
|
||||
nto-qnx* | linux-gnu* | linux-dietlibc | linux-uclibc* | uclinux-uclibc* | uclinux-gnu* | \
|
||||
kfreebsd*-gnu* | knetbsd*-gnu* | netbsd*-gnu* | storm-chaos* | os2-emx* | rtmk-nova*)
|
||||
nto-qnx* | linux-gnu* | linux-dietlibc | linux-newlib* | linux-uclibc* | \
|
||||
uclinux-uclibc* | uclinux-gnu* | kfreebsd*-gnu* | knetbsd*-gnu* | netbsd*-gnu* | \
|
||||
storm-chaos* | os2-emx* | rtmk-nova*)
|
||||
os=-$maybe_os
|
||||
basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'`
|
||||
;;
|
||||
|
|
@ -171,6 +173,10 @@ case $os in
|
|||
-hiux*)
|
||||
os=-hiuxwe2
|
||||
;;
|
||||
-sco6)
|
||||
os=-sco5v6
|
||||
basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
|
||||
;;
|
||||
-sco5)
|
||||
os=-sco3.2v5
|
||||
basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
|
||||
|
|
@ -187,6 +193,10 @@ case $os in
|
|||
# Don't forget version if it is 3.2v4 or newer.
|
||||
basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
|
||||
;;
|
||||
-sco5v6*)
|
||||
# Don't forget version if it is 3.2v4 or newer.
|
||||
basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
|
||||
;;
|
||||
-sco*)
|
||||
os=-sco3.2v2
|
||||
basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
|
||||
|
|
@ -231,15 +241,16 @@ case $basic_machine in
|
|||
| alpha | alphaev[4-8] | alphaev56 | alphaev6[78] | alphapca5[67] \
|
||||
| alpha64 | alpha64ev[4-8] | alpha64ev56 | alpha64ev6[78] | alpha64pca5[67] \
|
||||
| am33_2.0 \
|
||||
| arc | arm | arm[bl]e | arme[lb] | armv[2345] | armv[345][lb] | avr \
|
||||
| arc | arm | arm[bl]e | arme[lb] | armv[2345] | armv[345][lb] | avr | avr32 \
|
||||
| bfin \
|
||||
| c4x | clipper \
|
||||
| d10v | d30v | dlx | dsp16xx \
|
||||
| fr30 | frv \
|
||||
| fido | fr30 | frv \
|
||||
| h8300 | h8500 | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \
|
||||
| i370 | i860 | i960 | ia64 \
|
||||
| ip2k | iq2000 \
|
||||
| m32r | m32rle | m68000 | m68k | m88k | maxq | mcore \
|
||||
| m32c | m32r | m32rle | m68000 | m68k | m88k \
|
||||
| maxq | mb | microblaze | mcore | mep \
|
||||
| mips | mipsbe | mipseb | mipsel | mipsle \
|
||||
| mips16 \
|
||||
| mips64 | mips64el \
|
||||
|
|
@ -257,28 +268,27 @@ case $basic_machine in
|
|||
| mipsisa64sr71k | mipsisa64sr71kel \
|
||||
| mipstx39 | mipstx39el \
|
||||
| mn10200 | mn10300 \
|
||||
| ms1 \
|
||||
| mt \
|
||||
| msp430 \
|
||||
| nios | nios2 \
|
||||
| ns16k | ns32k \
|
||||
| or32 \
|
||||
| pdp10 | pdp11 | pj | pjl \
|
||||
| powerpc | powerpc64 | powerpc64le | powerpcle | ppcbe \
|
||||
| pyramid \
|
||||
| sh | sh[1234] | sh[24]a | sh[23]e | sh[34]eb | shbe | shle | sh[1234]le | sh3ele \
|
||||
| score \
|
||||
| sh | sh[1234] | sh[24]a | sh[23]e | sh[34]eb | sheb | shbe | shle | sh[1234]le | sh3ele \
|
||||
| sh64 | sh64le \
|
||||
| sparc | sparc64 | sparc64b | sparc86x | sparclet | sparclite \
|
||||
| sparcv8 | sparcv9 | sparcv9b \
|
||||
| strongarm \
|
||||
| sparc | sparc64 | sparc64b | sparc64v | sparc86x | sparclet | sparclite \
|
||||
| sparcv8 | sparcv9 | sparcv9b | sparcv9v \
|
||||
| spu | strongarm \
|
||||
| tahoe | thumb | tic4x | tic80 | tron \
|
||||
| v850 | v850e \
|
||||
| we32k \
|
||||
| x86 | xscale | xscalee[bl] | xstormy16 | xtensa \
|
||||
| x86 | xc16x | xscale | xscalee[bl] | xstormy16 | xtensa \
|
||||
| z8k)
|
||||
basic_machine=$basic_machine-unknown
|
||||
;;
|
||||
m32c)
|
||||
basic_machine=$basic_machine-unknown
|
||||
;;
|
||||
m6811 | m68hc11 | m6812 | m68hc12)
|
||||
# Motorola 68HC11/12.
|
||||
basic_machine=$basic_machine-unknown
|
||||
|
|
@ -286,6 +296,9 @@ case $basic_machine in
|
|||
;;
|
||||
m88110 | m680[12346]0 | m683?2 | m68360 | m5200 | v70 | w65 | z8k)
|
||||
;;
|
||||
ms1)
|
||||
basic_machine=mt-unknown
|
||||
;;
|
||||
|
||||
# We use `pc' rather than `unknown'
|
||||
# because (1) that's what they normally are, and
|
||||
|
|
@ -305,18 +318,18 @@ case $basic_machine in
|
|||
| alpha64-* | alpha64ev[4-8]-* | alpha64ev56-* | alpha64ev6[78]-* \
|
||||
| alphapca5[67]-* | alpha64pca5[67]-* | arc-* \
|
||||
| arm-* | armbe-* | armle-* | armeb-* | armv*-* \
|
||||
| avr-* \
|
||||
| avr-* | avr32-* \
|
||||
| bfin-* | bs2000-* \
|
||||
| c[123]* | c30-* | [cjt]90-* | c4x-* | c54x-* | c55x-* | c6x-* \
|
||||
| clipper-* | craynv-* | cydra-* \
|
||||
| d10v-* | d30v-* | dlx-* \
|
||||
| elxsi-* \
|
||||
| f30[01]-* | f700-* | fr30-* | frv-* | fx80-* \
|
||||
| f30[01]-* | f700-* | fido-* | fr30-* | frv-* | fx80-* \
|
||||
| h8300-* | h8500-* \
|
||||
| hppa-* | hppa1.[01]-* | hppa2.0-* | hppa2.0[nw]-* | hppa64-* \
|
||||
| i*86-* | i860-* | i960-* | ia64-* \
|
||||
| ip2k-* | iq2000-* \
|
||||
| m32r-* | m32rle-* \
|
||||
| m32c-* | m32r-* | m32rle-* \
|
||||
| m68000-* | m680[012346]0-* | m68360-* | m683?2-* | m68k-* \
|
||||
| m88110-* | m88k-* | maxq-* | mcore-* \
|
||||
| mips-* | mipsbe-* | mipseb-* | mipsel-* | mipsle-* \
|
||||
|
|
@ -336,31 +349,30 @@ case $basic_machine in
|
|||
| mipsisa64sr71k-* | mipsisa64sr71kel-* \
|
||||
| mipstx39-* | mipstx39el-* \
|
||||
| mmix-* \
|
||||
| ms1-* \
|
||||
| mt-* \
|
||||
| msp430-* \
|
||||
| nios-* | nios2-* \
|
||||
| none-* | np1-* | ns16k-* | ns32k-* \
|
||||
| orion-* \
|
||||
| pdp10-* | pdp11-* | pj-* | pjl-* | pn-* | power-* \
|
||||
| powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* | ppcbe-* \
|
||||
| pyramid-* \
|
||||
| romp-* | rs6000-* \
|
||||
| sh-* | sh[1234]-* | sh[24]a-* | sh[23]e-* | sh[34]eb-* | shbe-* \
|
||||
| sh-* | sh[1234]-* | sh[24]a-* | sh[23]e-* | sh[34]eb-* | sheb-* | shbe-* \
|
||||
| shle-* | sh[1234]le-* | sh3ele-* | sh64-* | sh64le-* \
|
||||
| sparc-* | sparc64-* | sparc64b-* | sparc86x-* | sparclet-* \
|
||||
| sparc-* | sparc64-* | sparc64b-* | sparc64v-* | sparc86x-* | sparclet-* \
|
||||
| sparclite-* \
|
||||
| sparcv8-* | sparcv9-* | sparcv9b-* | strongarm-* | sv1-* | sx?-* \
|
||||
| sparcv8-* | sparcv9-* | sparcv9b-* | sparcv9v-* | strongarm-* | sv1-* | sx?-* \
|
||||
| tahoe-* | thumb-* \
|
||||
| tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* \
|
||||
| tron-* \
|
||||
| v850-* | v850e-* | vax-* \
|
||||
| we32k-* \
|
||||
| x86-* | x86_64-* | xps100-* | xscale-* | xscalee[bl]-* \
|
||||
| x86-* | x86_64-* | xc16x-* | xps100-* | xscale-* | xscalee[bl]-* \
|
||||
| xstormy16-* | xtensa-* \
|
||||
| ymp-* \
|
||||
| z8k-*)
|
||||
;;
|
||||
m32c-*)
|
||||
;;
|
||||
# Recognize the various machine names and aliases which stand
|
||||
# for a CPU type and a company and sometimes even an OS.
|
||||
386bsd)
|
||||
|
|
@ -463,8 +475,8 @@ case $basic_machine in
|
|||
basic_machine=craynv-cray
|
||||
os=-unicosmp
|
||||
;;
|
||||
cr16c)
|
||||
basic_machine=cr16c-unknown
|
||||
cr16)
|
||||
basic_machine=cr16-unknown
|
||||
os=-elf
|
||||
;;
|
||||
crds | unos)
|
||||
|
|
@ -671,6 +683,10 @@ case $basic_machine in
|
|||
basic_machine=i386-pc
|
||||
os=-mingw32
|
||||
;;
|
||||
mingw32ce)
|
||||
basic_machine=arm-unknown
|
||||
os=-mingw32ce
|
||||
;;
|
||||
miniframe)
|
||||
basic_machine=m68000-convergent
|
||||
;;
|
||||
|
|
@ -696,6 +712,9 @@ case $basic_machine in
|
|||
basic_machine=i386-pc
|
||||
os=-msdos
|
||||
;;
|
||||
ms1-*)
|
||||
basic_machine=`echo $basic_machine | sed -e 's/ms1-/mt-/'`
|
||||
;;
|
||||
mvs)
|
||||
basic_machine=i370-ibm
|
||||
os=-mvs
|
||||
|
|
@ -803,6 +822,12 @@ case $basic_machine in
|
|||
pc532 | pc532-*)
|
||||
basic_machine=ns32k-pc532
|
||||
;;
|
||||
pc98)
|
||||
basic_machine=i386-pc
|
||||
;;
|
||||
pc98-*)
|
||||
basic_machine=i386-`echo $basic_machine | sed 's/^[^-]*-//'`
|
||||
;;
|
||||
pentium | p5 | k5 | k6 | nexgen | viac3)
|
||||
basic_machine=i586-pc
|
||||
;;
|
||||
|
|
@ -859,6 +884,10 @@ case $basic_machine in
|
|||
basic_machine=i586-unknown
|
||||
os=-pw32
|
||||
;;
|
||||
rdos)
|
||||
basic_machine=i386-pc
|
||||
os=-rdos
|
||||
;;
|
||||
rom68k)
|
||||
basic_machine=m68k-rom68k
|
||||
os=-coff
|
||||
|
|
@ -885,6 +914,10 @@ case $basic_machine in
|
|||
sb1el)
|
||||
basic_machine=mipsisa64sb1el-unknown
|
||||
;;
|
||||
sde)
|
||||
basic_machine=mipsisa32-sde
|
||||
os=-elf
|
||||
;;
|
||||
sei)
|
||||
basic_machine=mips-sei
|
||||
os=-seiux
|
||||
|
|
@ -896,6 +929,9 @@ case $basic_machine in
|
|||
basic_machine=sh-hitachi
|
||||
os=-hms
|
||||
;;
|
||||
sh5el)
|
||||
basic_machine=sh5le-unknown
|
||||
;;
|
||||
sh64)
|
||||
basic_machine=sh64-unknown
|
||||
;;
|
||||
|
|
@ -1101,7 +1137,7 @@ case $basic_machine in
|
|||
sh[1234] | sh[24]a | sh[34]eb | sh[1234]le | sh[23]ele)
|
||||
basic_machine=sh-unknown
|
||||
;;
|
||||
sparc | sparcv8 | sparcv9 | sparcv9b)
|
||||
sparc | sparcv8 | sparcv9 | sparcv9b | sparcv9v)
|
||||
basic_machine=sparc-sun
|
||||
;;
|
||||
cydra)
|
||||
|
|
@ -1174,21 +1210,23 @@ case $os in
|
|||
| -aos* \
|
||||
| -nindy* | -vxsim* | -vxworks* | -ebmon* | -hms* | -mvs* \
|
||||
| -clix* | -riscos* | -uniplus* | -iris* | -rtu* | -xenix* \
|
||||
| -hiux* | -386bsd* | -knetbsd* | -mirbsd* | -netbsd* | -openbsd* \
|
||||
| -hiux* | -386bsd* | -knetbsd* | -mirbsd* | -netbsd* \
|
||||
| -openbsd* | -solidbsd* \
|
||||
| -ekkobsd* | -kfreebsd* | -freebsd* | -riscix* | -lynxos* \
|
||||
| -bosx* | -nextstep* | -cxux* | -aout* | -elf* | -oabi* \
|
||||
| -ptx* | -coff* | -ecoff* | -winnt* | -domain* | -vsta* \
|
||||
| -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \
|
||||
| -chorusos* | -chorusrdb* \
|
||||
| -cygwin* | -pe* | -psos* | -moss* | -proelf* | -rtems* \
|
||||
| -mingw32* | -linux-gnu* | -linux-uclibc* | -uxpv* | -beos* | -mpeix* | -udk* \
|
||||
| -mingw32* | -linux-gnu* | -linux-newlib* | -linux-uclibc* \
|
||||
| -uxpv* | -beos* | -mpeix* | -udk* \
|
||||
| -interix* | -uwin* | -mks* | -rhapsody* | -darwin* | -opened* \
|
||||
| -openstep* | -oskit* | -conix* | -pw32* | -nonstopux* \
|
||||
| -storm-chaos* | -tops10* | -tenex* | -tops20* | -its* \
|
||||
| -os2* | -vos* | -palmos* | -uclinux* | -nucleus* \
|
||||
| -morphos* | -superux* | -rtmk* | -rtmk-nova* | -windiss* \
|
||||
| -powermax* | -dnix* | -nx6 | -nx7 | -sei* | -dragonfly* \
|
||||
| -skyos* | -haiku*)
|
||||
| -skyos* | -haiku* | -rdos* | -toppers* | -drops*)
|
||||
# Remember, each alternative MUST END IN *, to match a version number.
|
||||
;;
|
||||
-qnx*)
|
||||
|
|
@ -1340,6 +1378,12 @@ else
|
|||
# system, and we'll never get to this point.
|
||||
|
||||
case $basic_machine in
|
||||
score-*)
|
||||
os=-elf
|
||||
;;
|
||||
spu-*)
|
||||
os=-elf
|
||||
;;
|
||||
*-acorn)
|
||||
os=-riscix1.2
|
||||
;;
|
||||
|
|
@ -1349,9 +1393,9 @@ case $basic_machine in
|
|||
arm*-semi)
|
||||
os=-aout
|
||||
;;
|
||||
c4x-* | tic4x-*)
|
||||
os=-coff
|
||||
;;
|
||||
c4x-* | tic4x-*)
|
||||
os=-coff
|
||||
;;
|
||||
# This must come before the *-dec entry.
|
||||
pdp10-*)
|
||||
os=-tops20
|
||||
|
|
@ -1377,6 +1421,9 @@ case $basic_machine in
|
|||
m68*-cisco)
|
||||
os=-aout
|
||||
;;
|
||||
mep-*)
|
||||
os=-elf
|
||||
;;
|
||||
mips*-cisco)
|
||||
os=-elf
|
||||
;;
|
||||
|
|
|
|||
20
configure
vendored
20
configure
vendored
|
|
@ -1,6 +1,6 @@
|
|||
#! /bin/sh
|
||||
# Guess values for system-dependent variables and create Makefiles.
|
||||
# Generated by GNU Autoconf 2.64 for gflags 1.2.
|
||||
# Generated by GNU Autoconf 2.64 for gflags 1.3.
|
||||
#
|
||||
# Report bugs to <opensource@google.com>.
|
||||
#
|
||||
|
|
@ -703,8 +703,8 @@ MAKEFLAGS=
|
|||
# Identity of this package.
|
||||
PACKAGE_NAME='gflags'
|
||||
PACKAGE_TARNAME='gflags'
|
||||
PACKAGE_VERSION='1.2'
|
||||
PACKAGE_STRING='gflags 1.2'
|
||||
PACKAGE_VERSION='1.3'
|
||||
PACKAGE_STRING='gflags 1.3'
|
||||
PACKAGE_BUGREPORT='opensource@google.com'
|
||||
PACKAGE_URL=''
|
||||
|
||||
|
|
@ -1439,7 +1439,7 @@ if test "$ac_init_help" = "long"; then
|
|||
# Omit some internal or obsolete options to make the list less imposing.
|
||||
# This message is too long to be a string in the A/UX 3.1 sh.
|
||||
cat <<_ACEOF
|
||||
\`configure' configures gflags 1.2 to adapt to many kinds of systems.
|
||||
\`configure' configures gflags 1.3 to adapt to many kinds of systems.
|
||||
|
||||
Usage: $0 [OPTION]... [VAR=VALUE]...
|
||||
|
||||
|
|
@ -1509,7 +1509,7 @@ fi
|
|||
|
||||
if test -n "$ac_init_help"; then
|
||||
case $ac_init_help in
|
||||
short | recursive ) echo "Configuration of gflags 1.2:";;
|
||||
short | recursive ) echo "Configuration of gflags 1.3:";;
|
||||
esac
|
||||
cat <<\_ACEOF
|
||||
|
||||
|
|
@ -1618,7 +1618,7 @@ fi
|
|||
test -n "$ac_init_help" && exit $ac_status
|
||||
if $ac_init_version; then
|
||||
cat <<\_ACEOF
|
||||
gflags configure 1.2
|
||||
gflags configure 1.3
|
||||
generated by GNU Autoconf 2.64
|
||||
|
||||
Copyright (C) 2009 Free Software Foundation, Inc.
|
||||
|
|
@ -2248,7 +2248,7 @@ cat >config.log <<_ACEOF
|
|||
This file contains any messages produced by compilers while
|
||||
running configure, to aid debugging if configure makes a mistake.
|
||||
|
||||
It was created by gflags $as_me 1.2, which was
|
||||
It was created by gflags $as_me 1.3, which was
|
||||
generated by GNU Autoconf 2.64. Invocation command line was
|
||||
|
||||
$ $0 $@
|
||||
|
|
@ -2910,7 +2910,7 @@ fi
|
|||
|
||||
# Define the identity of the package.
|
||||
PACKAGE='gflags'
|
||||
VERSION='1.2'
|
||||
VERSION='1.3'
|
||||
|
||||
|
||||
cat >>confdefs.h <<_ACEOF
|
||||
|
|
@ -20564,7 +20564,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
|
|||
# report actual input values of CONFIG_FILES etc. instead of their
|
||||
# values after options handling.
|
||||
ac_log="
|
||||
This file was extended by gflags $as_me 1.2, which was
|
||||
This file was extended by gflags $as_me 1.3, which was
|
||||
generated by GNU Autoconf 2.64. Invocation command line was
|
||||
|
||||
CONFIG_FILES = $CONFIG_FILES
|
||||
|
|
@ -20628,7 +20628,7 @@ Report bugs to <opensource@google.com>."
|
|||
_ACEOF
|
||||
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
|
||||
ac_cs_version="\\
|
||||
gflags config.status 1.2
|
||||
gflags config.status 1.3
|
||||
configured by $0, generated by GNU Autoconf 2.64,
|
||||
with options \\"`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\"
|
||||
|
||||
|
|
|
|||
|
|
@ -4,7 +4,7 @@
|
|||
# make sure we're interpreted by some minimal autoconf
|
||||
AC_PREREQ(2.57)
|
||||
|
||||
AC_INIT(gflags, 1.2, opensource@google.com)
|
||||
AC_INIT(gflags, 1.3, opensource@google.com)
|
||||
# The argument here is just something that should be in the current directory
|
||||
# (for sanity checking)
|
||||
AC_CONFIG_SRCDIR(README)
|
||||
|
|
|
|||
|
|
@ -317,6 +317,9 @@ HREF="#special"><code>--undefok</code></A> to suppress the error.</p>
|
|||
processing. So in <code>foo -f1 1 -- -f2 2</code>, <code>f1</code> is
|
||||
considered a flag, but <code>-f2</code> is not.</p>
|
||||
|
||||
<p>If a flag is specified more than once, only the last specification
|
||||
is used; the others are ignored.</p>
|
||||
|
||||
<p>Note that flags do not have single-letter synonyms, like they do in
|
||||
the getopt library, nor do we allow "combining" flags behind a
|
||||
single dash, as in <code>ls -la</code>.</p>
|
||||
|
|
|
|||
275
ltmain.sh
275
ltmain.sh
|
|
@ -1,8 +1,8 @@
|
|||
# ltmain.sh - Provide generalized library-building support services.
|
||||
# NOTE: Changing this file will not affect anything until you rerun configure.
|
||||
#
|
||||
# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005
|
||||
# Free Software Foundation, Inc.
|
||||
# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, 2006,
|
||||
# 2007, 2008 Free Software Foundation, Inc.
|
||||
# Originally by Gordon Matzigkeit <gord@gnu.ai.mit.edu>, 1996
|
||||
#
|
||||
# This program is free software; you can redistribute it and/or modify
|
||||
|
|
@ -43,14 +43,22 @@ EXIT_FAILURE=1
|
|||
|
||||
PROGRAM=ltmain.sh
|
||||
PACKAGE=libtool
|
||||
VERSION="1.5.22 Debian 1.5.22-2"
|
||||
TIMESTAMP=" (1.1220.2.365 2005/12/18 22:14:06)"
|
||||
VERSION="1.5.26 Debian 1.5.26-1ubuntu1"
|
||||
TIMESTAMP=" (1.1220.2.493 2008/02/01 16:58:18)"
|
||||
|
||||
# See if we are running on zsh, and set the options which allow our
|
||||
# commands through without removal of \ escapes.
|
||||
if test -n "${ZSH_VERSION+set}" ; then
|
||||
# Be Bourne compatible (taken from Autoconf:_AS_BOURNE_COMPATIBLE).
|
||||
if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
|
||||
emulate sh
|
||||
NULLCMD=:
|
||||
# Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which
|
||||
# is contrary to our usage. Disable this feature.
|
||||
alias -g '${1+"$@"}'='"$@"'
|
||||
setopt NO_GLOB_SUBST
|
||||
else
|
||||
case `(set -o) 2>/dev/null` in *posix*) set -o posix;; esac
|
||||
fi
|
||||
BIN_SH=xpg4; export BIN_SH # for Tru64
|
||||
DUALCASE=1; export DUALCASE # for MKS sh
|
||||
|
||||
# Check that we have a working $echo.
|
||||
if test "X$1" = X--no-reexec; then
|
||||
|
|
@ -105,11 +113,19 @@ esac
|
|||
# These must not be set unconditionally because not all systems understand
|
||||
# e.g. LANG=C (notably SCO).
|
||||
# We save the old values to restore during execute mode.
|
||||
if test "${LC_ALL+set}" = set; then
|
||||
save_LC_ALL="$LC_ALL"; LC_ALL=C; export LC_ALL
|
||||
fi
|
||||
if test "${LANG+set}" = set; then
|
||||
save_LANG="$LANG"; LANG=C; export LANG
|
||||
lt_env=
|
||||
for lt_var in LANG LANGUAGE LC_ALL LC_CTYPE LC_COLLATE LC_MESSAGES
|
||||
do
|
||||
eval "if test \"\${$lt_var+set}\" = set; then
|
||||
save_$lt_var=\$$lt_var
|
||||
lt_env=\"$lt_var=\$$lt_var \$lt_env\"
|
||||
$lt_var=C
|
||||
export $lt_var
|
||||
fi"
|
||||
done
|
||||
|
||||
if test -n "$lt_env"; then
|
||||
lt_env="env $lt_env"
|
||||
fi
|
||||
|
||||
# Make sure IFS has a sensible default
|
||||
|
|
@ -136,6 +152,8 @@ duplicate_deps=no
|
|||
preserve_args=
|
||||
lo2o="s/\\.lo\$/.${objext}/"
|
||||
o2lo="s/\\.${objext}\$/.lo/"
|
||||
extracted_archives=
|
||||
extracted_serial=0
|
||||
|
||||
#####################################
|
||||
# Shell function definitions:
|
||||
|
|
@ -196,7 +214,13 @@ func_win32_libid ()
|
|||
if eval $OBJDUMP -f $1 | $SED -e '10q' 2>/dev/null | \
|
||||
$EGREP -e 'file format pe-i386(.*architecture: i386)?' >/dev/null ; then
|
||||
win32_nmres=`eval $NM -f posix -A $1 | \
|
||||
$SED -n -e '1,100{/ I /{s,.*,import,;p;q;};}'`
|
||||
$SED -n -e '1,100{
|
||||
/ I /{
|
||||
s,.*,import,
|
||||
p
|
||||
q
|
||||
}
|
||||
}'`
|
||||
case $win32_nmres in
|
||||
import*) win32_libid_type="x86 archive import";;
|
||||
*) win32_libid_type="x86 archive static";;
|
||||
|
|
@ -327,7 +351,17 @@ func_extract_archives ()
|
|||
*) my_xabs=`pwd`"/$my_xlib" ;;
|
||||
esac
|
||||
my_xlib=`$echo "X$my_xlib" | $Xsed -e 's%^.*/%%'`
|
||||
my_xdir="$my_gentop/$my_xlib"
|
||||
my_xlib_u=$my_xlib
|
||||
while :; do
|
||||
case " $extracted_archives " in
|
||||
*" $my_xlib_u "*)
|
||||
extracted_serial=`expr $extracted_serial + 1`
|
||||
my_xlib_u=lt$extracted_serial-$my_xlib ;;
|
||||
*) break ;;
|
||||
esac
|
||||
done
|
||||
extracted_archives="$extracted_archives $my_xlib_u"
|
||||
my_xdir="$my_gentop/$my_xlib_u"
|
||||
|
||||
$show "${rm}r $my_xdir"
|
||||
$run ${rm}r "$my_xdir"
|
||||
|
|
@ -454,11 +488,12 @@ do
|
|||
;;
|
||||
|
||||
--version)
|
||||
$echo "$PROGRAM (GNU $PACKAGE) $VERSION$TIMESTAMP"
|
||||
$echo
|
||||
$echo "Copyright (C) 2005 Free Software Foundation, Inc."
|
||||
$echo "This is free software; see the source for copying conditions. There is NO"
|
||||
$echo "warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
|
||||
echo "\
|
||||
$PROGRAM (GNU $PACKAGE) $VERSION$TIMESTAMP
|
||||
|
||||
Copyright (C) 2008 Free Software Foundation, Inc.
|
||||
This is free software; see the source for copying conditions. There is NO
|
||||
warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
|
||||
exit $?
|
||||
;;
|
||||
|
||||
|
|
@ -755,9 +790,11 @@ if test -z "$show_help"; then
|
|||
*.class) xform=class ;;
|
||||
*.cpp) xform=cpp ;;
|
||||
*.cxx) xform=cxx ;;
|
||||
*.f90) xform=f90 ;;
|
||||
*.[fF][09]?) xform=[fF][09]. ;;
|
||||
*.for) xform=for ;;
|
||||
*.java) xform=java ;;
|
||||
*.obj) xform=obj ;;
|
||||
*.sx) xform=sx ;;
|
||||
esac
|
||||
|
||||
libobj=`$echo "X$libobj" | $Xsed -e "s/\.$xform$/.lo/"`
|
||||
|
|
@ -926,7 +963,7 @@ EOF
|
|||
$run $rm "$lobj" "$output_obj"
|
||||
|
||||
$show "$command"
|
||||
if $run eval "$command"; then :
|
||||
if $run eval $lt_env "$command"; then :
|
||||
else
|
||||
test -n "$output_obj" && $run $rm $removelist
|
||||
exit $EXIT_FAILURE
|
||||
|
|
@ -998,7 +1035,7 @@ EOF
|
|||
command="$command$suppress_output"
|
||||
$run $rm "$obj" "$output_obj"
|
||||
$show "$command"
|
||||
if $run eval "$command"; then :
|
||||
if $run eval $lt_env "$command"; then :
|
||||
else
|
||||
$run $rm $removelist
|
||||
exit $EXIT_FAILURE
|
||||
|
|
@ -1131,6 +1168,7 @@ EOF
|
|||
thread_safe=no
|
||||
vinfo=
|
||||
vinfo_number=no
|
||||
single_module="${wl}-single_module"
|
||||
|
||||
func_infer_tag $base_compile
|
||||
|
||||
|
|
@ -1138,8 +1176,9 @@ EOF
|
|||
for arg
|
||||
do
|
||||
case $arg in
|
||||
-all-static | -static)
|
||||
if test "X$arg" = "X-all-static"; then
|
||||
-all-static | -static | -static-libtool-libs)
|
||||
case $arg in
|
||||
-all-static)
|
||||
if test "$build_libtool_libs" = yes && test -z "$link_static_flag"; then
|
||||
$echo "$modename: warning: complete static linking is impossible in this configuration" 1>&2
|
||||
fi
|
||||
|
|
@ -1147,12 +1186,20 @@ EOF
|
|||
dlopen_self=$dlopen_self_static
|
||||
fi
|
||||
prefer_static_libs=yes
|
||||
else
|
||||
;;
|
||||
-static)
|
||||
if test -z "$pic_flag" && test -n "$link_static_flag"; then
|
||||
dlopen_self=$dlopen_self_static
|
||||
fi
|
||||
prefer_static_libs=built
|
||||
fi
|
||||
;;
|
||||
-static-libtool-libs)
|
||||
if test -z "$pic_flag" && test -n "$link_static_flag"; then
|
||||
dlopen_self=$dlopen_self_static
|
||||
fi
|
||||
prefer_static_libs=yes
|
||||
;;
|
||||
esac
|
||||
build_libtool_libs=no
|
||||
build_old_libs=yes
|
||||
break
|
||||
|
|
@ -1600,13 +1647,18 @@ EOF
|
|||
continue
|
||||
;;
|
||||
|
||||
-mt|-mthreads|-kthread|-Kthread|-pthread|-pthreads|--thread-safe)
|
||||
-mt|-mthreads|-kthread|-Kthread|-pthread|-pthreads|--thread-safe|-threads)
|
||||
compiler_flags="$compiler_flags $arg"
|
||||
compile_command="$compile_command $arg"
|
||||
finalize_command="$finalize_command $arg"
|
||||
continue
|
||||
;;
|
||||
|
||||
-multi_module)
|
||||
single_module="${wl}-multi_module"
|
||||
continue
|
||||
;;
|
||||
|
||||
-module)
|
||||
module=yes
|
||||
continue
|
||||
|
|
@ -1620,10 +1672,11 @@ EOF
|
|||
# -m* pass through architecture-specific compiler args for GCC
|
||||
# -m*, -t[45]*, -txscale* pass through architecture-specific
|
||||
# compiler args for GCC
|
||||
# -pg pass through profiling flag for GCC
|
||||
# -p, -pg, --coverage, -fprofile-* pass through profiling flag for GCC
|
||||
# -F/path gives path to uninstalled frameworks, gcc on darwin
|
||||
# @file GCC response files
|
||||
-64|-mips[0-9]|-r[0-9][0-9]*|-xarch=*|-xtarget=*|+DA*|+DD*|-q*|-m*|-pg| \
|
||||
-t[45]*|-txscale*|@*)
|
||||
-64|-mips[0-9]|-r[0-9][0-9]*|-xarch=*|-xtarget=*|+DA*|+DD*|-q*|-m*| \
|
||||
-t[45]*|-txscale*|-p|-pg|--coverage|-fprofile-*|-F*|@*)
|
||||
|
||||
# Unknown arguments in both finalize_command and compile_command need
|
||||
# to be aesthetically quoted because they are evaled later.
|
||||
|
|
@ -1651,9 +1704,9 @@ EOF
|
|||
|
||||
-no-install)
|
||||
case $host in
|
||||
*-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2*)
|
||||
*-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2* | *-*-darwin*)
|
||||
# The PATH hackery in wrapper scripts is required on Windows
|
||||
# in order for the loader to find any dlls it needs.
|
||||
# and Darwin in order for the loader to find any dlls it needs.
|
||||
$echo "$modename: warning: \`-no-install' is ignored for $host" 1>&2
|
||||
$echo "$modename: warning: assuming \`-no-fast-install' instead" 1>&2
|
||||
fast_install=no
|
||||
|
|
@ -1712,7 +1765,7 @@ EOF
|
|||
continue
|
||||
;;
|
||||
|
||||
-static)
|
||||
-static | -static-libtool-libs)
|
||||
# The effects of -static are defined in a previous loop.
|
||||
# We used to do the same as -all-static on platforms that
|
||||
# didn't have a PIC flag, but the assumption that the effects
|
||||
|
|
@ -2097,7 +2150,7 @@ EOF
|
|||
lib=
|
||||
found=no
|
||||
case $deplib in
|
||||
-mt|-mthreads|-kthread|-Kthread|-pthread|-pthreads|--thread-safe)
|
||||
-mt|-mthreads|-kthread|-Kthread|-pthread|-pthreads|--thread-safe|-threads)
|
||||
if test "$linkmode,$pass" = "prog,link"; then
|
||||
compile_deplibs="$deplib $compile_deplibs"
|
||||
finalize_deplibs="$deplib $finalize_deplibs"
|
||||
|
|
@ -2112,7 +2165,12 @@ EOF
|
|||
continue
|
||||
fi
|
||||
name=`$echo "X$deplib" | $Xsed -e 's/^-l//'`
|
||||
for searchdir in $newlib_search_path $lib_search_path $sys_lib_search_path $shlib_search_path; do
|
||||
if test "$linkmode" = lib; then
|
||||
searchdirs="$newlib_search_path $lib_search_path $compiler_lib_search_dirs $sys_lib_search_path $shlib_search_path"
|
||||
else
|
||||
searchdirs="$newlib_search_path $lib_search_path $sys_lib_search_path $shlib_search_path"
|
||||
fi
|
||||
for searchdir in $searchdirs; do
|
||||
for search_ext in .la $std_shrext .so .a; do
|
||||
# Search the libtool library
|
||||
lib="$searchdir/lib${name}${search_ext}"
|
||||
|
|
@ -2493,7 +2551,9 @@ EOF
|
|||
|
||||
if test "$linkmode,$pass" = "prog,link"; then
|
||||
if test -n "$library_names" &&
|
||||
{ test "$prefer_static_libs" = no || test -z "$old_library"; }; then
|
||||
{ { test "$prefer_static_libs" = no ||
|
||||
test "$prefer_static_libs,$installed" = "built,yes"; } ||
|
||||
test -z "$old_library"; }; then
|
||||
# We need to hardcode the library path
|
||||
if test -n "$shlibpath_var" && test -z "$avoidtemprpath" ; then
|
||||
# Make sure the rpath contains only unique directories.
|
||||
|
|
@ -2906,12 +2966,18 @@ EOF
|
|||
# we do not want to link against static libs,
|
||||
# but need to link against shared
|
||||
eval deplibrary_names=`${SED} -n -e 's/^library_names=\(.*\)$/\1/p' $deplib`
|
||||
eval deplibdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $deplib`
|
||||
if test -n "$deplibrary_names" ; then
|
||||
for tmp in $deplibrary_names ; do
|
||||
depdepl=$tmp
|
||||
done
|
||||
if test -f "$path/$depdepl" ; then
|
||||
if test -f "$deplibdir/$depdepl" ; then
|
||||
depdepl="$deplibdir/$depdepl"
|
||||
elif test -f "$path/$depdepl" ; then
|
||||
depdepl="$path/$depdepl"
|
||||
else
|
||||
# Can't find it, oh well...
|
||||
depdepl=
|
||||
fi
|
||||
# do not add paths which are already there
|
||||
case " $newlib_search_path " in
|
||||
|
|
@ -3059,9 +3125,10 @@ EOF
|
|||
|
||||
case $linkmode in
|
||||
oldlib)
|
||||
if test -n "$deplibs"; then
|
||||
$echo "$modename: warning: \`-l' and \`-L' are ignored for archives" 1>&2
|
||||
fi
|
||||
case " $deplibs" in
|
||||
*\ -l* | *\ -L*)
|
||||
$echo "$modename: warning: \`-l' and \`-L' are ignored for archives" 1>&2 ;;
|
||||
esac
|
||||
|
||||
if test -n "$dlfiles$dlprefiles" || test "$dlself" != no; then
|
||||
$echo "$modename: warning: \`-dlopen' is ignored for archives" 1>&2
|
||||
|
|
@ -3189,7 +3256,7 @@ EOF
|
|||
# which has an extra 1 added just for fun
|
||||
#
|
||||
case $version_type in
|
||||
darwin|linux|osf|windows)
|
||||
darwin|linux|osf|windows|none)
|
||||
current=`expr $number_major + $number_minor`
|
||||
age="$number_minor"
|
||||
revision="$number_revision"
|
||||
|
|
@ -3200,9 +3267,10 @@ EOF
|
|||
age="0"
|
||||
;;
|
||||
irix|nonstopux)
|
||||
current=`expr $number_major + $number_minor - 1`
|
||||
current=`expr $number_major + $number_minor`
|
||||
age="$number_minor"
|
||||
revision="$number_minor"
|
||||
lt_irix_increment=no
|
||||
;;
|
||||
*)
|
||||
$echo "$modename: unknown library version type \`$version_type'" 1>&2
|
||||
|
|
@ -3266,7 +3334,8 @@ EOF
|
|||
versuffix="$major.$age.$revision"
|
||||
# Darwin ld doesn't like 0 for these options...
|
||||
minor_current=`expr $current + 1`
|
||||
verstring="${wl}-compatibility_version ${wl}$minor_current ${wl}-current_version ${wl}$minor_current.$revision"
|
||||
xlcverstring="${wl}-compatibility_version ${wl}$minor_current ${wl}-current_version ${wl}$minor_current.$revision"
|
||||
verstring="-compatibility_version $minor_current -current_version $minor_current.$revision"
|
||||
;;
|
||||
|
||||
freebsd-aout)
|
||||
|
|
@ -3280,8 +3349,11 @@ EOF
|
|||
;;
|
||||
|
||||
irix | nonstopux)
|
||||
major=`expr $current - $age + 1`
|
||||
|
||||
if test "X$lt_irix_increment" = "Xno"; then
|
||||
major=`expr $current - $age`
|
||||
else
|
||||
major=`expr $current - $age + 1`
|
||||
fi
|
||||
case $version_type in
|
||||
nonstopux) verstring_prefix=nonstopux ;;
|
||||
*) verstring_prefix=sgi ;;
|
||||
|
|
@ -3418,11 +3490,11 @@ EOF
|
|||
fi
|
||||
|
||||
# Eliminate all temporary directories.
|
||||
for path in $notinst_path; do
|
||||
lib_search_path=`$echo "$lib_search_path " | ${SED} -e "s% $path % %g"`
|
||||
deplibs=`$echo "$deplibs " | ${SED} -e "s% -L$path % %g"`
|
||||
dependency_libs=`$echo "$dependency_libs " | ${SED} -e "s% -L$path % %g"`
|
||||
done
|
||||
#for path in $notinst_path; do
|
||||
# lib_search_path=`$echo "$lib_search_path " | ${SED} -e "s% $path % %g"`
|
||||
# deplibs=`$echo "$deplibs " | ${SED} -e "s% -L$path % %g"`
|
||||
# dependency_libs=`$echo "$dependency_libs " | ${SED} -e "s% -L$path % %g"`
|
||||
#done
|
||||
|
||||
if test -n "$xrpath"; then
|
||||
# If the user specified any rpath flags, then add them.
|
||||
|
|
@ -3523,13 +3595,12 @@ EOF
|
|||
int main() { return 0; }
|
||||
EOF
|
||||
$rm conftest
|
||||
$LTCC $LTCFLAGS -o conftest conftest.c $deplibs
|
||||
if test "$?" -eq 0 ; then
|
||||
if $LTCC $LTCFLAGS -o conftest conftest.c $deplibs; then
|
||||
ldd_output=`ldd conftest`
|
||||
for i in $deplibs; do
|
||||
name=`expr $i : '-l\(.*\)'`
|
||||
# If $name is empty we are operating on a -L argument.
|
||||
if test "$name" != "" && test "$name" -ne "0"; then
|
||||
if test "$name" != "" && test "$name" != "0"; then
|
||||
if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then
|
||||
case " $predeps $postdeps " in
|
||||
*" $i "*)
|
||||
|
|
@ -3568,9 +3639,7 @@ EOF
|
|||
# If $name is empty we are operating on a -L argument.
|
||||
if test "$name" != "" && test "$name" != "0"; then
|
||||
$rm conftest
|
||||
$LTCC $LTCFLAGS -o conftest conftest.c $i
|
||||
# Did it work?
|
||||
if test "$?" -eq 0 ; then
|
||||
if $LTCC $LTCFLAGS -o conftest conftest.c $i; then
|
||||
ldd_output=`ldd conftest`
|
||||
if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then
|
||||
case " $predeps $postdeps " in
|
||||
|
|
@ -3602,7 +3671,7 @@ EOF
|
|||
droppeddeps=yes
|
||||
$echo
|
||||
$echo "*** Warning! Library $i is needed by this library but I was not able to"
|
||||
$echo "*** make it link in! You will probably need to install it or some"
|
||||
$echo "*** make it link in! You will probably need to install it or some"
|
||||
$echo "*** library that it depends on before this library will be fully"
|
||||
$echo "*** functional. Installing it before continuing would be even better."
|
||||
fi
|
||||
|
|
@ -3888,7 +3957,10 @@ EOF
|
|||
test -n "$hardcode_libdirs"; then
|
||||
libdir="$hardcode_libdirs"
|
||||
if test -n "$hardcode_libdir_flag_spec_ld"; then
|
||||
eval dep_rpath=\"$hardcode_libdir_flag_spec_ld\"
|
||||
case $archive_cmds in
|
||||
*\$LD*) eval dep_rpath=\"$hardcode_libdir_flag_spec_ld\" ;;
|
||||
*) eval dep_rpath=\"$hardcode_libdir_flag_spec\" ;;
|
||||
esac
|
||||
else
|
||||
eval dep_rpath=\"$hardcode_libdir_flag_spec\"
|
||||
fi
|
||||
|
|
@ -4198,9 +4270,10 @@ EOF
|
|||
;;
|
||||
|
||||
obj)
|
||||
if test -n "$deplibs"; then
|
||||
$echo "$modename: warning: \`-l' and \`-L' are ignored for objects" 1>&2
|
||||
fi
|
||||
case " $deplibs" in
|
||||
*\ -l* | *\ -L*)
|
||||
$echo "$modename: warning: \`-l' and \`-L' are ignored for objects" 1>&2 ;;
|
||||
esac
|
||||
|
||||
if test -n "$dlfiles$dlprefiles" || test "$dlself" != no; then
|
||||
$echo "$modename: warning: \`-dlopen' is ignored for objects" 1>&2
|
||||
|
|
@ -4247,12 +4320,14 @@ EOF
|
|||
reload_conv_objs=
|
||||
gentop=
|
||||
# reload_cmds runs $LD directly, so let us get rid of
|
||||
# -Wl from whole_archive_flag_spec
|
||||
# -Wl from whole_archive_flag_spec and hope we can get by with
|
||||
# turning comma into space..
|
||||
wl=
|
||||
|
||||
if test -n "$convenience"; then
|
||||
if test -n "$whole_archive_flag_spec"; then
|
||||
eval reload_conv_objs=\"\$reload_objs $whole_archive_flag_spec\"
|
||||
eval tmp_whole_archive_flags=\"$whole_archive_flag_spec\"
|
||||
reload_conv_objs=$reload_objs\ `$echo "X$tmp_whole_archive_flags" | $Xsed -e 's|,| |g'`
|
||||
else
|
||||
gentop="$output_objdir/${obj}x"
|
||||
generated="$generated $gentop"
|
||||
|
|
@ -4700,16 +4775,16 @@ static const void *lt_preloaded_setup() {
|
|||
case $host in
|
||||
*cygwin* | *mingw* )
|
||||
if test -f "$output_objdir/${outputname}.def" ; then
|
||||
compile_command=`$echo "X$compile_command" | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}.def $output_objdir/${outputname}S.${objext}%"`
|
||||
finalize_command=`$echo "X$finalize_command" | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}.def $output_objdir/${outputname}S.${objext}%"`
|
||||
compile_command=`$echo "X$compile_command" | $SP2NL | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}.def $output_objdir/${outputname}S.${objext}%" | $NL2SP`
|
||||
finalize_command=`$echo "X$finalize_command" | $SP2NL | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}.def $output_objdir/${outputname}S.${objext}%" | $NL2SP`
|
||||
else
|
||||
compile_command=`$echo "X$compile_command" | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}S.${objext}%"`
|
||||
finalize_command=`$echo "X$finalize_command" | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}S.${objext}%"`
|
||||
compile_command=`$echo "X$compile_command" | $SP2NL | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}S.${objext}%" | $NL2SP`
|
||||
finalize_command=`$echo "X$finalize_command" | $SP2NL | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}S.${objext}%" | $NL2SP`
|
||||
fi
|
||||
;;
|
||||
* )
|
||||
compile_command=`$echo "X$compile_command" | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}S.${objext}%"`
|
||||
finalize_command=`$echo "X$finalize_command" | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}S.${objext}%"`
|
||||
compile_command=`$echo "X$compile_command" | $SP2NL | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}S.${objext}%" | $NL2SP`
|
||||
finalize_command=`$echo "X$finalize_command" | $SP2NL | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}S.${objext}%" | $NL2SP`
|
||||
;;
|
||||
esac
|
||||
;;
|
||||
|
|
@ -4724,13 +4799,13 @@ static const void *lt_preloaded_setup() {
|
|||
# really was required.
|
||||
|
||||
# Nullify the symbol file.
|
||||
compile_command=`$echo "X$compile_command" | $Xsed -e "s% @SYMFILE@%%"`
|
||||
finalize_command=`$echo "X$finalize_command" | $Xsed -e "s% @SYMFILE@%%"`
|
||||
compile_command=`$echo "X$compile_command" | $SP2NL | $Xsed -e "s% @SYMFILE@%%" | $NL2SP`
|
||||
finalize_command=`$echo "X$finalize_command" | $SP2NL | $Xsed -e "s% @SYMFILE@%%" | $NL2SP`
|
||||
fi
|
||||
|
||||
if test "$need_relink" = no || test "$build_libtool_libs" != yes; then
|
||||
# Replace the output file specification.
|
||||
compile_command=`$echo "X$compile_command" | $Xsed -e 's%@OUTPUT@%'"$output"'%g'`
|
||||
compile_command=`$echo "X$compile_command" | $SP2NL | $Xsed -e 's%@OUTPUT@%'"$output"'%g' | $NL2SP`
|
||||
link_command="$compile_command$compile_rpath"
|
||||
|
||||
# We have no uninstalled library dependencies, so finalize right now.
|
||||
|
|
@ -4817,7 +4892,7 @@ static const void *lt_preloaded_setup() {
|
|||
if test "$fast_install" != no; then
|
||||
link_command="$finalize_var$compile_command$finalize_rpath"
|
||||
if test "$fast_install" = yes; then
|
||||
relink_command=`$echo "X$compile_var$compile_command$compile_rpath" | $Xsed -e 's%@OUTPUT@%\$progdir/\$file%g'`
|
||||
relink_command=`$echo "X$compile_var$compile_command$compile_rpath" | $SP2NL | $Xsed -e 's%@OUTPUT@%\$progdir/\$file%g' | $NL2SP`
|
||||
else
|
||||
# fast_install is set to needless
|
||||
relink_command=
|
||||
|
|
@ -4854,7 +4929,7 @@ static const void *lt_preloaded_setup() {
|
|||
fi
|
||||
done
|
||||
relink_command="(cd `pwd`; $relink_command)"
|
||||
relink_command=`$echo "X$relink_command" | $Xsed -e "$sed_quote_subst"`
|
||||
relink_command=`$echo "X$relink_command" | $SP2NL | $Xsed -e "$sed_quote_subst" | $NL2SP`
|
||||
fi
|
||||
|
||||
# Quote $echo for shipping.
|
||||
|
|
@ -5261,6 +5336,20 @@ EOF
|
|||
Xsed='${SED} -e 1s/^X//'
|
||||
sed_quote_subst='$sed_quote_subst'
|
||||
|
||||
# Be Bourne compatible (taken from Autoconf:_AS_BOURNE_COMPATIBLE).
|
||||
if test -n \"\${ZSH_VERSION+set}\" && (emulate sh) >/dev/null 2>&1; then
|
||||
emulate sh
|
||||
NULLCMD=:
|
||||
# Zsh 3.x and 4.x performs word splitting on \${1+\"\$@\"}, which
|
||||
# is contrary to our usage. Disable this feature.
|
||||
alias -g '\${1+\"\$@\"}'='\"\$@\"'
|
||||
setopt NO_GLOB_SUBST
|
||||
else
|
||||
case \`(set -o) 2>/dev/null\` in *posix*) set -o posix;; esac
|
||||
fi
|
||||
BIN_SH=xpg4; export BIN_SH # for Tru64
|
||||
DUALCASE=1; export DUALCASE # for MKS sh
|
||||
|
||||
# The HP-UX ksh and POSIX shell print the target directory to stdout
|
||||
# if CDPATH is set.
|
||||
(unset CDPATH) >/dev/null 2>&1 && unset CDPATH
|
||||
|
|
@ -5403,7 +5492,7 @@ else
|
|||
;;
|
||||
esac
|
||||
$echo >> $output "\
|
||||
\$echo \"\$0: cannot exec \$program \${1+\"\$@\"}\"
|
||||
\$echo \"\$0: cannot exec \$program \$*\"
|
||||
exit $EXIT_FAILURE
|
||||
fi
|
||||
else
|
||||
|
|
@ -5589,7 +5678,7 @@ fi\
|
|||
done
|
||||
# Quote the link command for shipping.
|
||||
relink_command="(cd `pwd`; $SHELL $progpath $preserve_args --mode=relink $libtool_args @inst_prefix_dir@)"
|
||||
relink_command=`$echo "X$relink_command" | $Xsed -e "$sed_quote_subst"`
|
||||
relink_command=`$echo "X$relink_command" | $SP2NL | $Xsed -e "$sed_quote_subst" | $NL2SP`
|
||||
if test "$hardcode_automatic" = yes ; then
|
||||
relink_command=
|
||||
fi
|
||||
|
|
@ -5934,9 +6023,9 @@ relink_command=\"$relink_command\""
|
|||
|
||||
if test -n "$inst_prefix_dir"; then
|
||||
# Stick the inst_prefix_dir data into the link command.
|
||||
relink_command=`$echo "$relink_command" | $SED "s%@inst_prefix_dir@%-inst-prefix-dir $inst_prefix_dir%"`
|
||||
relink_command=`$echo "$relink_command" | $SP2NL | $SED "s%@inst_prefix_dir@%-inst-prefix-dir $inst_prefix_dir%" | $NL2SP`
|
||||
else
|
||||
relink_command=`$echo "$relink_command" | $SED "s%@inst_prefix_dir@%%"`
|
||||
relink_command=`$echo "$relink_command" | $SP2NL | $SED "s%@inst_prefix_dir@%%" | $NL2SP`
|
||||
fi
|
||||
|
||||
$echo "$modename: warning: relinking \`$file'" 1>&2
|
||||
|
|
@ -6145,7 +6234,7 @@ relink_command=\"$relink_command\""
|
|||
file=`$echo "X$file$stripped_ext" | $Xsed -e 's%^.*/%%'`
|
||||
outputname="$tmpdir/$file"
|
||||
# Replace the output file specification.
|
||||
relink_command=`$echo "X$relink_command" | $Xsed -e 's%@OUTPUT@%'"$outputname"'%g'`
|
||||
relink_command=`$echo "X$relink_command" | $SP2NL | $Xsed -e 's%@OUTPUT@%'"$outputname"'%g' | $NL2SP`
|
||||
|
||||
$show "$relink_command"
|
||||
if $run eval "$relink_command"; then :
|
||||
|
|
@ -6356,8 +6445,10 @@ relink_command=\"$relink_command\""
|
|||
if test -f "$dir/$objdir/$dlname"; then
|
||||
dir="$dir/$objdir"
|
||||
else
|
||||
$echo "$modename: cannot find \`$dlname' in \`$dir' or \`$dir/$objdir'" 1>&2
|
||||
exit $EXIT_FAILURE
|
||||
if test ! -f "$dir/$dlname"; then
|
||||
$echo "$modename: cannot find \`$dlname' in \`$dir' or \`$dir/$objdir'" 1>&2
|
||||
exit $EXIT_FAILURE
|
||||
fi
|
||||
fi
|
||||
;;
|
||||
|
||||
|
|
@ -6421,12 +6512,12 @@ relink_command=\"$relink_command\""
|
|||
fi
|
||||
|
||||
# Restore saved environment variables
|
||||
if test "${save_LC_ALL+set}" = set; then
|
||||
LC_ALL="$save_LC_ALL"; export LC_ALL
|
||||
fi
|
||||
if test "${save_LANG+set}" = set; then
|
||||
LANG="$save_LANG"; export LANG
|
||||
fi
|
||||
for lt_var in LANG LANGUAGE LC_ALL LC_CTYPE LC_COLLATE LC_MESSAGES
|
||||
do
|
||||
eval "if test \"\${save_$lt_var+set}\" = set; then
|
||||
$lt_var=\$save_$lt_var; export $lt_var
|
||||
fi"
|
||||
done
|
||||
|
||||
# Now prepare to actually exec the command.
|
||||
exec_cmd="\$cmd$args"
|
||||
|
|
@ -6783,9 +6874,9 @@ The following components of LINK-COMMAND are treated specially:
|
|||
-dlpreopen FILE link in FILE and add its symbols to lt_preloaded_symbols
|
||||
-export-dynamic allow symbols from OUTPUT-FILE to be resolved with dlsym(3)
|
||||
-export-symbols SYMFILE
|
||||
try to export only the symbols listed in SYMFILE
|
||||
try to export only the symbols listed in SYMFILE
|
||||
-export-symbols-regex REGEX
|
||||
try to export only the symbols matching REGEX
|
||||
try to export only the symbols matching REGEX
|
||||
-LLIBDIR search LIBDIR for required installed libraries
|
||||
-lNAME OUTPUT-FILE requires the installed library libNAME
|
||||
-module build a library that can dlopened
|
||||
|
|
@ -6799,9 +6890,11 @@ The following components of LINK-COMMAND are treated specially:
|
|||
-release RELEASE specify package release information
|
||||
-rpath LIBDIR the created library will eventually be installed in LIBDIR
|
||||
-R[ ]LIBDIR add LIBDIR to the runtime path of programs and libraries
|
||||
-static do not do any dynamic linking of libtool libraries
|
||||
-static do not do any dynamic linking of uninstalled libtool libraries
|
||||
-static-libtool-libs
|
||||
do not do any dynamic linking of libtool libraries
|
||||
-version-info CURRENT[:REVISION[:AGE]]
|
||||
specify library version info [each variable defaults to 0]
|
||||
specify library version info [each variable defaults to 0]
|
||||
|
||||
All other options (arguments beginning with \`-') are ignored.
|
||||
|
||||
|
|
|
|||
|
|
@ -1,3 +1,9 @@
|
|||
gflags (1.3-1) unstable; urgency=low
|
||||
|
||||
* New upstream release.
|
||||
|
||||
-- Google Inc. <opensource@google.com> Mon, 04 Jan 2010 18:09:30 -0800
|
||||
|
||||
gflags (1.2-1) unstable; urgency=low
|
||||
|
||||
* New upstream release.
|
||||
|
|
|
|||
2311
python/gflags.py
2311
python/gflags.py
File diff suppressed because it is too large
Load diff
|
|
@ -1,536 +0,0 @@
|
|||
#!/usr/bin/env python
|
||||
#
|
||||
# Copyright (c) 2007, Google Inc.
|
||||
# All rights reserved.
|
||||
#
|
||||
# Redistribution and use in source and binary forms, with or without
|
||||
# modification, are permitted provided that the following conditions are
|
||||
# met:
|
||||
#
|
||||
# * Redistributions of source code must retain the above copyright
|
||||
# notice, this list of conditions and the following disclaimer.
|
||||
# * Redistributions in binary form must reproduce the above
|
||||
# copyright notice, this list of conditions and the following disclaimer
|
||||
# in the documentation and/or other materials provided with the
|
||||
# distribution.
|
||||
# * Neither the name of Google Inc. nor the names of its
|
||||
# contributors may be used to endorse or promote products derived from
|
||||
# this software without specific prior written permission.
|
||||
#
|
||||
# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
|
||||
# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
|
||||
# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
|
||||
# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
|
||||
# OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
|
||||
# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
|
||||
# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
|
||||
# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
|
||||
# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
|
||||
# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
|
||||
# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
||||
|
||||
"""gflags2man runs a Google flags base program and generates a man page.
|
||||
|
||||
Run the program, parse the output, and then format that into a man
|
||||
page.
|
||||
|
||||
Usage:
|
||||
gflags2man <program> [program] ...
|
||||
"""
|
||||
|
||||
# TODO(csilvers): work with windows paths (\) as well as unix (/)
|
||||
|
||||
# This may seem a bit of an end run, but it: doesn't bloat flags, can
|
||||
# support python/java/C++, supports older executables, and can be
|
||||
# extended to other document formats.
|
||||
# Inspired by help2man.
|
||||
|
||||
__author__ = 'Dan Christian'
|
||||
|
||||
import os
|
||||
import re
|
||||
import sys
|
||||
import stat
|
||||
import time
|
||||
|
||||
import gflags
|
||||
|
||||
_VERSION = '0.1'
|
||||
|
||||
|
||||
def _GetDefaultDestDir():
|
||||
home = os.environ.get('HOME', '')
|
||||
homeman = os.path.join(home, 'man', 'man1')
|
||||
if home and os.path.exists(homeman):
|
||||
return homeman
|
||||
else:
|
||||
return os.environ.get('TMPDIR', '/tmp')
|
||||
|
||||
FLAGS = gflags.FLAGS
|
||||
gflags.DEFINE_string('dest_dir', _GetDefaultDestDir(),
|
||||
'Directory to write resulting manpage to.'
|
||||
' Specify \'-\' for stdout')
|
||||
gflags.DEFINE_string('help_flag', '--help',
|
||||
'Option to pass to target program in to get help')
|
||||
gflags.DEFINE_integer('v', 0, 'verbosity level to use for output')
|
||||
|
||||
_MIN_VALID_USAGE_MSG = 9 # if fewer lines than this, help is suspect
|
||||
|
||||
|
||||
class Logging:
|
||||
"""A super-simple logging class"""
|
||||
def error(self, msg): print >>sys.stderr, "ERROR: ", msg
|
||||
def warn(self, msg): print >>sys.stderr, "WARNING: ", msg
|
||||
def info(self, msg): print msg
|
||||
def debug(self, msg): self.vlog(1, msg)
|
||||
def vlog(self, level, msg):
|
||||
if FLAGS.v >= level: print msg
|
||||
logging = Logging()
|
||||
|
||||
|
||||
def GetRealPath(filename):
|
||||
"""Given an executable filename, find in the PATH or find absolute path.
|
||||
Args:
|
||||
filename An executable filename (string)
|
||||
Returns:
|
||||
Absolute version of filename.
|
||||
None if filename could not be found locally, absolutely, or in PATH
|
||||
"""
|
||||
if os.path.isabs(filename): # already absolute
|
||||
return filename
|
||||
|
||||
if filename.startswith('./') or filename.startswith('../'): # relative
|
||||
return os.path.abspath(filename)
|
||||
|
||||
path = os.getenv('PATH', '')
|
||||
for directory in path.split(':'):
|
||||
tryname = os.path.join(directory, filename)
|
||||
if os.path.exists(tryname):
|
||||
if not os.path.isabs(directory): # relative directory
|
||||
return os.path.abspath(tryname)
|
||||
return tryname
|
||||
if os.path.exists(filename):
|
||||
return os.path.abspath(filename)
|
||||
return None # could not determine
|
||||
|
||||
class Flag(object):
|
||||
"""The information about a single flag."""
|
||||
|
||||
def __init__(self, flag_desc, help):
|
||||
"""Create the flag object.
|
||||
Args:
|
||||
flag_desc The command line forms this could take. (string)
|
||||
help The help text (string)
|
||||
"""
|
||||
self.desc = flag_desc # the command line forms
|
||||
self.help = help # the help text
|
||||
self.default = '' # default value
|
||||
self.tips = '' # parsing/syntax tips
|
||||
|
||||
|
||||
class ProgramInfo(object):
|
||||
"""All the information gleaned from running a program with --help."""
|
||||
|
||||
# Match a module block start, for python scripts --help
|
||||
# "goopy.logging:"
|
||||
module_py_re = re.compile(r'(\S.+):$')
|
||||
# match the start of a flag listing
|
||||
# " -v,--verbosity: Logging verbosity"
|
||||
flag_py_re = re.compile(r'\s+(-\S+):\s+(.*)$')
|
||||
# " (default: '0')"
|
||||
flag_default_py_re = re.compile(r'\s+\(default:\s+\'(.*)\'\)$')
|
||||
# " (an integer)"
|
||||
flag_tips_py_re = re.compile(r'\s+\((.*)\)$')
|
||||
|
||||
# Match a module block start, for c++ programs --help
|
||||
# "google/base/commandlineflags"
|
||||
module_c_re = re.compile(r'\s+Flags from (\S.+):$')
|
||||
# match the start of a flag listing
|
||||
# " -v,--verbosity: Logging verbosity"
|
||||
flag_c_re = re.compile(r'\s+(-\S+)\s+(.*)$')
|
||||
|
||||
# Match a module block start, for java programs --help
|
||||
# "com.google.common.flags"
|
||||
module_java_re = re.compile(r'\s+Flags for (\S.+):$')
|
||||
# match the start of a flag listing
|
||||
# " -v,--verbosity: Logging verbosity"
|
||||
flag_java_re = re.compile(r'\s+(-\S+)\s+(.*)$')
|
||||
|
||||
def __init__(self, executable):
|
||||
"""Create object with executable.
|
||||
Args:
|
||||
executable Program to execute (string)
|
||||
"""
|
||||
self.long_name = executable
|
||||
self.name = os.path.basename(executable) # name
|
||||
# Get name without extension (PAR files)
|
||||
(self.short_name, self.ext) = os.path.splitext(self.name)
|
||||
self.executable = GetRealPath(executable) # name of the program
|
||||
self.output = [] # output from the program. List of lines.
|
||||
self.desc = [] # top level description. List of lines
|
||||
self.modules = {} # { section_name(string), [ flags ] }
|
||||
self.module_list = [] # list of module names in their original order
|
||||
self.date = time.localtime(time.time()) # default date info
|
||||
|
||||
def Run(self):
|
||||
"""Run it and collect output.
|
||||
|
||||
Returns:
|
||||
1 (true) If everything went well.
|
||||
0 (false) If there were problems.
|
||||
"""
|
||||
if not self.executable:
|
||||
logging.error('Could not locate "%s"' % self.long_name)
|
||||
return 0
|
||||
|
||||
finfo = os.stat(self.executable)
|
||||
self.date = time.localtime(finfo[stat.ST_MTIME])
|
||||
|
||||
logging.info('Running: %s %s </dev/null 2>&1'
|
||||
% (self.executable, FLAGS.help_flag))
|
||||
# --help output is often routed to stderr, so we combine with stdout.
|
||||
# Re-direct stdin to /dev/null to encourage programs that
|
||||
# don't understand --help to exit.
|
||||
(child_stdin, child_stdout_and_stderr) = os.popen4(
|
||||
[self.executable, FLAGS.help_flag])
|
||||
child_stdin.close() # '</dev/null'
|
||||
self.output = child_stdout_and_stderr.readlines()
|
||||
child_stdout_and_stderr.close()
|
||||
if len(self.output) < _MIN_VALID_USAGE_MSG:
|
||||
logging.error('Error: "%s %s" returned only %d lines: %s'
|
||||
% (self.name, FLAGS.help_flag,
|
||||
len(self.output), self.output))
|
||||
return 0
|
||||
return 1
|
||||
|
||||
def Parse(self):
|
||||
"""Parse program output."""
|
||||
(start_line, lang) = self.ParseDesc()
|
||||
if start_line < 0:
|
||||
return
|
||||
if 'python' == lang:
|
||||
self.ParsePythonFlags(start_line)
|
||||
elif 'c' == lang:
|
||||
self.ParseCFlags(start_line)
|
||||
elif 'java' == lang:
|
||||
self.ParseJavaFlags(start_line)
|
||||
|
||||
def ParseDesc(self, start_line=0):
|
||||
"""Parse the initial description.
|
||||
|
||||
This could be Python or C++.
|
||||
|
||||
Returns:
|
||||
(start_line, lang_type)
|
||||
start_line Line to start parsing flags on (int)
|
||||
lang_type Either 'python' or 'c'
|
||||
(-1, '') if the flags start could not be found
|
||||
"""
|
||||
exec_mod_start = self.executable + ':'
|
||||
|
||||
after_blank = 0
|
||||
start_line = 0 # ignore the passed-in arg for now (?)
|
||||
for start_line in range(start_line, len(self.output)): # collect top description
|
||||
line = self.output[start_line].rstrip()
|
||||
# Python flags start with 'flags:\n'
|
||||
if ('flags:' == line
|
||||
and len(self.output) > start_line+1
|
||||
and '' == self.output[start_line+1].rstrip()):
|
||||
start_line += 2
|
||||
logging.debug('Flags start (python): %s' % line)
|
||||
return (start_line, 'python')
|
||||
# SWIG flags just have the module name followed by colon.
|
||||
if exec_mod_start == line:
|
||||
logging.debug('Flags start (swig): %s' % line)
|
||||
return (start_line, 'python')
|
||||
# C++ flags begin after a blank line and with a constant string
|
||||
if after_blank and line.startswith(' Flags from '):
|
||||
logging.debug('Flags start (c): %s' % line)
|
||||
return (start_line, 'c')
|
||||
# java flags begin with a constant string
|
||||
if line == 'where flags are':
|
||||
logging.debug('Flags start (java): %s' % line)
|
||||
start_line += 2 # skip "Standard flags:"
|
||||
return (start_line, 'java')
|
||||
|
||||
logging.debug('Desc: %s' % line)
|
||||
self.desc.append(line)
|
||||
after_blank = (line == '')
|
||||
else:
|
||||
logging.warn('Never found the start of the flags section for "%s"!'
|
||||
% self.long_name)
|
||||
return (-1, '')
|
||||
|
||||
def ParsePythonFlags(self, start_line=0):
|
||||
"""Parse python/swig style flags."""
|
||||
modname = None # name of current module
|
||||
modlist = []
|
||||
flag = None
|
||||
for line_num in range(start_line, len(self.output)): # collect flags
|
||||
line = self.output[line_num].rstrip()
|
||||
if not line: # blank
|
||||
continue
|
||||
|
||||
mobj = self.module_py_re.match(line)
|
||||
if mobj: # start of a new module
|
||||
modname = mobj.group(1)
|
||||
logging.debug('Module: %s' % line)
|
||||
if flag:
|
||||
modlist.append(flag)
|
||||
self.module_list.append(modname)
|
||||
self.modules.setdefault(modname, [])
|
||||
modlist = self.modules[modname]
|
||||
flag = None
|
||||
continue
|
||||
|
||||
mobj = self.flag_py_re.match(line)
|
||||
if mobj: # start of a new flag
|
||||
if flag:
|
||||
modlist.append(flag)
|
||||
logging.debug('Flag: %s' % line)
|
||||
flag = Flag(mobj.group(1), mobj.group(2))
|
||||
continue
|
||||
|
||||
if not flag: # continuation of a flag
|
||||
logging.error('Flag info, but no current flag "%s"' % line)
|
||||
mobj = self.flag_default_py_re.match(line)
|
||||
if mobj: # (default: '...')
|
||||
flag.default = mobj.group(1)
|
||||
logging.debug('Fdef: %s' % line)
|
||||
continue
|
||||
mobj = self.flag_tips_py_re.match(line)
|
||||
if mobj: # (tips)
|
||||
flag.tips = mobj.group(1)
|
||||
logging.debug('Ftip: %s' % line)
|
||||
continue
|
||||
if flag and flag.help:
|
||||
flag.help += line # multiflags tack on an extra line
|
||||
else:
|
||||
logging.info('Extra: %s' % line)
|
||||
if flag:
|
||||
modlist.append(flag)
|
||||
|
||||
def ParseCFlags(self, start_line=0):
|
||||
"""Parse C style flags."""
|
||||
modname = None # name of current module
|
||||
modlist = []
|
||||
flag = None
|
||||
for line_num in range(start_line, len(self.output)): # collect flags
|
||||
line = self.output[line_num].rstrip()
|
||||
if not line: # blank lines terminate flags
|
||||
if flag: # save last flag
|
||||
modlist.append(flag)
|
||||
flag = None
|
||||
continue
|
||||
|
||||
mobj = self.module_c_re.match(line)
|
||||
if mobj: # start of a new module
|
||||
modname = mobj.group(1)
|
||||
logging.debug('Module: %s' % line)
|
||||
if flag:
|
||||
modlist.append(flag)
|
||||
self.module_list.append(modname)
|
||||
self.modules.setdefault(modname, [])
|
||||
modlist = self.modules[modname]
|
||||
flag = None
|
||||
continue
|
||||
|
||||
mobj = self.flag_c_re.match(line)
|
||||
if mobj: # start of a new flag
|
||||
if flag: # save last flag
|
||||
modlist.append(flag)
|
||||
logging.debug('Flag: %s' % line)
|
||||
flag = Flag(mobj.group(1), mobj.group(2))
|
||||
continue
|
||||
|
||||
# append to flag help. type and default are part of the main text
|
||||
if flag:
|
||||
flag.help += ' ' + line.strip()
|
||||
else:
|
||||
logging.info('Extra: %s' % line)
|
||||
if flag:
|
||||
modlist.append(flag)
|
||||
|
||||
def ParseJavaFlags(self, start_line=0):
|
||||
"""Parse Java style flags (com.google.common.flags)."""
|
||||
# The java flags prints starts with a "Standard flags" "module"
|
||||
# that doesn't follow the standard module syntax.
|
||||
modname = 'Standard flags' # name of current module
|
||||
self.module_list.append(modname)
|
||||
self.modules.setdefault(modname, [])
|
||||
modlist = self.modules[modname]
|
||||
flag = None
|
||||
|
||||
for line_num in range(start_line, len(self.output)): # collect flags
|
||||
line = self.output[line_num].rstrip()
|
||||
logging.vlog(2, 'Line: "%s"' % line)
|
||||
if not line: # blank lines terminate module
|
||||
if flag: # save last flag
|
||||
modlist.append(flag)
|
||||
flag = None
|
||||
continue
|
||||
|
||||
mobj = self.module_java_re.match(line)
|
||||
if mobj: # start of a new module
|
||||
modname = mobj.group(1)
|
||||
logging.debug('Module: %s' % line)
|
||||
if flag:
|
||||
modlist.append(flag)
|
||||
self.module_list.append(modname)
|
||||
self.modules.setdefault(modname, [])
|
||||
modlist = self.modules[modname]
|
||||
flag = None
|
||||
continue
|
||||
|
||||
mobj = self.flag_java_re.match(line)
|
||||
if mobj: # start of a new flag
|
||||
if flag: # save last flag
|
||||
modlist.append(flag)
|
||||
logging.debug('Flag: %s' % line)
|
||||
flag = Flag(mobj.group(1), mobj.group(2))
|
||||
continue
|
||||
|
||||
# append to flag help. type and default are part of the main text
|
||||
if flag:
|
||||
flag.help += ' ' + line.strip()
|
||||
else:
|
||||
logging.info('Extra: %s' % line)
|
||||
if flag:
|
||||
modlist.append(flag)
|
||||
|
||||
def Filter(self):
|
||||
"""Filter parsed data to create derived fields."""
|
||||
if not self.desc:
|
||||
self.short_desc = ''
|
||||
return
|
||||
|
||||
for i in range(len(self.desc)): # replace full path with name
|
||||
if self.desc[i].find(self.executable) >= 0:
|
||||
self.desc[i] = self.desc[i].replace(self.executable, self.name)
|
||||
|
||||
self.short_desc = self.desc[0]
|
||||
word_list = self.short_desc.split(' ')
|
||||
all_names = [ self.name, self.short_name, ]
|
||||
# Since the short_desc is always listed right after the name,
|
||||
# trim it from the short_desc
|
||||
while word_list and (word_list[0] in all_names
|
||||
or word_list[0].lower() in all_names):
|
||||
del word_list[0]
|
||||
self.short_desc = '' # signal need to reconstruct
|
||||
if not self.short_desc and word_list:
|
||||
self.short_desc = ' '.join(word_list)
|
||||
|
||||
|
||||
class GenerateDoc(object):
|
||||
"""Base class to output flags information."""
|
||||
|
||||
def __init__(self, proginfo, directory='.'):
|
||||
"""Create base object.
|
||||
Args:
|
||||
proginfo A ProgramInfo object
|
||||
directory Directory to write output into
|
||||
"""
|
||||
self.info = proginfo
|
||||
self.dirname = directory
|
||||
|
||||
def Output(self):
|
||||
"""Output all sections of the page."""
|
||||
self.Open()
|
||||
self.Header()
|
||||
self.Body()
|
||||
self.Footer()
|
||||
|
||||
def Open(self): raise NotImplementedError # define in subclass
|
||||
def Header(self): raise NotImplementedError # define in subclass
|
||||
def Body(self): raise NotImplementedError # define in subclass
|
||||
def Footer(self): raise NotImplementedError # define in subclass
|
||||
|
||||
|
||||
class GenerateMan(GenerateDoc):
|
||||
"""Output a man page."""
|
||||
|
||||
def __init__(self, proginfo, directory='.'):
|
||||
"""Create base object.
|
||||
Args:
|
||||
proginfo A ProgramInfo object
|
||||
directory Directory to write output into
|
||||
"""
|
||||
GenerateDoc.__init__(self, proginfo, directory)
|
||||
|
||||
def Open(self):
|
||||
if self.dirname == '-':
|
||||
logging.info('Writing to stdout')
|
||||
self.fp = sys.stdout
|
||||
else:
|
||||
self.file_path = '%s.1' % os.path.join(self.dirname, self.info.name)
|
||||
logging.info('Writing: %s' % self.file_path)
|
||||
self.fp = open(self.file_path, 'w')
|
||||
|
||||
def Header(self):
|
||||
self.fp.write(
|
||||
'.\\" DO NOT MODIFY THIS FILE! It was generated by gflags2man %s\n'
|
||||
% _VERSION)
|
||||
self.fp.write(
|
||||
'.TH %s "1" "%s" "%s" "User Commands"\n'
|
||||
% (self.info.name, time.strftime('%x', self.info.date), self.info.name))
|
||||
self.fp.write(
|
||||
'.SH NAME\n%s \\- %s\n' % (self.info.name, self.info.short_desc))
|
||||
self.fp.write(
|
||||
'.SH SYNOPSIS\n.B %s\n[\\fIFLAGS\\fR]...\n' % self.info.name)
|
||||
|
||||
def Body(self):
|
||||
self.fp.write(
|
||||
'.SH DESCRIPTION\n.\\" Add any additional description here\n.PP\n')
|
||||
for ln in self.info.desc:
|
||||
self.fp.write('%s\n' % ln)
|
||||
self.fp.write(
|
||||
'.SH OPTIONS\n')
|
||||
# This shows flags in the original order
|
||||
for modname in self.info.module_list:
|
||||
if modname.find(self.info.executable) >= 0:
|
||||
mod = modname.replace(self.info.executable, self.info.name)
|
||||
else:
|
||||
mod = modname
|
||||
self.fp.write('\n.P\n.I %s\n' % mod)
|
||||
for flag in self.info.modules[modname]:
|
||||
help_string = flag.help
|
||||
if flag.default or flag.tips:
|
||||
help_string += '\n.br\n'
|
||||
if flag.default:
|
||||
help_string += ' (default: \'%s\')' % flag.default
|
||||
if flag.tips:
|
||||
help_string += ' (%s)' % flag.tips
|
||||
self.fp.write(
|
||||
'.TP\n%s\n%s\n' % (flag.desc, help_string))
|
||||
|
||||
def Footer(self):
|
||||
self.fp.write(
|
||||
'.SH COPYRIGHT\nCopyright \(co %s Google.\n'
|
||||
% time.strftime('%Y', self.info.date))
|
||||
self.fp.write('Gflags2man created this page from "%s %s" output.\n'
|
||||
% (self.info.name, FLAGS.help_flag))
|
||||
self.fp.write('\nGflags2man was written by Dan Christian. '
|
||||
' Note that the date on this'
|
||||
' page is the modification date of %s.\n' % self.info.name)
|
||||
|
||||
|
||||
def main(argv):
|
||||
argv = FLAGS(argv) # handles help as well
|
||||
if len(argv) <= 1:
|
||||
print >>sys.stderr, __doc__
|
||||
print >>sys.stderr, "flags:"
|
||||
print >>sys.stderr, str(FLAGS)
|
||||
return 1
|
||||
|
||||
for arg in argv[1:]:
|
||||
prog = ProgramInfo(arg)
|
||||
if not prog.Run():
|
||||
continue
|
||||
prog.Parse()
|
||||
prog.Filter()
|
||||
doc = GenerateMan(prog, FLAGS.dest_dir)
|
||||
doc.Output()
|
||||
return 0
|
||||
|
||||
if __name__ == '__main__':
|
||||
main(sys.argv)
|
||||
|
|
@ -1,563 +0,0 @@
|
|||
#!/usr/bin/env python
|
||||
|
||||
# Copyright (c) 2009, Google Inc.
|
||||
# All rights reserved.
|
||||
#
|
||||
# Redistribution and use in source and binary forms, with or without
|
||||
# modification, are permitted provided that the following conditions are
|
||||
# met:
|
||||
#
|
||||
# * Redistributions of source code must retain the above copyright
|
||||
# notice, this list of conditions and the following disclaimer.
|
||||
# * Redistributions in binary form must reproduce the above
|
||||
# copyright notice, this list of conditions and the following disclaimer
|
||||
# in the documentation and/or other materials provided with the
|
||||
# distribution.
|
||||
# * Neither the name of Google Inc. nor the names of its
|
||||
# contributors may be used to endorse or promote products derived from
|
||||
# this software without specific prior written permission.
|
||||
#
|
||||
# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
|
||||
# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
|
||||
# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
|
||||
# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
|
||||
# OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
|
||||
# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
|
||||
# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
|
||||
# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
|
||||
# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
|
||||
# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
|
||||
# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
||||
|
||||
"""Unit tests for the XML-format help generated by the gflags.py module."""
|
||||
|
||||
__author__ = 'Alex Salcianu'
|
||||
|
||||
|
||||
import string
|
||||
import StringIO
|
||||
import sys
|
||||
import unittest
|
||||
import xml.dom.minidom
|
||||
import xml.sax.saxutils
|
||||
|
||||
# We use the name 'flags' internally in this test, for historical reasons.
|
||||
# Don't do this yourself! :-) Just do 'import gflags; FLAGS=gflags.FLAGS; etc'
|
||||
import gflags as flags
|
||||
|
||||
# For historic reasons, we use the name module_bar instead of test_module_bar
|
||||
import test_module_bar as module_bar
|
||||
|
||||
def MultiLineEqual(expected_help, help):
|
||||
"""Returns True if expected_help == help. Otherwise returns False
|
||||
and logs the difference in a human-readable way.
|
||||
"""
|
||||
if help == expected_help:
|
||||
return True
|
||||
|
||||
print "Error: FLAGS.MainModuleHelp() didn't return the expected result."
|
||||
print "Got:"
|
||||
print help
|
||||
print "[End of got]"
|
||||
|
||||
help_lines = help.split('\n')
|
||||
expected_help_lines = expected_help.split('\n')
|
||||
|
||||
num_help_lines = len(help_lines)
|
||||
num_expected_help_lines = len(expected_help_lines)
|
||||
|
||||
if num_help_lines != num_expected_help_lines:
|
||||
print "Number of help lines = %d, expected %d" % (
|
||||
num_help_lines, num_expected_help_lines)
|
||||
|
||||
num_to_match = min(num_help_lines, num_expected_help_lines)
|
||||
|
||||
for i in range(num_to_match):
|
||||
if help_lines[i] != expected_help_lines[i]:
|
||||
print "One discrepancy: Got:"
|
||||
print help_lines[i]
|
||||
print "Expected:"
|
||||
print expected_help_lines[i]
|
||||
break
|
||||
else:
|
||||
# If we got here, found no discrepancy, print first new line.
|
||||
if num_help_lines > num_expected_help_lines:
|
||||
print "New help line:"
|
||||
print help_lines[num_expected_help_lines]
|
||||
elif num_expected_help_lines > num_help_lines:
|
||||
print "Missing expected help line:"
|
||||
print expected_help_lines[num_help_lines]
|
||||
else:
|
||||
print "Bug in this test -- discrepancy detected but not found."
|
||||
|
||||
return False
|
||||
|
||||
|
||||
class _MakeXMLSafeTest(unittest.TestCase):
|
||||
|
||||
def _Check(self, s, expected_output):
|
||||
self.assertEqual(flags._MakeXMLSafe(s), expected_output)
|
||||
|
||||
def testMakeXMLSafe(self):
|
||||
self._Check('plain text', 'plain text')
|
||||
self._Check('(x < y) && (a >= b)',
|
||||
'(x < y) && (a >= b)')
|
||||
# Some characters with ASCII code < 32 are illegal in XML 1.0 and
|
||||
# are removed by us. However, '\n', '\t', and '\r' are legal.
|
||||
self._Check('\x09\x0btext \x02 with\x0dsome \x08 good & bad chars',
|
||||
'\ttext with\rsome good & bad chars')
|
||||
|
||||
|
||||
def _ListSeparatorsInXMLFormat(separators, indent=''):
|
||||
"""Generates XML encoding of a list of list separators.
|
||||
|
||||
Args:
|
||||
separators: A list of list separators. Usually, this should be a
|
||||
string whose characters are the valid list separators, e.g., ','
|
||||
means that both comma (',') and space (' ') are valid list
|
||||
separators.
|
||||
indent: A string that is added at the beginning of each generated
|
||||
XML element.
|
||||
|
||||
Returns:
|
||||
A string.
|
||||
"""
|
||||
result = ''
|
||||
separators = list(separators)
|
||||
separators.sort()
|
||||
for sep_char in separators:
|
||||
result += ('%s<list_separator>%s</list_separator>\n' %
|
||||
(indent, repr(sep_char)))
|
||||
return result
|
||||
|
||||
|
||||
class WriteFlagHelpInXMLFormatTest(unittest.TestCase):
|
||||
"""Test the XML-format help for a single flag at a time.
|
||||
|
||||
There is one test* method for each kind of DEFINE_* declaration.
|
||||
"""
|
||||
|
||||
def setUp(self):
|
||||
# self.fv is a FlagValues object, just like flags.FLAGS. Each
|
||||
# test registers one flag with this FlagValues.
|
||||
self.fv = flags.FlagValues()
|
||||
|
||||
def assertMultiLineEqual(self, expected, actual):
|
||||
self.assert_(MultiLineEqual(expected, actual))
|
||||
|
||||
def _CheckFlagHelpInXML(self, flag_name, module_name,
|
||||
expected_output, is_key=False):
|
||||
# StringIO.StringIO is a file object that writes into a memory string.
|
||||
sio = StringIO.StringIO()
|
||||
flag_obj = self.fv[flag_name]
|
||||
flag_obj.WriteInfoInXMLFormat(sio, module_name, is_key=is_key, indent=' ')
|
||||
self.assertMultiLineEqual(sio.getvalue(), expected_output)
|
||||
sio.close()
|
||||
|
||||
def testFlagHelpInXML_Int(self):
|
||||
flags.DEFINE_integer('index', 17, 'An integer flag', flag_values=self.fv)
|
||||
expected_output_pattern = (
|
||||
' <flag>\n'
|
||||
' <file>module.name</file>\n'
|
||||
' <name>index</name>\n'
|
||||
' <meaning>An integer flag</meaning>\n'
|
||||
' <default>17</default>\n'
|
||||
' <current>%d</current>\n'
|
||||
' <type>int</type>\n'
|
||||
' </flag>\n')
|
||||
self._CheckFlagHelpInXML('index', 'module.name',
|
||||
expected_output_pattern % 17)
|
||||
# Check that the output is correct even when the current value of
|
||||
# a flag is different from the default one.
|
||||
self.fv['index'].value = 20
|
||||
self._CheckFlagHelpInXML('index', 'module.name',
|
||||
expected_output_pattern % 20)
|
||||
|
||||
def testFlagHelpInXML_IntWithBounds(self):
|
||||
flags.DEFINE_integer('nb_iters', 17, 'An integer flag',
|
||||
lower_bound=5, upper_bound=27,
|
||||
flag_values=self.fv)
|
||||
expected_output = (
|
||||
' <flag>\n'
|
||||
' <key>yes</key>\n'
|
||||
' <file>module.name</file>\n'
|
||||
' <name>nb_iters</name>\n'
|
||||
' <meaning>An integer flag</meaning>\n'
|
||||
' <default>17</default>\n'
|
||||
' <current>17</current>\n'
|
||||
' <type>int</type>\n'
|
||||
' <lower_bound>5</lower_bound>\n'
|
||||
' <upper_bound>27</upper_bound>\n'
|
||||
' </flag>\n')
|
||||
self._CheckFlagHelpInXML('nb_iters', 'module.name',
|
||||
expected_output, is_key=True)
|
||||
|
||||
def testFlagHelpInXML_String(self):
|
||||
flags.DEFINE_string('file_path', '/path/to/my/dir', 'A test string flag.',
|
||||
flag_values=self.fv)
|
||||
expected_output = (
|
||||
' <flag>\n'
|
||||
' <file>simple_module</file>\n'
|
||||
' <name>file_path</name>\n'
|
||||
' <meaning>A test string flag.</meaning>\n'
|
||||
' <default>/path/to/my/dir</default>\n'
|
||||
' <current>/path/to/my/dir</current>\n'
|
||||
' <type>string</type>\n'
|
||||
' </flag>\n')
|
||||
self._CheckFlagHelpInXML('file_path', 'simple_module',
|
||||
expected_output)
|
||||
|
||||
def testFlagHelpInXML_StringWithXMLIllegalChars(self):
|
||||
flags.DEFINE_string('file_path', '/path/to/\x08my/dir',
|
||||
'A test string flag.', flag_values=self.fv)
|
||||
# '\x08' is not a legal character in XML 1.0 documents. Our
|
||||
# current code purges such characters from the generated XML.
|
||||
expected_output = (
|
||||
' <flag>\n'
|
||||
' <file>simple_module</file>\n'
|
||||
' <name>file_path</name>\n'
|
||||
' <meaning>A test string flag.</meaning>\n'
|
||||
' <default>/path/to/my/dir</default>\n'
|
||||
' <current>/path/to/my/dir</current>\n'
|
||||
' <type>string</type>\n'
|
||||
' </flag>\n')
|
||||
self._CheckFlagHelpInXML('file_path', 'simple_module',
|
||||
expected_output)
|
||||
|
||||
def testFlagHelpInXML_Boolean(self):
|
||||
flags.DEFINE_boolean('use_hack', False, 'Use performance hack',
|
||||
flag_values=self.fv)
|
||||
expected_output = (
|
||||
' <flag>\n'
|
||||
' <key>yes</key>\n'
|
||||
' <file>a_module</file>\n'
|
||||
' <name>use_hack</name>\n'
|
||||
' <meaning>Use performance hack</meaning>\n'
|
||||
' <default>false</default>\n'
|
||||
' <current>false</current>\n'
|
||||
' <type>bool</type>\n'
|
||||
' </flag>\n')
|
||||
self._CheckFlagHelpInXML('use_hack', 'a_module',
|
||||
expected_output, is_key=True)
|
||||
|
||||
def testFlagHelpInXML_Enum(self):
|
||||
flags.DEFINE_enum('cc_version', 'stable', ['stable', 'experimental'],
|
||||
'Compiler version to use.', flag_values=self.fv)
|
||||
expected_output = (
|
||||
' <flag>\n'
|
||||
' <file>tool</file>\n'
|
||||
' <name>cc_version</name>\n'
|
||||
' <meaning><stable|experimental>: '
|
||||
'Compiler version to use.</meaning>\n'
|
||||
' <default>stable</default>\n'
|
||||
' <current>stable</current>\n'
|
||||
' <type>string enum</type>\n'
|
||||
' <enum_value>stable</enum_value>\n'
|
||||
' <enum_value>experimental</enum_value>\n'
|
||||
' </flag>\n')
|
||||
self._CheckFlagHelpInXML('cc_version', 'tool', expected_output)
|
||||
|
||||
def testFlagHelpInXML_CommaSeparatedList(self):
|
||||
flags.DEFINE_list('files', 'a.cc,a.h,archive/old.zip',
|
||||
'Files to process.', flag_values=self.fv)
|
||||
expected_output = (
|
||||
' <flag>\n'
|
||||
' <file>tool</file>\n'
|
||||
' <name>files</name>\n'
|
||||
' <meaning>Files to process.</meaning>\n'
|
||||
' <default>a.cc,a.h,archive/old.zip</default>\n'
|
||||
' <current>[\'a.cc\', \'a.h\', \'archive/old.zip\']</current>\n'
|
||||
' <type>comma separated list of strings</type>\n'
|
||||
' <list_separator>\',\'</list_separator>\n'
|
||||
' </flag>\n')
|
||||
self._CheckFlagHelpInXML('files', 'tool', expected_output)
|
||||
|
||||
def testFlagHelpInXML_SpaceSeparatedList(self):
|
||||
flags.DEFINE_spaceseplist('dirs', 'src libs bin',
|
||||
'Directories to search.', flag_values=self.fv)
|
||||
expected_output = (
|
||||
' <flag>\n'
|
||||
' <file>tool</file>\n'
|
||||
' <name>dirs</name>\n'
|
||||
' <meaning>Directories to search.</meaning>\n'
|
||||
' <default>src libs bin</default>\n'
|
||||
' <current>[\'src\', \'libs\', \'bin\']</current>\n'
|
||||
' <type>whitespace separated list of strings</type>\n'
|
||||
'LIST_SEPARATORS'
|
||||
' </flag>\n').replace('LIST_SEPARATORS',
|
||||
_ListSeparatorsInXMLFormat(string.whitespace,
|
||||
indent=' '))
|
||||
self._CheckFlagHelpInXML('dirs', 'tool', expected_output)
|
||||
|
||||
def testFlagHelpInXML_MultiString(self):
|
||||
flags.DEFINE_multistring('to_delete', ['a.cc', 'b.h'],
|
||||
'Files to delete', flag_values=self.fv)
|
||||
expected_output = (
|
||||
' <flag>\n'
|
||||
' <file>tool</file>\n'
|
||||
' <name>to_delete</name>\n'
|
||||
' <meaning>Files to delete;\n '
|
||||
'repeat this option to specify a list of values</meaning>\n'
|
||||
' <default>[\'a.cc\', \'b.h\']</default>\n'
|
||||
' <current>[\'a.cc\', \'b.h\']</current>\n'
|
||||
' <type>multi string</type>\n'
|
||||
' </flag>\n')
|
||||
self._CheckFlagHelpInXML('to_delete', 'tool', expected_output)
|
||||
|
||||
def testFlagHelpInXML_MultiInt(self):
|
||||
flags.DEFINE_multi_int('cols', [5, 7, 23],
|
||||
'Columns to select', flag_values=self.fv)
|
||||
expected_output = (
|
||||
' <flag>\n'
|
||||
' <file>tool</file>\n'
|
||||
' <name>cols</name>\n'
|
||||
' <meaning>Columns to select;\n '
|
||||
'repeat this option to specify a list of values</meaning>\n'
|
||||
' <default>[5, 7, 23]</default>\n'
|
||||
' <current>[5, 7, 23]</current>\n'
|
||||
' <type>multi int</type>\n'
|
||||
' </flag>\n')
|
||||
self._CheckFlagHelpInXML('cols', 'tool', expected_output)
|
||||
|
||||
|
||||
# The next EXPECTED_HELP_XML_* constants are parts of a template for
|
||||
# the expected XML output from WriteHelpInXMLFormatTest below. When
|
||||
# we assemble these parts into a single big string, we'll take into
|
||||
# account the ordering between the name of the main module and the
|
||||
# name of module_bar. Next, we'll fill in the docstring for this
|
||||
# module (%(usage_doc)s), the name of the main module
|
||||
# (%(main_module_name)s) and the name of the module module_bar
|
||||
# (%(module_bar_name)s). See WriteHelpInXMLFormatTest below.
|
||||
#
|
||||
# NOTE: given the current implementation of _GetMainModule(), we
|
||||
# already know the ordering between the main module and module_bar.
|
||||
# However, there is no guarantee that _GetMainModule will never be
|
||||
# changed in the future (especially since it's far from perfect).
|
||||
EXPECTED_HELP_XML_START = """\
|
||||
<?xml version="1.0"?>
|
||||
<AllFlags>
|
||||
<program>gflags_helpxml_test.py</program>
|
||||
<usage>%(usage_doc)s</usage>
|
||||
"""
|
||||
|
||||
EXPECTED_HELP_XML_FOR_FLAGS_FROM_MAIN_MODULE = """\
|
||||
<flag>
|
||||
<key>yes</key>
|
||||
<file>%(main_module_name)s</file>
|
||||
<name>cc_version</name>
|
||||
<meaning><stable|experimental>: Compiler version to use.</meaning>
|
||||
<default>stable</default>
|
||||
<current>stable</current>
|
||||
<type>string enum</type>
|
||||
<enum_value>stable</enum_value>
|
||||
<enum_value>experimental</enum_value>
|
||||
</flag>
|
||||
<flag>
|
||||
<key>yes</key>
|
||||
<file>%(main_module_name)s</file>
|
||||
<name>cols</name>
|
||||
<meaning>Columns to select;
|
||||
repeat this option to specify a list of values</meaning>
|
||||
<default>[5, 7, 23]</default>
|
||||
<current>[5, 7, 23]</current>
|
||||
<type>multi int</type>
|
||||
</flag>
|
||||
<flag>
|
||||
<key>yes</key>
|
||||
<file>%(main_module_name)s</file>
|
||||
<name>dirs</name>
|
||||
<meaning>Directories to create.</meaning>
|
||||
<default>src libs bins</default>
|
||||
<current>['src', 'libs', 'bins']</current>
|
||||
<type>whitespace separated list of strings</type>
|
||||
%(whitespace_separators)s </flag>
|
||||
<flag>
|
||||
<key>yes</key>
|
||||
<file>%(main_module_name)s</file>
|
||||
<name>file_path</name>
|
||||
<meaning>A test string flag.</meaning>
|
||||
<default>/path/to/my/dir</default>
|
||||
<current>/path/to/my/dir</current>
|
||||
<type>string</type>
|
||||
</flag>
|
||||
<flag>
|
||||
<key>yes</key>
|
||||
<file>%(main_module_name)s</file>
|
||||
<name>files</name>
|
||||
<meaning>Files to process.</meaning>
|
||||
<default>a.cc,a.h,archive/old.zip</default>
|
||||
<current>['a.cc', 'a.h', 'archive/old.zip']</current>
|
||||
<type>comma separated list of strings</type>
|
||||
<list_separator>\',\'</list_separator>
|
||||
</flag>
|
||||
<flag>
|
||||
<key>yes</key>
|
||||
<file>%(main_module_name)s</file>
|
||||
<name>index</name>
|
||||
<meaning>An integer flag</meaning>
|
||||
<default>17</default>
|
||||
<current>17</current>
|
||||
<type>int</type>
|
||||
</flag>
|
||||
<flag>
|
||||
<key>yes</key>
|
||||
<file>%(main_module_name)s</file>
|
||||
<name>nb_iters</name>
|
||||
<meaning>An integer flag</meaning>
|
||||
<default>17</default>
|
||||
<current>17</current>
|
||||
<type>int</type>
|
||||
<lower_bound>5</lower_bound>
|
||||
<upper_bound>27</upper_bound>
|
||||
</flag>
|
||||
<flag>
|
||||
<key>yes</key>
|
||||
<file>%(main_module_name)s</file>
|
||||
<name>to_delete</name>
|
||||
<meaning>Files to delete;
|
||||
repeat this option to specify a list of values</meaning>
|
||||
<default>['a.cc', 'b.h']</default>
|
||||
<current>['a.cc', 'b.h']</current>
|
||||
<type>multi string</type>
|
||||
</flag>
|
||||
<flag>
|
||||
<key>yes</key>
|
||||
<file>%(main_module_name)s</file>
|
||||
<name>use_hack</name>
|
||||
<meaning>Use performance hack</meaning>
|
||||
<default>false</default>
|
||||
<current>false</current>
|
||||
<type>bool</type>
|
||||
</flag>
|
||||
"""
|
||||
|
||||
EXPECTED_HELP_XML_FOR_FLAGS_FROM_MODULE_BAR = """\
|
||||
<flag>
|
||||
<file>%(module_bar_name)s</file>
|
||||
<name>tmod_bar_t</name>
|
||||
<meaning>Sample int flag.</meaning>
|
||||
<default>4</default>
|
||||
<current>4</current>
|
||||
<type>int</type>
|
||||
</flag>
|
||||
<flag>
|
||||
<key>yes</key>
|
||||
<file>%(module_bar_name)s</file>
|
||||
<name>tmod_bar_u</name>
|
||||
<meaning>Sample int flag.</meaning>
|
||||
<default>5</default>
|
||||
<current>5</current>
|
||||
<type>int</type>
|
||||
</flag>
|
||||
<flag>
|
||||
<file>%(module_bar_name)s</file>
|
||||
<name>tmod_bar_v</name>
|
||||
<meaning>Sample int flag.</meaning>
|
||||
<default>6</default>
|
||||
<current>6</current>
|
||||
<type>int</type>
|
||||
</flag>
|
||||
<flag>
|
||||
<file>%(module_bar_name)s</file>
|
||||
<name>tmod_bar_x</name>
|
||||
<meaning>Boolean flag.</meaning>
|
||||
<default>true</default>
|
||||
<current>true</current>
|
||||
<type>bool</type>
|
||||
</flag>
|
||||
<flag>
|
||||
<file>%(module_bar_name)s</file>
|
||||
<name>tmod_bar_y</name>
|
||||
<meaning>String flag.</meaning>
|
||||
<default>default</default>
|
||||
<current>default</current>
|
||||
<type>string</type>
|
||||
</flag>
|
||||
<flag>
|
||||
<key>yes</key>
|
||||
<file>%(module_bar_name)s</file>
|
||||
<name>tmod_bar_z</name>
|
||||
<meaning>Another boolean flag from module bar.</meaning>
|
||||
<default>false</default>
|
||||
<current>false</current>
|
||||
<type>bool</type>
|
||||
</flag>
|
||||
"""
|
||||
|
||||
EXPECTED_HELP_XML_END = """\
|
||||
</AllFlags>
|
||||
"""
|
||||
|
||||
|
||||
class WriteHelpInXMLFormatTest(unittest.TestCase):
|
||||
"""Big test of FlagValues.WriteHelpInXMLFormat, with several flags."""
|
||||
|
||||
def assertMultiLineEqual(self, expected, actual):
|
||||
self.assert_(MultiLineEqual(expected, actual))
|
||||
|
||||
def testWriteHelpInXMLFormat(self):
|
||||
fv = flags.FlagValues()
|
||||
# Since these flags are defined by the top module, they are all key.
|
||||
flags.DEFINE_integer('index', 17, 'An integer flag', flag_values=fv)
|
||||
flags.DEFINE_integer('nb_iters', 17, 'An integer flag',
|
||||
lower_bound=5, upper_bound=27, flag_values=fv)
|
||||
flags.DEFINE_string('file_path', '/path/to/my/dir', 'A test string flag.',
|
||||
flag_values=fv)
|
||||
flags.DEFINE_boolean('use_hack', False, 'Use performance hack',
|
||||
flag_values=fv)
|
||||
flags.DEFINE_enum('cc_version', 'stable', ['stable', 'experimental'],
|
||||
'Compiler version to use.', flag_values=fv)
|
||||
flags.DEFINE_list('files', 'a.cc,a.h,archive/old.zip',
|
||||
'Files to process.', flag_values=fv)
|
||||
flags.DEFINE_spaceseplist('dirs', 'src libs bins',
|
||||
'Directories to create.', flag_values=fv)
|
||||
flags.DEFINE_multistring('to_delete', ['a.cc', 'b.h'],
|
||||
'Files to delete', flag_values=fv)
|
||||
flags.DEFINE_multi_int('cols', [5, 7, 23],
|
||||
'Columns to select', flag_values=fv)
|
||||
# Define a few flags in a different module.
|
||||
module_bar.DefineFlags(flag_values=fv)
|
||||
# And declare only a few of them to be key. This way, we have
|
||||
# different kinds of flags, defined in different modules, and not
|
||||
# all of them are key flags.
|
||||
flags.DECLARE_key_flag('tmod_bar_z', flag_values=fv)
|
||||
flags.DECLARE_key_flag('tmod_bar_u', flag_values=fv)
|
||||
|
||||
# Generate flag help in XML format in the StringIO sio.
|
||||
sio = StringIO.StringIO()
|
||||
fv.WriteHelpInXMLFormat(sio)
|
||||
|
||||
# Check that we got the expected result.
|
||||
expected_output_template = EXPECTED_HELP_XML_START
|
||||
main_module_name = flags._GetMainModule()
|
||||
module_bar_name = module_bar.__name__
|
||||
|
||||
if main_module_name < module_bar_name:
|
||||
expected_output_template += EXPECTED_HELP_XML_FOR_FLAGS_FROM_MAIN_MODULE
|
||||
expected_output_template += EXPECTED_HELP_XML_FOR_FLAGS_FROM_MODULE_BAR
|
||||
else:
|
||||
expected_output_template += EXPECTED_HELP_XML_FOR_FLAGS_FROM_MODULE_BAR
|
||||
expected_output_template += EXPECTED_HELP_XML_FOR_FLAGS_FROM_MAIN_MODULE
|
||||
|
||||
expected_output_template += EXPECTED_HELP_XML_END
|
||||
|
||||
# XML representation of the whitespace list separators.
|
||||
whitespace_separators = _ListSeparatorsInXMLFormat(string.whitespace,
|
||||
indent=' ')
|
||||
expected_output = (
|
||||
expected_output_template %
|
||||
{'usage_doc': sys.modules['__main__'].__doc__,
|
||||
'main_module_name': main_module_name,
|
||||
'module_bar_name': module_bar_name,
|
||||
'whitespace_separators': whitespace_separators})
|
||||
|
||||
actual_output = sio.getvalue()
|
||||
self.assertMultiLineEqual(actual_output, expected_output)
|
||||
|
||||
# Also check that our result is valid XML. minidom.parseString
|
||||
# throws an xml.parsers.expat.ExpatError in case of an error.
|
||||
xml.dom.minidom.parseString(actual_output)
|
||||
|
||||
|
||||
if __name__ == '__main__':
|
||||
unittest.main()
|
||||
File diff suppressed because it is too large
Load diff
|
|
@ -1,42 +0,0 @@
|
|||
#!/usr/bin/env python
|
||||
|
||||
# Copyright (c) 2007, Google Inc.
|
||||
# All rights reserved.
|
||||
#
|
||||
# Redistribution and use in source and binary forms, with or without
|
||||
# modification, are permitted provided that the following conditions are
|
||||
# met:
|
||||
#
|
||||
# * Redistributions of source code must retain the above copyright
|
||||
# notice, this list of conditions and the following disclaimer.
|
||||
# * Redistributions in binary form must reproduce the above
|
||||
# copyright notice, this list of conditions and the following disclaimer
|
||||
# in the documentation and/or other materials provided with the
|
||||
# distribution.
|
||||
# * Neither the name of Google Inc. nor the names of its
|
||||
# contributors may be used to endorse or promote products derived from
|
||||
# this software without specific prior written permission.
|
||||
#
|
||||
# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
|
||||
# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
|
||||
# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
|
||||
# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
|
||||
# OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
|
||||
# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
|
||||
# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
|
||||
# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
|
||||
# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
|
||||
# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
|
||||
# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
||||
|
||||
from distutils.core import setup
|
||||
|
||||
setup(name='gflags',
|
||||
version='0.8',
|
||||
description='Google Commandline Flags Module',
|
||||
license='BSD',
|
||||
author='Google Inc.',
|
||||
author_email='opensource@google.com',
|
||||
url='http://code.google.com/p/google-gflags',
|
||||
py_modules=["gflags"],
|
||||
data_files=[("bin", ["gflags2man.py"])])
|
||||
|
|
@ -1,135 +0,0 @@
|
|||
#!/usr/bin/env python
|
||||
|
||||
# Copyright (c) 2009, Google Inc.
|
||||
# All rights reserved.
|
||||
#
|
||||
# Redistribution and use in source and binary forms, with or without
|
||||
# modification, are permitted provided that the following conditions are
|
||||
# met:
|
||||
#
|
||||
# * Redistributions of source code must retain the above copyright
|
||||
# notice, this list of conditions and the following disclaimer.
|
||||
# * Redistributions in binary form must reproduce the above
|
||||
# copyright notice, this list of conditions and the following disclaimer
|
||||
# in the documentation and/or other materials provided with the
|
||||
# distribution.
|
||||
# * Neither the name of Google Inc. nor the names of its
|
||||
# contributors may be used to endorse or promote products derived from
|
||||
# this software without specific prior written permission.
|
||||
#
|
||||
# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
|
||||
# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
|
||||
# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
|
||||
# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
|
||||
# OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
|
||||
# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
|
||||
# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
|
||||
# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
|
||||
# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
|
||||
# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
|
||||
# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
||||
|
||||
"""Auxiliary module for testing flags.py.
|
||||
|
||||
The purpose of this module is to define a few flags. We want to make
|
||||
sure the unit tests for flags.py involve more than one module.
|
||||
"""
|
||||
|
||||
__author__ = 'Alex Salcianu'
|
||||
|
||||
__pychecker__ = "no-local" # for unittest
|
||||
|
||||
# We use the name 'flags' internally in this test, for historical reasons.
|
||||
# Don't do this yourself! :-) Just do 'import gflags; FLAGS=gflags.FLAGS; etc'
|
||||
import gflags as flags
|
||||
FLAGS = flags.FLAGS
|
||||
|
||||
|
||||
def DefineFlags(flag_values=FLAGS):
|
||||
"""Defines some flags.
|
||||
|
||||
Args:
|
||||
flag_values: The FlagValues object we want to register the flags
|
||||
with.
|
||||
"""
|
||||
# The 'tmod_bar_' prefix (short for 'test_module_bar') ensures there
|
||||
# is no name clash with the existing flags.
|
||||
flags.DEFINE_boolean('tmod_bar_x', True, 'Boolean flag.',
|
||||
flag_values=flag_values)
|
||||
flags.DEFINE_string('tmod_bar_y', 'default', 'String flag.',
|
||||
flag_values=flag_values)
|
||||
flags.DEFINE_boolean('tmod_bar_z', False,
|
||||
'Another boolean flag from module bar.',
|
||||
flag_values=flag_values)
|
||||
flags.DEFINE_integer('tmod_bar_t', 4, 'Sample int flag.',
|
||||
flag_values=flag_values)
|
||||
flags.DEFINE_integer('tmod_bar_u', 5, 'Sample int flag.',
|
||||
flag_values=flag_values)
|
||||
flags.DEFINE_integer('tmod_bar_v', 6, 'Sample int flag.',
|
||||
flag_values=flag_values)
|
||||
|
||||
|
||||
def RemoveOneFlag(flag_name, flag_values=FLAGS):
|
||||
"""Removes the definition of one flag from flags.FLAGS.
|
||||
|
||||
Note: if the flag is not defined in flags.FLAGS, this function does
|
||||
not do anything (in particular, it does not raise any exception).
|
||||
|
||||
Motivation: We use this function for cleanup *after* a test: if
|
||||
there was a failure during a test and not all flags were declared,
|
||||
we do not want the cleanup code to crash.
|
||||
|
||||
Args:
|
||||
flag_name: A string, the name of the flag to delete.
|
||||
flag_values: The FlagValues object we remove the flag from.
|
||||
"""
|
||||
if flag_name in flag_values.FlagDict():
|
||||
flag_values.__delattr__(flag_name)
|
||||
|
||||
|
||||
def NamesOfDefinedFlags():
|
||||
"""Returns: List of names of the flags declared in this module."""
|
||||
return ['tmod_bar_x',
|
||||
'tmod_bar_y',
|
||||
'tmod_bar_z',
|
||||
'tmod_bar_t',
|
||||
'tmod_bar_u',
|
||||
'tmod_bar_v']
|
||||
|
||||
|
||||
def RemoveFlags(flag_values=FLAGS):
|
||||
"""Deletes the flag definitions done by the above DefineFlags().
|
||||
|
||||
Args:
|
||||
flag_values: The FlagValues object we remove the flags from.
|
||||
"""
|
||||
for flag_name in NamesOfDefinedFlags():
|
||||
RemoveOneFlag(flag_name, flag_values=flag_values)
|
||||
|
||||
|
||||
def GetModuleName():
|
||||
"""Uses flags._GetCallingModule() to return the name of this module.
|
||||
|
||||
For checking that _GetCallingModule works as expected.
|
||||
|
||||
Returns:
|
||||
A string, the name of this module.
|
||||
"""
|
||||
# Calling the protected _GetCallingModule generates a lint warning,
|
||||
# but we do not have any other alternative to test that function.
|
||||
return flags._GetCallingModule()
|
||||
|
||||
|
||||
def ExecuteCode(code, global_dict):
|
||||
"""Executes some code in a given global environment.
|
||||
|
||||
For testing of _GetCallingModule.
|
||||
|
||||
Args:
|
||||
code: A string, the code to be executed.
|
||||
global_dict: A dictionary, the global environment that code should
|
||||
be executed in.
|
||||
"""
|
||||
# Indeed, using exec generates a lint warning. But some user code
|
||||
# actually uses exec, and we have to test for it ...
|
||||
exec code in global_dict
|
||||
|
|
@ -1,120 +0,0 @@
|
|||
#!/usr/bin/env python
|
||||
|
||||
# Copyright (c) 2009, Google Inc.
|
||||
# All rights reserved.
|
||||
#
|
||||
# Redistribution and use in source and binary forms, with or without
|
||||
# modification, are permitted provided that the following conditions are
|
||||
# met:
|
||||
#
|
||||
# * Redistributions of source code must retain the above copyright
|
||||
# notice, this list of conditions and the following disclaimer.
|
||||
# * Redistributions in binary form must reproduce the above
|
||||
# copyright notice, this list of conditions and the following disclaimer
|
||||
# in the documentation and/or other materials provided with the
|
||||
# distribution.
|
||||
# * Neither the name of Google Inc. nor the names of its
|
||||
# contributors may be used to endorse or promote products derived from
|
||||
# this software without specific prior written permission.
|
||||
#
|
||||
# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
|
||||
# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
|
||||
# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
|
||||
# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
|
||||
# OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
|
||||
# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
|
||||
# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
|
||||
# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
|
||||
# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
|
||||
# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
|
||||
# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
||||
|
||||
"""Auxiliary module for testing flags.py.
|
||||
|
||||
The purpose of this module is to define a few flags, and declare some
|
||||
other flags as being important. We want to make sure the unit tests
|
||||
for flags.py involve more than one module.
|
||||
"""
|
||||
|
||||
__author__ = 'Alex Salcianu'
|
||||
|
||||
__pychecker__ = "no-local" # for unittest
|
||||
|
||||
# We use the name 'flags' internally in this test, for historical reasons.
|
||||
# Don't do this yourself! :-) Just do 'import gflags; FLAGS=gflags.FLAGS; etc'
|
||||
import gflags as flags
|
||||
FLAGS = flags.FLAGS
|
||||
|
||||
# For historical reasons we use the name module_bar instead of test_module_bar.
|
||||
import test_module_bar as module_bar
|
||||
|
||||
DECLARED_KEY_FLAGS = ['tmod_bar_x', 'tmod_bar_z', 'tmod_bar_t']
|
||||
|
||||
|
||||
def DefineFlags():
|
||||
"""Defines a few flags."""
|
||||
module_bar.DefineFlags()
|
||||
# The 'tmod_foo_' prefix (short for 'test_module_foo') ensures that we
|
||||
# have no name clash with existing flags.
|
||||
flags.DEFINE_boolean('tmod_foo_bool', True, 'Boolean flag from module foo.')
|
||||
flags.DEFINE_string('tmod_foo_str', 'default', 'String flag.')
|
||||
flags.DEFINE_integer('tmod_foo_int', 3, 'Sample int flag.')
|
||||
|
||||
|
||||
def DeclareKeyFlags():
|
||||
"""Declares a few key flags."""
|
||||
for flag_name in DECLARED_KEY_FLAGS:
|
||||
flags.DECLARE_key_flag(flag_name)
|
||||
|
||||
|
||||
def DeclareExtraKeyFlags():
|
||||
"""Declares some extra key flags."""
|
||||
flags.ADOPT_module_key_flags(module_bar)
|
||||
|
||||
|
||||
def NamesOfDefinedFlags():
|
||||
"""Returns: list of names of flags defined by this module."""
|
||||
return ['tmod_foo_bool', 'tmod_foo_str', 'tmod_foo_int']
|
||||
|
||||
|
||||
def NamesOfDeclaredKeyFlags():
|
||||
"""Returns: list of names of key flags for this module."""
|
||||
return NamesOfDefinedFlags() + DECLARED_KEY_FLAGS
|
||||
|
||||
|
||||
def NamesOfDeclaredExtraKeyFlags():
|
||||
"""Returns the list of names of additional key flags for this module.
|
||||
|
||||
These are the flags that became key for this module only as a result
|
||||
of a call to DeclareExtraKeyFlags() above. I.e., the flags declared
|
||||
by module_bar, that were not already declared as key for this
|
||||
module.
|
||||
|
||||
Returns:
|
||||
The list of names of additional key flags for this module.
|
||||
"""
|
||||
names_of_extra_key_flags = list(module_bar.NamesOfDefinedFlags())
|
||||
for flag_name in NamesOfDeclaredKeyFlags():
|
||||
while flag_name in names_of_extra_key_flags:
|
||||
names_of_extra_key_flags.remove(flag_name)
|
||||
return names_of_extra_key_flags
|
||||
|
||||
|
||||
def RemoveFlags():
|
||||
"""Deletes the flag definitions done by the above DefineFlags()."""
|
||||
for flag_name in NamesOfDefinedFlags():
|
||||
module_bar.RemoveOneFlag(flag_name)
|
||||
module_bar.RemoveFlags()
|
||||
|
||||
|
||||
def GetModuleName():
|
||||
"""Uses flags._GetCallingModule() to return the name of this module.
|
||||
|
||||
For checking that _GetCallingModule works as expected.
|
||||
|
||||
Returns:
|
||||
A string, the name of this module.
|
||||
"""
|
||||
# Calling the protected _GetCallingModule generates a lint warning,
|
||||
# but we do not have any other alternative to test that function.
|
||||
return flags._GetCallingModule()
|
||||
|
|
@ -144,13 +144,6 @@
|
|||
# define PRIu64 "llu"
|
||||
#endif
|
||||
|
||||
using std::string;
|
||||
using std::map;
|
||||
using std::vector;
|
||||
using std::pair;
|
||||
using std::cerr;
|
||||
using std::sort;
|
||||
|
||||
// Special flags, type 1: the 'recursive' flags. They set another flag's val.
|
||||
DEFINE_string(flagfile, "",
|
||||
"load flags from file");
|
||||
|
|
@ -169,6 +162,13 @@ DEFINE_string(undefok, "",
|
|||
|
||||
_START_GOOGLE_NAMESPACE_
|
||||
|
||||
using std::cerr;
|
||||
using std::map;
|
||||
using std::pair;
|
||||
using std::sort;
|
||||
using std::string;
|
||||
using std::vector;
|
||||
|
||||
// The help message indicating that the commandline flag has been
|
||||
// 'stripped'. It will not show up when doing "-help" and its
|
||||
// variants. The flag is stripped if STRIP_FLAG_HELP is set to 1
|
||||
|
|
|
|||
|
|
@ -60,10 +60,6 @@
|
|||
|
||||
#include <gflags/gflags.h>
|
||||
|
||||
using std::set;
|
||||
using std::string;
|
||||
using std::vector;
|
||||
|
||||
#ifndef PATH_SEPARATOR
|
||||
#define PATH_SEPARATOR '/'
|
||||
#endif
|
||||
|
|
@ -79,6 +75,10 @@ _START_GOOGLE_NAMESPACE_
|
|||
|
||||
namespace {
|
||||
|
||||
using std::set;
|
||||
using std::string;
|
||||
using std::vector;
|
||||
|
||||
// Function prototypes and Type forward declarations. Code may be
|
||||
// more easily understood if it is roughly ordered according to
|
||||
// control flow, rather than by C's "declare before use" ordering
|
||||
|
|
|
|||
|
|
@ -62,9 +62,6 @@
|
|||
#define PATH_SEPARATOR '/'
|
||||
#endif
|
||||
|
||||
using std::string;
|
||||
using std::vector;
|
||||
|
||||
// The 'reporting' flags. They all call exit().
|
||||
DEFINE_bool(help, false,
|
||||
"show help on all flags [tip: all flags can have two dashes]");
|
||||
|
|
@ -85,6 +82,9 @@ DEFINE_bool(version, false,
|
|||
|
||||
_START_GOOGLE_NAMESPACE_
|
||||
|
||||
using std::string;
|
||||
using std::vector;
|
||||
|
||||
// --------------------------------------------------------------------
|
||||
// DescribeOneFlag()
|
||||
// DescribeOneFlagInXML()
|
||||
|
|
|
|||
|
|
@ -47,18 +47,17 @@
|
|||
#include <math.h> // for isinf() and isnan()
|
||||
#include <vector>
|
||||
#include <string>
|
||||
|
||||
#include <gflags/gflags.h>
|
||||
// I don't actually use this header file, but #include it under the
|
||||
// old location to make sure that the include-header-forwarding
|
||||
// works. But don't bother on windows; the windows port is so new
|
||||
// it never had the old location-names.
|
||||
#ifndef _WIN32
|
||||
#ifndef _MSC_VER
|
||||
#include <google/gflags_completions.h>
|
||||
void (*unused_fn)() = &GOOGLE_NAMESPACE::HandleCommandLineCompletions;
|
||||
#endif
|
||||
|
||||
using std::vector;
|
||||
using std::string;
|
||||
using GOOGLE_NAMESPACE::int32;
|
||||
using GOOGLE_NAMESPACE::FlagRegisterer;
|
||||
using GOOGLE_NAMESPACE::StringFromEnv;
|
||||
|
|
@ -94,9 +93,13 @@ void setenv(const char* name, const char* value, int) {
|
|||
DECLARE_string(tryfromenv); // in gflags.cc
|
||||
|
||||
DEFINE_string(test_tmpdir, "/tmp/gflags_unittest", "Dir we use for temp files");
|
||||
#ifdef _MSC_VER // in MSVC, we run from the vsprojects directory
|
||||
DEFINE_string(srcdir, "..\\..",
|
||||
"Source-dir root, needed to find gflags_unittest_flagfile");
|
||||
#else
|
||||
DEFINE_string(srcdir, StringFromEnv("SRCDIR", "."),
|
||||
"Source-dir root, needed to find gflags_unittest_flagfile");
|
||||
|
||||
#endif
|
||||
|
||||
DEFINE_bool(test_bool, false, "tests bool-ness");
|
||||
DEFINE_int32(test_int32, -1, "");
|
||||
|
|
@ -128,8 +131,8 @@ static int changeable_bool_var = 8008;
|
|||
DEFINE_bool(changeable_bool_var, ++changeable_bool_var == 8009, "");
|
||||
|
||||
static int changeable_string_var = 0;
|
||||
static string ChangeableString() {
|
||||
char r[] = {'0' + ++changeable_string_var, '\0'};
|
||||
static std::string ChangeableString() {
|
||||
char r[] = {static_cast<char>('0' + ++changeable_string_var), '\0'};
|
||||
return r;
|
||||
}
|
||||
DEFINE_string(changeable_string_var, ChangeableString(), "");
|
||||
|
|
@ -151,14 +154,14 @@ DEFINE_bool(changed_bool2, false, "changed");
|
|||
|
||||
static bool AlwaysFail(const char* flag, bool value) { return value == false; }
|
||||
DEFINE_bool(always_fail, false, "will fail to validate when you set it");
|
||||
static const bool dummy = RegisterFlagValidator(&FLAGS_always_fail, AlwaysFail);
|
||||
static bool dummy = RegisterFlagValidator(&FLAGS_always_fail, AlwaysFail);
|
||||
|
||||
// See the comment by GetAllFlags in commandlineflags.h
|
||||
static bool DeadlockIfCantLockInValidators(const char* flag, bool value) {
|
||||
if (!value) {
|
||||
return true;
|
||||
}
|
||||
vector<CommandLineFlagInfo> dummy;
|
||||
std::vector<CommandLineFlagInfo> dummy;
|
||||
GetAllFlags(&dummy);
|
||||
return true;
|
||||
}
|
||||
|
|
@ -166,8 +169,8 @@ DEFINE_bool(deadlock_if_cant_lock,
|
|||
false,
|
||||
"will deadlock if set to true and "
|
||||
"if locking of registry in validators fails.");
|
||||
static const bool dummy1 = RegisterFlagValidator(&FLAGS_deadlock_if_cant_lock,
|
||||
DeadlockIfCantLockInValidators);
|
||||
static bool dummy1 = RegisterFlagValidator(&FLAGS_deadlock_if_cant_lock,
|
||||
DeadlockIfCantLockInValidators);
|
||||
|
||||
// This is a pseudo-flag -- we want to register a flag with a filename
|
||||
// at the top level, but there is no way to do this except by faking
|
||||
|
|
@ -196,6 +199,9 @@ using fLI::FLAGS_tldflag2;
|
|||
|
||||
_START_GOOGLE_NAMESPACE_
|
||||
|
||||
using std::string;
|
||||
using std::vector;
|
||||
|
||||
// The following is some bare-bones testing infrastructure
|
||||
|
||||
#define EXPECT_TRUE(cond) \
|
||||
|
|
@ -308,6 +314,26 @@ static int RUN_ALL_TESTS() {
|
|||
}
|
||||
|
||||
|
||||
static string TmpFile(const string& basename) {
|
||||
#ifdef _MSC_VER
|
||||
return FLAGS_test_tmpdir + "\\" + basename;
|
||||
#else
|
||||
return FLAGS_test_tmpdir + "/" + basename;
|
||||
#endif
|
||||
}
|
||||
|
||||
// Returns the definition of the --flagfile flag to be used in the tests.
|
||||
static const char* GetFlagFileFlag() {
|
||||
#ifdef _MSC_VER
|
||||
static const string flagfile = FLAGS_srcdir + "\\src\\gflags_unittest_flagfile";
|
||||
#else
|
||||
static const string flagfile = FLAGS_srcdir + "/src/gflags_unittest_flagfile";
|
||||
#endif
|
||||
static const string flagfile_flag = string("--flagfile=") + flagfile;
|
||||
return flagfile_flag.c_str();
|
||||
}
|
||||
|
||||
|
||||
// Defining a variable of type CompileAssertTypesEqual<T1, T2> will cause a
|
||||
// compiler error iff T1 and T2 are different types.
|
||||
template <typename T1, typename T2>
|
||||
|
|
@ -665,7 +691,7 @@ TEST(SetFlagValueTest, IllegalValues) {
|
|||
EXPECT_EQ("", SetCommandLineOption("test_double", ""));
|
||||
EXPECT_EQ("test_string set to \n", SetCommandLineOption("test_string", ""));
|
||||
|
||||
EXPECT_EQ(true, FLAGS_test_bool);
|
||||
EXPECT_TRUE(FLAGS_test_bool);
|
||||
EXPECT_EQ(119, FLAGS_test_int32);
|
||||
EXPECT_EQ(1191, FLAGS_test_int64);
|
||||
EXPECT_EQ(11911, FLAGS_test_uint64);
|
||||
|
|
@ -685,12 +711,12 @@ TEST(MacroArgs, EvaluateOnce) {
|
|||
}
|
||||
|
||||
TEST(MacroArgs, EvaluateOnceBool) {
|
||||
EXPECT_EQ(true, FLAGS_changeable_bool_var);
|
||||
EXPECT_EQ(true, FLAGS_changeable_bool_var);
|
||||
EXPECT_TRUE(FLAGS_changeable_bool_var);
|
||||
EXPECT_TRUE(FLAGS_changeable_bool_var);
|
||||
EXPECT_EQ(8009, changeable_bool_var);
|
||||
SetCommandLineOptionWithMode("changeable_bool_var", "false",
|
||||
SET_FLAG_IF_DEFAULT);
|
||||
EXPECT_EQ(false, FLAGS_changeable_bool_var);
|
||||
EXPECT_FALSE(FLAGS_changeable_bool_var);
|
||||
}
|
||||
|
||||
TEST(MacroArgs, EvaluateOnceStrings) {
|
||||
|
|
@ -708,12 +734,12 @@ TEST(FromEnvTest, LegalValues) {
|
|||
setenv("BOOL_VAL2", "false", 1);
|
||||
setenv("BOOL_VAL3", "1", 1);
|
||||
setenv("BOOL_VAL4", "F", 1);
|
||||
EXPECT_EQ(true, BoolFromEnv("BOOL_VAL1", false));
|
||||
EXPECT_EQ(false, BoolFromEnv("BOOL_VAL2", true));
|
||||
EXPECT_EQ(true, BoolFromEnv("BOOL_VAL3", false));
|
||||
EXPECT_EQ(false, BoolFromEnv("BOOL_VAL4", true));
|
||||
EXPECT_EQ(true, BoolFromEnv("BOOL_VAL_UNKNOWN", true));
|
||||
EXPECT_EQ(false, BoolFromEnv("BOOL_VAL_UNKNOWN", false));
|
||||
EXPECT_TRUE(BoolFromEnv("BOOL_VAL1", false));
|
||||
EXPECT_FALSE(BoolFromEnv("BOOL_VAL2", true));
|
||||
EXPECT_TRUE(BoolFromEnv("BOOL_VAL3", false));
|
||||
EXPECT_FALSE(BoolFromEnv("BOOL_VAL4", true));
|
||||
EXPECT_TRUE(BoolFromEnv("BOOL_VAL_UNKNOWN", true));
|
||||
EXPECT_FALSE(BoolFromEnv("BOOL_VAL_UNKNOWN", false));
|
||||
|
||||
setenv("INT_VAL1", "1", 1);
|
||||
setenv("INT_VAL2", "-1", 1);
|
||||
|
|
@ -749,7 +775,7 @@ TEST(FromEnvTest, LegalValues) {
|
|||
|
||||
// Tests that the FooFromEnv dies on parse-error
|
||||
TEST(FromEnvDeathTest, IllegalValues) {
|
||||
setenv("BOOL_BAD1", "so true!",1 );
|
||||
setenv("BOOL_BAD1", "so true!", 1);
|
||||
setenv("BOOL_BAD2", "", 1);
|
||||
EXPECT_DEATH(BoolFromEnv("BOOL_BAD1", false), "error parsing env variable");
|
||||
EXPECT_DEATH(BoolFromEnv("BOOL_BAD2", true), "error parsing env variable");
|
||||
|
|
@ -906,7 +932,7 @@ TEST(GetAllFlagsTest, BaseTest) {
|
|||
break;
|
||||
}
|
||||
}
|
||||
EXPECT_EQ(true, found_test_bool);
|
||||
EXPECT_TRUE(found_test_bool);
|
||||
}
|
||||
|
||||
TEST(ShowUsageWithFlagsTest, BaseTest) {
|
||||
|
|
@ -956,7 +982,7 @@ TEST(ProgramInvocationShortNameTest, BaseTest) {
|
|||
EXPECT_STREQ("gflags_unittest", ProgramInvocationShortName());
|
||||
}
|
||||
|
||||
TEST(ProgramUsageTest, BaseTest) { // Depends on 1st arg to InitGoogle in main()
|
||||
TEST(ProgramUsageTest, BaseTest) { // Depends on 1st arg to InitGoogle in main
|
||||
EXPECT_STREQ("/test/argv/for/gflags_unittest: "
|
||||
"<useless flag> [...]\nDoes something useless.\n",
|
||||
ProgramUsage());
|
||||
|
|
@ -965,11 +991,11 @@ TEST(ProgramUsageTest, BaseTest) { // Depends on 1st arg to InitGoogle in main()
|
|||
TEST(GetCommandLineOptionTest, NameExistsAndIsDefault) {
|
||||
string value("will be changed");
|
||||
bool r = GetCommandLineOption("test_bool", &value);
|
||||
EXPECT_EQ(true, r);
|
||||
EXPECT_TRUE(r);
|
||||
EXPECT_EQ("false", value);
|
||||
|
||||
r = GetCommandLineOption("test_int32", &value);
|
||||
EXPECT_EQ(true, r);
|
||||
EXPECT_TRUE(r);
|
||||
EXPECT_EQ("-1", value);
|
||||
}
|
||||
|
||||
|
|
@ -977,7 +1003,7 @@ TEST(GetCommandLineOptionTest, NameExistsAndWasAssigned) {
|
|||
FLAGS_test_int32 = 400;
|
||||
string value("will be changed");
|
||||
const bool r = GetCommandLineOption("test_int32", &value);
|
||||
EXPECT_EQ(true, r);
|
||||
EXPECT_TRUE(r);
|
||||
EXPECT_EQ("400", value);
|
||||
}
|
||||
|
||||
|
|
@ -985,7 +1011,7 @@ TEST(GetCommandLineOptionTest, NameExistsAndWasSet) {
|
|||
SetCommandLineOption("test_int32", "700");
|
||||
string value("will be changed");
|
||||
const bool r = GetCommandLineOption("test_int32", &value);
|
||||
EXPECT_EQ(true, r);
|
||||
EXPECT_TRUE(r);
|
||||
EXPECT_EQ("700", value);
|
||||
}
|
||||
|
||||
|
|
@ -995,60 +1021,59 @@ TEST(GetCommandLineOptionTest, NameExistsAndWasNotSet) {
|
|||
SetCommandLineOptionWithMode("test_int32", "800", SET_FLAGS_DEFAULT);
|
||||
string value("will be changed");
|
||||
const bool r = GetCommandLineOption("test_int32", &value);
|
||||
EXPECT_EQ(true, r);
|
||||
EXPECT_TRUE(r);
|
||||
EXPECT_EQ("800", value);
|
||||
EXPECT_EQ(true, GetCommandLineFlagInfoOrDie("test_int32").is_default);
|
||||
|
||||
EXPECT_TRUE(GetCommandLineFlagInfoOrDie("test_int32").is_default);
|
||||
}
|
||||
|
||||
TEST(GetCommandLineOptionTest, NameExistsAndWasConditionallySet) {
|
||||
SetCommandLineOptionWithMode("test_int32", "900", SET_FLAG_IF_DEFAULT);
|
||||
string value("will be changed");
|
||||
const bool r = GetCommandLineOption("test_int32", &value);
|
||||
EXPECT_EQ(true, r);
|
||||
EXPECT_TRUE(r);
|
||||
EXPECT_EQ("900", value);
|
||||
}
|
||||
|
||||
TEST(GetCommandLineOptionTest, NameDoesNotExist) {
|
||||
string value("will not be changed");
|
||||
const bool r = GetCommandLineOption("test_int3210", &value);
|
||||
EXPECT_EQ(false, r);
|
||||
EXPECT_FALSE(r);
|
||||
EXPECT_EQ("will not be changed", value);
|
||||
}
|
||||
|
||||
TEST(GetCommandLineFlagInfoTest, FlagExists) {
|
||||
CommandLineFlagInfo info;
|
||||
bool r = GetCommandLineFlagInfo("test_int32", &info);
|
||||
EXPECT_EQ(true, r);
|
||||
EXPECT_TRUE(r);
|
||||
EXPECT_EQ("test_int32", info.name);
|
||||
EXPECT_EQ("int32", info.type);
|
||||
EXPECT_EQ("", info.description);
|
||||
EXPECT_EQ("-1", info.current_value);
|
||||
EXPECT_EQ("-1", info.default_value);
|
||||
EXPECT_EQ(true, info.is_default);
|
||||
EXPECT_EQ(false, info.has_validator_fn);
|
||||
EXPECT_TRUE(info.is_default);
|
||||
EXPECT_FALSE(info.has_validator_fn);
|
||||
|
||||
FLAGS_test_bool = true;
|
||||
r = GetCommandLineFlagInfo("test_bool", &info);
|
||||
EXPECT_EQ(true, r);
|
||||
EXPECT_TRUE(r);
|
||||
EXPECT_EQ("test_bool", info.name);
|
||||
EXPECT_EQ("bool", info.type);
|
||||
EXPECT_EQ("tests bool-ness", info.description);
|
||||
EXPECT_EQ("true", info.current_value);
|
||||
EXPECT_EQ("false", info.default_value);
|
||||
EXPECT_EQ(false, info.is_default);
|
||||
EXPECT_EQ(false, info.has_validator_fn);
|
||||
EXPECT_FALSE(info.is_default);
|
||||
EXPECT_FALSE(info.has_validator_fn);
|
||||
|
||||
FLAGS_test_bool = false;
|
||||
r = GetCommandLineFlagInfo("test_bool", &info);
|
||||
EXPECT_EQ(true, r);
|
||||
EXPECT_TRUE(r);
|
||||
EXPECT_EQ("test_bool", info.name);
|
||||
EXPECT_EQ("bool", info.type);
|
||||
EXPECT_EQ("tests bool-ness", info.description);
|
||||
EXPECT_EQ("false", info.current_value);
|
||||
EXPECT_EQ("false", info.default_value);
|
||||
EXPECT_EQ(false, info.is_default); // value is same, but flag *was* modified
|
||||
EXPECT_EQ(false, info.has_validator_fn);
|
||||
EXPECT_FALSE(info.is_default); // value is same, but flag *was* modified
|
||||
EXPECT_FALSE(info.has_validator_fn);
|
||||
}
|
||||
|
||||
TEST(GetCommandLineFlagInfoTest, FlagDoesNotExist) {
|
||||
|
|
@ -1062,15 +1087,15 @@ TEST(GetCommandLineFlagInfoTest, FlagDoesNotExist) {
|
|||
info.is_default = false;
|
||||
info.has_validator_fn = true;
|
||||
bool r = GetCommandLineFlagInfo("test_int3210", &info);
|
||||
EXPECT_EQ(false, r);
|
||||
EXPECT_FALSE(r);
|
||||
EXPECT_EQ("name", info.name);
|
||||
EXPECT_EQ("type", info.type);
|
||||
EXPECT_EQ("", info.description);
|
||||
EXPECT_EQ("curr", info.current_value);
|
||||
EXPECT_EQ("def", info.default_value);
|
||||
EXPECT_EQ("/", info.filename);
|
||||
EXPECT_EQ(false, info.is_default);
|
||||
EXPECT_EQ(true, info.has_validator_fn);
|
||||
EXPECT_FALSE(info.is_default);
|
||||
EXPECT_TRUE(info.has_validator_fn);
|
||||
}
|
||||
|
||||
TEST(GetCommandLineFlagInfoOrDieTest, FlagExistsAndIsDefault) {
|
||||
|
|
@ -1081,15 +1106,15 @@ TEST(GetCommandLineFlagInfoOrDieTest, FlagExistsAndIsDefault) {
|
|||
EXPECT_EQ("", info.description);
|
||||
EXPECT_EQ("-1", info.current_value);
|
||||
EXPECT_EQ("-1", info.default_value);
|
||||
EXPECT_EQ(true, info.is_default);
|
||||
EXPECT_TRUE(info.is_default);
|
||||
info = GetCommandLineFlagInfoOrDie("test_bool");
|
||||
EXPECT_EQ("test_bool", info.name);
|
||||
EXPECT_EQ("bool", info.type);
|
||||
EXPECT_EQ("tests bool-ness", info.description);
|
||||
EXPECT_EQ("false", info.current_value);
|
||||
EXPECT_EQ("false", info.default_value);
|
||||
EXPECT_EQ(true, info.is_default);
|
||||
EXPECT_EQ(false, info.has_validator_fn);
|
||||
EXPECT_TRUE(info.is_default);
|
||||
EXPECT_FALSE(info.has_validator_fn);
|
||||
}
|
||||
|
||||
TEST(GetCommandLineFlagInfoOrDieTest, FlagExistsAndWasAssigned) {
|
||||
|
|
@ -1101,7 +1126,7 @@ TEST(GetCommandLineFlagInfoOrDieTest, FlagExistsAndWasAssigned) {
|
|||
EXPECT_EQ("", info.description);
|
||||
EXPECT_EQ("400", info.current_value);
|
||||
EXPECT_EQ("-1", info.default_value);
|
||||
EXPECT_EQ(false, info.is_default);
|
||||
EXPECT_FALSE(info.is_default);
|
||||
FLAGS_test_bool = true;
|
||||
info = GetCommandLineFlagInfoOrDie("test_bool");
|
||||
EXPECT_EQ("test_bool", info.name);
|
||||
|
|
@ -1109,8 +1134,8 @@ TEST(GetCommandLineFlagInfoOrDieTest, FlagExistsAndWasAssigned) {
|
|||
EXPECT_EQ("tests bool-ness", info.description);
|
||||
EXPECT_EQ("true", info.current_value);
|
||||
EXPECT_EQ("false", info.default_value);
|
||||
EXPECT_EQ(false, info.is_default);
|
||||
EXPECT_EQ(false, info.has_validator_fn);
|
||||
EXPECT_FALSE(info.is_default);
|
||||
EXPECT_FALSE(info.has_validator_fn);
|
||||
}
|
||||
|
||||
TEST(GetCommandLineFlagInfoOrDieDeathTest, FlagDoesNotExist) {
|
||||
|
|
@ -1129,10 +1154,10 @@ TEST(DeprecatedFunctionsTest, CommandlineFlagsIntoString) {
|
|||
|
||||
TEST(DeprecatedFunctionsTest, AppendFlagsIntoFile) {
|
||||
FLAGS_test_int32 = 10; // just to make the test more interesting
|
||||
string filename(FLAGS_test_tmpdir + "/flagfile");
|
||||
string filename(TmpFile("flagfile"));
|
||||
unlink(filename.c_str()); // just to be safe
|
||||
const bool r = AppendFlagsIntoFile(filename, "not the real argv0");
|
||||
EXPECT_EQ(true, r);
|
||||
EXPECT_TRUE(r);
|
||||
|
||||
FILE* fp = fopen(filename.c_str(), "r");
|
||||
EXPECT_TRUE(fp != NULL);
|
||||
|
|
@ -1148,27 +1173,27 @@ TEST(DeprecatedFunctionsTest, AppendFlagsIntoFile) {
|
|||
if (strcmp(line, "--test_int32=10\n") == 0)
|
||||
found_int32 = true;
|
||||
}
|
||||
EXPECT_EQ(true, found_int32);
|
||||
EXPECT_EQ(true, found_bool);
|
||||
EXPECT_TRUE(found_int32);
|
||||
EXPECT_TRUE(found_bool);
|
||||
fclose(fp);
|
||||
}
|
||||
|
||||
TEST(DeprecatedFunctionsTest, ReadFromFlagsFile) {
|
||||
FLAGS_test_int32 = -10; // just to make the test more interesting
|
||||
string filename(FLAGS_test_tmpdir + "/flagfile2");
|
||||
string filename(TmpFile("flagfile2"));
|
||||
unlink(filename.c_str()); // just to be safe
|
||||
bool r = AppendFlagsIntoFile(filename, GetArgv0());
|
||||
EXPECT_EQ(true, r);
|
||||
EXPECT_TRUE(r);
|
||||
|
||||
FLAGS_test_int32 = -11;
|
||||
r = ReadFromFlagsFile(filename, GetArgv0(), true);
|
||||
EXPECT_EQ(true, r);
|
||||
EXPECT_TRUE(r);
|
||||
EXPECT_EQ(-10, FLAGS_test_int32);
|
||||
}
|
||||
|
||||
TEST(DeprecatedFunctionsTest, ReadFromFlagsFileFailure) {
|
||||
FLAGS_test_int32 = -20;
|
||||
string filename(FLAGS_test_tmpdir + "/flagfile3");
|
||||
string filename(TmpFile("flagfile3"));
|
||||
FILE* fp = fopen(filename.c_str(), "w");
|
||||
EXPECT_TRUE(fp != NULL);
|
||||
// Note the error in the bool assignment below...
|
||||
|
|
@ -1177,7 +1202,7 @@ TEST(DeprecatedFunctionsTest, ReadFromFlagsFileFailure) {
|
|||
|
||||
FLAGS_test_int32 = -22;
|
||||
const bool r = ReadFromFlagsFile(filename, GetArgv0(), false);
|
||||
EXPECT_EQ(false, r);
|
||||
EXPECT_FALSE(r);
|
||||
EXPECT_EQ(-22, FLAGS_test_int32); // the -21 from the flagsfile didn't take
|
||||
}
|
||||
|
||||
|
|
@ -1191,14 +1216,6 @@ TEST(FlagsSetBeforeInitGoogleTest, TryFromEnv) {
|
|||
|
||||
DEFINE_int32(test_flag, -1, "used for testing commandlineflags.cc");
|
||||
|
||||
// Returns the definition of the --flagfile flag to be used in the tests.
|
||||
const char* GetFlagFileFlag() {
|
||||
static const string flagfile_flag = string("--flagfile=")
|
||||
+ FLAGS_srcdir + "/src/gflags_unittest_flagfile";
|
||||
|
||||
return flagfile_flag.c_str();
|
||||
}
|
||||
|
||||
// Parses and returns the --test_flag flag.
|
||||
// If with_help is true, calls ParseCommandLineFlags; otherwise calls
|
||||
// ParseCommandLineNonHelpFlags.
|
||||
|
|
@ -1506,7 +1523,7 @@ TEST(FlagsValidator, FlagSaver) {
|
|||
{
|
||||
FlagSaver fs;
|
||||
EXPECT_TRUE(RegisterFlagValidator(&FLAGS_test_flag, &ValidateTestFlagIs5));
|
||||
EXPECT_EQ("", SetCommandLineOption("test_flag", "50")); // fails validation
|
||||
EXPECT_EQ("", SetCommandLineOption("test_flag", "50")); // fails validation
|
||||
}
|
||||
EXPECT_NE("", SetCommandLineOption("test_flag", "50")); // validator is gone
|
||||
|
||||
|
|
@ -1550,7 +1567,7 @@ static int Main(int argc, char **argv) {
|
|||
// I had trouble creating a directory in /tmp from mingw
|
||||
FLAGS_test_tmpdir = "./gflags_unittest_testdir";
|
||||
mkdir(FLAGS_test_tmpdir.c_str()); // mingw has a weird one-arg mkdir
|
||||
#elif defined(_WIN32)
|
||||
#elif defined(_MSC_VER)
|
||||
char tmppath_buffer[1024];
|
||||
int tmppath_len = GetTempPathA(sizeof(tmppath_buffer), tmppath_buffer);
|
||||
assert(tmppath_len > 0 && tmppath_len < sizeof(tmppath_buffer));
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue