add new commane clear-cookies; select text on testgui sets an expectation

COPYING

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

ChangeLog

@@ -1,3 +1,14 @@
+2016-04-03 16:19  
+
+	* configure.ac, debian/control.in: after svn-server restore
+
+2015-12-26 00:13  marc
+
+	* COPYING, ChangeLog, INSTALL, ax_init_standard_project.m4,
+	  bootstrap.sh, build-in-docker.conf, build-in-docker.sh,
+	  resolve-debbuilddeps.sh, src/version.cxx, src/version.hxx: fixed
+	  build-in-docker
+
 2015-12-21 22:14  marc
 
 	* sql-to-dot.sed, test/runtests.sh, webtester.desktop.in: build in

INSTALL

@@ -1 +1 @@
-/usr/share/automake-1.15/INSTALL
+/usr/share/automake-1.14/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
+
+automake -a
+autoconf

ax_init_standard_project.m4

@@ -8,43 +8,54 @@ 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
-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;
+          VCS_REVISION=$(LANG= svn info $path | sed -n 's/Last Changed Rev: //p')
-    fi
+          if test -n "${VCS_REVISION}"; then break; fi
-  done
+        elif test -d .git; then
-  echo $ECHO_N $(($SVN_REVISION))
+          VCS_REVISION=$(git rev-list --all --count)
-]),  mrw_esyscmd_s([
+          if test -n "${VCS_REVISION}"; then break; fi
-  SVN_REVISION="ERROR-UNDEFINED-REVISION-to-be-built-in-subdirectory-of-svn-checkout"
+        fi
-  for path in . .. ../..; do
+      done
-    if svn info $path 2>&1 > /dev/null; then
+      echo $ECHO_N $(($VCS_REVISION))
-      SVN_REVISION=$(LANG= svn info $path | sed -n 's/Last Changed Rev: //p')
+    ]),  mrw_esyscmd_s([
-      if test -z "${SVN_REVISION}"; then SVN_REVISION=0; fi
+      VCS_REVISION="ERROR-UNDEFINED-REVISION-to-be-built-in-subdirectory-of-checkout"
-      break;
+      for path in . .. ../.. ../../..; do
-    fi
+        if test -d .svn; then
-  done
+          VCS_REVISION=$(LANG= svn info $path | sed -n 's/Last Changed Rev: //p')
-  # Mac does not support LEAST > 255
+          if test -n "${VCS_REVISION}"; then break; fi
-  echo $ECHO_N $(($SVN_REVISION%256))
+        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 $(($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')
+      VCS_REVISION=$(LANG= svn info $path | sed -n 's/Last Changed Rev: //p')
-      if test -z "${SVN_REVISION}"; then SVN_REVISION=0; fi
+      if test -n "${VCS_REVISION}"; then break; fi
-      break;
+    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]))])
 
