update buildsystem

COPYING

@@ -1 +1 @@
-/usr/share/automake-1.14/COPYING
+/usr/share/automake-1.15/COPYING

ChangeLog

@@ -1,3 +1,18 @@
+2016-04-03 16:19  
+
+	* bootstrap.sh: after svn-server restore
+
+2015-11-16 12:37  marc
+
+	* doc/doxyfile.in: SVG must not be interactive for embedding in
+	  redmine
+
+2015-11-09 10:59  marc
+
+	* ChangeLog, ax_init_standard_project.m4, bootstrap.sh,
+	  debian/control.in, resolve-debbuilddeps.sh: fixed build
+	  dependencies
+
 2015-11-07 10:47  marc
 
 	* bootstrap.sh: there is no qt4-default

INSTALL

@@ -1 +1 @@
-/usr/share/automake-1.14/INSTALL
+/usr/share/automake-1.15/INSTALL

autogen.sh

@@ -0,0 +1,8 @@
+#!/bin/bash -e
+if test -n "svn" -a -d .svn -a -e -x /usr/bin/svn2cl; then
+    svn2cl
+fi
+aclocal
+libtoolize --force
+automake -a
+autoconf

ax_cxx_compile_stdcxx_11.m4

@@ -4,12 +4,16 @@
 #
 # SYNOPSIS
 #
+#   AX_REQUIRE_STDCXX_11
+#   AX_REQUIRE_STDCXX_14
 #   AX_CXX_COMPILE_STDCXX_11([ext|noext],[mandatory|optional])
+#   AX_CXX_COMPILE_STDCXX_14([ext|noext],[mandatory|optional])
 #
 # DESCRIPTION
 #
 #   Check for baseline language coverage in the compiler for the C++11
-#   standard; if necessary, add switches to CXXFLAGS to enable support.
+#   or C++14 standard; if necessary, add switches to CXXFLAGS to
+#   enable support.
 #
 #   The first argument, if specified, indicates whether you insist on an
 #   extended mode (e.g. -std=gnu++11) or a strict conformance mode (e.g.
@@ -131,3 +135,97 @@ AC_DEFUN([AX_CXX_COMPILE_STDCXX_11], [dnl
     AC_SUBST(HAVE_CXX11)
   fi
 ])
