fix build on eoan

2019-10-08 00:17:54 +02:00
parent 2133615a4c
commit 6d81df1678
16 changed files with 1283 additions and 387 deletions
--- a/bootstrap.sh
+++ b/bootstrap.sh
@@ -129,9 +129,8 @@ GENERATED FILES
    * ${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_cxx_compile_stdcxx.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
@@ -274,7 +273,7 @@ FILES
      * Enable C++ testing using CppUnit: AX_USE_CPPUNIT
      * Enable other tests: AX_BUILD_TEST
      * Enable C++ examples, i.e. for libraries: AX_BUILD_EXAMPLES
-      * Check for C++11 support: AX_CXX_COMPILE_STDCXX_11 (see ax_cxx_compile_stdcxx_11.m4)
+      * Require C++17 support: AX_CXX_COMPILE_STDCXX([17], [noext], [mandatory]) (see ax_cxx_compile_stdcxx.m4)
      * Require a QT module: AX_REQUIRE_QT (see ax_check_qt.m4)
      * Optionally use a QT module: AX_CHECK_QT  (see ax_check_qt.m4)
      * Require a module: AX_PKG_REQUIRE (see ax_init_standard_project.m4)
@@ -450,7 +449,7 @@ checkdir() {
    if ! test -d "$1"; then # create path
        run mkdir -p "$1"
        if test -n "${VCS}" -a $novcs -eq 0 && ! contains "$1" "${excludevcs[@]}"; then
-            run ${VCS} add "$1"
+            run --no-check ${VCS} add "$1"
        fi
    fi
 }
@@ -498,7 +497,7 @@ to() {
    run chmod $mode $1
    if test $exists -eq 0; then
        if test -n "${VCS}" -a $novcs -eq 0 && ! contains "$1" "${excludevcs[@]}"; then
-            run ${VCS} add "$1"
+            run --no-check ${VCS} add "$1"
            if test "${VCS}" = "svn"; then
                run svn propset svn:keywords "Id" "$1"
            fi
@@ -523,10 +522,14 @@ copy() {
    if test "${1%/*}" != "$1"; then
        test -d "${1%/*}" || svn mkdir "${1%/*}"
    fi
+    if ! test -e "${source}"; then
+        ignored "$1" not found
+        return
+    fi
    run cp "${source}" "$1"
    if test $exists -eq 0; then
        if test -n "${VCS}" -a $novcs -eq 0 && ! contains "$1" "${excludevcs[@]}"; then
-            run ${VCS} add "$1"
+            run --no-check ${VCS} add "$1"
            if test "${VCS}" = "svn"; then
                run svn propset svn:keywords "Id" "$1"
            fi
@@ -575,7 +578,7 @@ vcs2cl() {
    fi
    if test $exists -eq 0; then
        if test -n "${VCS}" -a $novcs -eq 0 && ! contains "ChangeLog" "${excludevcs[@]}"; then
-            run ${VCS} add ChangeLog
+            run --no-check ${VCS} add ChangeLog
        fi
    fi
 }
@@ -591,9 +594,8 @@ fi
 # Initialize the environment:
 copy ${MY_NAME}
 copy ax_init_standard_project.m4
-copy ax_cxx_compile_stdcxx_11.m4
+copy ax_cxx_compile_stdcxx.m4
 copy ax_check_qt.m4
-copy makefile_test.inc.am
 copy resolve-debbuilddeps.sh
 copy resolve-rpmbuilddeps.sh
 copy build-in-docker.sh
@@ -1352,7 +1354,7 @@ ${HEADER}AM_CPPFLAGS = -I\${top_srcdir}/src -I\${top_builddir}/src
 AM_LDFLAGS = -L\${abs_top_builddir}/src/.libs
 LDADD = -l${PACKAGE_NAME#lib}

-exampledir = ${docdir}/examples
+exampledir = \${docdir}/examples
 example_DATA = 

 MAINTAINERCLEANFILES = makefile.in
@@ -1505,9 +1507,10 @@ if testtag AX_USE_DOXYGEN; then
    if ! checkfile doc/doxyfile.in || \
        contains doc/doxyfile.in "${rebuildfiles[@]}"; then
        run doxygen -g doc/doxyfile.in
+        sed -i ':a;/\\$/{s///;N;s/ *\n */ /g;ba}' doc/doxyfile.in
        if test $exists -eq 0; then
            if test -n "${VCS}" -a $novcs -eq 0 && ! contains "doc/doxyfile" "${excludevcs[@]}"; then
-                run ${VCS} add doc/doxyfile.in
+                run --no-check ${VCS} add doc/doxyfile.in
                if test "${VCS}" = "svn"; then
                    run svn propset svn:keywords "Id" doc/doxyfile.in
                fi
@@ -1548,6 +1551,7 @@ if testtag AX_USE_DOXYGEN; then
        doxyreplace WARN_IF_UNDOCUMENTED NO
        doxyreplace WARN_LOGFILE doxygen.errors
        doxyreplace INPUT "@top_srcdir@/src"
+        doxyadd INPUT "@top_srcdir@/@README_FILE@"
        if testtag AX_USE_SCRIPTS; then
            doxyadd INPUT "@top_srcdir@/scripts"
        fi
@@ -1562,6 +1566,7 @@ if testtag AX_USE_DOXYGEN; then
            doxyadd EXCLUDE "@top_srcdir@/nodejs/node_modules"
 	    doxyadd EXCLUDE "@top_srcdir@/nodejs/public/javascripts/ext"
        fi
+        doxyreplace USE_MDFILE_AS_MAINPAGE "@top_srcdir@/@README_FILE@"
        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_* version.[ch]xx"
@@ -1571,9 +1576,7 @@ if testtag AX_USE_DOXYGEN; then
        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_PATH @top_srcdir@
        doxyreplace EXAMPLE_RECURSIVE YES
        doxyreplace FILTER_PATTERNS '*.wt=doxygen-webtester.sed *.sql=@top_srcdir@/sql-to-dot.sed'
        doxyreplace SOURCE_BROWSER YES
@@ -1605,8 +1608,8 @@ if testtag AX_USE_DEBIAN_PACKAGING; then

 -- @PACKAGER@  @BUILD_DATE@
 EOF
-    RUN_DEPENDS="$(if testtag AX_USE_NODEJS; then echo -n ", nodejs, npm"; fi)"
-    BUILD_DEPENDS="debhelper, fakeroot, ${VCSDEPENDS_DEB} 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)"
+    RUN_DEPENDS="$(if testtag AX_USE_NODEJS; then echo -n ", nodejs, npm,"; fi)"
+    BUILD_DEPENDS="gnupg, debhelper, fakeroot, ${VCSDEPENDS_DEB} pkg-config, automake, libtool, libltdl-dev, 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 | qt4-dev,"; fi)"
    to debian/control.in <<EOF
 Source: @PACKAGE_NAME@
 Priority: extra
@@ -1646,6 +1649,9 @@ usr/lib/lib*.so
 usr/lib/pkgconfig/*
 usr/lib/*.la
 usr/share/doc/${PACKAGE_NAME}/html
+$(if testtag AX_BUILD_EXAMPLES; then
+  echo usr/share/doc/${PACKAGE_NAME}/examples
+fi)
 EOF
    to --mode "u=rwx,g=rwx,o=rx" debian/rules <<EOF
 ${HEADER}%:
@@ -1871,7 +1877,7 @@ desktop_DATA = @PACKAGE_DESKTOP@
 dist_pkgdata_DATA = @PACKAGE_ICON@
 dist_noinst_DATA = ax_check_qt.m4 bootstrap.sh				\\
                   resolve-rpmbuilddeps.sh autogen.sh			\\
-                    ax_cxx_compile_stdcxx_11.m4 build-in-docker.sh	\\
+                    ax_cxx_compile_stdcxx.m4 build-in-docker.sh	        \\
                    build-resource-file.sh				\\
                    ax_init_standard_project.m4				\\
                    mac-create-app-bundle.sh resolve-debbuilddeps.sh    \\