From 4f63c4f321056bc189fd7feec8964fa924629388 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marc=20W=C3=A4ckerlin?= <marc@mrw.sh>
Date: Thu, 5 May 2016 09:12:41 +0000
Subject: [PATCH] update build system

---
 ChangeLog                   | 20 ++++++++++++++++++++
 ax_init_standard_project.m4 |  5 +++--
 bootstrap.sh                |  7 -------
 build-in-docker.sh          |  6 +++---
 4 files changed, 26 insertions(+), 12 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 4d297b3..2dd263b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,23 @@
+2016-05-03 06:52  
+
+	* src/commands.hxx: some smaller fixes and improvements for joomla
+	  testing
+
+2016-05-02 15:25  
+
+	* src/commands.hxx, src/testgui.hxx: some smaller fixes and
+	  improvements for joomla testing
+
+2016-05-02 11:02  
+
+	* COPYING, ChangeLog, INSTALL, autogen.sh,
+	  ax_init_standard_project.m4, bootstrap.sh, build-in-docker.conf,
+	  build-in-docker.sh, mac-create-app-bundle.sh,
+	  resolve-debbuilddeps.sh, resolve-rpmbuilddeps.sh,
+	  src/commands.hxx, src/testgui.hxx, src/version.cxx,
+	  src/version.hxx: add new commane clear-cookies; select text on
+	  testgui sets an expectation
+
 2016-04-03 16:19  
 
 	* configure.ac, debian/control.in: after svn-server restore
diff --git a/ax_init_standard_project.m4 b/ax_init_standard_project.m4
index c13b9ed..f487c68 100644
--- a/ax_init_standard_project.m4
+++ b/ax_init_standard_project.m4
@@ -14,6 +14,7 @@ m4_define(x_least, m4_ifdef([x_least_fix], [x_least_fix],
       VCS_REVISION="ERROR-UNDEFINED-REVISION-to-be-built-in-subdirectory-of-checkout"
       for path in . .. ../.. ../../..; do
         if test -d .svn; then
+          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
@@ -26,6 +27,7 @@ m4_define(x_least, m4_ifdef([x_least_fix], [x_least_fix],
       VCS_REVISION="ERROR-UNDEFINED-REVISION-to-be-built-in-subdirectory-of-checkout"
       for path in . .. ../.. ../../..; do
         if test -d .svn; then
+          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
@@ -46,6 +48,7 @@ m4_define(x_minor_diff, m4_ifdef([x_least_fix], 0, mrw_esyscmd_s([
   VCS_REVISION="ERROR-UNDEFINED-REVISION-to-be-built-in-subdirectory-of-checkout"
   for path in . .. ../.. ../../..; do
     if test -d .svn; then
+      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
@@ -178,8 +181,6 @@ 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);;
diff --git a/bootstrap.sh b/bootstrap.sh
index 4f3b3a5..9b53b8b 100755
--- a/bootstrap.sh
+++ b/bootstrap.sh
@@ -129,7 +129,6 @@ GENERATED FILES
     * 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
@@ -1163,12 +1162,6 @@ 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
diff --git a/build-in-docker.sh b/build-in-docker.sh
index 8bca39c..27e9f78 100755
--- a/build-in-docker.sh
+++ b/build-in-docker.sh
@@ -189,9 +189,9 @@ 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"
+            docker exec -it ${DOCKER_ID} bash -c "echo 'Package: $f' >> /etc/apt/preferences"
+            docker exec -it ${DOCKER_ID} bash -c "echo 'Pin-Priority: -100' >> /etc/apt/preferences"
+            docker exec -it ${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}