diff --git a/ChangeLog b/ChangeLog index 091821e..79f6dab 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,45 @@ +2018-10-02 12:49 + + * [r223] COPYING, INSTALL, build-in-docker.conf, + build-in-docker.sh, resolve-rpmbuilddeps.sh: + fix distributor/codename + +2018-09-17 13:13 + + * [r222] COPYING, INSTALL, build-in-docker.sh: + support opensuse tumbleweed + +2018-09-11 10:21 + + * [r221] COPYING, INSTALL, build-in-docker.sh: + fix installation check after package build + +2018-09-10 21:43 + + * [r220] ax_check_qt.m4, ax_init_standard_project.m4, bootstrap.sh, + build-in-docker.sh, configure.ac, debian/control.in, + mac-create-app-bundle.sh: + add check whether built package can be installed; fixed typo in + debian development dependencie + +2018-07-19 11:34 + + * [r219] build-in-docker.conf: + updated the repository + +2018-07-09 09:05 + + * [r218] build-in-docker.sh: + fix build in debian buster + +2018-07-05 13:48 + + * [r217] ChangeLog, ax_init_standard_project.m4, bootstrap.sh, + build-in-docker.sh, configure.ac, mac-create-app-bundle.sh, + proxyface.spec.in, resolve-debbuilddeps.sh, + resolve-rpmbuilddeps.sh: + fix rpm build + 2018-04-04 20:15 * [r216] ChangeLog, bootstrap.sh, build-in-docker.sh: diff --git a/ax_init_standard_project.m4 b/ax_init_standard_project.m4 index 528841d..880499d 100644 --- a/ax_init_standard_project.m4 +++ b/ax_init_standard_project.m4 @@ -365,7 +365,7 @@ AC_DEFUN([AX_USE_CXX], [ CXXFLAGS="${CXXFLAGS//-g -O2/}" CFLAGS="${CFLAGS//-g -O2/}" -# pass compile flags to make distcheck + # pass compile flags to make distcheck AM_DISTCHECK_CONFIGURE_FLAGS="CXXFLAGS='${CXXFLAGS}' CPPFLAGS='${CPPFLAGS}' CFLAGS='${CFLAGS}' LDFLAGS='${LDFLAGS}'" AC_SUBST(AM_DISTCHECK_CONFIGURE_FLAGS) @@ -391,6 +391,20 @@ maintainer-clean-cxx-targets: EOF ]) +# require specific C++ version +AC_DEFUN([AX_USE_CXX_11], [ + AX_USE_CXX + AX_CXX_COMPILE_STDCXX([11], [noext], [mandatory]) +]) +AC_DEFUN([AX_USE_CXX_14], [ + AX_USE_CXX + AX_CXX_COMPILE_STDCXX([14], [noext], [mandatory]) +]) +AC_DEFUN([AX_USE_CXX_17], [ + AX_USE_CXX + AX_CXX_COMPILE_STDCXX([17], [noext], [mandatory]) +]) + # use this in configure.ac to support old school C AC_DEFUN([AX_USE_C], [ AC_LANG(C) @@ -637,7 +651,6 @@ 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 2>/dev/null) | sort -V | head -1)) PDF_DOC=${PACKAGE_NAME}-${PACKAGE_VERSION}.pdf AC_SUBST(PDF_DOC) if test "$have_doxygen" = "no"; then @@ -662,28 +675,12 @@ AC_DEFUN([AX_USE_DOXYGEN], [ AX_ADD_MAKEFILE_TARGET_DEP([.PHONY], [pdf gen-uml-images], [doc/makefile.in]) test -f doc/makefile.in && cat >> doc/makefile.in <&2 - exit 1 - ;; - esac + if test -z "$img"; then + case "$mode" in + (deb|apt) img="mwaeckerlin/debbuildenv";; + (rpm|zypper) img="opensuse:latest";; + (yum) img="centos:latest";; + (dnf) img="fedora:latest";; + (win) + img="mwaeckerlin/debbuildenv"; host="${host:---host=i686-w64-mingw32}" + targets="all install" + flags+=("--prefix=/workdir/usr") + packages+=("mingw-w64") + ;; + (*) + echo "**** ERROR: unknown mode '$1', try --help" 1>&2 + exit 1 + ;; + esac + fi ;; (-i|--image) shift; img="$1" @@ -243,6 +246,9 @@ function ifthenelse() { set -x +if test -z "$img"; then + img="mwaeckerlin/debbuildenv" +fi docker pull $img DOCKER_ID=$(docker create ${dns[@]} ${dirs[@]} ${envs[@]} -w /workdir $img sleep infinity) trap 'traperror '"${DOCKER_ID}"' "$? ${PIPESTATUS[@]}" $LINENO $BASH_LINENO "$BASH_COMMAND" "${FUNCNAME[@]}" "${FUNCTION}"' SIGINT INT TERM EXIT @@ -262,8 +268,8 @@ if test -z "$mode"; then (*deb*) mode=deb;; (*rpm*) mode=rpm;; (*) case "$img" in - (*ubuntu*|*debian*|*mint*) mode=deb;; - (*fedora*|*centos*|*mageia*) mode=rpm;; + (*deb*|*ubuntu*|*debian*|*mint*) mode=deb;; + (*rpm*|*fedora*|*centos*|*mageia*) mode=rpm;; (*mingw*|*win*) mode=win;; (*) mode=deb;; esac;; diff --git a/doc/makefile.am b/doc/makefile.am index b69f6c5..426857f 100644 --- a/doc/makefile.am +++ b/doc/makefile.am @@ -2,7 +2,7 @@ ## ## This file has been added: ## - by bootstrap.sh -## - on Thu, 22 November 2018 09:02:38 +0100 +## - on Fri, 23 November 2018 15:32:44 +0100 ## Feel free to change it or even remove and rebuild it, up to your needs ## ## 1 2 3 4 5 6 7 8 diff --git a/doc/plantuml.jar b/doc/plantuml.jar index 9502c23..2fcafa0 100644 Binary files a/doc/plantuml.jar and b/doc/plantuml.jar differ diff --git a/makefile.am b/makefile.am index 70bbeb0..c9890a0 100644 --- a/makefile.am +++ b/makefile.am @@ -2,7 +2,7 @@ ## ## This file has been added: ## - by bootstrap.sh -## - on Thu, 22 November 2018 09:02:38 +0100 +## - on Fri, 23 November 2018 15:32:44 +0100 ## Feel free to change it or even remove and rebuild it, up to your needs ## ## 1 2 3 4 5 6 7 8 @@ -23,4 +23,8 @@ dist_noinst_DATA = ax_check_qt.m4 bootstrap.sh \ sql-to-dot.sed dist_doc_DATA = AUTHORS NEWS README.md COPYING INSTALL ChangeLog +README: README.md + cp README.md README + +CLEANFILES = README MAINTAINERCLEANFILES = makefile.in