Skip to content

Commit

Permalink
Merge branch 'develop'
Browse files Browse the repository at this point in the history
  • Loading branch information
Phil Shafer committed Mar 16, 2016
2 parents 23ed713 + b0a972d commit 87fd7f9
Showing 19 changed files with 262 additions and 51 deletions.
1 change: 1 addition & 0 deletions Makefile.am
Original file line number Diff line number Diff line change
@@ -77,6 +77,7 @@ GH_PAGES_PACKAGE_DIR = ${GH_PAGES_DIR}/${GH_PACKAGING_DIR}
packages:
@-[ -d ${GH_PAGES_DIR} ] && set -x \
&& echo "Updating packages on gh-pages ..." \
&& mkdir -p ${GH_PAGES_DIR}/${GH_PACKAGING_DIR} \
&& SHA1="`openssl sha1 ${PACKAGE_FILE} | awk '{print $$2}'`" \
&& SHA256="`openssl sha256 ${PACKAGE_FILE} | awk '{print $$2}'`" \
&& SIZE="`ls -l ${PACKAGE_FILE} | awk '{print $$5}'`" \
3 changes: 3 additions & 0 deletions configure.ac
Original file line number Diff line number Diff line change
@@ -347,12 +347,15 @@ XO_SRCDIR=${srcdir}
XO_LIBDIR=${libdir}
XO_BINDIR=${bindir}
XO_INCLUDEDIR=${includedir}
XO_CFLAGS="${CFLAGS}"

AC_SUBST(XO_LIBS)
AC_SUBST(XO_SRCDIR)
AC_SUBST(XO_LIBDIR)
AC_SUBST(XO_BINDIR)
AC_SUBST(XO_INCLUDEDIR)
AC_SUBST(XO_LIBEXT)
AC_SUBST(XO_CFLAGS)

AC_ARG_WITH(encoder-dir,
[ --with-encoder-dir=[DIR] Specify location of encoder libraries],
31 changes: 31 additions & 0 deletions doc/libxo.txt
Original file line number Diff line number Diff line change
@@ -907,6 +907,16 @@ needed, but often this needs to be controlled by the caller.
JSON:
"year": "2014"

**** The Trim Modifier ({t:})

The trim modifier removes any leading or trailing whitespace from
the value.

EXAMPLE:
xo_emit("{t:description}", " some input ");
JSON:
"description": "some input"

**** The White Space Modifier ({w:})

The white space modifier appends a single space to the data value:
@@ -1653,6 +1663,27 @@ string, since an inappropriate cast can ruin your day. The vap
argument to xo_emit_hv() points to a variable argument list that can
be used to retrieve arguments via va_arg().

*** Additional Emitting Functions

The following functions can also make output, but only make a single
field at a time:

int xo_emit_field_hv (xo_handle_t *xop, const char *rolmod,
const char *contents, const char *fmt,
const char *efmt, va_list vap);

int xo_emit_field_h (xo_handle_t *xop, const char *rolmod,
const char *contents, const char *fmt,
const char *efmt, ...);

int xo_emit_field (const char *rolmod, const char *contents,
const char *fmt, const char *efmt, ...);

These functions are intended to avoid the scenario where one
would otherwise need to compose a format descriptors using
snprintf(). The individual parts of the format descriptor are
passed in distinctly.

*** Attributes (xo_attr) @xo_attr@

The xo_attr() function emits attributes for the XML output style.
16 changes: 8 additions & 8 deletions libxo-config.in
Original file line number Diff line number Diff line change
@@ -77,34 +77,34 @@ while test $# -gt 0; do
;;

--cflags)
echo -I@LIBXO_INCLUDEDIR@ @LIBXO_CFLAGS@
echo -I@XO_INCLUDEDIR@ @XO_CFLAGS@
;;


--share)
echo @LIBXO_SHAREDIR@
echo @XO_SHAREDIR@
;;

--bindir)
echo @LIBXO_BINDIR@
echo @XO_BINDIR@
;;

--libdir)
echo @LIBXO_LIBDIR@
echo @XO_LIBDIR@
;;


--libs)
if [ "`uname`" = "Linux" ]
then
if [ "@LIBXO_LIBDIR@" = "-L/usr/lib" -o "@LIBXO_LIBDIR@" = "-L/usr/lib64" ]
if [ "@XO_LIBDIR@" = "-L/usr/lib" -o "@XO_LIBDIR@" = "-L/usr/lib64" ]
then
echo @LIBXO_LIBS@
echo @XO_LIBS@
else
echo -L@LIBXO_LIBDIR@ @LIBXO_LIBS@
echo -L@XO_LIBDIR@ @XO_LIBS@
fi
else
echo -L@LIBXO_LIBDIR@ @LIBXO_LIBS@ @WIN32_EXTRA_LIBADD@
echo -L@XO_LIBDIR@ @XO_LIBS@
fi
;;

Loading

0 comments on commit 87fd7f9

Please sign in to comment.