From e6dc2de92744889ec6f8554dca727e757415b78c Mon Sep 17 00:00:00 2001 From: Art Clarke Date: Sat, 30 Aug 2014 07:57:39 -0700 Subject: [PATCH 1/9] autotools addition --- humble-video-captive/src/main/gnu/mk/compile | 1 + 1 file changed, 1 insertion(+) create mode 120000 humble-video-captive/src/main/gnu/mk/compile diff --git a/humble-video-captive/src/main/gnu/mk/compile b/humble-video-captive/src/main/gnu/mk/compile new file mode 120000 index 00000000..497c039c --- /dev/null +++ b/humble-video-captive/src/main/gnu/mk/compile @@ -0,0 +1 @@ +/usr/local/Cellar/automake/1.14.1/share/automake-1.14/compile \ No newline at end of file From 2b94fee55dc5e34d67c2b07470fb6243067a0306 Mon Sep 17 00:00:00 2001 From: Art Clarke Date: Sat, 30 Aug 2014 07:58:04 -0700 Subject: [PATCH 2/9] move to 0.1.1-SNAPSHOT in my attempt to fix versioning, and add SonaType info --- humble-video-all/pom.xml | 9 +- humble-video-captive/pom.xml | 6 +- humble-video-captive/src/main/gnu/Makefile.in | 17 +- humble-video-captive/src/main/gnu/aclocal.m4 | 109 +++- humble-video-captive/src/main/gnu/configure | 471 ++++++++++----- .../src/main/gnu/configure.ac | 6 +- .../src/main/gnu/ffmpeg/Makefile.in | 3 +- .../src/main/gnu/libmp3lame/Makefile.in | 3 +- .../src/main/gnu/libogg/Makefile.in | 3 +- .../src/main/gnu/liboil/Makefile.in | 3 +- .../src/main/gnu/libopencore-amr/Makefile.in | 3 +- .../src/main/gnu/librtmp/Makefile.in | 3 +- .../src/main/gnu/libspeex/Makefile.in | 3 +- .../src/main/gnu/libtheora/Makefile.in | 3 +- .../src/main/gnu/libtiff/Makefile.in | 3 +- .../src/main/gnu/libvo-aacenc/Makefile.in | 3 +- .../src/main/gnu/libvorbis/Makefile.in | 3 +- .../src/main/gnu/libvpx/Makefile.in | 3 +- .../src/main/gnu/libx264/Makefile.in | 3 +- .../src/main/gnu/openssl/Makefile.in | 3 +- .../src/main/gnu/spandsp/Makefile.in | 3 +- .../src/main/gnu/zlib/Makefile.in | 3 +- humble-video-native/pom.xml | 6 +- humble-video-native/src/main/gnu/Makefile.in | 1 + humble-video-native/src/main/gnu/config.h.in | 3 + humble-video-native/src/main/gnu/configure | 26 +- humble-video-native/src/main/gnu/configure.ac | 6 +- .../src/main/gnu/mk/pom.xml.in | 2 +- .../src/main/gnu/src/Makefile.in | 1 + .../src/main/gnu/src/io/Makefile.in | 1 + .../src/main/gnu/src/io/humble/Makefile.in | 1 + .../main/gnu/src/io/humble/ferry/Makefile.in | 1 + .../main/gnu/src/io/humble/video/Makefile.in | 1 + .../src/io/humble/video/customio/Makefile.in | 1 + .../src/main/gnu/test/Makefile.in | 1 + .../src/main/gnu/test/io/Makefile.in | 1 + .../src/main/gnu/test/io/humble/Makefile.in | 1 + .../main/gnu/test/io/humble/ferry/Makefile.in | 1 + .../gnu/test/io/humble/testutils/Makefile.in | 1 + .../main/gnu/test/io/humble/video/Makefile.in | 1 + .../test/io/humble/video/customio/Makefile.in | 1 + humble-video-noarch/pom.xml | 6 +- humble-video-parent/pom.xml | 540 ++++++++++-------- humble-video-stage/pom.xml | 2 +- humble-video-test/pom.xml | 6 +- pom.xml | 43 +- 46 files changed, 854 insertions(+), 466 deletions(-) diff --git a/humble-video-all/pom.xml b/humble-video-all/pom.xml index 9481a991..93283b53 100644 --- a/humble-video-all/pom.xml +++ b/humble-video-all/pom.xml @@ -5,7 +5,7 @@ io.humble humble-video-parent - 0.1-SNAPSHOT + 0.1.1-SNAPSHOT ../humble-video-parent/pom.xml @@ -19,30 +19,37 @@ io.humble humble-video-arch-i686-apple-darwin12 + 0.1.1-SNAPSHOT io.humble humble-video-arch-x86_64-apple-darwin12 + 0.1.1-SNAPSHOT io.humble humble-video-arch-i686-pc-linux-gnu6 + 0.1.1-SNAPSHOT io.humble humble-video-arch-x86_64-pc-linux-gnu6 + 0.1.1-SNAPSHOT io.humble humble-video-arch-i686-w64-mingw32 + 0.1.1-SNAPSHOT io.humble humble-video-arch-x86_64-w64-mingw32 + 0.1.1-SNAPSHOT io.humble humble-video-noarch + 0.1.1-SNAPSHOT diff --git a/humble-video-captive/pom.xml b/humble-video-captive/pom.xml index 2bb6a63d..11e82d93 100644 --- a/humble-video-captive/pom.xml +++ b/humble-video-captive/pom.xml @@ -1,14 +1,14 @@ - + 4.0.0 io.humble humble-video-parent - 0.1-SNAPSHOT + 0.1.1-SNAPSHOT ../humble-video-parent/pom.xml humble-video-captive + 0.1.1-SNAPSHOT pom humble-video-captive diff --git a/humble-video-captive/src/main/gnu/Makefile.in b/humble-video-captive/src/main/gnu/Makefile.in index 0f1cb03e..48cc8fdd 100644 --- a/humble-video-captive/src/main/gnu/Makefile.in +++ b/humble-video-captive/src/main/gnu/Makefile.in @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.13.2 from Makefile.am. +# Makefile.in generated by automake 1.14.1 from Makefile.am. # @configure_input@ # Copyright (C) 1994-2013 Free Software Foundation, Inc. @@ -82,8 +82,9 @@ subdir = . DIST_COMMON = INSTALL NEWS README AUTHORS ChangeLog \ $(srcdir)/Makefile.in $(srcdir)/Makefile.am \ $(top_srcdir)/configure $(am__configure_deps) \ - $(srcdir)/Makefile.global.in COPYING mk/config.guess \ - mk/config.sub mk/install-sh mk/missing mk/ltmain.sh \ + $(srcdir)/Makefile.global.in COPYING mk/compile \ + mk/config.guess mk/config.sub mk/install-sh mk/missing \ + mk/ltmain.sh $(top_srcdir)/mk/compile \ $(top_srcdir)/mk/config.guess $(top_srcdir)/mk/config.sub \ $(top_srcdir)/mk/install-sh $(top_srcdir)/mk/ltmain.sh \ $(top_srcdir)/mk/missing @@ -250,6 +251,7 @@ LIBTOOL = @LIBTOOL@ LIBTOOL_DEPS = @LIBTOOL_DEPS@ LIB_MAJOR_VERSION = @LIB_MAJOR_VERSION@ LIB_MINOR_VERSION = @LIB_MINOR_VERSION@ +LIB_PATCH_VERSION = @LIB_PATCH_VERSION@ LIPO = @LIPO@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ @@ -600,10 +602,16 @@ dist-xz: distdir $(am__post_remove_distdir) dist-tarZ: distdir + @echo WARNING: "Support for shar distribution archives is" \ + "deprecated." >&2 + @echo WARNING: "It will be removed altogether in Automake 2.0" >&2 tardir=$(distdir) && $(am__tar) | compress -c >$(distdir).tar.Z $(am__post_remove_distdir) dist-shar: distdir + @echo WARNING: "Support for distribution archives compressed with" \ + "legacy program 'compress' is deprecated." >&2 + @echo WARNING: "It will be removed altogether in Automake 2.0" >&2 shar $(distdir) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).shar.gz $(am__post_remove_distdir) @@ -645,9 +653,10 @@ distcheck: dist && dc_destdir="$${TMPDIR-/tmp}/am-dc-$$$$/" \ && am__cwd=`pwd` \ && $(am__cd) $(distdir)/_build \ - && ../configure --srcdir=.. --prefix="$$dc_install_base" \ + && ../configure \ $(AM_DISTCHECK_CONFIGURE_FLAGS) \ $(DISTCHECK_CONFIGURE_FLAGS) \ + --srcdir=.. --prefix="$$dc_install_base" \ && $(MAKE) $(AM_MAKEFLAGS) \ && $(MAKE) $(AM_MAKEFLAGS) dvi \ && $(MAKE) $(AM_MAKEFLAGS) check \ diff --git a/humble-video-captive/src/main/gnu/aclocal.m4 b/humble-video-captive/src/main/gnu/aclocal.m4 index 74429364..3f19400e 100644 --- a/humble-video-captive/src/main/gnu/aclocal.m4 +++ b/humble-video-captive/src/main/gnu/aclocal.m4 @@ -1,4 +1,4 @@ -# generated automatically by aclocal 1.13.2 -*- Autoconf -*- +# generated automatically by aclocal 1.14.1 -*- Autoconf -*- # Copyright (C) 1996-2013 Free Software Foundation, Inc. @@ -14,8 +14,8 @@ m4_ifndef([AC_CONFIG_MACRO_DIRS], [m4_defun([_AM_CONFIG_MACRO_DIRS], [])m4_defun([AC_CONFIG_MACRO_DIRS], [_AM_CONFIG_MACRO_DIRS($@)])]) m4_ifndef([AC_AUTOCONF_VERSION], [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl -m4_if(m4_defn([AC_AUTOCONF_VERSION]), [2.69],, -[m4_warning([this file was generated for autoconf 2.69. +m4_if(m4_defn([AC_AUTOCONF_VERSION]), [2.68],, +[m4_warning([this file was generated for autoconf 2.68. You have another version of autoconf. It may work, but is not guaranteed to. If you have problems, you may need to regenerate the build system entirely. To do so, use the procedure documented by the package, typically 'autoreconf'.])]) @@ -32,10 +32,10 @@ To do so, use the procedure documented by the package, typically 'autoreconf'.]) # generated from the m4 files accompanying Automake X.Y. # (This private macro should not be called outside this file.) AC_DEFUN([AM_AUTOMAKE_VERSION], -[am__api_version='1.13' +[am__api_version='1.14' dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to dnl require some minimum version. Point them to the right macro. -m4_if([$1], [1.13.2], [], +m4_if([$1], [1.14.1], [], [AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl ]) @@ -51,7 +51,7 @@ m4_define([_AM_AUTOCONF_VERSION], []) # Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced. # This function is AC_REQUIREd by AM_INIT_AUTOMAKE. AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION], -[AM_AUTOMAKE_VERSION([1.13.2])dnl +[AM_AUTOMAKE_VERSION([1.14.1])dnl m4_ifndef([AC_AUTOCONF_VERSION], [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl _AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))]) @@ -173,6 +173,12 @@ fi])]) # This macro actually does too much. Some checks are only needed if # your package does certain things. But this isn't really a big deal. +dnl Redefine AC_PROG_CC to automatically invoke _AM_PROG_CC_C_O. +m4_define([AC_PROG_CC], +m4_defn([AC_PROG_CC]) +[_AM_PROG_CC_C_O +]) + # AM_INIT_AUTOMAKE(PACKAGE, VERSION, [NO-DEFINE]) # AM_INIT_AUTOMAKE([OPTIONS]) # ----------------------------------------------- @@ -281,7 +287,48 @@ dnl macro is hooked onto _AC_COMPILER_EXEEXT early, see below. AC_CONFIG_COMMANDS_PRE(dnl [m4_provide_if([_AM_COMPILER_EXEEXT], [AM_CONDITIONAL([am__EXEEXT], [test -n "$EXEEXT"])])])dnl -]) + +# POSIX will say in a future version that running "rm -f" with no argument +# is OK; and we want to be able to make that assumption in our Makefile +# recipes. So use an aggressive probe to check that the usage we want is +# actually supported "in the wild" to an acceptable degree. +# See automake bug#10828. +# To make any issue more visible, cause the running configure to be aborted +# by default if the 'rm' program in use doesn't match our expectations; the +# user can still override this though. +if rm -f && rm -fr && rm -rf; then : OK; else + cat >&2 <<'END' +Oops! + +Your 'rm' program seems unable to run without file operands specified +on the command line, even when the '-f' option is present. This is contrary +to the behaviour of most rm programs out there, and not conforming with +the upcoming POSIX standard: + +Please tell bug-automake@gnu.org about your system, including the value +of your $PATH and any error possibly output before this message. This +can help us improve future automake versions. + +END + if test x"$ACCEPT_INFERIOR_RM_PROGRAM" = x"yes"; then + echo 'Configuration will proceed anyway, since you have set the' >&2 + echo 'ACCEPT_INFERIOR_RM_PROGRAM variable to "yes"' >&2 + echo >&2 + else + cat >&2 <<'END' +Aborting the configuration process, to ensure you take notice of the issue. + +You can download and install GNU coreutils to get an 'rm' implementation +that behaves properly: . + +If you want to complete the configuration process using your problematic +'rm' anyway, export the environment variable ACCEPT_INFERIOR_RM_PROGRAM +to "yes", and re-run configure. + +END + AC_MSG_ERROR([Your 'rm' program is bad, sorry.]) + fi +fi]) dnl Hook into '_AC_COMPILER_EXEEXT' early to learn its expansion. Do not dnl add the conditional right here, as _AC_COMPILER_EXEEXT may be further @@ -289,7 +336,6 @@ dnl mangled by Autoconf and run in a shell conditional statement. m4_define([_AC_COMPILER_EXEEXT], m4_defn([_AC_COMPILER_EXEEXT])[m4_provide([_AM_COMPILER_EXEEXT])]) - # When config.status generates a header, we must update the stamp-h file. # This file resides in the same directory as the config header # that is generated. The stamp files are numbered to have different names. @@ -457,6 +503,53 @@ AC_DEFUN([_AM_SET_OPTIONS], AC_DEFUN([_AM_IF_OPTION], [m4_ifset(_AM_MANGLE_OPTION([$1]), [$2], [$3])]) +# Copyright (C) 1999-2013 Free Software Foundation, Inc. +# +# This file is free software; the Free Software Foundation +# gives unlimited permission to copy and/or distribute it, +# with or without modifications, as long as this notice is preserved. + +# _AM_PROG_CC_C_O +# --------------- +# Like AC_PROG_CC_C_O, but changed for automake. We rewrite AC_PROG_CC +# to automatically call this. +AC_DEFUN([_AM_PROG_CC_C_O], +[AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl +AC_REQUIRE_AUX_FILE([compile])dnl +AC_LANG_PUSH([C])dnl +AC_CACHE_CHECK( + [whether $CC understands -c and -o together], + [am_cv_prog_cc_c_o], + [AC_LANG_CONFTEST([AC_LANG_PROGRAM([])]) + # Make sure it works both with $CC and with simple cc. + # Following AC_PROG_CC_C_O, we do the test twice because some + # compilers refuse to overwrite an existing .o file with -o, + # though they will create one. + am_cv_prog_cc_c_o=yes + for am_i in 1 2; do + if AM_RUN_LOG([$CC -c conftest.$ac_ext -o conftest2.$ac_objext]) \ + && test -f conftest2.$ac_objext; then + : OK + else + am_cv_prog_cc_c_o=no + break + fi + done + rm -f core conftest* + unset am_i]) +if test "$am_cv_prog_cc_c_o" != yes; then + # Losing compiler, so override with the script. + # FIXME: It is wrong to rewrite CC. + # But if we don't then we get into trouble of one sort or another. + # A longer-term fix would be to have automake use am__CC in this case, + # and then we could set am__CC="\$(top_srcdir)/compile \$(CC)" + CC="$am_aux_dir/compile $CC" +fi +AC_LANG_POP([C])]) + +# For backward compatibility. +AC_DEFUN_ONCE([AM_PROG_CC_C_O], [AC_REQUIRE([AC_PROG_CC])]) + # Copyright (C) 2001-2013 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation diff --git a/humble-video-captive/src/main/gnu/configure b/humble-video-captive/src/main/gnu/configure index 7069e2f4..7bbf6fde 100755 --- a/humble-video-captive/src/main/gnu/configure +++ b/humble-video-captive/src/main/gnu/configure @@ -1,11 +1,13 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.69 for humble-captive 0.1. +# Generated by GNU Autoconf 2.68 for humble-captive 0.1.1. # # Report bugs to . # # -# Copyright (C) 1992-1996, 1998-2012 Free Software Foundation, Inc. +# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, +# 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 Free Software +# Foundation, Inc. # # # This configure script is free software; the Free Software Foundation @@ -134,31 +136,6 @@ export LANGUAGE # CDPATH. (unset CDPATH) >/dev/null 2>&1 && unset CDPATH -# Use a proper internal environment variable to ensure we don't fall - # into an infinite loop, continuously re-executing ourselves. - if test x"${_as_can_reexec}" != xno && test "x$CONFIG_SHELL" != x; then - _as_can_reexec=no; export _as_can_reexec; - # We cannot yet assume a decent shell, so we have to provide a -# neutralization value for shells without unset; and this also -# works around shells that cannot unset nonexistent variables. -# Preserve -v and -x to the replacement shell. -BASH_ENV=/dev/null -ENV=/dev/null -(unset BASH_ENV) >/dev/null 2>&1 && unset BASH_ENV ENV -case $- in # (((( - *v*x* | *x*v* ) as_opts=-vx ;; - *v* ) as_opts=-v ;; - *x* ) as_opts=-x ;; - * ) as_opts= ;; -esac -exec $CONFIG_SHELL $as_opts "$as_myself" ${1+"$@"} -# Admittedly, this is quite paranoid, since all the known shells bail -# out after a failed `exec'. -$as_echo "$0: could not re-execute with $CONFIG_SHELL" >&2 -as_fn_exit 255 - fi - # We don't want this to propagate to other subprocesses. - { _as_can_reexec=; unset _as_can_reexec;} if test "x$CONFIG_SHELL" = x; then as_bourne_compatible="if test -n \"\${ZSH_VERSION+set}\" && (emulate sh) >/dev/null 2>&1; then : emulate sh @@ -192,8 +169,7 @@ if ( set x; as_fn_ret_success y && test x = \"\$1\" ); then : else exitcode=1; echo positional parameters were not saved. fi -test x\$exitcode = x0 || exit 1 -test -x / || exit 1" +test x\$exitcode = x0 || exit 1" as_suggested=" as_lineno_1=";as_suggested=$as_suggested$LINENO;as_suggested=$as_suggested" as_lineno_1a=\$LINENO as_lineno_2=";as_suggested=$as_suggested$LINENO;as_suggested=$as_suggested" as_lineno_2a=\$LINENO eval 'test \"x\$as_lineno_1'\$as_run'\" != \"x\$as_lineno_2'\$as_run'\" && @@ -246,25 +222,21 @@ IFS=$as_save_IFS if test "x$CONFIG_SHELL" != x; then : - export CONFIG_SHELL - # We cannot yet assume a decent shell, so we have to provide a -# neutralization value for shells without unset; and this also -# works around shells that cannot unset nonexistent variables. -# Preserve -v and -x to the replacement shell. -BASH_ENV=/dev/null -ENV=/dev/null -(unset BASH_ENV) >/dev/null 2>&1 && unset BASH_ENV ENV -case $- in # (((( - *v*x* | *x*v* ) as_opts=-vx ;; - *v* ) as_opts=-v ;; - *x* ) as_opts=-x ;; - * ) as_opts= ;; -esac -exec $CONFIG_SHELL $as_opts "$as_myself" ${1+"$@"} -# Admittedly, this is quite paranoid, since all the known shells bail -# out after a failed `exec'. -$as_echo "$0: could not re-execute with $CONFIG_SHELL" >&2 -exit 255 + # We cannot yet assume a decent shell, so we have to provide a + # neutralization value for shells without unset; and this also + # works around shells that cannot unset nonexistent variables. + # Preserve -v and -x to the replacement shell. + BASH_ENV=/dev/null + ENV=/dev/null + (unset BASH_ENV) >/dev/null 2>&1 && unset BASH_ENV ENV + export CONFIG_SHELL + case $- in # (((( + *v*x* | *x*v* ) as_opts=-vx ;; + *v* ) as_opts=-v ;; + *x* ) as_opts=-x ;; + * ) as_opts= ;; + esac + exec "$CONFIG_SHELL" $as_opts "$as_myself" ${1+"$@"} fi if test x$as_have_required = xno; then : @@ -367,14 +339,6 @@ $as_echo X"$as_dir" | } # as_fn_mkdir_p - -# as_fn_executable_p FILE -# ----------------------- -# Test if FILE is an executable regular file. -as_fn_executable_p () -{ - test -f "$1" && test -x "$1" -} # as_fn_executable_p # as_fn_append VAR VALUE # ---------------------- # Append the text in VALUE to the end of the definition contained in VAR. Take @@ -496,10 +460,6 @@ as_cr_alnum=$as_cr_Letters$as_cr_digits chmod +x "$as_me.lineno" || { $as_echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2; as_fn_exit 1; } - # If we had to re-execute with $CONFIG_SHELL, we're ensured to have - # already done that, so ensure we don't try to do so again and fall - # in an infinite loop. This has already happened in practice. - _as_can_reexec=no; export _as_can_reexec # Don't try to exec as it changes $[0], causing all sort of problems # (the dirname of $[0] is not the place where we might find the # original and so on. Autoconf is especially sensitive to this). @@ -534,16 +494,16 @@ if (echo >conf$$.file) 2>/dev/null; then # ... but there are two gotchas: # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail. # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable. - # In both cases, we have to default to `cp -pR'. + # In both cases, we have to default to `cp -p'. ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe || - as_ln_s='cp -pR' + as_ln_s='cp -p' elif ln conf$$.file conf$$ 2>/dev/null; then as_ln_s=ln else - as_ln_s='cp -pR' + as_ln_s='cp -p' fi else - as_ln_s='cp -pR' + as_ln_s='cp -p' fi rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file rmdir conf$$.dir 2>/dev/null @@ -555,8 +515,28 @@ else as_mkdir_p=false fi -as_test_x='test -x' -as_executable_p=as_fn_executable_p +if test -x / >/dev/null 2>&1; then + as_test_x='test -x' +else + if ls -dL / >/dev/null 2>&1; then + as_ls_L_option=L + else + as_ls_L_option= + fi + as_test_x=' + eval sh -c '\'' + if test -d "$1"; then + test -d "$1/."; + else + case $1 in #( + -*)set "./$1";; + esac; + case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in #(( + ???[sx]*):;;*)false;;esac;fi + '\'' sh + ' +fi +as_executable_p=$as_test_x # Sed expression to map a string onto a valid CPP name. as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'" @@ -590,8 +570,8 @@ MAKEFLAGS= # Identity of this package. PACKAGE_NAME='humble-captive' PACKAGE_TARNAME='humble-captive' -PACKAGE_VERSION='0.1' -PACKAGE_STRING='humble-captive 0.1' +PACKAGE_VERSION='0.1.1' +PACKAGE_STRING='humble-captive 0.1.1' PACKAGE_BUGREPORT='info@humble.io' PACKAGE_URL='' @@ -654,6 +634,7 @@ HOST_TYPE VS_DEBUG VS_DEBUG_FALSE VS_DEBUG_TRUE +LIB_PATCH_VERSION LIB_MINOR_VERSION LIB_MAJOR_VERSION VS_CROSS_COMPILE_FALSE @@ -1261,6 +1242,8 @@ target=$target_alias if test "x$host_alias" != x; then if test "x$build_alias" = x; then cross_compiling=maybe + $as_echo "$as_me: WARNING: if you wanted to set the --build type, don't use --host. + If a cross compiler is detected then cross compile mode will be used" >&2 elif test "x$build_alias" != "x$host_alias"; then cross_compiling=yes fi @@ -1346,7 +1329,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 humble-captive 0.1 to adapt to many kinds of systems. +\`configure' configures humble-captive 0.1.1 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1416,7 +1399,7 @@ fi if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of humble-captive 0.1:";; + short | recursive ) echo "Configuration of humble-captive 0.1.1:";; esac cat <<\_ACEOF @@ -1533,10 +1516,10 @@ fi test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -humble-captive configure 0.1 -generated by GNU Autoconf 2.69 +humble-captive configure 0.1.1 +generated by GNU Autoconf 2.68 -Copyright (C) 2012 Free Software Foundation, Inc. +Copyright (C) 2010 Free Software Foundation, Inc. This configure script is free software; the Free Software Foundation gives unlimited permission to copy, distribute and modify it. _ACEOF @@ -1612,7 +1595,7 @@ $as_echo "$ac_try_echo"; } >&5 test ! -s conftest.err } && test -s conftest$ac_exeext && { test "$cross_compiling" = yes || - test -x conftest$ac_exeext + $as_test_x conftest$ac_exeext }; then : ac_retval=0 else @@ -1910,7 +1893,7 @@ $as_echo "$ac_try_echo"; } >&5 test ! -s conftest.err } && test -s conftest$ac_exeext && { test "$cross_compiling" = yes || - test -x conftest$ac_exeext + $as_test_x conftest$ac_exeext }; then : ac_retval=0 else @@ -1932,8 +1915,8 @@ 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 humble-captive $as_me 0.1, which was -generated by GNU Autoconf 2.69. Invocation command line was +It was created by humble-captive $as_me 0.1.1, which was +generated by GNU Autoconf 2.68. Invocation command line was $ $0 $@ @@ -2311,7 +2294,7 @@ ac_config_sub="$SHELL $ac_aux_dir/config.sub" # Please don't use this var. ac_configure="$SHELL $ac_aux_dir/configure" # Please don't use this var. -am__api_version='1.13' +am__api_version='1.14' # Find a good install program. We prefer a C program (faster), # so one script is as good as another. But avoid the broken or @@ -2350,7 +2333,7 @@ case $as_dir/ in #(( # by default. for ac_prog in ginstall scoinst install; do for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_prog$ac_exec_ext"; then + if { test -f "$as_dir/$ac_prog$ac_exec_ext" && $as_test_x "$as_dir/$ac_prog$ac_exec_ext"; }; then if test $ac_prog = install && grep dspmsg "$as_dir/$ac_prog$ac_exec_ext" >/dev/null 2>&1; then # AIX install. It has an incompatible calling convention. @@ -2534,7 +2517,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_prog_STRIP="${ac_tool_prefix}strip" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -2574,7 +2557,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_prog_ac_ct_STRIP="strip" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -2625,7 +2608,7 @@ do test -z "$as_dir" && as_dir=. for ac_prog in mkdir gmkdir; do for ac_exec_ext in '' $ac_executable_extensions; do - as_fn_executable_p "$as_dir/$ac_prog$ac_exec_ext" || continue + { test -f "$as_dir/$ac_prog$ac_exec_ext" && $as_test_x "$as_dir/$ac_prog$ac_exec_ext"; } || continue case `"$as_dir/$ac_prog$ac_exec_ext" --version 2>&1` in #( 'mkdir (GNU coreutils) '* | \ 'mkdir (coreutils) '* | \ @@ -2672,7 +2655,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_prog_AWK="$ac_prog" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -2797,7 +2780,7 @@ fi # Define the identity of the package. PACKAGE='humble-captive' - VERSION='0.1' + VERSION='0.1.1' cat >>confdefs.h <<_ACEOF @@ -2933,6 +2916,47 @@ $as_echo "$am_cv_prog_tar_pax" >&6; } +# POSIX will say in a future version that running "rm -f" with no argument +# is OK; and we want to be able to make that assumption in our Makefile +# recipes. So use an aggressive probe to check that the usage we want is +# actually supported "in the wild" to an acceptable degree. +# See automake bug#10828. +# To make any issue more visible, cause the running configure to be aborted +# by default if the 'rm' program in use doesn't match our expectations; the +# user can still override this though. +if rm -f && rm -fr && rm -rf; then : OK; else + cat >&2 <<'END' +Oops! + +Your 'rm' program seems unable to run without file operands specified +on the command line, even when the '-f' option is present. This is contrary +to the behaviour of most rm programs out there, and not conforming with +the upcoming POSIX standard: + +Please tell bug-automake@gnu.org about your system, including the value +of your $PATH and any error possibly output before this message. This +can help us improve future automake versions. + +END + if test x"$ACCEPT_INFERIOR_RM_PROGRAM" = x"yes"; then + echo 'Configuration will proceed anyway, since you have set the' >&2 + echo 'ACCEPT_INFERIOR_RM_PROGRAM variable to "yes"' >&2 + echo >&2 + else + cat >&2 <<'END' +Aborting the configuration process, to ensure you take notice of the issue. + +You can download and install GNU coreutils to get an 'rm' implementation +that behaves properly: . + +If you want to complete the configuration process using your problematic +'rm' anyway, export the environment variable ACCEPT_INFERIOR_RM_PROGRAM +to "yes", and re-run configure. + +END + as_fn_error $? "Your 'rm' program is bad, sorry." "$LINENO" 5 + fi +fi { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to enable maintainer-specific portions of Makefiles" >&5 $as_echo_n "checking whether to enable maintainer-specific portions of Makefiles... " >&6; } @@ -3182,7 +3206,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_prog_CC="${ac_tool_prefix}gcc" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -3222,7 +3246,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_prog_ac_ct_CC="gcc" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -3275,7 +3299,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_prog_CC="${ac_tool_prefix}cc" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -3316,7 +3340,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then if test "$as_dir/$ac_word$ac_exec_ext" = "/usr/ucb/cc"; then ac_prog_rejected=yes continue @@ -3374,7 +3398,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_prog_CC="$ac_tool_prefix$ac_prog" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -3418,7 +3442,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_prog_ac_ct_CC="$ac_prog" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -3864,7 +3888,8 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #include #include -struct stat; +#include +#include /* Most of the following tests are stolen from RCS 5.7's src/conf.sh. */ struct buf { int x; }; FILE * (*rcsopen) (struct buf *, struct stat *, int); @@ -3949,6 +3974,65 @@ ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' ac_compiler_gnu=$ac_cv_c_compiler_gnu +ac_ext=c +ac_cpp='$CPP $CPPFLAGS' +ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' +ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' +ac_compiler_gnu=$ac_cv_c_compiler_gnu +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CC understands -c and -o together" >&5 +$as_echo_n "checking whether $CC understands -c and -o together... " >&6; } +if ${am_cv_prog_cc_c_o+:} false; then : + $as_echo_n "(cached) " >&6 +else + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +int +main () +{ + + ; + return 0; +} +_ACEOF + # Make sure it works both with $CC and with simple cc. + # Following AC_PROG_CC_C_O, we do the test twice because some + # compilers refuse to overwrite an existing .o file with -o, + # though they will create one. + am_cv_prog_cc_c_o=yes + for am_i in 1 2; do + if { echo "$as_me:$LINENO: $CC -c conftest.$ac_ext -o conftest2.$ac_objext" >&5 + ($CC -c conftest.$ac_ext -o conftest2.$ac_objext) >&5 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } \ + && test -f conftest2.$ac_objext; then + : OK + else + am_cv_prog_cc_c_o=no + break + fi + done + rm -f core conftest* + unset am_i +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_prog_cc_c_o" >&5 +$as_echo "$am_cv_prog_cc_c_o" >&6; } +if test "$am_cv_prog_cc_c_o" != yes; then + # Losing compiler, so override with the script. + # FIXME: It is wrong to rewrite CC. + # But if we don't then we get into trouble of one sort or another. + # A longer-term fix would be to have automake use am__CC in this case, + # and then we could set am__CC="\$(top_srcdir)/compile \$(CC)" + CC="$am_aux_dir/compile $CC" +fi +ac_ext=c +ac_cpp='$CPP $CPPFLAGS' +ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' +ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' +ac_compiler_gnu=$ac_cv_c_compiler_gnu + + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for a sed that does not truncate output" >&5 $as_echo_n "checking for a sed that does not truncate output... " >&6; } if ${ac_cv_path_SED+:} false; then : @@ -3971,7 +4055,7 @@ do for ac_prog in sed gsed; do for ac_exec_ext in '' $ac_executable_extensions; do ac_path_SED="$as_dir/$ac_prog$ac_exec_ext" - as_fn_executable_p "$ac_path_SED" || continue + { test -f "$ac_path_SED" && $as_test_x "$ac_path_SED"; } || continue # Check for GNU ac_path_SED and select it if it is found. # Check for GNU $ac_path_SED case `"$ac_path_SED" --version 2>&1` in @@ -4047,7 +4131,7 @@ do for ac_prog in grep ggrep; do for ac_exec_ext in '' $ac_executable_extensions; do ac_path_GREP="$as_dir/$ac_prog$ac_exec_ext" - as_fn_executable_p "$ac_path_GREP" || continue + { test -f "$ac_path_GREP" && $as_test_x "$ac_path_GREP"; } || continue # Check for GNU ac_path_GREP and select it if it is found. # Check for GNU $ac_path_GREP case `"$ac_path_GREP" --version 2>&1` in @@ -4113,7 +4197,7 @@ do for ac_prog in egrep; do for ac_exec_ext in '' $ac_executable_extensions; do ac_path_EGREP="$as_dir/$ac_prog$ac_exec_ext" - as_fn_executable_p "$ac_path_EGREP" || continue + { test -f "$ac_path_EGREP" && $as_test_x "$ac_path_EGREP"; } || continue # Check for GNU ac_path_EGREP and select it if it is found. # Check for GNU $ac_path_EGREP case `"$ac_path_EGREP" --version 2>&1` in @@ -4180,7 +4264,7 @@ do for ac_prog in fgrep; do for ac_exec_ext in '' $ac_executable_extensions; do ac_path_FGREP="$as_dir/$ac_prog$ac_exec_ext" - as_fn_executable_p "$ac_path_FGREP" || continue + { test -f "$ac_path_FGREP" && $as_test_x "$ac_path_FGREP"; } || continue # Check for GNU ac_path_FGREP and select it if it is found. # Check for GNU $ac_path_FGREP case `"$ac_path_FGREP" --version 2>&1` in @@ -4436,7 +4520,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_prog_DUMPBIN="$ac_tool_prefix$ac_prog" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -4480,7 +4564,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_prog_ac_ct_DUMPBIN="$ac_prog" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -4904,7 +4988,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_prog_OBJDUMP="${ac_tool_prefix}objdump" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -4944,7 +5028,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_prog_ac_ct_OBJDUMP="objdump" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -5247,7 +5331,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_prog_DLLTOOL="${ac_tool_prefix}dlltool" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -5287,7 +5371,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_prog_ac_ct_DLLTOOL="dlltool" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -5388,7 +5472,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_prog_AR="$ac_tool_prefix$ac_prog" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -5432,7 +5516,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_prog_ac_ct_AR="$ac_prog" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -5557,7 +5641,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_prog_STRIP="${ac_tool_prefix}strip" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -5597,7 +5681,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_prog_ac_ct_STRIP="strip" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -5656,7 +5740,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_prog_RANLIB="${ac_tool_prefix}ranlib" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -5696,7 +5780,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_prog_ac_ct_RANLIB="ranlib" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -6345,7 +6429,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_prog_MANIFEST_TOOL="${ac_tool_prefix}mt" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -6385,7 +6469,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_prog_ac_ct_MANIFEST_TOOL="mt" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -6465,7 +6549,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_prog_DSYMUTIL="${ac_tool_prefix}dsymutil" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -6505,7 +6589,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_prog_ac_ct_DSYMUTIL="dsymutil" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -6557,7 +6641,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_prog_NMEDIT="${ac_tool_prefix}nmedit" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -6597,7 +6681,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_prog_ac_ct_NMEDIT="nmedit" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -6649,7 +6733,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_prog_LIPO="${ac_tool_prefix}lipo" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -6689,7 +6773,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_prog_ac_ct_LIPO="lipo" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -6741,7 +6825,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_prog_OTOOL="${ac_tool_prefix}otool" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -6781,7 +6865,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_prog_ac_ct_OTOOL="otool" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -6833,7 +6917,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_prog_OTOOL64="${ac_tool_prefix}otool64" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -6873,7 +6957,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_prog_ac_ct_OTOOL64="otool64" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -7435,7 +7519,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_prog_AS="${ac_tool_prefix}as" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -7475,7 +7559,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_prog_ac_ct_AS="as" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -7527,7 +7611,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_prog_DLLTOOL="${ac_tool_prefix}dlltool" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -7567,7 +7651,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_prog_ac_ct_DLLTOOL="dlltool" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -7619,7 +7703,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_prog_OBJDUMP="${ac_tool_prefix}objdump" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -7659,7 +7743,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_prog_ac_ct_OBJDUMP="objdump" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -11730,7 +11814,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_prog_CC="${ac_tool_prefix}gcc" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -11770,7 +11854,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_prog_ac_ct_CC="gcc" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -11823,7 +11907,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_prog_CC="${ac_tool_prefix}cc" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -11864,7 +11948,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then if test "$as_dir/$ac_word$ac_exec_ext" = "/usr/ucb/cc"; then ac_prog_rejected=yes continue @@ -11922,7 +12006,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_prog_CC="$ac_tool_prefix$ac_prog" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -11966,7 +12050,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_prog_ac_ct_CC="$ac_prog" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -12162,7 +12246,8 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #include #include -struct stat; +#include +#include /* Most of the following tests are stolen from RCS 5.7's src/conf.sh. */ struct buf { int x; }; FILE * (*rcsopen) (struct buf *, struct stat *, int); @@ -12247,6 +12332,65 @@ ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' ac_compiler_gnu=$ac_cv_cxx_compiler_gnu +ac_ext=c +ac_cpp='$CPP $CPPFLAGS' +ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' +ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' +ac_compiler_gnu=$ac_cv_c_compiler_gnu +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CC understands -c and -o together" >&5 +$as_echo_n "checking whether $CC understands -c and -o together... " >&6; } +if ${am_cv_prog_cc_c_o+:} false; then : + $as_echo_n "(cached) " >&6 +else + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +int +main () +{ + + ; + return 0; +} +_ACEOF + # Make sure it works both with $CC and with simple cc. + # Following AC_PROG_CC_C_O, we do the test twice because some + # compilers refuse to overwrite an existing .o file with -o, + # though they will create one. + am_cv_prog_cc_c_o=yes + for am_i in 1 2; do + if { echo "$as_me:$LINENO: $CC -c conftest.$ac_ext -o conftest2.$ac_objext" >&5 + ($CC -c conftest.$ac_ext -o conftest2.$ac_objext) >&5 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } \ + && test -f conftest2.$ac_objext; then + : OK + else + am_cv_prog_cc_c_o=no + break + fi + done + rm -f core conftest* + unset am_i +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_prog_cc_c_o" >&5 +$as_echo "$am_cv_prog_cc_c_o" >&6; } +if test "$am_cv_prog_cc_c_o" != yes; then + # Losing compiler, so override with the script. + # FIXME: It is wrong to rewrite CC. + # But if we don't then we get into trouble of one sort or another. + # A longer-term fix would be to have automake use am__CC in this case, + # and then we could set am__CC="\$(top_srcdir)/compile \$(CC)" + CC="$am_aux_dir/compile $CC" +fi +ac_ext=cpp +ac_cpp='$CXXCPP $CPPFLAGS' +ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' +ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' +ac_compiler_gnu=$ac_cv_cxx_compiler_gnu + + ac_ext=cpp ac_cpp='$CXXCPP $CPPFLAGS' ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' @@ -12275,7 +12419,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_prog_CXX="$ac_tool_prefix$ac_prog" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -12319,7 +12463,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_prog_ac_ct_CXX="$ac_prog" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -15751,6 +15895,8 @@ fi LIB_MAJOR_VERSION=0 LIB_MINOR_VERSION=1 +LIB_PATCH_VERSION=1 + @@ -15760,6 +15906,9 @@ $as_echo "#define VS_LIB_MAJOR_VERSION 0" >>confdefs.h $as_echo "#define VS_LIB_MINOR_VERSION 1" >>confdefs.h +$as_echo "#define VS_LIB_PATCH_VERSION 1" >>confdefs.h + + VS_CPPFLAGS= VS_CFLAGS= VS_CXXFLAGS= @@ -15842,7 +15991,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_path_YASM="$as_dir/$ac_word$ac_exec_ext" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -16419,16 +16568,16 @@ if (echo >conf$$.file) 2>/dev/null; then # ... but there are two gotchas: # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail. # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable. - # In both cases, we have to default to `cp -pR'. + # In both cases, we have to default to `cp -p'. ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe || - as_ln_s='cp -pR' + as_ln_s='cp -p' elif ln conf$$.file conf$$ 2>/dev/null; then as_ln_s=ln else - as_ln_s='cp -pR' + as_ln_s='cp -p' fi else - as_ln_s='cp -pR' + as_ln_s='cp -p' fi rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file rmdir conf$$.dir 2>/dev/null @@ -16488,16 +16637,28 @@ else as_mkdir_p=false fi - -# as_fn_executable_p FILE -# ----------------------- -# Test if FILE is an executable regular file. -as_fn_executable_p () -{ - test -f "$1" && test -x "$1" -} # as_fn_executable_p -as_test_x='test -x' -as_executable_p=as_fn_executable_p +if test -x / >/dev/null 2>&1; then + as_test_x='test -x' +else + if ls -dL / >/dev/null 2>&1; then + as_ls_L_option=L + else + as_ls_L_option= + fi + as_test_x=' + eval sh -c '\'' + if test -d "$1"; then + test -d "$1/."; + else + case $1 in #( + -*)set "./$1";; + esac; + case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in #(( + ???[sx]*):;;*)false;;esac;fi + '\'' sh + ' +fi +as_executable_p=$as_test_x # Sed expression to map a string onto a valid CPP name. as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'" @@ -16518,8 +16679,8 @@ 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 humble-captive $as_me 0.1, which was -generated by GNU Autoconf 2.69. Invocation command line was +This file was extended by humble-captive $as_me 0.1.1, which was +generated by GNU Autoconf 2.68. Invocation command line was CONFIG_FILES = $CONFIG_FILES CONFIG_HEADERS = $CONFIG_HEADERS @@ -16575,11 +16736,11 @@ _ACEOF cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" ac_cs_version="\\ -humble-captive config.status 0.1 -configured by $0, generated by GNU Autoconf 2.69, +humble-captive config.status 0.1.1 +configured by $0, generated by GNU Autoconf 2.68, with options \\"\$ac_cs_config\\" -Copyright (C) 2012 Free Software Foundation, Inc. +Copyright (C) 2010 Free Software Foundation, Inc. This config.status script is free software; the Free Software Foundation gives unlimited permission to copy, distribute and modify it." @@ -16659,7 +16820,7 @@ fi _ACEOF cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 if \$ac_cs_recheck; then - set X $SHELL '$0' $ac_configure_args \$ac_configure_extra_args --no-create --no-recursion + set X '$SHELL' '$0' $ac_configure_args \$ac_configure_extra_args --no-create --no-recursion shift \$as_echo "running CONFIG_SHELL=$SHELL \$*" >&6 CONFIG_SHELL='$SHELL' diff --git a/humble-video-captive/src/main/gnu/configure.ac b/humble-video-captive/src/main/gnu/configure.ac index f4eac605..d19a1843 100644 --- a/humble-video-captive/src/main/gnu/configure.ac +++ b/humble-video-captive/src/main/gnu/configure.ac @@ -6,8 +6,9 @@ # JAVA build.xml FILE m4_define([VSM4_LIB_MAJOR_VERSION], [0]) m4_define([VSM4_LIB_MINOR_VERSION], [1]) +m4_define([VSM4_LIB_PATCH_VERSION], [1]) -AC_INIT([humble-captive],[VSM4_LIB_MAJOR_VERSION.VSM4_LIB_MINOR_VERSION],[info@humble.io]) +AC_INIT([humble-captive],[VSM4_LIB_MAJOR_VERSION.VSM4_LIB_MINOR_VERSION.VSM4_LIB_PATCH_VERSION],[info@humble.io]) AC_PREREQ([2.63]) AC_PREFIX_DEFAULT([${HUMBLE_HOME:-/usr/local}]) AC_CONFIG_AUX_DIR(mk) @@ -94,10 +95,13 @@ AM_CONDITIONAL([VS_CROSS_COMPILE], [ test "x$host_alias" != "x" ]) LIB_MAJOR_VERSION=VSM4_LIB_MAJOR_VERSION LIB_MINOR_VERSION=VSM4_LIB_MINOR_VERSION +LIB_PATCH_VERSION=VSM4_LIB_PATCH_VERSION AC_SUBST([LIB_MAJOR_VERSION]) AC_SUBST([LIB_MINOR_VERSION]) +AC_SUBST([LIB_PATCH_VERSION]) AC_DEFINE(VS_LIB_MAJOR_VERSION, [VSM4_LIB_MAJOR_VERSION], [Major version of library]) AC_DEFINE(VS_LIB_MINOR_VERSION, [VSM4_LIB_MINOR_VERSION], [Minor version of library]) +AC_DEFINE(VS_LIB_PATCH_VERSION, [VSM4_LIB_PATCH_VERSION], [Patch version of library]) VS_CPPFLAGS= VS_CFLAGS= diff --git a/humble-video-captive/src/main/gnu/ffmpeg/Makefile.in b/humble-video-captive/src/main/gnu/ffmpeg/Makefile.in index 0bd2cd31..39737e66 100644 --- a/humble-video-captive/src/main/gnu/ffmpeg/Makefile.in +++ b/humble-video-captive/src/main/gnu/ffmpeg/Makefile.in @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.13.2 from Makefile.am. +# Makefile.in generated by automake 1.14.1 from Makefile.am. # @configure_input@ # Copyright (C) 1994-2013 Free Software Foundation, Inc. @@ -164,6 +164,7 @@ LIBTOOL = @LIBTOOL@ LIBTOOL_DEPS = @LIBTOOL_DEPS@ LIB_MAJOR_VERSION = @LIB_MAJOR_VERSION@ LIB_MINOR_VERSION = @LIB_MINOR_VERSION@ +LIB_PATCH_VERSION = @LIB_PATCH_VERSION@ LIPO = @LIPO@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ diff --git a/humble-video-captive/src/main/gnu/libmp3lame/Makefile.in b/humble-video-captive/src/main/gnu/libmp3lame/Makefile.in index 438d1eba..d848a661 100644 --- a/humble-video-captive/src/main/gnu/libmp3lame/Makefile.in +++ b/humble-video-captive/src/main/gnu/libmp3lame/Makefile.in @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.13.2 from Makefile.am. +# Makefile.in generated by automake 1.14.1 from Makefile.am. # @configure_input@ # Copyright (C) 1994-2013 Free Software Foundation, Inc. @@ -163,6 +163,7 @@ LIBTOOL = @LIBTOOL@ LIBTOOL_DEPS = @LIBTOOL_DEPS@ LIB_MAJOR_VERSION = @LIB_MAJOR_VERSION@ LIB_MINOR_VERSION = @LIB_MINOR_VERSION@ +LIB_PATCH_VERSION = @LIB_PATCH_VERSION@ LIPO = @LIPO@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ diff --git a/humble-video-captive/src/main/gnu/libogg/Makefile.in b/humble-video-captive/src/main/gnu/libogg/Makefile.in index deb520fe..076d898f 100644 --- a/humble-video-captive/src/main/gnu/libogg/Makefile.in +++ b/humble-video-captive/src/main/gnu/libogg/Makefile.in @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.13.2 from Makefile.am. +# Makefile.in generated by automake 1.14.1 from Makefile.am. # @configure_input@ # Copyright (C) 1994-2013 Free Software Foundation, Inc. @@ -163,6 +163,7 @@ LIBTOOL = @LIBTOOL@ LIBTOOL_DEPS = @LIBTOOL_DEPS@ LIB_MAJOR_VERSION = @LIB_MAJOR_VERSION@ LIB_MINOR_VERSION = @LIB_MINOR_VERSION@ +LIB_PATCH_VERSION = @LIB_PATCH_VERSION@ LIPO = @LIPO@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ diff --git a/humble-video-captive/src/main/gnu/liboil/Makefile.in b/humble-video-captive/src/main/gnu/liboil/Makefile.in index 6c728ac5..f9fcd240 100644 --- a/humble-video-captive/src/main/gnu/liboil/Makefile.in +++ b/humble-video-captive/src/main/gnu/liboil/Makefile.in @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.13.2 from Makefile.am. +# Makefile.in generated by automake 1.14.1 from Makefile.am. # @configure_input@ # Copyright (C) 1994-2013 Free Software Foundation, Inc. @@ -163,6 +163,7 @@ LIBTOOL = @LIBTOOL@ LIBTOOL_DEPS = @LIBTOOL_DEPS@ LIB_MAJOR_VERSION = @LIB_MAJOR_VERSION@ LIB_MINOR_VERSION = @LIB_MINOR_VERSION@ +LIB_PATCH_VERSION = @LIB_PATCH_VERSION@ LIPO = @LIPO@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ diff --git a/humble-video-captive/src/main/gnu/libopencore-amr/Makefile.in b/humble-video-captive/src/main/gnu/libopencore-amr/Makefile.in index 2448b3d7..cd740037 100644 --- a/humble-video-captive/src/main/gnu/libopencore-amr/Makefile.in +++ b/humble-video-captive/src/main/gnu/libopencore-amr/Makefile.in @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.13.2 from Makefile.am. +# Makefile.in generated by automake 1.14.1 from Makefile.am. # @configure_input@ # Copyright (C) 1994-2013 Free Software Foundation, Inc. @@ -163,6 +163,7 @@ LIBTOOL = @LIBTOOL@ LIBTOOL_DEPS = @LIBTOOL_DEPS@ LIB_MAJOR_VERSION = @LIB_MAJOR_VERSION@ LIB_MINOR_VERSION = @LIB_MINOR_VERSION@ +LIB_PATCH_VERSION = @LIB_PATCH_VERSION@ LIPO = @LIPO@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ diff --git a/humble-video-captive/src/main/gnu/librtmp/Makefile.in b/humble-video-captive/src/main/gnu/librtmp/Makefile.in index 7c46509a..89077f7d 100644 --- a/humble-video-captive/src/main/gnu/librtmp/Makefile.in +++ b/humble-video-captive/src/main/gnu/librtmp/Makefile.in @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.13.2 from Makefile.am. +# Makefile.in generated by automake 1.14.1 from Makefile.am. # @configure_input@ # Copyright (C) 1994-2013 Free Software Foundation, Inc. @@ -164,6 +164,7 @@ LIBTOOL = @LIBTOOL@ LIBTOOL_DEPS = @LIBTOOL_DEPS@ LIB_MAJOR_VERSION = @LIB_MAJOR_VERSION@ LIB_MINOR_VERSION = @LIB_MINOR_VERSION@ +LIB_PATCH_VERSION = @LIB_PATCH_VERSION@ LIPO = @LIPO@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ diff --git a/humble-video-captive/src/main/gnu/libspeex/Makefile.in b/humble-video-captive/src/main/gnu/libspeex/Makefile.in index e62ed61e..3b994b94 100644 --- a/humble-video-captive/src/main/gnu/libspeex/Makefile.in +++ b/humble-video-captive/src/main/gnu/libspeex/Makefile.in @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.13.2 from Makefile.am. +# Makefile.in generated by automake 1.14.1 from Makefile.am. # @configure_input@ # Copyright (C) 1994-2013 Free Software Foundation, Inc. @@ -163,6 +163,7 @@ LIBTOOL = @LIBTOOL@ LIBTOOL_DEPS = @LIBTOOL_DEPS@ LIB_MAJOR_VERSION = @LIB_MAJOR_VERSION@ LIB_MINOR_VERSION = @LIB_MINOR_VERSION@ +LIB_PATCH_VERSION = @LIB_PATCH_VERSION@ LIPO = @LIPO@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ diff --git a/humble-video-captive/src/main/gnu/libtheora/Makefile.in b/humble-video-captive/src/main/gnu/libtheora/Makefile.in index b00422bd..6d3cda22 100644 --- a/humble-video-captive/src/main/gnu/libtheora/Makefile.in +++ b/humble-video-captive/src/main/gnu/libtheora/Makefile.in @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.13.2 from Makefile.am. +# Makefile.in generated by automake 1.14.1 from Makefile.am. # @configure_input@ # Copyright (C) 1994-2013 Free Software Foundation, Inc. @@ -163,6 +163,7 @@ LIBTOOL = @LIBTOOL@ LIBTOOL_DEPS = @LIBTOOL_DEPS@ LIB_MAJOR_VERSION = @LIB_MAJOR_VERSION@ LIB_MINOR_VERSION = @LIB_MINOR_VERSION@ +LIB_PATCH_VERSION = @LIB_PATCH_VERSION@ LIPO = @LIPO@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ diff --git a/humble-video-captive/src/main/gnu/libtiff/Makefile.in b/humble-video-captive/src/main/gnu/libtiff/Makefile.in index 2fd2f43a..e08f40f7 100644 --- a/humble-video-captive/src/main/gnu/libtiff/Makefile.in +++ b/humble-video-captive/src/main/gnu/libtiff/Makefile.in @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.13.2 from Makefile.am. +# Makefile.in generated by automake 1.14.1 from Makefile.am. # @configure_input@ # Copyright (C) 1994-2013 Free Software Foundation, Inc. @@ -163,6 +163,7 @@ LIBTOOL = @LIBTOOL@ LIBTOOL_DEPS = @LIBTOOL_DEPS@ LIB_MAJOR_VERSION = @LIB_MAJOR_VERSION@ LIB_MINOR_VERSION = @LIB_MINOR_VERSION@ +LIB_PATCH_VERSION = @LIB_PATCH_VERSION@ LIPO = @LIPO@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ diff --git a/humble-video-captive/src/main/gnu/libvo-aacenc/Makefile.in b/humble-video-captive/src/main/gnu/libvo-aacenc/Makefile.in index 1286fb15..59633e63 100644 --- a/humble-video-captive/src/main/gnu/libvo-aacenc/Makefile.in +++ b/humble-video-captive/src/main/gnu/libvo-aacenc/Makefile.in @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.13.2 from Makefile.am. +# Makefile.in generated by automake 1.14.1 from Makefile.am. # @configure_input@ # Copyright (C) 1994-2013 Free Software Foundation, Inc. @@ -163,6 +163,7 @@ LIBTOOL = @LIBTOOL@ LIBTOOL_DEPS = @LIBTOOL_DEPS@ LIB_MAJOR_VERSION = @LIB_MAJOR_VERSION@ LIB_MINOR_VERSION = @LIB_MINOR_VERSION@ +LIB_PATCH_VERSION = @LIB_PATCH_VERSION@ LIPO = @LIPO@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ diff --git a/humble-video-captive/src/main/gnu/libvorbis/Makefile.in b/humble-video-captive/src/main/gnu/libvorbis/Makefile.in index 87b03a93..08009ef9 100644 --- a/humble-video-captive/src/main/gnu/libvorbis/Makefile.in +++ b/humble-video-captive/src/main/gnu/libvorbis/Makefile.in @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.13.2 from Makefile.am. +# Makefile.in generated by automake 1.14.1 from Makefile.am. # @configure_input@ # Copyright (C) 1994-2013 Free Software Foundation, Inc. @@ -163,6 +163,7 @@ LIBTOOL = @LIBTOOL@ LIBTOOL_DEPS = @LIBTOOL_DEPS@ LIB_MAJOR_VERSION = @LIB_MAJOR_VERSION@ LIB_MINOR_VERSION = @LIB_MINOR_VERSION@ +LIB_PATCH_VERSION = @LIB_PATCH_VERSION@ LIPO = @LIPO@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ diff --git a/humble-video-captive/src/main/gnu/libvpx/Makefile.in b/humble-video-captive/src/main/gnu/libvpx/Makefile.in index c2578d69..5c87c30d 100644 --- a/humble-video-captive/src/main/gnu/libvpx/Makefile.in +++ b/humble-video-captive/src/main/gnu/libvpx/Makefile.in @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.13.2 from Makefile.am. +# Makefile.in generated by automake 1.14.1 from Makefile.am. # @configure_input@ # Copyright (C) 1994-2013 Free Software Foundation, Inc. @@ -164,6 +164,7 @@ LIBTOOL = @LIBTOOL@ LIBTOOL_DEPS = @LIBTOOL_DEPS@ LIB_MAJOR_VERSION = @LIB_MAJOR_VERSION@ LIB_MINOR_VERSION = @LIB_MINOR_VERSION@ +LIB_PATCH_VERSION = @LIB_PATCH_VERSION@ LIPO = @LIPO@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ diff --git a/humble-video-captive/src/main/gnu/libx264/Makefile.in b/humble-video-captive/src/main/gnu/libx264/Makefile.in index db034097..a36e6412 100644 --- a/humble-video-captive/src/main/gnu/libx264/Makefile.in +++ b/humble-video-captive/src/main/gnu/libx264/Makefile.in @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.13.2 from Makefile.am. +# Makefile.in generated by automake 1.14.1 from Makefile.am. # @configure_input@ # Copyright (C) 1994-2013 Free Software Foundation, Inc. @@ -163,6 +163,7 @@ LIBTOOL = @LIBTOOL@ LIBTOOL_DEPS = @LIBTOOL_DEPS@ LIB_MAJOR_VERSION = @LIB_MAJOR_VERSION@ LIB_MINOR_VERSION = @LIB_MINOR_VERSION@ +LIB_PATCH_VERSION = @LIB_PATCH_VERSION@ LIPO = @LIPO@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ diff --git a/humble-video-captive/src/main/gnu/openssl/Makefile.in b/humble-video-captive/src/main/gnu/openssl/Makefile.in index 41b1c47a..ef29dcfb 100644 --- a/humble-video-captive/src/main/gnu/openssl/Makefile.in +++ b/humble-video-captive/src/main/gnu/openssl/Makefile.in @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.13.2 from Makefile.am. +# Makefile.in generated by automake 1.14.1 from Makefile.am. # @configure_input@ # Copyright (C) 1994-2013 Free Software Foundation, Inc. @@ -164,6 +164,7 @@ LIBTOOL = @LIBTOOL@ LIBTOOL_DEPS = @LIBTOOL_DEPS@ LIB_MAJOR_VERSION = @LIB_MAJOR_VERSION@ LIB_MINOR_VERSION = @LIB_MINOR_VERSION@ +LIB_PATCH_VERSION = @LIB_PATCH_VERSION@ LIPO = @LIPO@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ diff --git a/humble-video-captive/src/main/gnu/spandsp/Makefile.in b/humble-video-captive/src/main/gnu/spandsp/Makefile.in index 189f040c..c68e78da 100644 --- a/humble-video-captive/src/main/gnu/spandsp/Makefile.in +++ b/humble-video-captive/src/main/gnu/spandsp/Makefile.in @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.13.2 from Makefile.am. +# Makefile.in generated by automake 1.14.1 from Makefile.am. # @configure_input@ # Copyright (C) 1994-2013 Free Software Foundation, Inc. @@ -163,6 +163,7 @@ LIBTOOL = @LIBTOOL@ LIBTOOL_DEPS = @LIBTOOL_DEPS@ LIB_MAJOR_VERSION = @LIB_MAJOR_VERSION@ LIB_MINOR_VERSION = @LIB_MINOR_VERSION@ +LIB_PATCH_VERSION = @LIB_PATCH_VERSION@ LIPO = @LIPO@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ diff --git a/humble-video-captive/src/main/gnu/zlib/Makefile.in b/humble-video-captive/src/main/gnu/zlib/Makefile.in index d86e7eed..7f737444 100644 --- a/humble-video-captive/src/main/gnu/zlib/Makefile.in +++ b/humble-video-captive/src/main/gnu/zlib/Makefile.in @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.13.2 from Makefile.am. +# Makefile.in generated by automake 1.14.1 from Makefile.am. # @configure_input@ # Copyright (C) 1994-2013 Free Software Foundation, Inc. @@ -164,6 +164,7 @@ LIBTOOL = @LIBTOOL@ LIBTOOL_DEPS = @LIBTOOL_DEPS@ LIB_MAJOR_VERSION = @LIB_MAJOR_VERSION@ LIB_MINOR_VERSION = @LIB_MINOR_VERSION@ +LIB_PATCH_VERSION = @LIB_PATCH_VERSION@ LIPO = @LIPO@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ diff --git a/humble-video-native/pom.xml b/humble-video-native/pom.xml index 485b0425..c64ffc4d 100644 --- a/humble-video-native/pom.xml +++ b/humble-video-native/pom.xml @@ -1,14 +1,14 @@ - + 4.0.0 io.humble humble-video-parent - 0.1-SNAPSHOT + 0.1.1-SNAPSHOT ../humble-video-parent/pom.xml humble-video-native + 0.1.1-SNAPSHOT pom humble-video-native diff --git a/humble-video-native/src/main/gnu/Makefile.in b/humble-video-native/src/main/gnu/Makefile.in index ab0a72ae..c2641147 100644 --- a/humble-video-native/src/main/gnu/Makefile.in +++ b/humble-video-native/src/main/gnu/Makefile.in @@ -277,6 +277,7 @@ LIBTOOL = @LIBTOOL@ LIBTOOL_DEPS = @LIBTOOL_DEPS@ LIB_MAJOR_VERSION = @LIB_MAJOR_VERSION@ LIB_MINOR_VERSION = @LIB_MINOR_VERSION@ +LIB_PATCH_VERSION = @LIB_PATCH_VERSION@ LIPO = @LIPO@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ diff --git a/humble-video-native/src/main/gnu/config.h.in b/humble-video-native/src/main/gnu/config.h.in index 30a0515b..afadac06 100644 --- a/humble-video-native/src/main/gnu/config.h.in +++ b/humble-video-native/src/main/gnu/config.h.in @@ -105,6 +105,9 @@ /* Minor version of library */ #undef VS_LIB_MINOR_VERSION +/* Patch version of library */ +#undef VS_LIB_PATCH_VERSION + /* Name of library */ #undef VS_PROJECT_NAME diff --git a/humble-video-native/src/main/gnu/configure b/humble-video-native/src/main/gnu/configure index edcf8ab4..a0c31d26 100755 --- a/humble-video-native/src/main/gnu/configure +++ b/humble-video-native/src/main/gnu/configure @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.68 for humble-video 0.1. +# Generated by GNU Autoconf 2.68 for humble-video 0.1.1. # # Report bugs to . # @@ -570,8 +570,8 @@ MAKEFLAGS= # Identity of this package. PACKAGE_NAME='humble-video' PACKAGE_TARNAME='humble-video' -PACKAGE_VERSION='0.1' -PACKAGE_STRING='humble-video 0.1' +PACKAGE_VERSION='0.1.1' +PACKAGE_STRING='humble-video 0.1.1' PACKAGE_BUGREPORT='info@humble.io' PACKAGE_URL='' @@ -707,6 +707,7 @@ VS_DEBUG_TRUE VS_IS_GCC_FALSE VS_IS_GCC_TRUE VS_PROJECT_NAME +LIB_PATCH_VERSION LIB_MINOR_VERSION LIB_MAJOR_VERSION VS_CROSS_COMPILE_FALSE @@ -1426,7 +1427,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 humble-video 0.1 to adapt to many kinds of systems. +\`configure' configures humble-video 0.1.1 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1496,7 +1497,7 @@ fi if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of humble-video 0.1:";; + short | recursive ) echo "Configuration of humble-video 0.1.1:";; esac cat <<\_ACEOF @@ -1635,7 +1636,7 @@ fi test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -humble-video configure 0.1 +humble-video configure 0.1.1 generated by GNU Autoconf 2.68 Copyright (C) 2010 Free Software Foundation, Inc. @@ -2461,7 +2462,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 humble-video $as_me 0.1, which was +It was created by humble-video $as_me 0.1.1, which was generated by GNU Autoconf 2.68. Invocation command line was $ $0 $@ @@ -3326,7 +3327,7 @@ fi # Define the identity of the package. PACKAGE='humble-video' - VERSION='0.1' + VERSION='0.1.1' cat >>confdefs.h <<_ACEOF @@ -17048,17 +17049,22 @@ fi LIB_MAJOR_VERSION=0 LIB_MINOR_VERSION=1 +LIB_PATCH_VERSION=1 VS_PROJECT_NAME=humble-video + $as_echo "#define VS_LIB_MAJOR_VERSION 0" >>confdefs.h $as_echo "#define VS_LIB_MINOR_VERSION 1" >>confdefs.h +$as_echo "#define VS_LIB_PATCH_VERSION 1" >>confdefs.h + + $as_echo "#define VS_PROJECT_NAME humble-video" >>confdefs.h @@ -21395,7 +21401,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 humble-video $as_me 0.1, which was +This file was extended by humble-video $as_me 0.1.1, which was generated by GNU Autoconf 2.68. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -21461,7 +21467,7 @@ _ACEOF cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" ac_cs_version="\\ -humble-video config.status 0.1 +humble-video config.status 0.1.1 configured by $0, generated by GNU Autoconf 2.68, with options \\"\$ac_cs_config\\" diff --git a/humble-video-native/src/main/gnu/configure.ac b/humble-video-native/src/main/gnu/configure.ac index 94f7fc36..e2e5e7ff 100644 --- a/humble-video-native/src/main/gnu/configure.ac +++ b/humble-video-native/src/main/gnu/configure.ac @@ -6,9 +6,10 @@ # JAVA build.xml FILE m4_define([VSM4_LIB_MAJOR_VERSION], [0]) m4_define([VSM4_LIB_MINOR_VERSION], [1]) +m4_define([VSM4_LIB_PATCH_VERSION], [1]) m4_define([VSM4_PROJECT_NAME], [humble-video]) -AC_INIT(VSM4_PROJECT_NAME,[VSM4_LIB_MAJOR_VERSION.VSM4_LIB_MINOR_VERSION],[info@humble.io]) +AC_INIT(VSM4_PROJECT_NAME,[VSM4_LIB_MAJOR_VERSION.VSM4_LIB_MINOR_VERSION.VSM4_LIB_PATCH_VERSION],[info@humble.io]) AC_PREREQ([2.68]) AC_PREFIX_DEFAULT([/usr/local/humble]) AC_CONFIG_AUX_DIR(mk) @@ -90,12 +91,15 @@ AM_CONDITIONAL([VS_CROSS_COMPILE], [ test "x$host_alias" != "x" ]) LIB_MAJOR_VERSION=VSM4_LIB_MAJOR_VERSION LIB_MINOR_VERSION=VSM4_LIB_MINOR_VERSION +LIB_PATCH_VERSION=VSM4_LIB_PATCH_VERSION VS_PROJECT_NAME=VSM4_PROJECT_NAME AC_SUBST([LIB_MAJOR_VERSION]) AC_SUBST([LIB_MINOR_VERSION]) +AC_SUBST([LIB_PATCH_VERSION]) AC_SUBST([VS_PROJECT_NAME]) AC_DEFINE(VS_LIB_MAJOR_VERSION, [VSM4_LIB_MAJOR_VERSION], [Major version of library]) AC_DEFINE(VS_LIB_MINOR_VERSION, [VSM4_LIB_MINOR_VERSION], [Minor version of library]) +AC_DEFINE(VS_LIB_PATCH_VERSION, [VSM4_LIB_PATCH_VERSION], [Patch version of library]) AC_DEFINE(VS_PROJECT_NAME, [VSM4_PROJECT_NAME], [Name of library]) AC_CONFIG_MACRO_DIR([m4]) diff --git a/humble-video-native/src/main/gnu/mk/pom.xml.in b/humble-video-native/src/main/gnu/mk/pom.xml.in index fd5cec5d..d834c7d1 100644 --- a/humble-video-native/src/main/gnu/mk/pom.xml.in +++ b/humble-video-native/src/main/gnu/mk/pom.xml.in @@ -4,7 +4,7 @@ io.humble @VS_PROJECT_NAME@-arch-@VS_MVN_HOST@ - @LIB_MAJOR_VERSION@.@LIB_MINOR_VERSION@-SNAPSHOT + @LIB_MAJOR_VERSION@.@LIB_MINOR_VERSION@.@LIB_PATCH_VERSION@-SNAPSHOT jar @VS_PROJECT_NAME@-arch-@VS_MVN_HOST@ diff --git a/humble-video-native/src/main/gnu/src/Makefile.in b/humble-video-native/src/main/gnu/src/Makefile.in index 566e50e6..1c694774 100644 --- a/humble-video-native/src/main/gnu/src/Makefile.in +++ b/humble-video-native/src/main/gnu/src/Makefile.in @@ -245,6 +245,7 @@ LIBTOOL = @LIBTOOL@ LIBTOOL_DEPS = @LIBTOOL_DEPS@ LIB_MAJOR_VERSION = @LIB_MAJOR_VERSION@ LIB_MINOR_VERSION = @LIB_MINOR_VERSION@ +LIB_PATCH_VERSION = @LIB_PATCH_VERSION@ LIPO = @LIPO@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ diff --git a/humble-video-native/src/main/gnu/src/io/Makefile.in b/humble-video-native/src/main/gnu/src/io/Makefile.in index e92b9b6f..d8d8f173 100644 --- a/humble-video-native/src/main/gnu/src/io/Makefile.in +++ b/humble-video-native/src/main/gnu/src/io/Makefile.in @@ -245,6 +245,7 @@ LIBTOOL = @LIBTOOL@ LIBTOOL_DEPS = @LIBTOOL_DEPS@ LIB_MAJOR_VERSION = @LIB_MAJOR_VERSION@ LIB_MINOR_VERSION = @LIB_MINOR_VERSION@ +LIB_PATCH_VERSION = @LIB_PATCH_VERSION@ LIPO = @LIPO@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ diff --git a/humble-video-native/src/main/gnu/src/io/humble/Makefile.in b/humble-video-native/src/main/gnu/src/io/humble/Makefile.in index 62a623fe..90bd88c5 100644 --- a/humble-video-native/src/main/gnu/src/io/humble/Makefile.in +++ b/humble-video-native/src/main/gnu/src/io/humble/Makefile.in @@ -344,6 +344,7 @@ LIBTOOL = @LIBTOOL@ LIBTOOL_DEPS = @LIBTOOL_DEPS@ LIB_MAJOR_VERSION = @LIB_MAJOR_VERSION@ LIB_MINOR_VERSION = @LIB_MINOR_VERSION@ +LIB_PATCH_VERSION = @LIB_PATCH_VERSION@ LIPO = @LIPO@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ diff --git a/humble-video-native/src/main/gnu/src/io/humble/ferry/Makefile.in b/humble-video-native/src/main/gnu/src/io/humble/ferry/Makefile.in index 8d74bb3f..8d95f566 100644 --- a/humble-video-native/src/main/gnu/src/io/humble/ferry/Makefile.in +++ b/humble-video-native/src/main/gnu/src/io/humble/ferry/Makefile.in @@ -280,6 +280,7 @@ LIBTOOL = @LIBTOOL@ LIBTOOL_DEPS = @LIBTOOL_DEPS@ LIB_MAJOR_VERSION = @LIB_MAJOR_VERSION@ LIB_MINOR_VERSION = @LIB_MINOR_VERSION@ +LIB_PATCH_VERSION = @LIB_PATCH_VERSION@ LIPO = @LIPO@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ diff --git a/humble-video-native/src/main/gnu/src/io/humble/video/Makefile.in b/humble-video-native/src/main/gnu/src/io/humble/video/Makefile.in index 3d7c99d2..76482eba 100644 --- a/humble-video-native/src/main/gnu/src/io/humble/video/Makefile.in +++ b/humble-video-native/src/main/gnu/src/io/humble/video/Makefile.in @@ -343,6 +343,7 @@ LIBTOOL = @LIBTOOL@ LIBTOOL_DEPS = @LIBTOOL_DEPS@ LIB_MAJOR_VERSION = @LIB_MAJOR_VERSION@ LIB_MINOR_VERSION = @LIB_MINOR_VERSION@ +LIB_PATCH_VERSION = @LIB_PATCH_VERSION@ LIPO = @LIPO@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ diff --git a/humble-video-native/src/main/gnu/src/io/humble/video/customio/Makefile.in b/humble-video-native/src/main/gnu/src/io/humble/video/customio/Makefile.in index ed40d711..0fa31c0d 100644 --- a/humble-video-native/src/main/gnu/src/io/humble/video/customio/Makefile.in +++ b/humble-video-native/src/main/gnu/src/io/humble/video/customio/Makefile.in @@ -270,6 +270,7 @@ LIBTOOL = @LIBTOOL@ LIBTOOL_DEPS = @LIBTOOL_DEPS@ LIB_MAJOR_VERSION = @LIB_MAJOR_VERSION@ LIB_MINOR_VERSION = @LIB_MINOR_VERSION@ +LIB_PATCH_VERSION = @LIB_PATCH_VERSION@ LIPO = @LIPO@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ diff --git a/humble-video-native/src/main/gnu/test/Makefile.in b/humble-video-native/src/main/gnu/test/Makefile.in index 0d179e20..b72d527a 100644 --- a/humble-video-native/src/main/gnu/test/Makefile.in +++ b/humble-video-native/src/main/gnu/test/Makefile.in @@ -245,6 +245,7 @@ LIBTOOL = @LIBTOOL@ LIBTOOL_DEPS = @LIBTOOL_DEPS@ LIB_MAJOR_VERSION = @LIB_MAJOR_VERSION@ LIB_MINOR_VERSION = @LIB_MINOR_VERSION@ +LIB_PATCH_VERSION = @LIB_PATCH_VERSION@ LIPO = @LIPO@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ diff --git a/humble-video-native/src/main/gnu/test/io/Makefile.in b/humble-video-native/src/main/gnu/test/io/Makefile.in index 327b2cb0..6b2ffcaf 100644 --- a/humble-video-native/src/main/gnu/test/io/Makefile.in +++ b/humble-video-native/src/main/gnu/test/io/Makefile.in @@ -245,6 +245,7 @@ LIBTOOL = @LIBTOOL@ LIBTOOL_DEPS = @LIBTOOL_DEPS@ LIB_MAJOR_VERSION = @LIB_MAJOR_VERSION@ LIB_MINOR_VERSION = @LIB_MINOR_VERSION@ +LIB_PATCH_VERSION = @LIB_PATCH_VERSION@ LIPO = @LIPO@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ diff --git a/humble-video-native/src/main/gnu/test/io/humble/Makefile.in b/humble-video-native/src/main/gnu/test/io/humble/Makefile.in index 20d381e0..2b103dc8 100644 --- a/humble-video-native/src/main/gnu/test/io/humble/Makefile.in +++ b/humble-video-native/src/main/gnu/test/io/humble/Makefile.in @@ -245,6 +245,7 @@ LIBTOOL = @LIBTOOL@ LIBTOOL_DEPS = @LIBTOOL_DEPS@ LIB_MAJOR_VERSION = @LIB_MAJOR_VERSION@ LIB_MINOR_VERSION = @LIB_MINOR_VERSION@ +LIB_PATCH_VERSION = @LIB_PATCH_VERSION@ LIPO = @LIPO@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ diff --git a/humble-video-native/src/main/gnu/test/io/humble/ferry/Makefile.in b/humble-video-native/src/main/gnu/test/io/humble/ferry/Makefile.in index 7eabdab2..aa6c7733 100644 --- a/humble-video-native/src/main/gnu/test/io/humble/ferry/Makefile.in +++ b/humble-video-native/src/main/gnu/test/io/humble/ferry/Makefile.in @@ -468,6 +468,7 @@ LIBTOOL = @LIBTOOL@ LIBTOOL_DEPS = @LIBTOOL_DEPS@ LIB_MAJOR_VERSION = @LIB_MAJOR_VERSION@ LIB_MINOR_VERSION = @LIB_MINOR_VERSION@ +LIB_PATCH_VERSION = @LIB_PATCH_VERSION@ LIPO = @LIPO@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ diff --git a/humble-video-native/src/main/gnu/test/io/humble/testutils/Makefile.in b/humble-video-native/src/main/gnu/test/io/humble/testutils/Makefile.in index 32906695..b6640792 100644 --- a/humble-video-native/src/main/gnu/test/io/humble/testutils/Makefile.in +++ b/humble-video-native/src/main/gnu/test/io/humble/testutils/Makefile.in @@ -445,6 +445,7 @@ LIBTOOL = @LIBTOOL@ LIBTOOL_DEPS = @LIBTOOL_DEPS@ LIB_MAJOR_VERSION = @LIB_MAJOR_VERSION@ LIB_MINOR_VERSION = @LIB_MINOR_VERSION@ +LIB_PATCH_VERSION = @LIB_PATCH_VERSION@ LIPO = @LIPO@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ diff --git a/humble-video-native/src/main/gnu/test/io/humble/video/Makefile.in b/humble-video-native/src/main/gnu/test/io/humble/video/Makefile.in index 9446e472..8703e7c7 100644 --- a/humble-video-native/src/main/gnu/test/io/humble/video/Makefile.in +++ b/humble-video-native/src/main/gnu/test/io/humble/video/Makefile.in @@ -678,6 +678,7 @@ LIBTOOL = @LIBTOOL@ LIBTOOL_DEPS = @LIBTOOL_DEPS@ LIB_MAJOR_VERSION = @LIB_MAJOR_VERSION@ LIB_MINOR_VERSION = @LIB_MINOR_VERSION@ +LIB_PATCH_VERSION = @LIB_PATCH_VERSION@ LIPO = @LIPO@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ diff --git a/humble-video-native/src/main/gnu/test/io/humble/video/customio/Makefile.in b/humble-video-native/src/main/gnu/test/io/humble/video/customio/Makefile.in index 66bd5c37..b0c1126c 100644 --- a/humble-video-native/src/main/gnu/test/io/humble/video/customio/Makefile.in +++ b/humble-video-native/src/main/gnu/test/io/humble/video/customio/Makefile.in @@ -449,6 +449,7 @@ LIBTOOL = @LIBTOOL@ LIBTOOL_DEPS = @LIBTOOL_DEPS@ LIB_MAJOR_VERSION = @LIB_MAJOR_VERSION@ LIB_MINOR_VERSION = @LIB_MINOR_VERSION@ +LIB_PATCH_VERSION = @LIB_PATCH_VERSION@ LIPO = @LIPO@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ diff --git a/humble-video-noarch/pom.xml b/humble-video-noarch/pom.xml index 5e73e531..68cc68f5 100644 --- a/humble-video-noarch/pom.xml +++ b/humble-video-noarch/pom.xml @@ -1,11 +1,10 @@ - + 4.0.0 io.humble humble-video-parent - 0.1-SNAPSHOT + 0.1.1-SNAPSHOT ../humble-video-parent/pom.xml @@ -13,6 +12,7 @@ of the humble-video-main project because it also has the source code for all our native code --> humble-video-noarch + 0.1.1-SNAPSHOT This is the main Humble Video Java library. It contains no native code, but all Java runtime code. It must be paired up with the correct humble-video-arch-*.jar library for your OS. For most diff --git a/humble-video-parent/pom.xml b/humble-video-parent/pom.xml index 81bf5056..e17fe677 100644 --- a/humble-video-parent/pom.xml +++ b/humble-video-parent/pom.xml @@ -1,249 +1,309 @@ - 4.0.0 - io.humble - humble-video-parent - 0.1-SNAPSHOT - pom - humble-video-parent - http://www.humble.io + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> + 4.0.0 + io.humble + humble-video-parent + 0.1.1-SNAPSHOT + pom + humble-video-parent + http://www.humble.io - - UTF-8 - ${maven.build.timestamp} - yyyy-MM-dd HH:mm:ss - + + UTF-8 + ${maven.build.timestamp} + yyyy-MM-dd HH:mm:ss + - - Humble Software - http://www.humble.io - - + + Humble Software + http://www.humble.io + + This is the parent POM for all the humble-video submodules. - - - AGPL - http://www.gnu.org/licenses/agpl-3.0.txt - repo - GNU Affero General Public License - - - - https://github.com/artclarke/humble-video - scm:git:git://github.com/artclarke/humble-video.git - - - - art.clarke@gmail.com - Art Clarke - art.clarke@gmail.com - http://www.linkedin.com/in/artclarke - - - - - - src/main/resources - true - - - - - - org.apache.maven.plugins - maven-compiler-plugin - 2.3.2 - - 1.6 - 1.6 - - - - org.codehaus.mojo - versions-maven-plugin - 2.1 - - - org.apache.maven.plugins - maven-source-plugin - 2.2.1 - - - attach-sources - - jar - - - - - - org.apache.maven.plugins - maven-javadoc-plugin - 2.9.1 - - - attach-javadocs - - jar - - - - - - org.apache.maven.plugins - maven-surefire-plugin - 2.17 - - false - - true - - 1 - false - ${basedir}/target/test-workingdir - - - - maven-site-plugin - 3.0 - - - org.apache.maven.plugins - maven-project-info-reports-plugin - 2.7 - - - org.apache.maven.plugins - maven-jxr-plugin - 2.1 - - true - - - - - - - org.codehaus.mojo - exec-maven-plugin - 1.2.1 - - - + + + AGPL + http://www.gnu.org/licenses/agpl-3.0.txt + repo + GNU Affero General Public License + + + + https://github.com/artclarke/humble-video + scm:git:git://github.com/artclarke/humble-video.git + + + + art.clarke@gmail.com + Art Clarke + art.clarke@gmail.com + http://www.linkedin.com/in/artclarke + + + + + + src/main/resources + true + + + + + + org.apache.maven.plugins + maven-compiler-plugin + 2.3.2 + + 1.6 + 1.6 + + + + org.codehaus.mojo + versions-maven-plugin + + false + + 2.1 + + + maven-scm-plugin + 1.8.1 + + ${project.artifactId}-${project.version} + + + + org.apache.maven.plugins + maven-release-plugin + 2.5 + + + maven-gpg-plugin + 1.5 + + + sign-artifacts + verify + + sign + + + + + + org.apache.maven.plugins + maven-source-plugin + 2.2.1 + + + package-sources + + jar + + + + + + org.apache.maven.plugins + maven-javadoc-plugin + 2.9.1 + + + package-javadocs + package + + jar + + + + + + org.sonatype.plugins + nexus-staging-maven-plugin + 1.6 + true + + oss.sonatype.org + https://oss.sonatype.org/ + ${project.version} + + + + deploy-to-sonatype + deploy + + deploy + release + + + + + + org.apache.maven.plugins + maven-surefire-plugin + 2.17 + + false + + true + + 1 + false + ${basedir}/target/test-workingdir + + + + maven-site-plugin + 3.0 + + + org.apache.maven.plugins + maven-project-info-reports-plugin + 2.7 + + + org.apache.maven.plugins + maven-jxr-plugin + 2.1 + + true + + + + + + + org.codehaus.mojo + exec-maven-plugin + 1.2.1 + + + - - - - org.codehaus.mojo - versions-maven-plugin - 2.1 - - - - dependency-updates-report - plugin-updates-report - property-updates-report - - - - - - org.apache.maven.plugins - maven-javadoc-plugin - 2.9 - - public - true - org.umlgraph.doclet.UmlGraphDoc - - org.umlgraph - umlgraph - 5.6 - - -quiet -hide java.* -hide - org.eclipse.* - -collpackages java.util.* -postfixpackage - -nodefontsize 9 - -nodefontpackagesize 7 - -enumerations - - true - - + + + + org.codehaus.mojo + versions-maven-plugin + 2.1 + + + + dependency-updates-report + plugin-updates-report + property-updates-report + + + + + + org.apache.maven.plugins + maven-javadoc-plugin + 2.9 + + public + true + org.umlgraph.doclet.UmlGraphDoc + + org.umlgraph + umlgraph + 5.6 + + -quiet -hide java.* -hide + org.eclipse.* + -collpackages java.util.* -postfixpackage + -nodefontsize 9 + -nodefontpackagesize 7 + -enumerations + + true + + - - org.apache.maven.plugins - maven-surefire-report-plugin - 2.17 - - - + + org.apache.maven.plugins + maven-surefire-report-plugin + 2.17 + + + - - - - org.slf4j - slf4j-api - 1.7.5 - - - junit - junit - 4.5 - test - - - ch.qos.logback - logback-classic - 1.0.13 - test - - - io.humble - humble-video-noarch - 0.1-SNAPSHOT - - - io.humble - humble-video-arch-i686-apple-darwin12 - 0.1-SNAPSHOT - - - io.humble - humble-video-arch-x86_64-apple-darwin12 - 0.1-SNAPSHOT - - - io.humble - humble-video-arch-i686-pc-linux-gnu6 - 0.1-SNAPSHOT - - - io.humble - humble-video-arch-x86_64-pc-linux-gnu6 - 0.1-SNAPSHOT - - - io.humble - humble-video-arch-i686-w64-mingw32 - 0.1-SNAPSHOT - - - io.humble - humble-video-arch-x86_64-w64-mingw32 - 0.1-SNAPSHOT - - - io.humble - humble-video-arch-all - 0.1-SNAPSHOT - - - io.humble - humble-video-all - 0.1-SNAPSHOT - - - + + + + org.slf4j + slf4j-api + 1.7.5 + + + junit + junit + 4.5 + test + + + ch.qos.logback + logback-classic + 1.0.13 + test + + + io.humble + humble-video-noarch + 0.1.1-SNAPSHOT + + + io.humble + humble-video-arch-i686-apple-darwin12 + 0.1.1-SNAPSHOT + + + io.humble + humble-video-arch-x86_64-apple-darwin12 + 0.1.1-SNAPSHOT + + + io.humble + humble-video-arch-i686-pc-linux-gnu6 + 0.1.1-SNAPSHOT + + + io.humble + humble-video-arch-x86_64-pc-linux-gnu6 + 0.1.1-SNAPSHOT + + + io.humble + humble-video-arch-i686-w64-mingw32 + 0.1.1-SNAPSHOT + + + io.humble + humble-video-arch-x86_64-w64-mingw32 + 0.1.1-SNAPSHOT + + + io.humble + humble-video-arch-all + 0.1.1-SNAPSHOT + + + io.humble + humble-video-all + 0.1.1-SNAPSHOT + + + + + + oss.sonatype.org + https://oss.sonatype.org/service/local/staging/deploy/maven2/ + + + oss.sonatype.org + https://oss.sonatype.org/content/repositories/snapshots + + diff --git a/humble-video-stage/pom.xml b/humble-video-stage/pom.xml index 8ac17042..76a52253 100644 --- a/humble-video-stage/pom.xml +++ b/humble-video-stage/pom.xml @@ -5,7 +5,7 @@ io.humble humble-video-parent - 0.1-SNAPSHOT + 0.1.1-SNAPSHOT ../humble-video-parent/pom.xml diff --git a/humble-video-test/pom.xml b/humble-video-test/pom.xml index 71a9628b..00ceacd4 100644 --- a/humble-video-test/pom.xml +++ b/humble-video-test/pom.xml @@ -1,15 +1,15 @@ - + 4.0.0 io.humble humble-video-parent - 0.1-SNAPSHOT + 0.1.1-SNAPSHOT ../humble-video-parent/pom.xml humble-video-test + 0.1.1-SNAPSHOT jar humble-video-test diff --git a/pom.xml b/pom.xml index 9b2780f8..4f81169c 100644 --- a/pom.xml +++ b/pom.xml @@ -1,36 +1,47 @@ - + 4.0.0 UTF-8 - io.humble + + io.humble + humble-video-parent + 0.1.1-SNAPSHOT + ./humble-video-parent/pom.xml + + humble-video-superproject - 0.1-SNAPSHOT pom humble-video-superproject http://humble.io - - humble-video-captive - - - humble-video-native - - - humble-video-noarch - - - humble-video-test - + humble-video-captive + humble-video-native + humble-video-noarch + humble-video-test + + + + ci + + humble-video-captive + humble-video-native + humble-video-stage + humble-video-noarch + humble-video-test + humble-video-all + + + From f62b4b28607a7fb604c4d84cac78abaa8206fce1 Mon Sep 17 00:00:00 2001 From: Art Clarke Date: Sat, 30 Aug 2014 11:29:01 -0700 Subject: [PATCH 3/9] add logger stacks to turn down trace logging -- on linux vm writing the logs takes minutes --- .../src/main/gnu/test/io/humble/video/EncoderTest.cpp | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/humble-video-native/src/main/gnu/test/io/humble/video/EncoderTest.cpp b/humble-video-native/src/main/gnu/test/io/humble/video/EncoderTest.cpp index 8aca193b..1cbdc607 100644 --- a/humble-video-native/src/main/gnu/test/io/humble/video/EncoderTest.cpp +++ b/humble-video-native/src/main/gnu/test/io/humble/video/EncoderTest.cpp @@ -54,6 +54,8 @@ EncoderTest::testCreation() { void EncoderTest::testEncodeVideo() { Logger::setGlobalIsLogging(Logger::LEVEL_TRACE, true); + LoggerStack stack; + stack.setGlobalLevel(Logger::LEVEL_INFO, false); const bool isMemCheck = getenv("VS_TEST_MEMCHECK") ? true : false; const int32_t maxPics = isMemCheck ? 10 : 500; @@ -147,6 +149,8 @@ EncoderTest::testEncodeVideo() { void EncoderTest::testEncodeAudio() { Logger::setGlobalIsLogging(Logger::LEVEL_TRACE, true); + LoggerStack stack; + stack.setGlobalLevel(Logger::LEVEL_INFO, false); const bool isMemCheck = getenv("VS_TEST_MEMCHECK") ? true : false; const int32_t sampleRate = 44100; @@ -374,6 +378,8 @@ EncoderTest::testTranscode() // enable trace logging Logger::setGlobalIsLogging(Logger::LEVEL_TRACE, true); const bool isMemCheck = getenv("VS_TEST_MEMCHECK") ? true : false; + LoggerStack stack; + stack.setGlobalLevel(Logger::LEVEL_INFO, false); TestData::Fixture* fixture; fixture=mFixtures.getFixture("testfile.flv"); From 8997d21f7eedcf2fc25194f606bfc3404738e161 Mon Sep 17 00:00:00 2001 From: Art Clarke Date: Mon, 1 Sep 2014 06:41:22 -0700 Subject: [PATCH 4/9] indentation --- humble-video-noarch/pom.xml | 174 ++++++++++++++++++------------------ 1 file changed, 87 insertions(+), 87 deletions(-) diff --git a/humble-video-noarch/pom.xml b/humble-video-noarch/pom.xml index 68cc68f5..8610d8a9 100644 --- a/humble-video-noarch/pom.xml +++ b/humble-video-noarch/pom.xml @@ -1,101 +1,101 @@ - 4.0.0 + 4.0.0 - - io.humble - humble-video-parent - 0.1.1-SNAPSHOT - ../humble-video-parent/pom.xml - + + io.humble + humble-video-parent + 0.1.1-SNAPSHOT + ../humble-video-parent/pom.xml + - humble-video-noarch - 0.1.1-SNAPSHOT + 0.1.1-SNAPSHOT - This is the main Humble Video Java library. It contains no native code, but all Java runtime code. - It must be paired up with the correct humble-video-arch-*.jar library for your OS. For most - users, depending on humble-video-all will work better. - + This is the main Humble Video Java library. It contains no native code, but all Java runtime code. + It must be paired up with the correct humble-video-arch-*.jar library for your OS. For most + users, depending on humble-video-all will work better. + jar - - org.slf4j - slf4j-api - - - junit - junit - test - - - ch.qos.logback - logback-classic - test - - - - - Windows - - - Windows - - - - - io.humble - humble-video-arch-i686-w64-mingw32 - test - - - io.humble - humble-video-arch-x86_64-w64-mingw32 - test - - - - - Mac - - - Mac - - - - - io.humble - humble-video-arch-i686-apple-darwin12 + + org.slf4j + slf4j-api + + + junit + junit test - - - io.humble - humble-video-arch-x86_64-apple-darwin12 + + + ch.qos.logback + logback-classic test - - - - - Linux - - - Linux - - - - - io.humble - humble-video-arch-i686-pc-linux-gnu6 - test - - - io.humble - humble-video-arch-x86_64-pc-linux-gnu6 - test - - - + + + + + Windows + + + Windows + + + + + io.humble + humble-video-arch-i686-w64-mingw32 + test + + + io.humble + humble-video-arch-x86_64-w64-mingw32 + test + + + + + Mac + + + Mac + + + + + io.humble + humble-video-arch-i686-apple-darwin12 + test + + + io.humble + humble-video-arch-x86_64-apple-darwin12 + test + + + + + Linux + + + Linux + + + + + io.humble + humble-video-arch-i686-pc-linux-gnu6 + test + + + io.humble + humble-video-arch-x86_64-pc-linux-gnu6 + test + + + From 72718d8287caf7eeac69bbe796d8b356b933c464 Mon Sep 17 00:00:00 2001 From: Art Clarke Date: Mon, 1 Sep 2014 07:17:30 -0700 Subject: [PATCH 5/9] add empty relativePath to parent lookup to force a look up in the local repo, and build parent before all others --- humble-video-all/pom.xml | 2 +- humble-video-captive/pom.xml | 1 - humble-video-native/pom.xml | 1 - .../src/main/gnu/mk/pom.xml.in | 7 ++++++ humble-video-noarch/pom.xml | 3 +-- humble-video-parent/pom.xml | 24 +++++++++++++++---- humble-video-stage/pom.xml | 2 +- humble-video-test/pom.xml | 2 +- pom.xml | 8 +++---- 9 files changed, 34 insertions(+), 16 deletions(-) diff --git a/humble-video-all/pom.xml b/humble-video-all/pom.xml index 93283b53..e75b6c7c 100644 --- a/humble-video-all/pom.xml +++ b/humble-video-all/pom.xml @@ -6,7 +6,7 @@ io.humble humble-video-parent 0.1.1-SNAPSHOT - ../humble-video-parent/pom.xml + humble-video-all diff --git a/humble-video-captive/pom.xml b/humble-video-captive/pom.xml index 11e82d93..e8e3b43d 100644 --- a/humble-video-captive/pom.xml +++ b/humble-video-captive/pom.xml @@ -4,7 +4,6 @@ io.humble humble-video-parent 0.1.1-SNAPSHOT - ../humble-video-parent/pom.xml humble-video-captive diff --git a/humble-video-native/pom.xml b/humble-video-native/pom.xml index c64ffc4d..50f3c4e7 100644 --- a/humble-video-native/pom.xml +++ b/humble-video-native/pom.xml @@ -4,7 +4,6 @@ io.humble humble-video-parent 0.1.1-SNAPSHOT - ../humble-video-parent/pom.xml humble-video-native diff --git a/humble-video-native/src/main/gnu/mk/pom.xml.in b/humble-video-native/src/main/gnu/mk/pom.xml.in index d834c7d1..7b9b2794 100644 --- a/humble-video-native/src/main/gnu/mk/pom.xml.in +++ b/humble-video-native/src/main/gnu/mk/pom.xml.in @@ -2,6 +2,13 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 + + io.humble + humble-video-parent + @LIB_MAJOR_VERSION@.@LIB_MINOR_VERSION@.@LIB_PATCH_VERSION@-SNAPSHOT + + + io.humble @VS_PROJECT_NAME@-arch-@VS_MVN_HOST@ @LIB_MAJOR_VERSION@.@LIB_MINOR_VERSION@.@LIB_PATCH_VERSION@-SNAPSHOT diff --git a/humble-video-noarch/pom.xml b/humble-video-noarch/pom.xml index 8610d8a9..39d8f429 100644 --- a/humble-video-noarch/pom.xml +++ b/humble-video-noarch/pom.xml @@ -5,7 +5,7 @@ io.humble humble-video-parent 0.1.1-SNAPSHOT - ../humble-video-parent/pom.xml + - ci + deploy - humble-video-captive - humble-video-native + humble-video-parent humble-video-stage humble-video-noarch humble-video-test From d1cae76d8b3724f29e479a33ac46a5b5ed3d1fe1 Mon Sep 17 00:00:00 2001 From: Art Clarke Date: Mon, 1 Sep 2014 07:18:03 -0700 Subject: [PATCH 6/9] only sign on deploy --- humble-video-parent/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/humble-video-parent/pom.xml b/humble-video-parent/pom.xml index b65db4d4..c4b8bd50 100644 --- a/humble-video-parent/pom.xml +++ b/humble-video-parent/pom.xml @@ -86,7 +86,7 @@ sign-artifacts - verify + deploy sign From d2e555b7980d022e914dcf6212c6fd745360381d Mon Sep 17 00:00:00 2001 From: Art Clarke Date: Mon, 1 Sep 2014 08:47:10 -0700 Subject: [PATCH 7/9] do jarsigning of artifacts with a fake keystore. This means that people who build this themselves with be signed with the self-signed development.keystore, which if running as an applet will display "untrusted" to the user. To change, when running a MVN build, pass in -Djarsigner.keystore and other jarsigner.* properties to tell the build system the actual keystore to use. Note to self: when doing releases, use the actual keystore. --- .../src/main/gnu/mk/pom.xml.in | 1 + humble-video-parent/pom.xml | 30 +++++++++++++++++- .../src/main/resources/development.keystore | Bin 0 -> 1363 bytes 3 files changed, 30 insertions(+), 1 deletion(-) create mode 100644 humble-video-parent/src/main/resources/development.keystore diff --git a/humble-video-native/src/main/gnu/mk/pom.xml.in b/humble-video-native/src/main/gnu/mk/pom.xml.in index 7b9b2794..5270c1d8 100644 --- a/humble-video-native/src/main/gnu/mk/pom.xml.in +++ b/humble-video-native/src/main/gnu/mk/pom.xml.in @@ -19,6 +19,7 @@ UTF-8 + ../../humble-video-parent/src/main/resources/development.keystore diff --git a/humble-video-parent/pom.xml b/humble-video-parent/pom.xml index c4b8bd50..cdd1eeb6 100644 --- a/humble-video-parent/pom.xml +++ b/humble-video-parent/pom.xml @@ -10,8 +10,13 @@ UTF-8 - ${maven.build.timestamp} yyyy-MM-dd HH:mm:ss + ${maven.build.timestamp} + humblesoftware-selfsigned + ../humble-video-parent/src/main/resources/development.keystore + untrusted + untrusted + JKS @@ -121,6 +126,25 @@ + + org.apache.maven.plugins + maven-jarsigner-plugin + 1.3.2 + + + sign + + sign + + + + verify + + verify + + + + org.sonatype.plugins nexus-staging-maven-plugin @@ -193,6 +217,10 @@ org.apache.maven.plugins maven-gpg-plugin + + org.apache.maven.plugins + maven-jarsigner-plugin + diff --git a/humble-video-parent/src/main/resources/development.keystore b/humble-video-parent/src/main/resources/development.keystore new file mode 100644 index 0000000000000000000000000000000000000000..64e25c2577a2a7426e05223cc9fbe896b469a063 GIT binary patch literal 1363 zcmezO_TO6u1_mY|W&~r&jMChsoYdm{w370~qEy}D)SR^9%=Em}6rc(Z!?P>50O@{% zCdO_9J~l3GHbxdkEha%mMpg!vCdTsL$?jdQb0kxpf7jUWG&sM{{QA4|T6L3`>&v}# ze7kk-)8{cycRFl5`Rl&i-{nS+KNs!4wBfeFuT109=O+a$-Tza_VNdxvo$BYx=R>NV z)?2DO?Kr4#f-&gI%^5+8-|kx}>1x$aeaL=L#bseqyECKsj{biczhAuDn!au2rXz9Z zmhPNfQ+6wWNpYjMvP`+9#WUtmvD%lx-h1vUNm=Yoa?D&_q{#T;9Jy^;NEapRE1EslH2 zISyH2Oq)t~WR`p`5DjFRqUR7Ww^RPTGP~u4&WQ>;KYg7ipqiNQ#o~8qX-BEAy{@+? z!)u3ytIHDBDa1~V_<#3g+yuV`*QU#?_B(b+La#?@z3k&{%YJ3v<@{2`p6GB*d-~^9 z`GLpzeA2Uw<$8aIeR!@WoV2#yPW|)ukE>lSVK@cO6&&G6FgBOpT2Uf9r!A zWlM!LgYJ9H(R=gc`8UDsK{oGQ7!J$XH*5=3%XE!(PzwAVY1l-NY0Z>68tX(wLSdjCm@S#s`0560t6q72g$0{TUjxzB8xw6kf^>lW@05i(yv zPW%3FLF={Iw)al&Ssi1xBYbD&l=ZuRS-ood8ScYv%ife87#ZHT>q?~mvqE-(#)d7P zVui{td^E&_x1Z-U>N&COp^aEocSudI#)HM{yMJ~*17N$PqhP9+Nd^4*uJBxqu}vbk?n(0N)@R6aWAK literal 0 HcmV?d00001 From 3677ee741d9359e0e43af5e8c11ce53ee5a0940f Mon Sep 17 00:00:00 2001 From: Art Clarke Date: Mon, 1 Sep 2014 09:41:34 -0700 Subject: [PATCH 8/9] add build and deploy profiles, and auto-enable build. To build (and install locally), this will work: mvn install However, to deploy you need to do: mvn -Pdeploy deploy Finally, sometimes you want to test a redeploy without a full build. To do that, do: mvn -P!build,deploy This works by having the build profile run whenver a file is not present (and that file is never generated, so it always runs). This 'maven hack' allows us to turn off some projects from always rebuilding. Use with caution. --- pom.xml | 38 +++++++++++++++++++++++--------------- 1 file changed, 23 insertions(+), 15 deletions(-) diff --git a/pom.xml b/pom.xml index 0baab86e..d5799467 100644 --- a/pom.xml +++ b/pom.xml @@ -18,30 +18,38 @@ humble-video-superproject http://humble.io - - humble-video-parent - humble-video-captive - humble-video-native - humble-video-noarch - humble-video-test - - - + build + + + humble-video-parent + humble-video-captive + humble-video-native + humble-video-noarch + humble-video-test + + + + + target/file-is-never-generated + + + + deploy + humble-video-parent humble-video-stage humble-video-noarch - humble-video-test humble-video-all - From 02d13e36fbb2dfc09611d3a72915b309683a8ac1 Mon Sep 17 00:00:00 2001 From: Art Clarke Date: Mon, 1 Sep 2014 16:32:54 -0700 Subject: [PATCH 9/9] make -sources and -javadocs for all Jars, and only when -Pdeploy is set. Two changes here: 1) The native-jars now have a single Java class in them to force the creation of the -sources and -javadoc jars (which are required for Maven Central deployment). 2) Our parent pom now only does -sources, -javadoc and GPG signing if we've set the Deploy profile. That way we save a few seconds in what is already a laborious build. --- humble-video-native/src/main/gnu/Makefile.am | 3 +- humble-video-native/src/main/gnu/Makefile.in | 3 +- .../src/main/gnu/mk/Version.java | 52 +++++++++++++++++++ humble-video-parent/pom.xml | 47 ++++++++++++----- .../java/io/humble/video_test/Version.java | 49 +++++++++++++++++ 5 files changed, 139 insertions(+), 15 deletions(-) create mode 100644 humble-video-native/src/main/gnu/mk/Version.java create mode 100644 humble-video-test/src/main/java/io/humble/video_test/Version.java diff --git a/humble-video-native/src/main/gnu/Makefile.am b/humble-video-native/src/main/gnu/Makefile.am index 0bfc384c..e0c1ed35 100644 --- a/humble-video-native/src/main/gnu/Makefile.am +++ b/humble-video-native/src/main/gnu/Makefile.am @@ -167,8 +167,9 @@ EXTRA_DIST= \ mk/lib install-exec-hook: - @$(MKDIR_P) $(abs_top_srcdir)/../../../../humble-video-stage/humble-video-arch-${VS_MVN_HOST} + @$(MKDIR_P) $(abs_top_srcdir)/../../../../humble-video-stage/humble-video-arch-${VS_MVN_HOST}/src/main/java/io/humble/video_native @cp -f pom.xml $(abs_top_srcdir)/../../../../humble-video-stage/humble-video-arch-${VS_MVN_HOST}/pom.xml + @cp -f $(abs_top_srcdir)/mk/Version.java $(abs_top_srcdir)/../../../../humble-video-stage/humble-video-arch-${VS_MVN_HOST}/src/main/java/io/humble/video_native @(cd $(abs_top_srcdir)/../../../../humble-video-stage/humble-video-arch-${VS_MVN_HOST} && mvn install) doc: doxygen-doc diff --git a/humble-video-native/src/main/gnu/Makefile.in b/humble-video-native/src/main/gnu/Makefile.in index c2641147..b920184c 100644 --- a/humble-video-native/src/main/gnu/Makefile.in +++ b/humble-video-native/src/main/gnu/Makefile.in @@ -942,8 +942,9 @@ include $(abs_top_builddir)/mk/Makefile.global @DX_COND_doc_TRUE@ $(DX_ENV) $(DX_DOXYGEN) $(srcdir)/$(DX_CONFIG) install-exec-hook: - @$(MKDIR_P) $(abs_top_srcdir)/../../../../humble-video-stage/humble-video-arch-${VS_MVN_HOST} + @$(MKDIR_P) $(abs_top_srcdir)/../../../../humble-video-stage/humble-video-arch-${VS_MVN_HOST}/src/main/java/io/humble/video_native @cp -f pom.xml $(abs_top_srcdir)/../../../../humble-video-stage/humble-video-arch-${VS_MVN_HOST}/pom.xml + @cp -f $(abs_top_srcdir)/mk/Version.java $(abs_top_srcdir)/../../../../humble-video-stage/humble-video-arch-${VS_MVN_HOST}/src/main/java/io/humble/video_native @(cd $(abs_top_srcdir)/../../../../humble-video-stage/humble-video-arch-${VS_MVN_HOST} && mvn install) doc: doxygen-doc diff --git a/humble-video-native/src/main/gnu/mk/Version.java b/humble-video-native/src/main/gnu/mk/Version.java new file mode 100644 index 00000000..aa2dab13 --- /dev/null +++ b/humble-video-native/src/main/gnu/mk/Version.java @@ -0,0 +1,52 @@ +/* + * Copyright (c) 2014, Andrew "Art" Clarke. All rights reserved. + * + * This file is part of Humble-Video. + * + * Humble-Video is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * Humble-Video is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Affero General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with Humble-Video. If not, see . + */ +package io.humble.video_native; + +/** + * A class for finding out version information about this jar. + * @author aclarke + * + */ +public class Version { + /** Private class; cannot construct */ + private Version() {}; + + /** + * Prints the version of this library to System.out along with + * some information on what this jar is. + */ + public static String getVersionInfo() { + final Class c = Version.class; + final Package p = c.getPackage(); + final StringBuilder b = new StringBuilder(); + + b.append("Package: " + p.getName() + ";"); + b.append("Class: " + c.getName() + ";"); + b.append("Specification Vendor: " + p.getSpecificationVendor() + ";"); + b.append("Specification Title: " + p.getSpecificationTitle() + ";"); + b.append("Specification Version: " + p.getSpecificationVersion() + ";"); + b.append("Implementation Vendor: " + p.getImplementationVendor() + ";"); + b.append("Implementation Title: " + p.getImplementationTitle() + ";"); + b.append("Implementation Version: " + p.getImplementationVersion() + ";"); + + return b.toString(); + } + +} + diff --git a/humble-video-parent/pom.xml b/humble-video-parent/pom.xml index cdd1eeb6..daaa5b60 100644 --- a/humble-video-parent/pom.xml +++ b/humble-video-parent/pom.xml @@ -91,7 +91,7 @@ sign-artifacts - deploy + verify sign @@ -145,6 +145,18 @@ + + org.apache.maven.plugins + maven-jar-plugin + + + + true + true + + + + org.sonatype.plugins nexus-staging-maven-plugin @@ -205,24 +217,33 @@ exec-maven-plugin 1.2.1 - - maven-source-plugin - org.apache.maven.plugins - - - org.apache.maven.plugins - maven-javadoc-plugin - - - org.apache.maven.plugins - maven-gpg-plugin - org.apache.maven.plugins maven-jarsigner-plugin + + + deploy + + + + maven-source-plugin + org.apache.maven.plugins + + + org.apache.maven.plugins + maven-javadoc-plugin + + + org.apache.maven.plugins + maven-gpg-plugin + + + + + diff --git a/humble-video-test/src/main/java/io/humble/video_test/Version.java b/humble-video-test/src/main/java/io/humble/video_test/Version.java new file mode 100644 index 00000000..397ad93a --- /dev/null +++ b/humble-video-test/src/main/java/io/humble/video_test/Version.java @@ -0,0 +1,49 @@ +/* + * Copyright (c) 2014, Andrew "Art" Clarke. All rights reserved. + * + * This file is part of Humble-Video. + * + * Humble-Video is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * Humble-Video is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Affero General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with Humble-Video. If not, see . + */ +package io.humble.video_test; + +/** + * A class for finding out version information about this jar. + * @author aclarke + * + */ +public class Version { + + /** + * Prints the version of this library to System.out along with + * some information on what this jar is. + */ + public String getVersionInfo() { + final Class c = Version.class; + final Package p = c.getPackage(); + final StringBuilder b = new StringBuilder(); + + b.append("Package: " + p.getName() + ";"); + b.append("Class: " + c.getName() + ";"); + b.append("Specification Vendor: " + p.getSpecificationVendor() + ";"); + b.append("Specification Title: " + p.getSpecificationTitle() + ";"); + b.append("Specification Version: " + p.getSpecificationVersion() + ";"); + b.append("Implementation Vendor: " + p.getImplementationVendor() + ";"); + b.append("Implementation Title: " + p.getImplementationTitle() + ";"); + b.append("Implementation Version: " + p.getImplementationVersion() + ";"); + + return b.toString(); + } + +}