+
+AC_DEFUN([AX_CXX_COMPILE_STDCXX_14], [dnl
+  m4_if([$1], [], [],
+        [$1], [ext], [],
+        [$1], [noext], [],
+        [m4_fatal([invalid argument `$1' to AX_CXX_COMPILE_STDCXX_14])])dnl
+  m4_if([$2], [], [ax_cxx_compile_cxx14_required=true],
+        [$2], [mandatory], [ax_cxx_compile_cxx14_required=true],
+        [$2], [optional], [ax_cxx_compile_cxx14_required=false],
+        [m4_fatal([invalid second argument `$2' to AX_CXX_COMPILE_STDCXX_14])])dnl
+  AC_LANG_PUSH([C++])dnl
+  ac_success=no
+  AC_CACHE_CHECK(whether $CXX supports C++14 features by default,
+  ax_cv_cxx_compile_cxx14,
+  [AC_COMPILE_IFELSE([AC_LANG_SOURCE([_AX_CXX_COMPILE_STDCXX_11_testbody])],
+    [ax_cv_cxx_compile_cxx14=yes],
+    [ax_cv_cxx_compile_cxx14=no])])
+  if test x$ax_cv_cxx_compile_cxx14 = xyes; then
+    ac_success=yes
+  fi
+
+  m4_if([$1], [noext], [], [dnl
+  if test x$ac_success = xno; then
+    for switch in -std=gnu++14 -std=gnu++0y; do
+      cachevar=AS_TR_SH([ax_cv_cxx_compile_cxx14_$switch])
+      AC_CACHE_CHECK(whether $CXX supports C++14 features with $switch,
+                     $cachevar,
+        [ac_save_CXXFLAGS="$CXXFLAGS"
+         CXXFLAGS="$CXXFLAGS $switch"
+         AC_COMPILE_IFELSE([AC_LANG_SOURCE([_AX_CXX_COMPILE_STDCXX_11_testbody])],
+          [eval $cachevar=yes],
+          [eval $cachevar=no])
+         CXXFLAGS="$ac_save_CXXFLAGS"])
+      if eval test x\$$cachevar = xyes; then
+        CXXFLAGS="$CXXFLAGS $switch"
+        ac_success=yes
+        break
+      fi
+    done
+  fi])
+
+  m4_if([$1], [ext], [], [dnl
+  if test x$ac_success = xno; then
+    for switch in -std=c++14 -std=c++0y; do
+      cachevar=AS_TR_SH([ax_cv_cxx_compile_cxx14_$switch])
+      AC_CACHE_CHECK(whether $CXX supports C++14 features with $switch,
+                     $cachevar,
+        [ac_save_CXXFLAGS="$CXXFLAGS"
+         CXXFLAGS="$CXXFLAGS $switch"
+         AC_COMPILE_IFELSE([AC_LANG_SOURCE([_AX_CXX_COMPILE_STDCXX_11_testbody])],
+          [eval $cachevar=yes],
+          [eval $cachevar=no])
+         CXXFLAGS="$ac_save_CXXFLAGS"])
+      if eval test x\$$cachevar = xyes; then
+        CXXFLAGS="$CXXFLAGS $switch"
+        ac_success=yes
+        break
+      fi
+    done
+  fi])
+  AC_LANG_POP([C++])
+  if test x$ax_cxx_compile_cxx14_required = xtrue; then
+    if test x$ac_success = xno; then
+      AC_MSG_ERROR([*** A compiler with support for C++14 language features is required.])
+    fi
+  else
+    if test x$ac_success = xno; then
+      HAVE_CXX14=0
+      AC_MSG_NOTICE([No compiler with C++14 support was found])
+      AX_CXX_COMPILE_STDCXX_11([$1], [optional])
+    else
+      HAVE_CXX11=1
+      HAVE_CXX14=1
+      AC_DEFINE(HAVE_CXX14,1,
+                [define if the compiler supports basic C++14 syntax])
+      AC_DEFINE(HAVE_CXX11,1,
+                [define if the compiler supports basic C++14 syntax])
+    fi
+    AC_SUBST(HAVE_CXX11)
+    AC_SUBST(HAVE_CXX14)
+  fi
+])
+
+AC_DEFUN([AX_REQUIRE_STDCXX_11], [
+  if test x${HAVE_CXX11} != x1; then
+    AC_MSG_ERROR([*** A compiler with support for C++11 language features is required.])
+  fi
+])
+
+AC_DEFUN([AX_REQUIRE_STDCXX_14], [
+  if test x${HAVE_CXX14} != x1; then
+    AC_MSG_ERROR([*** A compiler with support for C++14 language features is required.])
+  fi
+])

ax_init_standard_project.m4

@@ -7,44 +7,55 @@
 m4_define([mrw_esyscmd_s], [m4_normalize(m4_esyscmd([$1]))])
 
 # define least version number from subversion's revision number:
-# it is taken modulo 256 due to a bug on Apple's MacOSX
+# it is taken modulo 256 due to a bug on Apple's MaxOSX
-m4_define(x_least, m4_ifdef([x_least_diff], mrw_esyscmd_s([
+m4_define(x_least, m4_ifdef([x_least_fix], [x_least_fix],
-  SVN_REVISION="ERROR-UNDEFINED-REVISION-to-be-built-in-subdirectory-of-svn-checkout"
+  m4_ifdef([x_least_diff],
-  for path in . .. ../..; do
+    mrw_esyscmd_s([
-    if svn info $path 2>&1 > /dev/null; then
+      VCS_REVISION="ERROR-UNDEFINED-REVISION-to-be-built-in-subdirectory-of-checkout"
-      SVN_REVISION=$(LANG= svn info $path | sed -n 's/Last Changed Rev: //p')
+      for path in . .. ../.. ../../..; do
-      if test -z "${SVN_REVISION}"; then SVN_REVISION=0; fi
+        if test -d .svn; then
-      break;
+          svn upgrade 1>&2 > /dev/null || true
+          VCS_REVISION=$(LANG= svn info $path | sed -n 's/Last Changed Rev: //p')
+          if test -n "${VCS_REVISION}"; then break; fi
+        elif test -d .git; then
+          VCS_REVISION=$(git rev-list --all --count)
+          if test -n "${VCS_REVISION}"; then break; fi
         fi
       done
-  echo $ECHO_N $(($SVN_REVISION))
+      echo $ECHO_N $(($VCS_REVISION))
     ]),  mrw_esyscmd_s([
-  SVN_REVISION="ERROR-UNDEFINED-REVISION-to-be-built-in-subdirectory-of-svn-checkout"
+      VCS_REVISION="ERROR-UNDEFINED-REVISION-to-be-built-in-subdirectory-of-checkout"
-  for path in . .. ../..; do
+      for path in . .. ../.. ../../..; do
-    if svn info $path 2>&1 > /dev/null; then
+        if test -d .svn; then
-      SVN_REVISION=$(LANG= svn info $path | sed -n 's/Last Changed Rev: //p')
+          svn upgrade 1>&2 > /dev/null || true
-      if test -z "${SVN_REVISION}"; then SVN_REVISION=0; fi
+          VCS_REVISION=$(LANG= svn info $path | sed -n 's/Last Changed Rev: //p')
-      break;
+          if test -n "${VCS_REVISION}"; then break; fi
+        elif test -d .git; then
+          VCS_REVISION=$(git rev-list --all --count)
+          if test -n "${VCS_REVISION}"; then break; fi
         fi
       done
       # Mac does not support LEAST > 255
-  echo $ECHO_N $(($SVN_REVISION%256))
+      echo $ECHO_N $(($VCS_REVISION%256))]))))
-])))
+
 # define version number from subversion's revision number:
 # it is taken modulo 256 due to a bug on Apple's MacOSX
 # add to x_minor if revision number is > 256
-m4_define(x_minor_diff, mrw_esyscmd_s([
+m4_define(x_minor_diff, m4_ifdef([x_least_fix], 0, mrw_esyscmd_s([
-  SVN_REVISION="ERROR-UNDEFINED-REVISION-to-be-built-in-subdirectory-of-svn-checkout"
+  VCS_REVISION="ERROR-UNDEFINED-REVISION-to-be-built-in-subdirectory-of-checkout"
-  for path in . .. ../..; do
+  for path in . .. ../.. ../../..; do
-    if svn info $path 2>&1 > /dev/null; then
+    if test -d .svn; then
-      SVN_REVISION=$(LANG= svn info $path | sed -n 's/Last Changed Rev: //p')
+      svn upgrade 1>&2 > /dev/null || true
-      if test -z "${SVN_REVISION}"; then SVN_REVISION=0; fi
+      VCS_REVISION=$(LANG= svn info $path | sed -n 's/Last Changed Rev: //p')
-      break;
+      if test -n "${VCS_REVISION}"; then break; fi
+    elif test -d .git; then
+      VCS_REVISION=$(git rev-list --all --count)
+      if test -n "${VCS_REVISION}"; then break; fi
     fi;
   done
   # Mac does not support LEAST > 255
-  echo $ECHO_N $(($SVN_REVISION/256))
+  echo $ECHO_N $(($VCS_REVISION/256))])))
-]))
+
 # setup version number
 m4_define(x_version, [x_major.m4_ifdef([x_least_diff], x_minor, m4_eval(x_minor+x_minor_diff)).m4_eval(m4_ifdef([x_least_diff], [x_least-x_least_diff], [x_least]))])
 
@@ -90,16 +101,19 @@ AC_DEFUN([AX_ADD_MAKEFILE_TARGET_DEP], [
   fi
 ])
 
-# Same as AC_SUBST, but adds -Dname="value" option to CPPFLAGS
+# Same as AC_SUBST, but adds -Dname="value" option to CPPFLAGS and a
+# notz only a @name@ replacement, but also a @name_ENCODED@ one to be
+# used in code.
 #  - parameters:
 #     $1 = variable name
 AC_DEFUN([AX_SUBST], [
+  [$1]_ENCODED=$(echo "${$1}" | awk 1 ORS='\\n' | sed 's,\\n$,,')
+  [$1]_ENCODED=${[$1]_ENCODED//\"/\\\"}
+  [$1]_ENCODED=${[$1]_ENCODED//\'/\'\"\'\"\'}
+  [$1]_ENCODED=${[$1]_ENCODED//#/\\#}
+  AM_CPPFLAGS+=" '-D$1=\"${[$1]_ENCODED}\"'"
   AC_SUBST([$1])
-  tmp_var=$(echo "${$1}" | awk 1 ORS='\\n' | sed 's,\\n$,,')
+  AC_SUBST([$1]_ENCODED)
-  tmp_var=${tmp_var//\"/\\\"}
-  tmp_var=${tmp_var//\'/\'\"\'\"\'}
-  tmp_var=${tmp_var//#/\\#}
-  AM_CPPFLAGS+=" '-D$1=\"${tmp_var}\"'"
   AC_SUBST(AM_CPPFLAGS)
 ])
 
@@ -112,13 +126,23 @@ AC_DEFUN([AX_SUBST], [
 # m4_define(x_minor, MINOR_NUMBER) # project's minor version
 # m4_include(ax_init_standard_project.m4)
 # AC_INIT(x_package_name, x_version, x_bugreport, x_package_name)
-# AM_INIT_AUTOMAKE([1.9 tar-pax])
+# AM_INIT_AUTOMAKE([1.9 tar-pax parallel-tests color-tests])
 # AX_INIT_STANDARD_PROJECT
 #
 # you change nothing but: YOUR_PACKAGE_NAME, MAJOR_NUMBER, MINOR_NUMBER
 #
 # configures the basic environment
 AC_DEFUN([AX_INIT_STANDARD_PROJECT], [
+  PREFIX=$(test "$prefix" = NONE && prefix=$ac_default_prefix; eval echo "${prefix}")
+  AX_SUBST(PREFIX)
+  SYSCONFDIR=$(test "$prefix" = NONE && prefix=$ac_default_prefix; eval echo "${sysconfdir}")
+  AX_SUBST(SYSCONFDIR)
+  DATADIR=$(test "$prefix" = NONE && prefix=$ac_default_prefix; eval echo "${datadir}")
+  AX_SUBST(DATADIR)
+  PKGDATADIR=$(test "$prefix" = NONE && prefix=$ac_default_prefix; eval echo "${DATADIR}/${PACKAGE_NAME}")
+  AX_SUBST(PKGDATADIR)
+  LOCALSTATEDIR=$(test "$prefix" = NONE && prefix=$ac_default_prefix; eval echo "${localstatedir}")
+  AX_SUBST(LOCALSTATEDIR)
   AC_MSG_CHECKING([target platfrom])
   UNIX=1
   MINGW=
@@ -143,17 +167,49 @@ AC_DEFUN([AX_INIT_STANDARD_PROJECT], [
   AM_CPPFLAGS+=" '-DMAKE_STRING(X)=\#X' '-DNAMESPACE=${PACKAGE_TARNAME//[^a-zA-Z0-9]/_}'"
   AX_SUBST(NUMBERS)
   AX_SUBST(HOME)
+  if test -f README.md; then
+    README=$(tail -n +3 README.md)
+    DESCRIPTION=$(head -1 README.md)
+  else
     README=$(tail -n +3 README)
+    DESCRIPTION=$(head -1 README)
+  fi
+  README_ESCAPED=$(echo "$README" | sed ':a;N;$!ba;s/\n/\\n/g;s,",\\",g')
+  if which pandoc 2>&1 > /dev/null; then   
+    README_HTML=$(echo "$README" | pandoc -f markdown_github -t html | sed ':a;N;$!ba;s,\\\(.\),\\\\<span>\1</span>,g;s/\n/\\n/g;s,",\\",g;s,  ,\&nbsp;\&nbsp;,g')
+  else
+    README_HTML="${README}"
+  fi
   AX_SUBST(README)
   _AM_SUBST_NOTMAKE([README])
-  DESCRIPTION=$(head -1 README)
+  AX_SUBST(README_ESCAPED)
+  _AM_SUBST_NOTMAKE([README_ESCAPED])
+  AX_SUBST(README_HTML)
+  _AM_SUBST_NOTMAKE([README_HTML])
   AX_SUBST(DESCRIPTION)
   _AM_SUBST_NOTMAKE([DESCRIPTION])
+  LICENSE=$(echo $(head -1 COPYING))
+  AX_SUBST(LICENSE)
+  COPYING=$(<COPYING)
+  AX_SUBST(COPYING)
+  _AM_SUBST_NOTMAKE([COPYING])
   AUTHOR=$(head -1 AUTHORS)
+  AUTHOR_NAME=$(echo $AUTHOR | sed 's, *[[<(]].*$,,')
+  AUTHOR_URL=$(echo $AUTHOR | sed 's,.*(\(http[[^)]]*\)).*,\1,')
+  AUTHOR_MAIL=$(echo $AUTHOR | sed 's,.*<\(.*@.*\)>.*,\1,')
   AX_SUBST(AUTHOR)
   _AM_SUBST_NOTMAKE([AUTHOR])
+  AX_SUBST(AUTHOR_NAME)
+  AX_SUBST(AUTHOR_URL)
+  AX_SUBST(AUTHOR_MAIL)
+  PROJECT_URL="${PROJECT_URL:-${AUTHOR_URL}/projects/${PACKAGE_NAME}}"
+  SOURCE_DOWNLOAD="${SOURCE_DOWNLOAD:-${AUTHOR_URL}/downloads/${PACKAGE_NAME}}"
+  AX_SUBST(PROJECT_URL)
+  AX_SUBST(SOURCE_DOWNLOAD)
   DISTRO=$(lsb_release -sc 2>/dev/null || uname -s 2>/dev/null)
   AX_SUBST(DISTRO)
+  ARCH=$((@<:@@<:@ $(uname -sm) =~ 64 @:>@@:>@ && echo amd64) || (@<:@@<:@ $(uname -sm) =~ 'i?86' @:>@@:>@ && echo i386 || uname -sm))
+  AX_SUBST(ARCH)
   DISTRIBUTOR=$(lsb_release -si 2>/dev/null || uname -s 2>/dev/null)
   case "${DISTRIBUTOR// /-}" in
     (Ubuntu) UBUNTU=1; AX_SUBST(UBUNTU);;
@@ -167,14 +223,24 @@ AC_DEFUN([AX_INIT_STANDARD_PROJECT], [
   AX_SUBST(BUILD_NUMBER)
   BUILD_DATE=$(LANG= date +"%a, %d %b %Y %H:%M:%S %z")
   AX_SUBST(BUILD_DATE)
-  if test -f "${PROJECT_NAME}-logo.png"; then
+  if test -f "${PACKAGE_NAME}.desktop.in"; then
-     PROJECT_LOGO="${PROJECT_NAME}-logo.png"
+     PACKAGE_DESKTOP="${PACKAGE_NAME}.desktop"
+  fi
+  AX_SUBST(PACKAGE_DESKTOP)
+  if test -f "${PACKAGE_NAME}-logo.png"; then
+     PACKAGE_LOGO="${PACKAGE_NAME}-logo.png"
   fi
-  AX_SUBST(PROJECT_LOGO)
+  AX_SUBST(PACKAGE_LOGO)
-  if test -f "${PROJECT_NAME}-icon.png"; then
+  if test -f "${PACKAGE_NAME}-icon.svg"; then
-     PROJECT_ICON="${PROJECT_NAME}-icon.png"
+     PACKAGE_ICON="${PACKAGE_NAME}-icon.svg"
+  elif test -f "${PACKAGE_NAME}-icon.png"; then
+     PACKAGE_ICON="${PACKAGE_NAME}-icon.png"
+  elif test -f "${PACKAGE_NAME}.svg"; then
+     PACKAGE_ICON="${PACKAGE_NAME}.svg"
+  elif test -f "${PACKAGE_NAME}.png"; then
+     PACKAGE_ICON="${PACKAGE_NAME}.png"
   fi
-  AX_SUBST(PROJECT_ICON)
+  AX_SUBST(PACKAGE_ICON)
 
   AC_ARG_ENABLE(pedantic,
     [AS_HELP_STRING([--enable-pedantic],
@@ -204,6 +270,29 @@ AC_DEFUN([AX_INIT_STANDARD_PROJECT], [
     AM_CPPFLAGS="${AM_CPPFLAGS} -DQT_NO_DEBUG_OUTPUT -DQT_NO_DEBUG"
   fi
 
+  AC_ARG_WITH(gcov,
+    [AS_HELP_STRING([--with-gcov=FILE],
+                    [enable gcov, set gcov file (defaults to gcov)])],
+    [GCOV="$enableval"], [GCOV="no"])
+  AM_CONDITIONAL(COVERAGE, test "$GCOV" != "no")
+  if test "$GCOV" != "no"; then
+    if test "$GCOV" == "yes"; then
+      GCOV=gcov
+    fi
+    AC_CHECK_PROG(has_gcov, [$GCOV], [yes], [no])
+    if test "$has_gcov" != "yes"; then
+      AC_MSG_ERROR([gcov: program $GCOV not found])
+    fi
+    AC_MSG_NOTICE([Coverage tests enabled, using ${GCOV}]);
+    AM_CXXFLAGS="${AM_CXXFLAGS:-} -O0 --coverage -fprofile-arcs -ftest-coverage"
+    AM_LDFLAGS="${AM_LDFLAGS} -O0 --coverage -fprofile-arcs"
+    AX_SUBST(GCOV)
+  fi
+  
+  if test -f ${PACKAGE_NAME}.desktop.in; then
+    AC_CONFIG_FILES([${PACKAGE_NAME}.desktop])
+  fi
+
   AC_CONFIG_FILES([makefile])
   AX_ADD_MAKEFILE_TARGET_DEP([clean-am], [clean-standard-project-targets], [makefile.in])
   AX_ADD_MAKEFILE_TARGET_DEP([distclean-am], [distclean-standard-project-targets], [makefile.in])
@@ -230,7 +319,7 @@ EOF
 AC_DEFUN([AX_USE_CXX], [
   m4_include(ax_cxx_compile_stdcxx_11.m4)
   AC_LANG(C++)
-  AX_CXX_COMPILE_STDCXX_11(noext, optional)
+  AX_CXX_COMPILE_STDCXX_14(noext, optional)
   AC_PROG_CXX
   AC_PROG_CPP
 
@@ -268,6 +357,43 @@ maintainer-clean-cxx-targets:
 EOF
 ])
 
+# use this in configure.ac to support old school C
+AC_DEFUN([AX_USE_C], [
+  AC_LANG(C)
+  AC_PROG_CC
+  AC_PROG_CPP
+
+  AC_CONFIG_FILES([src/makefile])
+  
+  AM_CPPFLAGS+=' -I ${top_srcdir}/src -I ${top_builddir}/src -I ${srcdir} -I ${builddir}'
+  AM_LDFLAGS+=' -L ${top_srcdir}/src -L ${top_builddir}/src'
+
+  # Get rid of those stupid -g -O2 options!
+  CXXFLAGS="${CXXFLAGS//-g -O2/}"
+  CFLAGS="${CFLAGS//-g -O2/}"
+
+  # pass compile flags to make distcheck
+  AM_DISTCHECK_CONFIGURE_FLAGS="CFLAGS='${CFLAGS}' CPPFLAGS='${CPPFLAGS}' CFLAGS='${CFLAGS}' LDFLAGS='${LDFLAGS}'"
+  AC_SUBST(AM_DISTCHECK_CONFIGURE_FLAGS)
+
+  AC_SUBST(AM_CFLAGS)
+  AC_SUBST(AM_CPPFLAGS)
+  AC_SUBST(AM_LDFLAGS)
+  AX_ADD_MAKEFILE_TARGET_DEP([maintainer-clean-am], [maintainer-clean-c-targets], [src/makefile.in])
+  test -f src/makefile.in && cat >> src/makefile.in <<EOF
+#### Begin: Appended by $0
+%.app: %
+	-rm -r [\$][@]
+	\$(MAKE) DESTDIR=[\$][\$](pwd)/[\$][@]/tmp install
+	  \${top_builddir}/mac-create-app-bundle.sh \
+	    [\$][@] [\$][<] [\$][\$](pwd)/[\$][@]/tmp\${prefix}
+
+maintainer-clean-c-targets:
+	-rm makefile.in
+#### End: $0
+EOF
+])
+
 # use this in configure.ac to support tests without CppUnit
 AC_DEFUN([AX_BUILD_TEST], [
   AC_CONFIG_FILES([test/makefile])
@@ -303,6 +429,33 @@ maintainer-clean-example-targets:
 EOF
 ])
 
+# use this in configure.ac to support C++ examples
+AC_DEFUN([AX_USE_NODEJS], [
+  AC_PATH_PROG(ANDROID, [android], [0],
+                         [${PATH}${PATH_SEPARATOR}${ANDROID_HOME}/tools])
+  AC_PATH_PROG(CORDOVA, [cordova], [0],
+                        [${PATH}${PATH_SEPARATOR}$(pwd)/node_modules/cordova/bin])
+  if test ${CORDOVA} = 0; then
+     AC_MSG_WARN([cordova is missing, on ubuntu install cordova-cli from repository ppa:cordova-ubuntu/ppa])
+  fi
+  if test ${ANDROID} = 0; then
+     AC_MSG_WARN([android sdk is missing, set variable ANDROID_HOME after installation])
+  fi
+  AM_CONDITIONAL(HAVE_CORDOVA, [test ${CORDOVA} != 0 -a ${ANDROID} != 0])
+  AX_SUBST(CORDOVA)
+  AC_CONFIG_FILES([nodejs/package.json])
+  AC_CONFIG_FILES([nodejs/makefile])
+  AC_CONFIG_FILES([cordova/makefile])
+  AC_CONFIG_FILES([cordova/config.xml])
+  AX_ADD_MAKEFILE_TARGET_DEP([maintainer-clean-am], [maintainer-clean-example-targets], [examples/makefile.in])
+  test -f examples/makefile.in && cat >> examples/makefile.in <<EOF
+#### Begin: Appended by $0
+maintainer-clean-example-targets:
+	-rm makefile.in
+#### End: $0
+EOF
+])
+
 # use this in configure.ac to support HTML data for webservers
 AC_DEFUN([AX_BUILD_HTML], [
   AC_CONFIG_FILES([html/makefile])
@@ -345,7 +498,11 @@ EOF
 
 # use this in configure.ac to support debian packages
 AC_DEFUN([AX_USE_DEBIAN_PACKAGING], [
+  if test -f README.md; then
+    README_DEB=$(tail -n +3 README.md | sed -e 's/^ *$/./g' -e 's/^/ /g')
+  else
     README_DEB=$(tail -n +3 README | sed -e 's/^ *$/./g' -e 's/^/ /g')
+  fi
   AC_SUBST(README_DEB)
   _AM_SUBST_NOTMAKE([README_DEB])
   AC_CONFIG_FILES([debian/changelog debian/control])
@@ -368,12 +525,15 @@ EOF
 AC_DEFUN([AX_USE_RPM_PACKAGING], [
   AC_CONFIG_FILES([${PACKAGE_NAME}.spec])
   #AX_ADD_MAKEFILE_TARGET_DEP([clean-am], [clean-rpm-targets], [makefile.in])
+  AX_ADD_MAKEFILE_TARGET_DEP([clean-am], [clean-rpm-targets], [makefile.in])
   AX_ADD_MAKEFILE_TARGET_DEP([distclean-am], [distclean-rpm-targets], [makefile.in])
   test -f makefile.in && cat >> makefile.in <<EOF
 #### Begin: Appended by $0
 EXTRA_DIST += \${PACKAGE_NAME}.spec.in
 rpm: dist
 	rpmbuild -ba --define "_topdir \$\$(pwd)" --define "_sourcedir \$\$(pwd)" \${PACKAGE_NAME}.spec
+clean-rpm-targets:
+	-rm -rf BUILD BUILDROOT RPMS SPECS SRPMS
 distclean-rpm-targets:
 	-rm \${PACKAGE_NAME}.spec
 #### End: $0
@@ -390,6 +550,7 @@ AC_DEFUN([AX_USE_DOXYGEN], [
   AC_CHECK_PROG(have_doxygen, doxygen, yes, no)
   AC_CHECK_PROG(have_dot, dot, yes, no)
   AC_CHECK_PROG(have_mscgen, mscgen, yes, no)
+  AM_CONDITIONAL(NEED_PLANTUML, test "$have_doxygen" = "yes" -a "1.8.11" != $((echo "1.8.11"; doxygen -v) | sort -V | head -1))
   PDF_DOC=${PACKAGE_NAME}-${PACKAGE_VERSION}.pdf
   AC_SUBST(PDF_DOC)
   if test "$have_doxygen" = "no"; then
@@ -404,22 +565,38 @@ AC_DEFUN([AX_USE_DOXYGEN], [
     AC_MSG_WARN([Missing program mscgen!
      - when you rebild documentation, there are no message state charts
      - there are precompiled derived files in the distribution]); fi
-  AC_CONFIG_FILES([doc/makefile doc/doxyfile])
+  AC_CONFIG_FILES([doc/makefile doc/doxyfile doc/header.html doc/footer.html])
   AX_ADD_MAKEFILE_TARGET_DEP([clean-am], [clean-documentation], [doc/makefile.in])
   AX_ADD_MAKEFILE_TARGET_DEP([distclean-am], [distclean-documentation], [doc/makefile.in])
   AX_ADD_MAKEFILE_TARGET_DEP([maintainer-clean-am], [maintainer-clean-documentation], [doc/makefile.in])
   AX_ADD_MAKEFILE_TARGET_DEP([install-data-am], [install-data-documentation], [doc/makefile.in])
   AX_ADD_MAKEFILE_TARGET_DEP([uninstall-am], [uninstall-documentation], [doc/makefile.in])
   AX_ADD_MAKEFILE_TARGET_DEP([all], [doc], [doc/makefile.in])
-  AX_ADD_MAKEFILE_TARGET_DEP([.PHONY], [pdf], [doc/makefile.in])
+  AX_ADD_MAKEFILE_TARGET_DEP([.PHONY], [pdf gen-uml-images], [doc/makefile.in])
   test -f doc/makefile.in && cat >> doc/makefile.in <<EOF
 #### Begin: Appended by $0
-doc: doxyfile
+doc: doxyfile @NEED_PLANTUML_TRUE@ gen-uml-images
+	@NEED_PLANTUML_TRUE@ doxyadd() { grep -q "\$\$[1] += \$\$[2]" doxyfile || sed -i '/^'"\$\$[1]"' *=/a'"\$\$[1]"' += '"\$\$[2]" doxyfile; }; \\
+	@NEED_PLANTUML_TRUE@ doxyadd ALIASES '"startuml{1}=@image html \\\\1\\\\n@image latex \\\\1\\\\n\\\\if DontIgnorePlantUMLCode"'; \\
+	@NEED_PLANTUML_TRUE@ doxyadd ALIASES '"enduml=\\\\endif"'; \\
+	@NEED_PLANTUML_TRUE@ doxyadd IMAGE_PATH '"gen-uml-images"';
 	doxygen doxyfile
 @PEDANTIC_TRUE@	test \! -s doxygen.errors
 
+@NEED_PLANTUML_TRUE@EXTRA_DIST = ${EXTRA_DIST} plantuml.jar
+@NEED_PLANTUML_TRUE@
+@NEED_PLANTUML_TRUE@gen-uml-images:
+@NEED_PLANTUML_TRUE@	test -d gen-uml-images || mkdir gen-uml-images
+@NEED_PLANTUML_TRUE@	eval \$\$(sed -n 's, *INPUT *\\(+\\?\\)= *\\(.*\\),INPUT\\1=" \\2",gp' doxyfile); \\
+@NEED_PLANTUML_TRUE@	eval \$\$(sed -n 's, *FILE_PATTERNS *\\(+\\?\\)= *\\(.*\\),FILE_PATTERNS\\1=" \\2",gp' doxyfile); \\
+@NEED_PLANTUML_TRUE@	SOURCES="**.("\$\$(echo \$\${FILE_PATTERNS} | sed 's,*.,,g;s, ,|,g')")"; \\
+@NEED_PLANTUML_TRUE@	for src in \$\$INPUT; do \\
+@NEED_PLANTUML_TRUE@	  java  -Djava.awt.headless=true -jar \${top_srcdir}/doc/plantuml.jar -v -o \$\$(pwd)/gen-uml-images "\$\$src/\$\$SOURCES"; \\
+@NEED_PLANTUML_TRUE@	done
+
 clean-documentation:
 	-rm doxygen.errors @PDF_DOC@
+	@NEED_PLANTUML_TRUE@ -rm -rf gen-uml-images
 distclean-documentation:
 	-rm -r html
 	-rm  @PACKAGE_NAME@.doxytag
@@ -436,6 +613,55 @@ uninstall-documentation:
 EOF
 ])
 
+# use this in configure.ac to support Doxygen documentation generation
+AC_DEFUN([AX_USE_PERLDOC], [
+  PERL_SOURCES="m4_default([$1], [perl])"
+  AX_SUBST(PERL_SOURCES)
+  if test -z "$PERL_SOURCES"; then
+    AC_MSG_ERROR([You must specify the path to per files
+     - use [AX]_[USE]_PERLDOC([[pathes to perldoc]])]); fi
+  AC_CHECK_PROG(have_perldoc, pods2html, yes, no)
+  if test "$have_doxygen" = "no"; then
+    AC_MSG_WARN([Missing program pods2html!
+     - you cannot rebuild the documentation
+     - there are precompiled derived files in the distribution
+     - if you need to generate documentation, install libpod-tree-perl]); fi
+  AC_CONFIG_FILES([doc/makefile])
+  AX_ADD_MAKEFILE_TARGET_DEP([distclean-am], [distclean-perldoc], [doc/makefile.in])
+  AX_ADD_MAKEFILE_TARGET_DEP([maintainer-clean-am], [maintainer-clean-perldoc], [doc/makefile.in])
+  AX_ADD_MAKEFILE_TARGET_DEP([install-data-am], [install-data-perldoc], [doc/makefile.in])
+  AX_ADD_MAKEFILE_TARGET_DEP([uninstall-am], [uninstall-perldoc], [doc/makefile.in])
+  AX_ADD_MAKEFILE_TARGET_DEP([all], [doc], [doc/makefile.in])
+  AX_ADD_MAKEFILE_TARGET_DEP([.PHONY], [doc], [doc/makefile.in])
+  test -f doc/makefile.in && cat >> doc/makefile.in <<EOF
+#### Begin: Appended by $0
+doc: perldoc/index.html
+
+perldoc/index.html: \${PERL_SOURCES:%=perldoc/%}
+	echo "<html><head><title>Perl Documentation</title></head><body><h1>Perl Documentation</h1><ul>" > perldoc/index.html
+	for p in \${PERL_SOURCES:%=perldoc/%}; do \
+	  echo '<li><a href="'"\$\${p#perldoc/}"'/index.html">'"\$\${p#perldoc/}"'</a></li>' >> perldoc/index.html; \
+	done
+	echo "</ul></body></html>" >> perldoc/index.html
+
+perldoc/%:
+	pods2html --notoc --empty --index index @top_srcdir@/\${@:perldoc/%=%} \$[@]
+
+distclean-perldoc:
+	-rm -r perldoc
+maintainer-clean-perldoc:
+	-rm makefile.in
+install-data-perldoc:
+	test -d \$(DESTDIR)\${docdir} || mkdir -p \$(DESTDIR)\${docdir}
+	chmod -R u+w \$(DESTDIR)\${docdir}
+	cp -r perldoc \$(DESTDIR)\${docdir}/
+uninstall-perldoc:
+	-chmod -R u+w \$(DESTDIR)\${docdir}
+	-rm -rf \$(DESTDIR)\${docdir}/perldoc
+#### End: $0
+EOF
+])
+
 # require a specific package, with fallback: test for a header
 #  - parameter:
 #     $1 = unique id (no special characters)
@@ -591,6 +817,7 @@ AC_DEFUN([AX_PKG_CHECK], [
 # make sure, a specific header exists
 # - parameter:
 #    $1 = header name
+#    $2 = pathes to search for
 AC_DEFUN([AX_REQUIRE_HEADER], [
   AC_CHECK_HEADER($1, [], [
     if test -n "$2"; then

bootstrap.sh

@@ -20,19 +20,25 @@ DEFAULT_PROJECT_NAME=${PROJECT_PATH##*/}
 configure=0
 build=0
 docker=0
-buildtarget="distcheck"
+buildtarget=""
 overwrite=0
 rebuild=0
+novcs=0
+excludevcs=()
 rebuildfiles=()
 while test $# -gt 0; do
     case "$1" in
         (--configure|-c) configure=1;;
         (--docker|-d) docker=1;;
-        (--build|-b) configure=1; build=1;;
+        (--build|-b) configure=1; build=1; buildtarget+=" distcheck";;
-        (--target|-t) shift; configure=1; build=1; buildtarget="$1";;
+        (--all|-a) shift; configure=1; build=1; buildtarget+=" all";;
+        (--clean) shift; configure=1; build=1; buildtarget+=" maintainer-clean";;
+        (--target|-t) shift; configure=1; build=1; buildtarget+=" $1";;
         (--overwrite|-o) overwrite=1;;
         (--rebuild|-r) rebuild=1;;
         (--rebuild-file|-f) shift; rebuildfiles+=("$1");;
+        (--no-vcs|-n) novcs=1;;
+        (--exclude-vcs|-x) shift; excludevcs+=("$1");;
         (--version|-v)
             echo "$Id$";
             exit;;
@@ -46,10 +52,14 @@ OPTIONS
   --configure, -c            call ./configure after initialization
   --docker, -d               build and run tests in a docker instance
   --build, -b                build, also call ./configure && make distcheck
+  --all, -a                  same as -b, but make target all
+  --clean                    same as -b, but make target maintainer-clean
   --target, -t <target>      same as -b, but specify target instead of distcheck
   --overwrite, -o            overwrite all basic files (bootstrap.sh, m4-macros)
   --rebuild, -r              force rebuild of generated files, even if modified
   --rebuild-file, -f <file>  rebild specific file (can be added multiple times)
+  --no-vcs, -n               do not automatically add files to version control
+  --exclude-vcs, -x <file>   exclude specific file from version control
   --help, -h                 show this help
   --version, -v              show version and date of this file
 
@@ -60,7 +70,7 @@ DESCRIPTION
   configure.ac. Automatically copies or creates all required template
   files.
 
-  From your new and empty project's subversion path, call $0 to
+  From your new and empty project's subversion or git path, call $0 to
   initialize your build environment.
 
   Before you call ${MY_NAME} the very first time, edit ${0#/*}/AUTHORS
@@ -79,16 +89,27 @@ DESCRIPTION
   https://dev.marc.waeckerlin.org/, and the path from where you call
   ${MY_NAME} (which is actually ${PROJECT_PATH}) should be the path to
   your newly created project. Please note that your project must be a
-  checked out subversion repository, since this build environment
+  checked out subversion or git repository, since this build
-  relies on subversion.
+  environment relies on subversion or git.
 
   Example for an initial run, where your new projet is stored in
-  subversion on svn:/path/to/your/new-project:
+  subversion on https:/path/to/your/new-project:
 
     cd ~/svn
     svn co https://dev.marc.waeckerlin.org/svn/bootstrap-build-environment/trunk \\
            bootstrap-build-environment
-    svn co svn:/path/to/your/new-project/trunk new-project
+    svn co https:/path/to/your/new-project/trunk new-project
+    cd new-project
+    ../bootstrap-build-environment/bootstrap.sh
+
+  Example for an initial run, where your new projet is stored in
+  git on https:/path/to/your/new-project:
+
+    cd ~/svn
+    svn co https://dev.marc.waeckerlin.org/svn/bootstrap-build-environment/trunk \\
+           bootstrap-build-environment
+    cd ~/git
+    git clone https:/path/to/your/new-project
     cd new-project
     ../bootstrap-build-environment/bootstrap.sh
 
@@ -97,33 +118,45 @@ RUNNING
   If you run ${MY_NAME}, it first generates the necessary files (see
   below), then first runs make distclean if a makefile exists. After
   this it calles aclocal, libtoolize, automake, autoconf and
-  optionally ./configure.
+  optionally ./configure. If necessary, files are added to version
+  control.
 
 GENERATED FILES
 
   This script copies the following files into your project environment:
     * ${MY_NAME}
+    * autogen.sh - just the basics to initialize auto tools and create configure
     * ax_init_standard_project.m4 - auxiliary macro definition file
     * ax_cxx_compile_stdcxx_11.m4 - auxiliary macro definition file
     * ax_check_qt.m4 - auxiliary macro definition file
+    * makefile_test.inc.am - makefile to be included in tests
     * resolve-debbuilddeps.sh - script to install debian package dependencies
     * resolve-rpmbuilddeps.sh - script to install RPM package dependencies
     * build-in-docker.sh - script to build the project encapsulated in a docker container
+    * build-in-docker.conf - additional configuration for build-in-docker.sh
     * build-resource-file.sh - build resource.qrc file from a resource directory
+    * sql-to-dot.sed - script to convert SQL schema files to graphviz dot in doxygen
     * mac-create-app-bundle.sh - script to create apple mac os-x app-bundle
+    * test/runtests.sh - template file to run test scripts, i.e. docker based
     * AUTHORS - replace your name in AUTHORS before first run
     * NEWS - empty file add your project's news
     * README - add project description (first line is header, followed by an empty line)
     * configure.ac - global configuration file template
     * makefile.am - global makefile template
+    * ${DEFAULT_PROJECT_NAME}.desktop.in - linux desktop file
     * src/makefile.am - if you enabled AX_USE_CXX
     * src/version.hxx - if you enabled AX_USE_CXX
     * src/version.cxx - if you enabled AX_USE_CXX
     * html/makefile.am - if you enabled AX_BUILD_HTML
     * scripts/makefile.am - if you enabled AX_USE_SCRIPTS
-    * doc/makefile.am - if you enabled AX_USE_DOXYGEN
+    * doc/makefile.am - if you enabled AX_USE_DOXYGEN or AX_USE_PERLDOC
     * doc/doxyfile.in - if you enabled AX_USE_DOXYGEN
-    * test/makefile.am - if you enabled AX_BUILD_TEST or AX_USE_CPPUNIT
+    * doc/header.html.in - if you enabled AX_USE_DOXYGEN
+    * doc/footer.html.in - if you enabled AX_USE_DOXYGEN
+    * doc/style.css - if you enabled AX_USE_DOXYGEN
+    * doc/plantuml.jar - if you enable AX_USE_DOXYGEN
+    * test/makefile.am - if you enabled AX_USE_CPPUNIT and AX_USE_CXX
+    * test/${DEFAULT_PROJECT_NAME#lib}.cxx - if you enabled AX_BUILD_TEST or AX_USE_CPPUNIT
     * examples/makefile.am - if you enabled AX_BUILD_EXAMPLES
     * debian/changelog.in - if you enabled AX_USE_DEBIAN_PACKAGING
     * debian/control.in - if you enabled AX_USE_DEBIAN_PACKAGING
@@ -164,6 +197,7 @@ FILES TO EDIT
     * src/makefile.am
     * html/makefile.am
     * test/makefile.am
+    * test/${DEFAULT_PROJECT_NAME}.cxx
     * examples/makefile.am
 
 FILE DEPENDENCIES
@@ -174,8 +208,8 @@ FILE DEPENDENCIES
     * test/makefile.am depends on AX_USE_LIBTOOL
     * html/makefile.am depends on AX_BUILD_HTML
     * doc/doxyfile.in depends on AX_BUILD_EXAMPLES
-    * debian/control.in depends on AX_USE_DOXYGEN, AX_USE_CPPUNIT
+    * debian/control.in depends on AX_USE_DOXYGEN, AX_USE_PERLDOC,
-      AX_CXX_QT, AX_CHECK_QT, AX_REQUIRE_QT, AX_USE_LIBTOOL
+      AX_USE_CPPUNIT AX_CXX_QT, AX_CHECK_QT, AX_REQUIRE_QT, AX_USE_LIBTOOL
     * debian/${DEFAULT_PROJECT_NAME}.install depends on AX_USE_LIBTOOL
     * debian/${DEFAULT_PROJECT_NAME}.dirs depends on AX_USE_LIBTOOL
     * debian/${DEFAULT_PROJECT_NAME}-dev.install depends on AX_USE_LIBTOOL
@@ -197,17 +231,19 @@ FILES
                   ${DEFAULT_PROJECT_NAME}::description().
   * ChangeLog:    Your changelog is automatically maintained from
                   subversion history, using svn2cl. You don't need to
-                  care about.
+                  care about. It uses git2cl on git repositories.
   * configure.ac: This file becomes very short and simple. You provide
                   the project name, the major and minor version. The
                   least version number is automatically taken from
                   subversion's revision, so every checkin
                   automatically increments the least version
-                  number. The following macros are supported:
+                  number. In git, git rev-list --all --count is used.
+                  The following macros are supported in configure.ac:
       * Enable C++: AX_USE_CXX
       * Enable LibTool library creation: AX_USE_LIBTOOL
       * Enable Scripts: AX_USE_SCRIPTS
       * Enable Doxygen documentation generation: AX_USE_DOXYGEN
+      * Enable Perldoc documentation generation: AX_USE_PERLDOC
       * Enable Debian packaging by calling "make deb": AX_USE_DEBIAN_PACKAGING
       * Enable RPM packaging by calling "make rpm": AX_USE_RPM_PACKAGING
       * Enable C++ testing using CppUnit: AX_USE_CPPUNIT
@@ -243,6 +279,20 @@ EOF
     shift;
 done
 
+echo -en "\e[1m-> checking:\e[0m for version control system ..."
+VCS=""
+VCSDEPENDS=""
+if test -d .svn; then
+    VCS="svn"
+    VCSDEPENDS="subversion,"
+    echo -e " \e[32msuccess\e[0m detected ${VCS}"
+elif test -d .git; then
+    VCS="git"
+    VCSDEPENDS="git,"
+    echo -e " \e[32msuccess\e[0m detected ${VCS}"
+else
+    echo -e " \e[33mignored\e[0m"
+fi
 
 HEADER='## @id '"\$Id\$"'
 ##
@@ -266,6 +316,7 @@ CHEADER='/** @id '"\$Id\$"'
 //       1         2         3         4         5         6         7         8
 // 45678901234567890123456789012345678901234567890123456789012345678901234567890
 
+
 '
 
 notice() {
@@ -314,26 +365,32 @@ contains() {
 checkdir() {
     if ! test -d "$1"; then # create path
         run mkdir -p "$1"
-        run svn add "$1"
+        if test -n "${VCS}" -a $novcs -eq 0 && ! contains "$1" "${excludevcs[@]}"; then
+            run ${VCS} add "$1"
+        fi
     fi
 }
 
 checkfile() {
     exists=0
-    if test -f "$1"; then
+    if test -f "$1" -o -f "$1".in; then
         exists=1
     fi
     test $exists -eq 1
 }
 
 to() {
-    while test $# -gt 0; do
     mode="u=rw,g=rw,o=r"
+    while test $# -gt 0; do
         case "$1" in
             (--condition) shift # test for a tag, abort if not set
                 if ! testtag "$1"; then
                     return 0
                 fi;;
+            (--unless) shift # test for a tag, abort if set
+                if testtag "$1"; then
+                    return 0
+                fi;;
             (--mode) shift # test for a tag, abort if not set
                 mode="$1";;
             (*) break;;
@@ -359,11 +416,15 @@ to() {
     else
         echo -e " \e[32msuccess\e[0m"
     fi
-    chmod $mode $1
+    run chmod $mode $1
     if test $exists -eq 0; then
-        run svn add "$1"
+        if test -n "${VCS}" -a $novcs -eq 0 && ! contains "$1" "${excludevcs[@]}"; then
+            run ${VCS} add "$1"
+            if test "${VCS}" = "svn"; then
                 run svn propset svn:keywords "Id" "$1"
             fi
+        fi
+    fi
     return 0
 }
 
@@ -380,11 +441,18 @@ copy() {
             source="${0%/*}/$1"
         fi
     fi
+    if test "${1%/*}" != "$1"; then
+        test -d "${1%/*}" || svn mkdir "${1%/*}"
+    fi
     run cp "${source}" "$1"
     if test $exists -eq 0; then
-        run svn add "$1"
+        if test -n "${VCS}" -a $novcs -eq 0 && ! contains "$1" "${excludevcs[@]}"; then
+            run ${VCS} add "$1"
+            if test "${VCS}" = "svn"; then
                 run svn propset svn:keywords "Id" "$1"
             fi
+        fi
+    fi
 }
 
 doxyreplace() {
@@ -409,21 +477,46 @@ doxyadd() {
     fi
 }
 
+vcs2cl() {
+    exists=0
+    if test -f "ChangeLog"; then
+        exists=1
+    else
+        touch "ChangeLog"
+    fi
+    if test -x $(which ${VCS}2cl); then
+        if test "${VCS}" = "git"; then
+            ${VCS}2cl > ChangeLog
+        elif test -n "${VCS}"; then
+            ${VCS}2cl
+        fi
+    fi
+    if test $exists -eq 0; then
+        if test -n "${VCS}" -a $novcs -eq 0 && ! contains "ChangeLog" "${excludevcs[@]}"; then
+            run ${VCS} add ChangeLog
+        fi
+    fi
+}
+
 # Check if we are in subversion root, if so, create trunk, branches, tags:
+if test "${VCS}" = "svn" -a $novcs -eq 0; then
     if test "$(LANG= svn info | sed -n 's,Relative URL: *,,p')" = "^/"; then
         svn mkdir trunk branches tags
         cd trunk
     fi
+fi
 
 # Initialize the environment:
 copy ${MY_NAME}
 copy ax_init_standard_project.m4
 copy ax_cxx_compile_stdcxx_11.m4
 copy ax_check_qt.m4
+copy makefile_test.inc.am
 copy resolve-debbuilddeps.sh
 copy resolve-rpmbuilddeps.sh
 copy build-in-docker.sh
 copy build-resource-file.sh
+copy sql-to-dot.sed
 copy mac-create-app-bundle.sh
 AUTHOR=$(gpg -K  | sed -n 's,uid *,,p' | sort | head -1)
 if test -z "${AUTHOR}"; then
@@ -441,7 +534,11 @@ ${DEFAULT_PROJECT_NAME}
 add description for ${DEFAULT_PROJECT_NAME}
 EOF
 to configure.ac <<EOF && notice "please edit configure.ac, then rerun $0" && exit 0
-${HEADER}m4_define(x_package_name, ${DEFAULT_PROJECT_NAME}) # project's name
+${HEADER}# default is generated from AUTHORS and project name
+PROJECT_URL=
+SOURCE_DOWNLOAD=
+
+m4_define(x_package_name, ${DEFAULT_PROJECT_NAME}) # project's name
 m4_define(x_major, 0) # project's major version
 m4_define(x_minor, 0) # project's minor version
 m4_include(ax_init_standard_project.m4)
@@ -454,6 +551,7 @@ AX_INIT_STANDARD_PROJECT
 #AX_USE_LIBTOOL
 #AX_USE_SCRIPTS
 #AX_USE_DOXYGEN
+#AX_USE_PERLDOC
 #AX_USE_DEBIAN_PACKAGING
 #AX_USE_RPM_PACKAGING
 #AX_USE_CPPUNIT
@@ -481,6 +579,20 @@ if ! testtag AX_CHECK_QT && \
    ! testtag AX_REQUIRE_QT; then
     echo "${HEADER}MAINTAINERCLEANFILES = makefile.in" | \
         to --condition AX_USE_CXX src/makefile.am
+    if ! ls src/*.[ch]xx; then
+        to --condition AX_USE_CXX src/${PACKAGE_NAME#lib}.hxx <<EOF
+${CHEADER}#ifndef ${PackageName^^}_HXX
+#define ${PackageName^^}_HXX
+
+/** @mainpage @description
+
+    @readme
+
+    */
+
+#endif
+EOF
+    fi
 elif ! test -e src/makefile.am; then
     to --condition AX_USE_CXX src/makefile.am <<EOF
 ${HEADER}bin_PROGRAMS = ${PACKAGE_NAME}
@@ -571,10 +683,17 @@ int main(int argc, char *argv[]) try {
   return 1;
  }
 EOF
-    to --condition AX_USE_CXX src/${PACKAGE_NAME}.hxx <<EOF
+    if ! ls src/*.[ch]xx; then
+        to --condition AX_USE_CXX src/${PACKAGE_NAME#lib}.hxx <<EOF
 ${CHEADER}#ifndef ${PackageName^^}_HXX
 #define ${PackageName^^}_HXX
 
+/** @mainpage @description
+
+    @readme
+
+    */
+
 #include <QMainWindow>
 #include <ui_${PACKAGE_NAME}.hxx>
 
@@ -591,7 +710,8 @@ class ${PackageName}: public QMainWindow, protected Ui::${PackageName} {
 
 #endif
 EOF
-    to --condition AX_USE_CXX src/${PACKAGE_NAME}.ui <<EOF
+    fi
+    to --condition AX_USE_CXX src/${PACKAGE_NAME#lib}.ui <<EOF
 <?xml version="1.0" encoding="UTF-8"?>
 <ui version="4.0">
  <class>${PackageName}</class>
@@ -673,7 +793,7 @@ EOF
 to --condition AX_USE_CXX src/version.cxx <<EOF
 /*! @file
 
-    @id $Id\$
+    @id \$Id\$
 */
 //       1         2         3         4         5         6         7         8
 // 45678901234567890123456789012345678901234567890123456789012345678901234567890
@@ -703,10 +823,10 @@ namespace NAMESPACE {
     return README;
   }
   std::string logo() {
-    return PROJECT_LOGO;
+    return PACKAGE_LOGO;
   }
   std::string icon() {
-    return PROJECT_ICON;
+    return PACKAGE_ICON;
   }
   const std::string WHAT("#(@) " PACKAGE_STRING);
   const std::string IDENT("\$Id: " PACKAGE_STRING);
@@ -717,7 +837,10 @@ ${HEADER}dist_bin_SCRIPTS =
 
 MAINTAINERCLEANFILES = makefile.in
 EOF
-echo "${HEADER}MAINTAINERCLEANFILES = makefile.in" | to --condition AX_USE_DOXYGEN doc/makefile.am
+echo "${HEADER}MAINTAINERCLEANFILES = makefile.in" | to --condition 'AX_USE_DOXYGEN|AX_USE_PERLDOC' doc/makefile.am
+if testtag AX_BUILD_TEST; then
+    to test/runtests.sh < ${0%/*}/test/runtests.sh
+fi
 to --condition 'AX_BUILD_TEST|AX_USE_CPPUNIT' test/makefile.am <<EOF
 ${HEADER}$(if testtag AX_USE_CXX; then
 cat <<EOF2
@@ -725,16 +848,51 @@ AM_CPPFLAGS = -I\${top_srcdir}/src -I\${top_builddir}/src
 AM_LDFLAGS = -L\${abs_top_builddir}/src/.libs
 $(if testtag AX_USE_LIBTOOL; then
 cat <<EOF3
-LDADD = -l${PACKAGE_NAME#lib}
+LDADD = -lcppunit -l${PACKAGE_NAME#lib}
 EOF3
 fi)
 EOF2
 fi)
 
-TESTS =
+check_PROGRAMS = ${PACKAGE_NAME#lib}
+TESTS = \${check_PROGRAMS}
+
+${PACKAGE_NAME#lib}_SOURCES = ${PACKAGE_NAME#lib}.cxx
 
 MAINTAINERCLEANFILES = makefile.in
 EOF
+to --condition AX_USE_CPPUNIT --condition AX_USE_CXX test/${PACKAGE_NAME#lib}.cxx <<EOF
+${CHEADER}
+#include <cppunit/TestFixture.h>
+#include <cppunit/ui/text/TestRunner.h>
+#include <cppunit/extensions/HelperMacros.h>
+#include <cppunit/extensions/TestFactoryRegistry.h>
+#include <cppunit/XmlOutputter.h>
+#include <fstream>
+
+/// @todo Rename DummyTest and DummyTest::dummy()
+/// @todo Write test cases
+class DummyTest: public CppUnit::TestFixture { 
+  public:
+    void dummy() {
+    }
+    CPPUNIT_TEST_SUITE(DummyTest);
+    CPPUNIT_TEST(dummy);
+    CPPUNIT_TEST_SUITE_END();
+};
+CPPUNIT_TEST_SUITE_REGISTRATION(DummyTest);
+
+int main(int argc, char** argv) try {
+  std::ofstream ofs((*argv+std::string(".xml")).c_str());
+  CppUnit::TextUi::TestRunner runner;
+  runner.setOutputter(new CppUnit::XmlOutputter(&runner.result(), ofs));
+  runner.addTest(CppUnit::TestFactoryRegistry::getRegistry().makeTest());
+  return runner.run() ? 0 : 1;
+ } catch (std::exception& e) {
+  std::cerr<<"***Exception: "<<e.what()<<std::endl;
+  return 1;
+ }
+EOF
 to --condition AX_BUILD_EXAMPLES examples/makefile.am <<EOF
 ${HEADER}AM_CPPFLAGS = -I\${top_srcdir}/src -I\${top_builddir}/src
 AM_LDFLAGS = -L\${abs_top_builddir}/src/.libs
@@ -750,27 +908,124 @@ www_DATA =
 
 MAINTAINERCLEANFILES = makefile.in
 EOF
+to --condition AX_USE_DOXYGEN doc/header.html.in <<EOF
+<!-- HTML header for doxygen 1.8.6-->
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+<meta http-equiv="Content-Type" content="text/xhtml;charset=UTF-8"/>
+<meta http-equiv="X-UA-Compatible" content="IE=9"/>
+<meta name="generator" content="Doxygen \$doxygenversion"/>
+<!--BEGIN PROJECT_NAME--><title>\$projectname: \$title</title><!--END PROJECT_NAME-->
+<!--BEGIN !PROJECT_NAME--><title>\$title</title><!--END !PROJECT_NAME-->
+<link href="\$relpath^tabs.css" rel="stylesheet" type="text/css"/>
+<script type="text/javascript" src="\$relpath^jquery.js"></script>
+<script type="text/javascript" src="\$relpath^dynsections.js"></script>
+\$treeview
+\$search
+\$mathjax
+<link href="\$relpath^\$stylesheet" rel="stylesheet" type="text/css" />
+\$extrastylesheet
+</head>
+<body>
+<div id="top"><!-- do not remove this div, it is closed by doxygen! -->
+
+<div id="titlearea">
+  <div id="projecthead">
+    <div id="projectlogo"><img alt="" src="\$relpath^\$projectlogo"/></div>
+    <div id="projectname">\$projectname</span>&#160;<span id="projectnumber">\$projectnumber</div>
+    <div id="projectbrief">\$projectbrief</div>
+  </div>
+  <nav>
+    <a href="@PROJECT_URL@" target="_blank">Project Management</a>
+    <a href="@SOURCE_DOWNLOAD@" target="_blank">Download</a>
+    <div>\$searchbox</div>
+  </nav>
+</div>
+EOF
+to --condition AX_USE_DOXYGEN doc/footer.html.in <<EOF
+<div id="nav-path" class="navpath"><!-- id is needed for treeview function! -->
+  <ul>
+    \$navpath
+    <li class="footer"><a href="@AUTHOR_URL@" target="_blank">@AUTHOR_NAME@</a></li>
+  </ul>
+</div>
+</body>
+</html>
+EOF
+to --condition AX_USE_DOXYGEN doc/style.css <<EOF
+#titlearea {
+  display: flex;
+  justify-content: space-between;
+  align-items: flex-begin;
+}
+#titlearea nav {
+  padding: 0;
+  margin: 0;
+}
+#titlearea nav a {
+  background-color: lightgray;
+  border: 1px solid gray;
+  color: black;
+  padding: 1ex;
+  margin: 0;
+}
+img, object {
+  max-width: 100% !important;
+}
+@media (max-width: 50em) {
+  #navrow1, #navrow2 {
+    display: block
+  }
+  #side-nav, #splitbar, .ui-resizable-handle ui-resizable-e, .ui-resizable-handle ui-resizable-s {
+    display: none;
+  }
+  #doc-content {
+    margin-left: 0 !important;
+  }
+}
+@media (min-width: 50em) {
+  #navrow1, #navrow2 {
+    display: none;
+  }
+  #side-nav, #splitbar, .ui-resizable-handle ui-resizable-e, .ui-resizable-handle ui-resizable-s {
+    display: block
+  }
+}
+EOF
+if testtag AX_USE_DOXYGEN; then
+    copy doc/plantuml.jar
+fi
 if testtag AX_USE_DOXYGEN; then
     if ! checkfile doc/doxyfile.in || \
         contains doc/doxyfile.in "${rebuildfiles[@]}"; then
         run doxygen -g doc/doxyfile.in
         if test $exists -eq 0; then
-            run svn add doc/doxyfile.in
+            if test -n "${VCS}" -a $novcs -eq 0 && ! contains "doc/doxyfile" "${excludevcs[@]}"; then
+                run ${VCS} add doc/doxyfile.in
+                if test "${VCS}" = "svn"; then
                     run svn propset svn:keywords "Id" doc/doxyfile.in
                 fi
+            fi
+        fi
         doxyreplace PROJECT_NAME "@PACKAGE_NAME@"
         doxyreplace PROJECT_NUMBER "@PACKAGE_VERSION@"
         doxyreplace PROJECT_BRIEF "@DESCRIPTION@"
-        doxyreplace PROJECT_LOGO "@PROJECT_LOGO@"
+        doxyreplace PROJECT_LOGO "@top_srcdir@/@PACKAGE_LOGO@"
         doxyreplace INLINE_INHERITED_MEMB YES
         doxyreplace MULTILINE_CPP_IS_BRIEF YES
         doxyreplace TAB_SIZE 2
         doxyreplace ALIASES '"id=\\par File-ID\\n"'
-        doxyadd ALIASES '"copy=\\par Copyright\\n"'
+        doxyadd ALIASES '"copy=\\par Copyright by <a href="@AUTHOR_URL@" target="_blank">@AUTHOR_NAME@</a>\\n"'
         doxyadd ALIASES '"license=\\par License\\n"'
         doxyadd ALIASES '"classmutex=\\par Reentrant:\\nAccess is locked with class static mutex @c "'
         doxyadd ALIASES '"instancemutex=\\par Reentrant:\\nAccess is locked with per instance mutex @c "'
         doxyadd ALIASES '"mutex=\\par Reentrant:\\nAccess is locked with mutex @c "'
+        doxyadd ALIASES '"api=\\xrefitem api \\"API Call\\" \\"\\""'
+        doxyadd ALIASES '"description=@DESCRIPTION@"'
+        doxyadd ALIASES '"readme=@README_HTML@"'
+        doxyadd ALIASES '"author=<a href="@AUTHOR_URL@" target="_blank">@AUTHOR_NAME@</a>"'
+        doxyreplace PLANTUML_JAR_PATH '"@top_srcdir@/doc/plantuml.jar"'
         doxyreplace ENABLE_PREPROCESSING YES
         doxyreplace MACRO_EXPANSION YES
         doxyadd PREDEFINED '"NAMESPACE=@PACKAGE_NAME@"'
@@ -797,18 +1052,28 @@ if testtag AX_USE_DOXYGEN; then
         if testtag AX_BUILD_TEST AX_USE_CPPUNIT; then
             doxyadd INPUT "@top_srcdir@/test"
         fi
-        doxyreplace FILE_PATTERNS '*.c *.cc *.cxx *.cpp *.c++ *.java *.ii *.ixx *.ipp *.i++ *.inl *.idl *.ddl *.odl *.h *.hh *.hxx *.hpp *.h++ *.cs *.d *.php *.php4 *.php5 *.phtml *.inc *.m *.markdown *.md *.mm *.dox *.py *.f90 *.f *.for *.tcl *.vhd *.vhdl *.ucf *.qsf *.as *.js *.wt'
+        if testtag AX_USE_NODEJS; then
+            doxyadd INPUT "@top_srcdir@/nodejs"
+            doxyadd EXCLUDE "@top_srcdir@/nodejs/node_modules"
+	    doxyadd EXCLUDE "@top_srcdir@/nodejs/public/javascripts/ext"
+        fi
+        doxyreplace FILE_PATTERNS '*.c *.cc *.cxx *.cpp *.c++ *.java *.ii *.ixx *.ipp *.i++ *.inl *.idl *.ddl *.odl *.h *.hh *.hxx *.hpp *.h++ *.cs *.d *.php *.php4 *.php5 *.phtml *.inc *.m *.markdown *.md *.mm *.dox *.py *.f90 *.f *.for *.tcl *.vhd *.vhdl *.ucf *.qsf *.as *.js *.wt *.sql'
         doxyreplace RECURSIVE YES
-        doxyreplace EXCLUDE_PATTERNS "moc_* uic_* qrc_*"
+        doxyreplace EXCLUDE_PATTERNS "moc_* uic_* qrc_* version.[ch]xx"
+        doxyreplace HTML_HEADER header.html
+        doxyreplace HTML_FOOTER footer.html
+        doxyreplace HTML_EXTRA_STYLESHEET style.css
+        doxyreplace HTML_DYNAMIC_SECTIONS YES
+        doxyreplace DISABLE_INDEX NO
+        doxyreplace GENERATE_TREEVIEW YES 
         if testtag AX_BUILD_EXAMPLES; then
             doxyreplace EXAMPLE_PATH @top_srcdir@/examples
         fi
         doxyreplace EXAMPLE_RECURSIVE YES
-        doxyreplace FILTER_PATTERNS '*.wt=doxygen-webtester.sed'
+        doxyreplace FILTER_PATTERNS '*.wt=doxygen-webtester.sed *.sql=@top_srcdir@/sql-to-dot.sed'
         doxyreplace SOURCE_BROWSER YES
         doxyreplace INLINE_SOURCES YES
         doxyreplace GENERATE_TESTLIST YES
-        doxyreplace GENERATE_TREEVIEW NO
         doxyreplace SEARCHENGINE NO
         doxyreplace GENERATE_HTML YES
         doxyreplace GENERATE_LATEX NO
@@ -822,7 +1087,7 @@ if testtag AX_USE_DOXYGEN; then
         doxyreplace CLASS_GRAPH YES
         doxyreplace TEMPLATE_RELATIONS YES
         doxyreplace DOT_IMAGE_FORMAT svg
-        doxyreplace INTERACTIVE_SVG YES
+        doxyreplace INTERACTIVE_SVG NO
         doxyreplace DOT_TRANSPARENT YES
     fi
 fi
@@ -835,7 +1100,7 @@ if testtag AX_USE_DEBIAN_PACKAGING; then
 
  -- @AUTHOR@  @BUILD_DATE@
 EOF
-    BUILD_DEPENDS="debhelper, subversion, pkg-config, automake, libtool, autotools-dev, lsb-release $(if testtag AX_USE_DOXYGEN; then echo -n ", doxygen, graphviz, mscgen"; fi; if testtag AX_USE_CPPUNIT; then echo -n ", libcppunit-dev"; fi; if testtag AX_CXX_QT || testtag AX_CHECK_QT AX_REQUIRE_QT; then echo -n ", qt5-default | libqt4-core | libqtcore4, qt5-qmake | qt4-qmake, qtbase5-dev | libqt4-dev, qtbase5-dev-tools | qt4-dev-tools, qttools5-dev-tools | qt4-dev-tools, qttools5-dev-tools | qt4-dev-tools"; fi)"
+    BUILD_DEPENDS="debhelper, ${VCSDEPENDS} pkg-config, automake, libtool, autotools-dev, pandoc, lsb-release $(if testtag AX_USE_DOXYGEN; then echo -n ", doxygen, graphviz, mscgen, default-jre-headless|default-jre"; fi; if testtag AX_USE_PERLDOC; then echo -n ", libpod-tree-perl"; fi; if testtag AX_USE_CPPUNIT; then echo -n ", libcppunit-dev"; fi; if testtag AX_CXX_QT || testtag AX_CHECK_QT AX_REQUIRE_QT; then echo -n ", qt5-default | libqt4-core | libqtcore4, qt5-qmake | qt4-qmake, qtbase5-dev | libqt4-dev, qtbase5-dev-tools | qt4-dev-tools, qttools5-dev-tools | qt4-dev-tools, qttools5-dev-tools | qt4-dev-tools"; fi)"
     to debian/control.in <<EOF
 Source: @PACKAGE_NAME@
 Priority: extra
@@ -882,6 +1147,17 @@ ${HEADER}%:
 EOF
     echo 7 | to debian/compat
 fi
+to ${PACKAGE_NAME}.desktop.in <<EOF
+[Desktop Entry]
+Type=Application
+Name=${PACKAGE_NAME}
+GenericName=${PACKAGE_NAME}
+Comment=@DESCRIPTION@
+Icon=@prefix@/share/@PACKAGE_NAME@/@PACKAGE_ICON@
+Exec=${PACKAGE_NAME} %u
+Terminal=false
+Categories=Qt;Utility;
+EOF
 to --condition AX_USE_RPM_PACKAGING ${PACKAGE_NAME}.spec.in <<EOF
 Summary: @DESCRIPTION@
 Name: @PACKAGE_NAME@
@@ -895,10 +1171,14 @@ else
 fi)
 Source0: %{name}-%{version}.tar.gz
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
-BuildRequires: gnupg, subversion, automake, autoconf$(
+BuildRequires: gnupg, ${VCSDEPENDS} make, automake, autoconf, rpm-build$(
     if testtag AX_USE_DOXYGEN; then
-      echo -n ", doxygen";
+      echo -n ", doxygen, default-jre-headless";
-    fi)
+    fi
+    if testtag AX_USE_PERLDOC; then
+      echo -n ", libpod-tree-perl";
+    fi
+)
 %if 0%{?fedora} != 20
 $(if testtag AX_USE_DOXYGEN; then echo -n "BuildRequires: graphviz"; fi)
 %endif
@@ -955,6 +1235,7 @@ $(if testtag AX_USE_LIBTOOL; then
 echo '/usr/%_lib/@PACKAGE_NAME@.so.*'
 else
 echo '/usr/bin/*'
+echo '/usr/share/applications/*'
 fi)
 %doc
 $(if testtag AX_USE_LIBTOOL; then
@@ -1008,7 +1289,7 @@ fi
 if testtag AX_USE_SCRIPTS; then
     SUBDIRS="${SUBDIRS} scripts"
 fi
-if testtag AX_USE_DOXYGEN; then
+if testtag 'AX_USE_DOXYGEN|AX_USE_PERLDOC'; then
     SUBDIRS="${SUBDIRS} doc"
 fi
 if testtag AX_BUILD_EXAMPLES; then
@@ -1022,10 +1303,32 @@ for d in src test scripts doc examples html; do
         SUBDIRS="${SUBDIRS} $d"
     fi
 done
+to --mode "u=rwx,g=rwx,o=rx" autogen.sh <<EOF
+#!/bin/bash -e
+if test -n "$VCS" -a -d .$VCS -a -e -x $(which ${VCS}2cl); then
+$(case "$VCS" in
+  (svn) echo "    ${VCS}2cl";;
+  (git) echo "    ${VCS}2cl > ChangeLog";;
+esac)
+fi
+aclocal
+$(if testtag AX_USE_LIBTOOL; then echo libtoolize --force; fi)
+automake -a
+autoconf
+EOF
 to makefile.am<<EOF
 ${HEADER}SUBDIRS =${SUBDIRS}
 
-doc_DATA = AUTHORS NEWS README COPYING INSTALL ChangeLog
+desktopdir = \${datadir}/applications
+desktop_DATA = @PACKAGE_DESKTOP@
+dist_pkgdata_DATA = @PACKAGE_ICON@ ax_check_qt.m4 bootstrap.sh		\\
+                    resolve-rpmbuilddeps.sh autogen.sh			\\
+                    ax_cxx_compile_stdcxx_11.m4 build-in-docker.sh	\\
+                    build-resource-file.sh				\\
+                    ax_init_standard_project.m4				\\
+                    mac-create-app-bundle.sh resolve-debbuilddeps.sh    \\
+                    sql-to-dot.sed
+dist_doc_DATA = AUTHORS NEWS README COPYING INSTALL ChangeLog
 
 MAINTAINERCLEANFILES = makefile.in
 EOF
@@ -1043,6 +1346,12 @@ Libs: -L\${libdir} -l${PACKAGE_NAME#lib} @LDFLAGS@
 Cflags: -I\${includedir} @CPPFLAGS@
 Requires: @PKG_REQUIREMENTS@
 EOF
+to build-in-docker.conf <<EOF
+repos+=("Debian|Ubuntu-precise::::::universe")
+repos+=("Ubuntu-precise:::'deb http://archive.ubuntu.com/ubuntu precise universe'")
+envs+=("-e 'HOME=\${HOME}'")
+dirs+=("-v \${HOME}/.gnupg:\${HOME}/.gnupg:ro")
+EOF
 
 #### Cleanup If Makefile Exists ####
 if test -f makefile; then
@@ -1050,7 +1359,7 @@ if test -f makefile; then
 fi
 
 #### Bootstrap Before Configure ####
-run --no-check svn2cl
+run --no-check vcs2cl
 run aclocal
 if testtag AX_USE_LIBTOOL; then run libtoolize --force; fi
 run automake -a
@@ -1058,15 +1367,15 @@ run autoconf
 
 #### Run Configure If User Requires ####
 if test "$configure" -eq 1; then
-    ./configure $*
+    ./configure $* || exit 1
 fi
 
 #### Run Make If User Requires ####
 if test "$build" -eq 1; then
-    make $buildtarget
+    make $buildtarget || exit 1
 fi
 
 #### Build In Docker If User Requires ####
 if test "$docker" -eq 1; then
-    ./build-in-docker.sh
+    ./build-in-docker.sh || exit 1
 fi

build-in-docker.conf

@@ -0,0 +1,4 @@
+repos+=("Debian|Ubuntu-precise::::::universe")
+repos+=("Ubuntu-precise:::'deb http://archive.ubuntu.com/ubuntu precise universe'")
+envs+=("-e 'HOME=${HOME}'")
+dirs+=("-v ${HOME}/.gnupg:${HOME}/.gnupg:ro")

build-in-docker.sh

@@ -1,15 +1,237 @@
-#! /bin/bash -ex
+#! /bin/bash -e
+set -o errtrace
 
 # build and test everything in a fresh docker installation
+mode="apt"
+img="ubuntu:latest"
+repos=()
+keys=()
+envs=("-e DEBIAN_FRONTEND=noninteractive" "-e DEBCONF_NONINTERACTIVE_SEEN=true")
+dirs=("-v $(pwd):/workdir")
+packages=()
+targets="all check distcheck"
+commands=()
+wait=0
+if test -e ./build-in-docker.conf; then
+    # you can preconfigure the variables in file build-in-docker.conf
+    # if you do so, add the file to EXTRA_DIST in makefile.am
+    source ./build-in-docker.conf
+fi
+while test $# -gt 0; do
+    case "$1" in
+        (-h|--help)
+            echo "$0 [OPTIONS]"
+            echo
+            echo "OPTIONS:"
+            echo
+            echo "  -h, --help            show this help"
+            echo "  -m, --mode <type>     mode: apt or yum, default: ${mode}"
+            echo "  -i, --image <image>   use given docker image instead of ${img}"
+            echo "  -t, --targets targets specify build targets, default: ${targets}"
+            echo "  -r, --repo <url>      add given apt repository"
+            echo "  -k, --key <url>       add public key from url"
+            echo "  -e, --env <var>=<val> set environment variable in docker"
+            echo "  -d, --dir <dir>       access given directory read only"
+            echo "  -p, --package <pkg>   install extra debian packages"
+            echo "  -c, --cmd <command>   execute commands as root in docker"
+            echo "  -w, --wait            on error keep docker container and wait for enter"
+            echo
+            echo "  The option -i must be after -m, because mode sets a new default image"
+            echo
+            echo "  The options -r -k -e -d -p -c can be repeated several times."
+            echo
+            echo "  The options -r -p -c allow an if-then-else contruct"
+            echo "  depending on the operating system:"
+            echo "    <os>:::<A>:::<B>"
+            echo "    <os>:::<A>"
+            echo "  Read as: On linux type <os> use <A> else use <B>"
+            echo "  That means: If the distributer ID or codename in lsb_release"
+            echo "  matches regular expression <os>, then <A> is replaced, else <B> is replaced."
+            echo "  The three colons are for splitting <os> from <A> and <B> part."
+            echo "  E.g.: Install package curl on wheezy and npm on olter systems:"
+            echo "    $0 -p Debian|precise:::curl:::npm"
+            echo
+            echo "EXAMPLE:"
+            echo
+            echo "$0 -i mwaeckerlin/ubuntu:trusty-i386 \\"
+            echo "                     -t deb \\"
+            echo "                     -e ANDROID_HOME=/opt/local/android \\"
+            echo "                     -d /opt/local/android \\"
+            echo "                     -r universe \\"
+            echo "                     -r https://dev.marc.waeckerlin.org/repository \\"
+            echo "                     -k https://dev.marc.waeckerlin.org/repository/PublicKey \\"
+            echo "                     -p mrw-c++"
+            echo
+            exit 0
+            ;;
+        (-m|--mode) shift;
+            mode="$1"
+            case "$mode" in
+                (apt) img="ubuntu:latest";;
+                (yum) img="centos:latest";;
+                (*)
+                    echo "**** ERROR: unknown mode '$1', try --help" 1>&2
+                    exit 1
+                    ;;
+            esac
+            ;;
+        (-i|--image) shift;
+            img="$1"
+            ;;
+        (-t|--targets) shift;
+            targets="$1"
+            ;;
+        (-r|--repo) shift;
+            repos+=("$1")
+            ;;
+        (-k|--key) shift;
+            keys+=("$1")
+            ;;
+        (-e|--env) shift;
+            envs+=("-e $1")
+            ;;
+        (-d|--dirs) shift;
+            dirs+=("-v $1:$1:ro")
+            ;;
+        (-p|--package) shift;
+            packages+=("$1")
+            ;;
+        (-c|--cmd) shift;
+            commands+=("$1")
+            ;;
+        (-w|--wait)
+            wait=1
+            ;;
+        (*)
+            echo "**** ERROR: unknown option '$1', try --help" 1>&2
+            exit 1
+            ;;
+    esac
+    if test $# -eq 0; then
+        echo "**** ERROR: missing value, try --help" 2>61
+        exit 1
+    fi
+    shift
+done
 
-DOCKER_ID=$(docker run -d -v $(pwd):/workdir -w /workdir ubuntu sleep infinity)
+function traperror() {
-trap "docker rm -f ${DOCKER_ID}" INT TERM EXIT
+    set +x
-docker exec ${DOCKER_ID} apt-get install -y software-properties-common apt-transport-https dpkg-dev
+    local DOCKER_ID="$1"
-docker exec ${DOCKER_ID} apt-add-repository universe
+    local err=($2) # error status
-docker exec ${DOCKER_ID} apt-add-repository https://dev.marc.waeckerlin.org/repository
+    local line="$3" # LINENO
-wget -O- https://dev.marc.waeckerlin.org/repository/PublicKey \
+    local linecallfunc="$4" 
+    local command="$5"
+    local funcstack="$6"
+    for e in ${err[@]}; do
+        if test -n "$e" -a "$e" != "0"; then
+            echo "<---"
+            echo "ERROR: line $line - command '$command' exited with status: $e (${err[@]})"
+            if [ "${funcstack}" != "main" -o "$linecallfunc" != "0" ]; then
+                echo -n "   ... Error at ${funcstack} "
+                if [ "$linecallfunc" != "" ]; then
+                    echo -n "called at line $linecallfunc"
+                fi
+                echo
+            fi
+            if [ "$wait" -eq 1 ]; then
+                echo "  ... now you can access the docker container:"
+                echo "      docker exec -u $(id -u) -it ${DOCKER_ID} bash"
+                echo -n "  ... press enter to cleanup: "
+                read
+            fi
+            echo -n "   ... cleanup docker: "
+            docker rm -f "${DOCKER_ID}"
+            echo "returning status: $e"
+            echo "--->"
+            exit $e
+        fi
+    done
+    if [ "$wait" -eq 1 ]; then
+        echo "  ... now you can access the docker container:"
+        echo "      docker exec -u $(id -u) -it ${DOCKER_ID} bash"
+        echo -n "  ... press enter to cleanup: "
+        read
+    fi
+    echo -n "   SUCCESS ... cleanup docker: "
+    docker rm -f "${DOCKER_ID}"
+    exit 0
+}
+
+function ifthenelse() {
+    arg="$1"
+    shift
+    cmd="$*"
+    if test "${arg/:::/}" = "${arg}"; then
+        docker exec ${DOCKER_ID} bash -c "${cmd//ARG/${arg}}"
+    else
+        os="${arg%%:::*}"
+        thenpart="${arg#*:::}"
+        if test "${thenpart/:::/}" = "${thenpart}"; then
+            docker exec ${DOCKER_ID} bash -c 'os="'$os'"; if [[ "$(lsb_release -is)-$(lsb_release -cs)-$(dpkg --print-architecture)" =~ ${os} ]]; then '"${cmd//ARG/${thenpart}}"'; fi'
+        else
+            elsepart="${thenpart##*:::}"
+            thenpart="${thenpart%:::*}"
+            if test -n "${thenpart}"; then
+                docker exec ${DOCKER_ID} bash -c 'os="'$os'"; if [[ "$(lsb_release -is)-$(lsb_release -cs)-$(dpkg --print-architecture)" =~ ${os} ]]; then '"${cmd//ARG/${thenpart}}"'; else '"${cmd//ARG/${elsepart}}"'; fi'
+            else
+                docker exec ${DOCKER_ID} bash -c 'os="'$os'"; if [[ "$(lsb_release -is)-$(lsb_release -cs)-$(dpkg --print-architecture)" =~ ${os} ]]; then true; else '"${cmd//ARG/${elsepart}}"'; fi'
+            fi    
+        fi
+    fi
+}
+
+set -x
+
+docker pull $img
+DOCKER_ID=$(docker run -d ${dirs[@]} ${envs[@]} -e HOME="${HOME}" -w /workdir $img sleep infinity)
+trap 'traperror '"${DOCKER_ID}"' "$? ${PIPESTATUS[@]}" $LINENO $BASH_LINENO "$BASH_COMMAND" "${FUNCNAME[@]}" "${FUNCTION}"' SIGINT INT TERM EXIT
+case $mode in
+    (apt)
+        OPTIONS='-o Dpkg::Options::=--force-confdef -o Dpkg::Options::=--force-confnew -y --force-yes --no-install-suggests --no-install-recommends'
+        for f in 'libpam-systemd:amd64' 'policykit*' 'colord'; do
+            docker exec ${DOCKER_ID} bash -c "echo 'Package: $f' >> /etc/apt/preferences"
+            docker exec ${DOCKER_ID} bash -c "echo 'Pin-Priority: -100' >> /etc/apt/preferences"
+            docker exec ${DOCKER_ID} bash -c "echo >> /etc/apt/preferences"
+        done
+        docker exec ${DOCKER_ID} apt-get update ${OPTIONS}
+        docker exec ${DOCKER_ID} apt-get upgrade ${OPTIONS}
+        docker exec ${DOCKER_ID} apt-get install ${OPTIONS} python-software-properties software-properties-common apt-transport-https dpkg-dev lsb-release || \
+            docker exec ${DOCKER_ID} apt-get install ${OPTIONS} software-properties-common apt-transport-https dpkg-dev lsb-release || \
+            docker exec ${DOCKER_ID} apt-get install ${OPTIONS} python-software-properties apt-transport-https dpkg-dev lsb-release;
+        for repo in "${repos[@]}"; do
+            ifthenelse "${repo}" "apt-add-repository ARG"
+        done
+        for key in "${keys[@]}"; do
+            wget -O- "$key" \
                 | docker exec -i ${DOCKER_ID} apt-key add -
-docker exec ${DOCKER_ID} apt-get update
+        done
+        docker exec ${DOCKER_ID} apt-get update ${OPTIONS}
+        for package in "${packages[@]}"; do
+            ifthenelse "${package}" "apt-get install ${OPTIONS} ARG"
+        done
+        for command in "${commands[@]}"; do
+            ifthenelse "${command}" "ARG"
+        done
         docker exec ${DOCKER_ID} ./resolve-debbuilddeps.sh
-docker exec -u $(id -u) ${DOCKER_ID} svn upgrade || true
+        ;;
-docker exec -u $(id -u) ${DOCKER_ID} ./bootstrap.sh -t "all check distcheck"
+    (yum)
+        ./bootstrap.sh -t dist
+        if [[ "$img" =~ "centos" ]]; then
+            docker exec ${DOCKER_ID} yum install -y redhat-lsb
+            docker exec -i ${DOCKER_ID} bash -c 'cat > /etc/yum.repos.d/wandisco-svn.repo' <<EOF
+[WandiscoSVN]
+name=Wandisco SVN Repo
+EOF
+            docker exec -i ${DOCKER_ID} bash -c 'echo "baseurl=http://opensource.wandisco.com/centos/$(lsb_release -sr | sed '"'"'s,[^0-9].*,,'"'"')/svn-'$(svn --version | head -1 | sed 's,[^0-9]*\([0-9]\+\.[0-9]\+\).*,\1,')'/RPMS/$(uname -i)/" >> /etc/yum.repos.d/wandisco-svn.repo'
+            docker exec -i ${DOCKER_ID} bash -c 'cat >> /etc/yum.repos.d/wandisco-svn.repo' <<EOF
+enabled=1
+gpgcheck=0
+EOF
+        fi
+        docker exec ${DOCKER_ID} yum install -y rpm-build 
+        docker exec ${DOCKER_ID} groupadd -g $(id -g) build
+        docker exec ${DOCKER_ID} useradd -g $(id -g) -u $(id -u) build
+        docker exec ${DOCKER_ID} ./resolve-rpmbuilddeps.sh || true
+        ;;
+esac
+docker exec -u $(id -u):$(id -g) ${DOCKER_ID} ./bootstrap.sh -t "${targets}"

configure.ac

@@ -8,8 +8,10 @@
 
 m4_define(x_package_name, proxyface) # project's name
 m4_define(x_major, 1) # project's major version
-m4_define(x_minor, 1) # project's minor version
+m4_define(x_minor, 2) # project's minor version
+m4_define(x_least_diff, 203) # reset project's least version
 m4_include(ax_init_standard_project.m4)
+
 AC_INIT(x_package_name, x_major.x_minor.x_least, x_bugreport, x_package_name)
 AM_INIT_AUTOMAKE([1.9 tar-pax])
 AX_INIT_STANDARD_PROJECT

doc/footer.html.in

@@ -0,0 +1,8 @@
+<div id="nav-path" class="navpath"><!-- id is needed for treeview function! -->
+  <ul>
+    $navpath
+    <li class="footer"><a href="@AUTHOR_URL@" target="_blank">@AUTHOR_NAME@</a></li>
+  </ul>
+</div>
+</body>
+</html>

doc/header.html.in

@@ -0,0 +1,33 @@
+<!-- HTML header for doxygen 1.8.6-->
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+<meta http-equiv="Content-Type" content="text/xhtml;charset=UTF-8"/>
+<meta http-equiv="X-UA-Compatible" content="IE=9"/>
+<meta name="generator" content="Doxygen $doxygenversion"/>
+<!--BEGIN PROJECT_NAME--><title>$projectname: $title</title><!--END PROJECT_NAME-->
+<!--BEGIN !PROJECT_NAME--><title>$title</title><!--END !PROJECT_NAME-->
+<link href="$relpath^tabs.css" rel="stylesheet" type="text/css"/>
+<script type="text/javascript" src="$relpath^jquery.js"></script>
+<script type="text/javascript" src="$relpath^dynsections.js"></script>
+$treeview
+$search
+$mathjax
+<link href="$relpath^$stylesheet" rel="stylesheet" type="text/css" />
+$extrastylesheet
+</head>
+<body>
+<div id="top"><!-- do not remove this div, it is closed by doxygen! -->
+
+<div id="titlearea">
+  <div id="projecthead">
+    <div id="projectlogo"><img alt="" src="$relpath^$projectlogo"/></div>
+    <div id="projectname">$projectname</span>&#160;<span id="projectnumber">$projectnumber</div>
+    <div id="projectbrief">$projectbrief</div>
+  </div>
+  <nav>
+    <a href="@PROJECT_URL@" target="_blank">Project Management</a>
+    <a href="@SOURCE_DOWNLOAD@" target="_blank">Download</a>
+    <div>$searchbox</div>
+  </nav>
+</div>

doc/style.css

@@ -0,0 +1,38 @@
+#titlearea {
+  display: flex;
+  justify-content: space-between;
+  align-items: flex-begin;
+}
+#titlearea nav {
+  padding: 0;
+  margin: 0;
+}
+#titlearea nav a {
+  background-color: lightgray;
+  border: 1px solid gray;
+  color: black;
+  padding: 1ex;
+  margin: 0;
+}
+img, object {
+  max-width: 100% !important;
+}
+@media (max-width: 50em) {
+  #navrow1, #navrow2 {
+    display: block
+  }
+  #side-nav, #splitbar, .ui-resizable-handle ui-resizable-e, .ui-resizable-handle ui-resizable-s {
+    display: none;
+  }
+  #doc-content {
+    margin-left: 0 !important;
+  }
+}
+@media (min-width: 50em) {
+  #navrow1, #navrow2 {
+    display: none;
+  }
+  #side-nav, #splitbar, .ui-resizable-handle ui-resizable-e, .ui-resizable-handle ui-resizable-s {
+    display: block
+  }
+}

mac-create-app-bundle.sh

@@ -75,7 +75,7 @@ cd ${oldpath}
 
 # Step 4: if necessary, install qt_menu.nib
 if test -n "${QTDIR}"; then
-    MENU_NIB=$(find ${QTDIR} -name .svn -prune -o -name qt_menu.nib -print \
+    MENU_NIB=$(find ${QTDIR} -name .svn -o -name .git -prune -o -name qt_menu.nib -print \
                | head -1)
     if test -e "${MENU_NIB}"; then
         rsync -r "${MENU_NIB}" ${1}/Contents/Resources/

makefile_test.inc.am

@@ -0,0 +1,9 @@
+## @id $Id$
+
+##       1         2         3         4         5         6         7         8
+## 45678901234567890123456789012345678901234567890123456789012345678901234567890
+
+%.gcda: %
+	gcov $<
+
+CLEANFILES += ${CLEANFILES} ${TEST:%=%.gcno} ${TEST:%=%.gcda} *.gcov

proxyface.desktop.in

@@ -0,0 +1,9 @@
+[Desktop Entry]
+Type=Application
+Name=proxyface
+GenericName=proxyface
+Comment=@DESCRIPTION@
+Icon=@prefix@/share/@PACKAGE_NAME@/@PACKAGE_ICON@
+Exec=proxyface %u
+Terminal=false
+Categories=Qt;Utility;

resolve-debbuilddeps.sh

@@ -16,8 +16,12 @@ if test -n "${SCHROOTNAME}"; then
   SUDO="schroot -c "${SCHROOTNAME}" -u root -d / --"
 else
   DO=""
+  if grep -q '/docker' /proc/1/cgroup; then
+      SUDO=""
+  else
       SUDO="sudo"
   fi
+fi
 
 function install() {
     if ${SUDO} apt-get -y install $*; then
@@ -31,7 +35,7 @@ TO_INSTALL=
 
 if test -e debian/control.in -a ! -e debian/control; then
     for f in $(sed -n 's, *AX_DEB_DEPEND_IFEXISTS(\([^)]*\)).*,\1,p' configure.ac); do
-        if test -n "$(${DO} apt-cache policy -q ${f})" && ! ${DO} dpkg -l "${f}"; then
+        if test -n "$(${DO} apt-cache policy -q ${f})" && ! "$(${DO} apt-cache policy ${f} 2>&1 | grep -q 'N: Unable to locate package')" && ! ${DO} dpkg -l "${f}"; then
             TO_INSTALL+=" ${f}"
         fi
     done
@@ -41,7 +45,7 @@ if test -e debian/control.in -a ! -e debian/control; then
 fi
 
 install dpkg-dev
-DEPS=$(${DO} dpkg-checkbuilddeps 2>&1 || true)
+DEPS=$(LANG= ${DO} dpkg-checkbuilddeps 2>&1 || true)
 DEPS=$(echo "$DEPS" | sed -n '/Unmet build dependencies/ { s,.*Unmet build dependencies: ,,g; s, ([^)]*),,g; s, *| *,|,g; p}')
 
 for pa in ${DEPS}; do

resolve-rpmbuilddeps.sh

@@ -12,19 +12,30 @@
 
 SCHROOTNAME="$1"
 PACKAGE_NAME=$(sed -n 's/^ *m4_define(x_package_name, \(.*\)).*/\1/p' configure.ac)
+PKGCONFIGS="${2:-epel-release}" # packages to configure yum
 
 if test -n "${SCHROOTNAME}"; then
-    schroot -c ${SCHROOTNAME} -- ./bootstrap.sh -t dist
     FILES=$(LANG= schroot -c ${SCHROOTNAME} -- rpmbuild -bb --clean --nobuild --define "_topdir ." --define "_sourcedir ." ${PACKAGE_NAME}.spec  2>&1 | sed -n 's, is needed by.*,,p')
     if test -n "${FILES}"; then
+        FIRST=$(echo "${FILES}" | egrep -o "${PKGCONFIGS// /|}")
+        if test -n "${FIRST}"; then
+            schroot -c ${SCHROOTNAME} -u root -- yum install -y ${FIRST} || \
+                schroot -c ${SCHROOTNAME} -u root -- zypper install -y ${FIRST} || \
+                schroot -c ${SCHROOTNAME} -u root -- dnf install -y ${FIRST}
+        fi
         schroot -c ${SCHROOTNAME} -u root -- yum install -y ${FILES} || \
             schroot -c ${SCHROOTNAME} -u root -- zypper install -y ${FILES} || \
             schroot -c ${SCHROOTNAME} -u root -- dnf install -y ${FILES}
     fi
 else
-    ./bootstrap.sh -t dist
     FILES=$(LANG= rpmbuild -bb --clean --nobuild --define "_topdir ." --define "_sourcedir ." ${PACKAGE_NAME}.spec 2>&1 | sed -n 's, is needed by.*,,p')
     if test -n "${FILES}"; then
+        FIRST=$(echo "${FILES}" | egrep -o "${PKGCONFIGS// /|}")
+        if test -n "${FIRST}"; then
+            yum install -y ${FIRST} || \
+                zypper install -y ${FIRST} || \
+                dnf install -y ${FIRST}
+        fi
         yum install -y ${FILES} || \
             zypper install -y ${FILES} || \
             dnf install -y ${FILES}

sql-to-dot.sed

@@ -0,0 +1,87 @@
+#! /bin/sed -nf
+1i\
+/** @page database Database Schema\
+\
+@dot\
+digraph schema {
+
+# get everithing on one single line
+H;$!d;$x
+
+# remove all single-line comment lines
+s/\n--[^\n]*//g
+
+# encode html entities
+s/&/\&amp##SEMICOLON##/g
+s/</\&lt##SEMICOLON##/g
+s/>/\&gt##SEMICOLON##/g
+
+# reduce spaces
+s,\t\| \+, ,g
+
+# remove multiline comments
+:f;s,\(.*\)/\*.*\*/[ \n]*;*,\1,g;tf
+
+# remove empty lines
+s,\n\+,\n,g
+
+# remove unknown commands
+s,\(;\|\n\) *\(INSERT\|DELIMITER\|USE\|DROP\|CREATE[ \n]\+DATABASE\)[ \n]\+[^;]*;\+,,ig
+
+# convert special characters within quotes
+:a;s/^\(\([^"]*"[^",]*"\)*[^"]*"[^"]*\),\([^"]*".*\)/\1\##COMMA##\3/g;ta
+:c;s/^\(\([^']*'[^',]*'\)*[^']*'[^']*\),\([^']*'.*\)/\1\##COMMA##\3/g;tc
+
+# backup everything to the buffer
+# then analyze only on one create table
+:i
+h
+s,.*\(create[ \n]\+table[^;]*;\).*,\1,ig
+
+# start html table node
+s|CREATE[ \n]\+TABLE[ \n]\+\(IF[ \n]\+NOT[ \n]\+EXISTS[ \n]\+\)\?`\?\(\w\+\)`\?|    \2\n        [shape=none, margin=0, label=<\n            <table bgcolor="#dddddd">\n                <tr><td bgcolor="#ddddff" colspan="4"><b>\2</b></td></tr>|ig
+
+# remove key definitions
+s/[),][\n ]*\(\(UNIQUE\|PRIMARY\)[ \n]\+\)\?KEY[ \n]\+[^(]*([^)]*)//gi
+
+# move foreign keys as relation to the end
+:b;s/\(\w\+\)\([^;]*\)FOREIGN[\n ]\+KEY[ \n]*([ \n]*`\?\([a-z]\+\)`\?[ \n]*)[ \n]*REFERENCES[ \n]*`\?\([a-z]\+\)`\?[ \n]*([ \n]*`\?\([a-z]\+\)`\?[ \n]*)[ \n]*\([^,)]*\)\([,)].*\)/\1\2\7\n \1:\3 -> \4:\5 [label="\6"]##SEMICOLON##/ig;tb
+
+# create table rows
+s|[(,][ \n]*`\?\(\w\+\)`\?[ \n]\+\(\w\+\(([^)]\+)\)\?\)[ \n]*\([^,)]*\)|\n                <tr><td align="left" port="\1"><b>\1</b></td><td align="left">\2</td><td align="left">\4</td><td></td></tr>|g
+# extract comment
+s|\(<td\( *\w*="\w*"\)* *>[^<]*\)COMMENT[ \n]\+["']\([^"']*\)["']\([^<]*</td>\)<td></td>|\1\4<td align="left">\3</td>|g
+
+# add line breaks for long lines
+s|\(<td[^>]*>[^<]\{30,40\}\)[ \n]\+\([^<]\{20,\}</td>\)|\1<br/>\2|g
+#:d;s|\(<br/>[^<]\{30,40\}\)[ \n]\+\([^<]\{20,\}</td>\)|\1<br/>\2|g;td
+
+# add table comment below
+:k;tk
+s|[ \n]*)[^)]*COMMENT[ \n]*=[ \n]*["']\?\([^"']*\)["']\?[^;]*|\n                <tr><td bgcolor="#ddddff" colspan="4">\1</td></tr>|ig;th
+s|)[^);]*;|\n;|ig
+:h
+
+# cleanup comment below, add line breaksfor long lines
+s|\(<td[^>]*>[^<]\{60,80\}\)[ \n]\+\([^<]\{30,\}</td>\)|\1<br/>\2|g
+#:e;s|\(<br/>[^<]\{60,80\}\)[ \n]\+\([^<]\{30,\}</td>\)|\1<br/>\2|g;te
+
+# close table
+s|;|\n            </table>\n        >];|ig
+
+# convert ##COMMA## to ,
+s|##COMMA##|,|g
+# convert ##SEMICOLON## to ;
+s,##SEMICOLON##,;,g
+
+# print one table
+p
+# get buffer back and remove the table that has just been analyzed
+x
+s,\(.*\)create[ \n]\+table[^;]*;\(.*\),\1\2,ig
+ti
+
+$a\
+}\
+@enddot\
+*/