@@ -122,6 +133,16 @@ AC_DEFUN([AX_SUBST], [
 #
 # 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=
@@ -157,6 +178,8 @@ AC_DEFUN([AX_INIT_STANDARD_PROJECT], [
   _AM_SUBST_NOTMAKE([AUTHOR])
   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);;
@@ -178,8 +201,14 @@ AC_DEFUN([AX_INIT_STANDARD_PROJECT], [
      PACKAGE_LOGO="${PACKAGE_NAME}-logo.png"
   fi
   AX_SUBST(PACKAGE_LOGO)
-  if test -f "${PACKAGE_NAME}-icon.png"; then
+  if test -f "${PACKAGE_NAME}-icon.svg"; then
+     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(PACKAGE_ICON)
 
@@ -279,6 +308,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])
@@ -368,7 +434,7 @@ EXTRA_DIST += debian
 clean-debian-targets:
 	-rm -rf \${PACKAGE_NAME}_\${PACKAGE_VERSION}~\${DISTRO}.\${BUILD_NUMBER}.{dsc,tar.gz} \${PACKAGE_NAME}_\${PACKAGE_VERSION}~\${DISTRO}.\${BUILD_NUMBER}*.changes \$\$(sed -n 's,Package: \(.*\),\1_${PACKAGE_VERSION}~${DISTRO}.${BUILD_NUMBER}*.deb,p;' debian/control)
 deb: distdir
-	cd \${PACKAGE_NAME}-\${PACKAGE_VERSION} && ( export CFLAGS="\${CFLAGS}"; export CPPFLAGS="\${CPPFLAGS}"; export  CXXFLAGS="\${CXXFLAGS}"; export LDFLAGS="\${LDFLAGS}"; export DEB_CFLAGS_APPEND="\${CFLAGS}"; export DEB_CPPFLAGS_APPEND="\${CPPFLAGS}"; export  DEB_CXXFLAGS_APPEND="\${CXXFLAGS}"; export  DEB_LDFLAGS_APPEND="\${LDFLAGS}"; dpkg-buildpackage )
+	cd \${PACKAGE_NAME}-\${PACKAGE_VERSION} && ( export CFLAGS="\${CFLAGS}"; export CPPFLAGS="\${CPPFLAGS}"; export CXXFLAGS="\${CXXFLAGS}"; export LDFLAGS="\${LDFLAGS}"; export DEB_CFLAGS_APPEND="\${CFLAGS}"; export DEB_CPPFLAGS_APPEND="\${CPPFLAGS}"; export  DEB_CXXFLAGS_APPEND="\${CXXFLAGS}"; export DEB_LDFLAGS_APPEND="\${LDFLAGS}"; dpkg-buildpackage )
 distclean-debian-targets:
 	-rm debian/changelog debian/control
 #### End: $0
@@ -379,12 +445,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
@@ -602,6 +671,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

@@ -23,6 +23,8 @@ docker=0
 buildtarget=""
 overwrite=0
 rebuild=0
+novcs=0
+excludevcs=()
 rebuildfiles=()
 while test $# -gt 0; do
     case "$1" in
@@ -34,6 +36,8 @@ while test $# -gt 0; do
         (--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;;
@@ -51,6 +55,8 @@ OPTIONS
   --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
 
@@ -61,7 +67,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
@@ -80,16 +86,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
 
@@ -98,18 +115,21 @@ 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
     * 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
@@ -201,13 +221,14 @@ 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
@@ -247,6 +268,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\$"'
 ##
@@ -270,6 +305,7 @@ CHEADER='/** @id '"\$Id\$"'
 //       1         2         3         4         5         6         7         8
 // 45678901234567890123456789012345678901234567890123456789012345678901234567890
 
+
 '
 
 notice() {
@@ -318,7 +354,9 @@ 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
 }
 
@@ -331,13 +369,17 @@ checkfile() {
 }
 
 to() {
+    mode="u=rw,g=rw,o=r"
     while test $# -gt 0; do
-        mode="u=rw,g=rw,o=r"
         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;;
@@ -363,10 +405,14 @@ 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 svn propset svn:keywords "Id" "$1"
+            run ${VCS} add "$1"
+            if test "${VCS}" = "svn"; then
+                run svn propset svn:keywords "Id" "$1"
+            fi
+        fi
     fi
     return 0
 }
@@ -386,8 +432,12 @@ copy() {
     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 svn propset svn:keywords "Id" "$1"
+            run ${VCS} add "$1"
+            if test "${VCS}" = "svn"; then
+                run svn propset svn:keywords "Id" "$1"
+            fi
+        fi
     fi
 }
 
@@ -413,10 +463,33 @@ 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 "$(LANG= svn info | sed -n 's,Relative URL: *,,p')" = "^/"; then
+if test "${VCS}" = "svn" -a $novcs -eq 0; then
-    svn mkdir trunk branches tags
+    if test "$(LANG= svn info | sed -n 's,Relative URL: *,,p')" = "^/"; then
-    cd trunk
+        svn mkdir trunk branches tags
+        cd trunk
+    fi
 fi
 
 # Initialize the environment:
@@ -723,7 +796,9 @@ ${HEADER}dist_bin_SCRIPTS =
 MAINTAINERCLEANFILES = makefile.in
 EOF
 echo "${HEADER}MAINTAINERCLEANFILES = makefile.in" | to --condition AX_USE_DOXYGEN doc/makefile.am
-to --condition AX_BUILD_TEST test/runtests.sh < ${0%/*}/test/runtests.sh
+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
@@ -761,8 +836,12 @@ if testtag AX_USE_DOXYGEN; then
         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 svn propset svn:keywords "Id" doc/doxyfile.in
+                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@"
@@ -842,7 +921,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, 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)"
     to debian/control.in <<EOF
 Source: @PACKAGE_NAME@
 Priority: extra
@@ -913,7 +992,7 @@ 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";
     fi)
@@ -1041,12 +1120,31 @@ 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}
 
 desktopdir = \${datadir}/applications
 desktop_DATA = @PACKAGE_DESKTOP@
-dist_pkgdata_DATA = @PACKAGE_ICON@
+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
@@ -1065,6 +1163,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
@@ -1072,7 +1176,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

build-in-docker.sh

@@ -2,6 +2,7 @@
 set -o errtrace
 
 # build and test everything in a fresh docker installation
+mode="apt"
 img="ubuntu:latest"
 repos=()
 keys=()
@@ -10,6 +11,7 @@ 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
@@ -23,6 +25,7 @@ while test $# -gt 0; do
             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"
@@ -31,6 +34,9 @@ while test $# -gt 0; do
             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
@@ -58,6 +64,17 @@ while test $# -gt 0; do
             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"
             ;;
@@ -82,6 +99,9 @@ while test $# -gt 0; do
         (-c|--cmd) shift;
             commands+=("$1")
             ;;
+        (-w|--wait)
+            wait=1
+            ;;
         (*)
             echo "**** ERROR: unknown option '$1', try --help" 1>&2
             exit 1
@@ -113,7 +133,12 @@ function traperror() {
                 fi
                 echo
             fi
-            echo "**** Entering docker container ${DOCKER_ID}, exit with Ctrl-D"
+            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"
@@ -121,6 +146,12 @@ function traperror() {
             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
@@ -154,26 +185,53 @@ set -x
 docker pull $img
 DOCKER_ID=$(docker run -d ${dirs[@]} ${envs[@]} -w /workdir $img sleep infinity)
 trap 'traperror '"${DOCKER_ID}"' "$? ${PIPESTATUS[@]}" $LINENO $BASH_LINENO "$BASH_COMMAND" "${FUNCNAME[@]}" "${FUNCTION}"' SIGINT INT TERM EXIT
-docker exec ${DOCKER_ID} apt-get update
+case $mode in
-docker exec ${DOCKER_ID} apt-get upgrade -y
+    (apt)
-docker exec ${DOCKER_ID} apt-get install -y python-software-properties software-properties-common apt-transport-https dpkg-dev lsb-release || \
+        OPTIONS='-o Dpkg::Options::=--force-confdef -o Dpkg::Options::=--force-confnew -y --force-yes --no-install-suggests --no-install-recommends'
-    docker exec ${DOCKER_ID} apt-get install -y software-properties-common apt-transport-https dpkg-dev lsb-release || \
+        for f in 'libpam-systemd:amd64' 'policykit*' 'colord'; do
-    docker exec ${DOCKER_ID} apt-get install -y python-software-properties apt-transport-https dpkg-dev lsb-release;
+            docker exec ${DOCKER_ID} bash -c "echo 'Package: $f' >> /etc/apt/preferences"
-for repo in "${repos[@]}"; do
+            docker exec ${DOCKER_ID} bash -c "echo 'Pin-Priority: -100' >> /etc/apt/preferences"
-    ifthenelse "${repo}" "apt-add-repository ARG"
+            docker exec ${DOCKER_ID} bash -c "echo >> /etc/apt/preferences"
-done
+        done
-for key in "${keys[@]}"; do
+        docker exec ${DOCKER_ID} apt-get update ${OPTIONS}
-    wget -O- "$key" \
+        docker exec ${DOCKER_ID} apt-get upgrade ${OPTIONS}
-        | docker exec -i ${DOCKER_ID} apt-key add -
+        docker exec ${DOCKER_ID} apt-get install ${OPTIONS} python-software-properties software-properties-common apt-transport-https dpkg-dev lsb-release || \
-done
+            docker exec ${DOCKER_ID} apt-get install ${OPTIONS} software-properties-common apt-transport-https dpkg-dev lsb-release || \
-docker exec ${DOCKER_ID} apt-get update
+            docker exec ${DOCKER_ID} apt-get install ${OPTIONS} python-software-properties apt-transport-https dpkg-dev lsb-release;
-docker exec ${DOCKER_ID} apt-get upgrade
+        for repo in "${repos[@]}"; do
-for package in "${packages[@]}"; do
+            ifthenelse "${repo}" "apt-add-repository ARG"
-    ifthenelse "${package}" "apt-get install -y --force-yes ARG"
+        done
-done
+        for key in "${keys[@]}"; do
-for command in "${commands[@]}"; do
+            wget -O- "$key" \
-    ifthenelse "${command}" "ARG"
+                | docker exec -i ${DOCKER_ID} apt-key add -
-done
+        done
-docker exec ${DOCKER_ID} ./resolve-debbuilddeps.sh
+        docker exec ${DOCKER_ID} apt-get update ${OPTIONS}
-docker exec -u $(id -u) ${DOCKER_ID} svn upgrade || true
+        for package in "${packages[@]}"; do
-docker exec -u $(id -u) ${DOCKER_ID} ./bootstrap.sh -t "${targets}"
+            ifthenelse "${package}" "apt-get install ${OPTIONS} ARG"
+        done
+        for command in "${commands[@]}"; do
+            ifthenelse "${command}" "ARG"
+        done
+        docker exec ${DOCKER_ID} ./resolve-debbuilddeps.sh
+        ;;
+    (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}"

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/
@@ -100,4 +100,4 @@ else
   </dict>
 </plist>
 EOF
-fi
+fi

resolve-debbuilddeps.sh

@@ -35,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

resolve-rpmbuilddeps.sh

@@ -14,15 +14,13 @@ SCHROOTNAME="$1"
 PACKAGE_NAME=$(sed -n 's/^ *m4_define(x_package_name, \(.*\)).*/\1/p' configure.ac)
 
 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
         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}
+            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
         yum install -y ${FILES} || \

src/commands.hxx

@@ -22,6 +22,8 @@
 #include <QProcess>
 #include <QMouseEvent>
 #include <QRegularExpression>
+#include <QNetworkCookieJar>
+#include <QNetworkCookie>
 #include <vector>
 #include <queue>
 #include <map>
@@ -2344,7 +2346,7 @@ class Echo: public Command {
       log(script->replacevars(_text));
       return true;
     }
-  public:
+  private:
     QString _text;
 };
 
@@ -2378,6 +2380,42 @@ class OfflineStoragePath: public Command {
     QString _path;
 };
 
+class ClearCookies: public Command {
+  public:
+    QString tag() const {
+      return "clear-cookies";
+    }
+    QString description() const {
+      return
+        tag()+" <url>"
+        "\n\n"
+        "Clear all cookies of given URL <url>, or of the current URL if no"
+        " <url> is specified.";
+    }
+    QString command() const {
+      return tag()+(_url.isEmpty()?"":" "+_url);
+    }
+    std::shared_ptr<Command> parse(Script*, QString args,
+                                   QStringList&, QString, int, int) {
+      std::shared_ptr<ClearCookies> cmd(new ClearCookies());
+      if (args.size()) cmd->_url = args;
+      return cmd;
+    }
+    bool execute(Script* script, QWebFrame* frame) {
+      Logger log(this, script);
+      QString url(_url);
+      if (url.isEmpty()) url = frame->url().toString();
+      QNetworkCookieJar* cookies = frame->page()->networkAccessManager()->cookieJar();
+      Q_FOREACH(QNetworkCookie cookie, cookies->cookiesForUrl(url)) {
+        log("delete cookie "+cookie.name());
+        cookies->deleteCookie(cookie);
+      }
+      return true;
+    }
+  private:
+    QString _url;
+};
+
 /* Template:
 class : public Command {
   public:
@@ -2508,6 +2546,7 @@ inline void Script::initPrototypes() {
   add(new For);
   add(new Echo);
   add(new OfflineStoragePath);
+  add(new ClearCookies);
 }
 
 #endif

src/testgui.hxx

@@ -351,7 +351,13 @@ class TestGUI: public QMainWindow, protected Ui::TestGUI {
                 // is important, but the text that will be typed
                 _typing = true;
               } else {
-                appendCommand("click "+map(selected));
+                if (_web->page()->selectedText() != "")
+                  // user has selected a text, append a check
+                  appendCommand("expect "+map(selected)
+                                +" -> "+_web->page()->selectedText());
+                else
+                  // user has clicked without selection, append a click
+                  appendCommand("click "+map(selected));
               }
             } else {
               appendCommand("# click, but where?");