From owner-svn-src-stable-11@freebsd.org Mon Aug 7 17:23:46 2017 Return-Path: Delivered-To: svn-src-stable-11@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 78047DBC77F; Mon, 7 Aug 2017 17:23:46 +0000 (UTC) (envelope-from phil@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 1B234759C5; Mon, 7 Aug 2017 17:23:46 +0000 (UTC) (envelope-from phil@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v77HNjFu005378; Mon, 7 Aug 2017 17:23:45 GMT (envelope-from phil@FreeBSD.org) Received: (from phil@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v77HNihZ005373; Mon, 7 Aug 2017 17:23:44 GMT (envelope-from phil@FreeBSD.org) Message-Id: <201708071723.v77HNihZ005373@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: phil set sender to phil@FreeBSD.org using -f From: Phil Shafer Date: Mon, 7 Aug 2017 17:23:44 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-11@freebsd.org Subject: svn commit: r322172 - in stable/11: contrib/libxo contrib/libxo/doc contrib/libxo/encoder/cbor contrib/libxo/encoder/test contrib/libxo/libxo contrib/libxo/tests/core contrib/libxo/tests/core/saved... X-SVN-Group: stable-11 X-SVN-Commit-Author: phil X-SVN-Commit-Paths: in stable/11: contrib/libxo contrib/libxo/doc contrib/libxo/encoder/cbor contrib/libxo/encoder/test contrib/libxo/libxo contrib/libxo/tests/core contrib/libxo/tests/core/saved contrib/libxo/tests/gett... X-SVN-Commit-Revision: 322172 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-stable-11@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: SVN commit messages for only the 11-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 07 Aug 2017 17:23:46 -0000 Author: phil Date: Mon Aug 7 17:23:44 2017 New Revision: 322172 URL: https://svnweb.freebsd.org/changeset/base/322172 Log: Import libxo-0.8.4 from HEAD into stable/11 Submitted by: phil Added: stable/11/contrib/libxo/libxo/xo_options.7 - copied, changed from r318364, head/contrib/libxo/libxo/xo_options.7 Modified: stable/11/contrib/libxo/Makefile.am stable/11/contrib/libxo/configure.ac stable/11/contrib/libxo/doc/Makefile.am stable/11/contrib/libxo/doc/libxo-manual.html stable/11/contrib/libxo/doc/libxo.txt stable/11/contrib/libxo/encoder/cbor/enc_cbor.c stable/11/contrib/libxo/encoder/test/enc_test.c stable/11/contrib/libxo/libxo/Makefile.am stable/11/contrib/libxo/libxo/libxo.3 stable/11/contrib/libxo/libxo/libxo.c stable/11/contrib/libxo/libxo/xo.h stable/11/contrib/libxo/libxo/xo_attr.3 stable/11/contrib/libxo/libxo/xo_buf.h stable/11/contrib/libxo/libxo/xo_create.3 stable/11/contrib/libxo/libxo/xo_emit.3 stable/11/contrib/libxo/libxo/xo_emit_err.3 stable/11/contrib/libxo/libxo/xo_emit_f.3 stable/11/contrib/libxo/libxo/xo_encoder.c stable/11/contrib/libxo/libxo/xo_encoder.h stable/11/contrib/libxo/libxo/xo_err.3 stable/11/contrib/libxo/libxo/xo_error.3 stable/11/contrib/libxo/libxo/xo_finish.3 stable/11/contrib/libxo/libxo/xo_flush.3 stable/11/contrib/libxo/libxo/xo_format.5 stable/11/contrib/libxo/libxo/xo_message.3 stable/11/contrib/libxo/libxo/xo_no_setlocale.3 stable/11/contrib/libxo/libxo/xo_open_container.3 stable/11/contrib/libxo/libxo/xo_open_list.3 stable/11/contrib/libxo/libxo/xo_open_marker.3 stable/11/contrib/libxo/libxo/xo_parse_args.3 stable/11/contrib/libxo/libxo/xo_set_allocator.3 stable/11/contrib/libxo/libxo/xo_set_flags.3 stable/11/contrib/libxo/libxo/xo_set_info.3 stable/11/contrib/libxo/libxo/xo_set_options.3 stable/11/contrib/libxo/libxo/xo_set_style.3 stable/11/contrib/libxo/libxo/xo_set_syslog_enterprise_id.3 stable/11/contrib/libxo/libxo/xo_set_version.3 stable/11/contrib/libxo/libxo/xo_set_writer.3 stable/11/contrib/libxo/libxo/xo_syslog.3 stable/11/contrib/libxo/libxo/xo_syslog.c stable/11/contrib/libxo/tests/core/Makefile.am stable/11/contrib/libxo/tests/core/saved/test_01.E.out stable/11/contrib/libxo/tests/core/saved/test_01.H.out stable/11/contrib/libxo/tests/core/saved/test_01.HIPx.out stable/11/contrib/libxo/tests/core/saved/test_01.HP.out stable/11/contrib/libxo/tests/core/saved/test_01.J.out stable/11/contrib/libxo/tests/core/saved/test_01.JP.out stable/11/contrib/libxo/tests/core/saved/test_01.T.out stable/11/contrib/libxo/tests/core/saved/test_01.X.out stable/11/contrib/libxo/tests/core/saved/test_01.XP.out stable/11/contrib/libxo/tests/core/saved/test_02.E.out stable/11/contrib/libxo/tests/core/saved/test_02.J.out stable/11/contrib/libxo/tests/core/saved/test_02.JP.out stable/11/contrib/libxo/tests/core/saved/test_02.X.out stable/11/contrib/libxo/tests/core/saved/test_02.XP.out stable/11/contrib/libxo/tests/core/saved/test_03.E.out stable/11/contrib/libxo/tests/core/saved/test_04.E.out stable/11/contrib/libxo/tests/core/saved/test_05.E.out stable/11/contrib/libxo/tests/core/saved/test_06.E.out stable/11/contrib/libxo/tests/core/saved/test_07.E.out stable/11/contrib/libxo/tests/core/saved/test_08.E.out stable/11/contrib/libxo/tests/core/saved/test_09.E.out stable/11/contrib/libxo/tests/core/saved/test_10.E.out stable/11/contrib/libxo/tests/core/saved/test_10.X.out stable/11/contrib/libxo/tests/core/saved/test_10.XP.out stable/11/contrib/libxo/tests/core/saved/test_11.E.out stable/11/contrib/libxo/tests/core/saved/test_11.HIPx.out stable/11/contrib/libxo/tests/core/saved/test_11.X.out stable/11/contrib/libxo/tests/core/saved/test_11.XP.out stable/11/contrib/libxo/tests/core/saved/test_12.E.out stable/11/contrib/libxo/tests/core/saved/test_12.H.out stable/11/contrib/libxo/tests/core/saved/test_12.HIPx.out stable/11/contrib/libxo/tests/core/saved/test_12.HP.out stable/11/contrib/libxo/tests/core/saved/test_12.J.out stable/11/contrib/libxo/tests/core/saved/test_12.JP.out stable/11/contrib/libxo/tests/core/saved/test_12.T.out stable/11/contrib/libxo/tests/core/saved/test_12.X.out stable/11/contrib/libxo/tests/core/saved/test_12.XP.out stable/11/contrib/libxo/tests/core/test_01.c stable/11/contrib/libxo/tests/core/test_12.c stable/11/contrib/libxo/tests/gettext/Makefile.am stable/11/contrib/libxo/tests/gettext/saved/gt_01.J.out stable/11/contrib/libxo/tests/gettext/saved/gt_01.JP.out stable/11/contrib/libxo/tests/xo/Makefile.am stable/11/contrib/libxo/tests/xo/saved/xo_01.H.out stable/11/contrib/libxo/tests/xo/saved/xo_01.HIPx.out stable/11/contrib/libxo/tests/xo/saved/xo_01.HP.out stable/11/contrib/libxo/tests/xo/saved/xo_01.J.out stable/11/contrib/libxo/tests/xo/saved/xo_01.JP.out stable/11/contrib/libxo/tests/xo/saved/xo_01.T.out stable/11/contrib/libxo/tests/xo/saved/xo_01.X.out stable/11/contrib/libxo/tests/xo/saved/xo_01.XP.out stable/11/contrib/libxo/tests/xo/xo_01.sh stable/11/contrib/libxo/xo/xo.1 stable/11/contrib/libxo/xo/xo.c stable/11/contrib/libxo/xohtml/xohtml.1 stable/11/contrib/libxo/xohtml/xohtml.css stable/11/contrib/libxo/xohtml/xohtml.sh.in stable/11/contrib/libxo/xolint/xolint.1 stable/11/contrib/libxo/xopo/xopo.1 stable/11/contrib/libxo/xopo/xopo.c stable/11/lib/libxo/Makefile stable/11/lib/libxo/add.man stable/11/lib/libxo/tests/functional_test.sh stable/11/lib/libxo/xo_config.h stable/11/usr.bin/xo/Makefile stable/11/usr.bin/xo/tests/functional_test.sh Directory Properties: stable/11/ (props changed) Modified: stable/11/contrib/libxo/Makefile.am ============================================================================== --- stable/11/contrib/libxo/Makefile.am Mon Aug 7 17:23:10 2017 (r322171) +++ stable/11/contrib/libxo/Makefile.am Mon Aug 7 17:23:44 2017 (r322172) @@ -38,7 +38,14 @@ GH_PAGES_DIR = gh-pages/ GH_PAGES_DIR_VER = gh-pages/${PACKAGE_VERSION} PACKAGE_FILE = ${PACKAGE_TARNAME}-${PACKAGE_VERSION}.tar.gz -upload: dist upload-docs +XOHTML_FILES = \ + ${top_srcdir}/xohtml/xohtml.css \ + ${top_srcdir}/xohtml/xohtml.js \ + ${top_srcdir}/xohtml/external/jquery.js \ + ${top_srcdir}/xohtml/external/jquery.qtip.css \ + ${top_srcdir}/xohtml/external/jquery.qtip.js + +upload: dist upload-docs upload-xohtml-files @echo "Remember to run:" @echo " gt tag ${PACKAGE_VERSION}" @@ -56,6 +63,18 @@ upload-docs: docs libxo-manual.html ${PACKAGE_VERSION} \ && git push origin gh-pages ) ; true +upload-xohtml-files: + @echo "Uploading xohtml files ... " + @-[ -d ${GH_PAGES_DIR} ] \ + && echo "Updating xohtml files on gh-pages ..." \ + && mkdir -p ${GH_PAGES_DIR_VER}/xohtml \ + && cp ${XOHTML_FILES} ${GH_PAGES_DIR_VER}/xohtml \ + && (cd ${GH_PAGES_DIR} \ + && git add ${PACKAGE_VERSION}/xohtml \ + && git commit -m 'new xohtml files' \ + ${PACKAGE_VERSION}/xohtml \ + && git push origin gh-pages ) ; true + pkgconfigdir=$(libdir)/pkgconfig pkgconfig_DATA = packaging/${PACKAGE_NAME}.pc @@ -100,4 +119,25 @@ ANALYZE_DIR = ~/trash/libxo ANALYZE_CMD = scan-build-mp-3.6 analyze: + ${MAKE} clean ${ANALYZE_CMD} -o ${ANALYZE_DIR} ${MAKE} + +SANIFLAGS=-fno-omit-frame-pointer -g -O2 + +sanitize-address: + ${MAKE} clean + ${MAKE} CFLAGS="-fsanitize=address ${SANIFLAGS}" + ${MAKE} install + ${MAKE} test + +sanitize-undefined: + ${MAKE} clean + ${MAKE} CFLAGS="-fsanitize=undefined ${SANIFLAGS}" + ${MAKE} install + ${MAKE} test + +sanitize-memory: + ${MAKE} clean + ${MAKE} CFLAGS="-fsanitize=memory ${SANIFLAGS}" + ${MAKE} install + ${MAKE} test Modified: stable/11/contrib/libxo/configure.ac ============================================================================== --- stable/11/contrib/libxo/configure.ac Mon Aug 7 17:23:10 2017 (r322171) +++ stable/11/contrib/libxo/configure.ac Mon Aug 7 17:23:44 2017 (r322172) @@ -12,7 +12,7 @@ # AC_PREREQ(2.2) -AC_INIT([libxo], [0.6.3], [phil@juniper.net]) +AC_INIT([libxo], [0.8.4], [phil@juniper.net]) AM_INIT_AUTOMAKE([-Wall -Werror foreign -Wno-portability]) # Support silent build rules. Requires at least automake-1.11. @@ -20,7 +20,6 @@ AM_INIT_AUTOMAKE([-Wall -Werror foreign -Wno-portabili m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])]) AC_PROG_CC -AM_PROG_AR AC_PROG_INSTALL AC_CONFIG_MACRO_DIR([m4]) AC_PROG_LN_S @@ -135,6 +134,21 @@ if test "$GETTEXT_ENABLE" != "no"; then AC_MSG_RESULT([$HAVE_GETTEXT]) fi + + if test "$HAVE_GETTEXT" != "yes"; then + GETTEXT_PREFIX=/usr/local + AC_MSG_CHECKING([gettext in ${GETTEXT_PREFIX}]) + + _save_cflags="$CFLAGS" + CFLAGS="$CFLAGS -I${GETTEXT_PREFIX}/include -L${GETTEXT_PREFIX}/lib -Werror -lintl" + AC_LINK_IFELSE([AC_LANG_SOURCE([[#include ] + [int main() {char *cp = dgettext(NULL, "xx"); return 0; }]])], + [HAVE_GETTEXT=yes], + [HAVE_GETTEXT=no]) + CFLAGS="$_save_cflags" + + AC_MSG_RESULT([$HAVE_GETTEXT]) + fi fi if test "$HAVE_GETTEXT" = "yes"; then @@ -277,6 +291,13 @@ AC_ARG_ENABLE([debug], [LIBXO_DEBUG=no]) AC_MSG_RESULT([$LIBXO_DEBUG]) AM_CONDITIONAL([LIBXO_DEBUG], [test "$LIBXO_DEBUG" != "no"]) + +AC_MSG_CHECKING([whether to use int return codes]) +AC_ARG_ENABLE([int-return-codes], + [ --enable-int-return-codes Use int return codes (instead of ssize_t)], + [USE_INT_RETURN_CODES=yes; AC_DEFINE([USE_INT_RETURN_CODES], [1], [Use int return codes])], + [USE_INT_RETURN_CODES=no]) +AC_MSG_RESULT([$USE_INT_RETURN_CODES]) AC_MSG_CHECKING([whether to build with text-only rendering]) AC_ARG_ENABLE([text-only], Modified: stable/11/contrib/libxo/doc/Makefile.am ============================================================================== --- stable/11/contrib/libxo/doc/Makefile.am Mon Aug 7 17:23:10 2017 (r322171) +++ stable/11/contrib/libxo/doc/Makefile.am Mon Aug 7 17:23:44 2017 (r322172) @@ -61,9 +61,9 @@ xolint.txt: ${top_srcdir}/xolint/xolint.pl CLEANFILES = \ xolint.txt \ ${INPUT}.xml \ -${INPUT}.txt \ ${INPUT}.fxml \ -${INPUT}.html +${OUTPUT}.txt \ +${OUTPUT}.html else doc docs: @${ECHO} "The 'oxtradoc' tool is not installed; see libslax.org" Modified: stable/11/contrib/libxo/doc/libxo-manual.html ============================================================================== --- stable/11/contrib/libxo/doc/libxo-manual.html Mon Aug 7 17:23:10 2017 (r322171) +++ stable/11/contrib/libxo/doc/libxo-manual.html Mon Aug 7 17:23:44 2017 (r322172) @@ -515,7 +515,7 @@ li.indline1 { } @top-right { - content: "May 2016"; + content: "August 2017"; } @top-center { @@ -21983,15 +21983,17 @@ jQuery(function ($) { - - - - - - - - - + + + + + + + + + + + @@ -22009,7 +22011,7 @@ jQuery(function ($) { -May 28, 2016 +August 3, 2017

libxo: The Easy Way to Generate text, XML, JSON, and HTML output
libxo-manual

@@ -22018,394 +22020,413 @@ jQuery(function ($) {