fixed dependency resolve

ChangeLog

@@ -1,3 +1,32 @@
+2015-11-07 10:47  marc
+
+	* bootstrap.sh: there is no qt4-default
+
+2015-11-07 09:23  marc
+
+	* bootstrap.sh: there is no qt4-default
+
+2015-11-05 09:57  marc
+
+	* ax_init_standard_project.m4, bootstrap.sh, build-in-docker.sh,
+	  debian/control.in, resolve-debbuilddeps.sh: updated build system
+
+2015-11-03 13:36  marc
+
+	* ax_init_standard_project.m4, configure.ac, debian/control.in,
+	  resolve-debbuilddeps.sh: should now work fr any ubuntu
+	  distributon
+
+2015-11-03 10:41  marc
+
+	* debian/control.in, resolve-debbuilddeps.sh: prepared for build in
+	  a docker instance on jenkins
+
+2015-11-03 09:29  marc
+
+	* ChangeLog, ax_check_qt.m4, bootstrap.sh, resolve-debbuilddeps.sh:
+	  faster resolve-bebuilddeps.sh
+
 2015-11-02 22:43  marc
 
 	* resolve-debbuilddeps.sh: sudo or not sudo shall be the problem of

ax_init_standard_project.m4

@@ -13,6 +13,7 @@ m4_define(x_least, m4_ifdef([x_least_diff], mrw_esyscmd_s([
   for path in . .. ../..; do
     if svn info $path 2>&1 > /dev/null; then
       SVN_REVISION=$(LANG= svn info $path | sed -n 's/Last Changed Rev: //p')
+      if test -z "${SVN_REVISION}"; then SVN_REVISION=0; fi
       break;
     fi
   done
@@ -22,6 +23,7 @@ m4_define(x_least, m4_ifdef([x_least_diff], mrw_esyscmd_s([
   for path in . .. ../..; do
     if svn info $path 2>&1 > /dev/null; then
       SVN_REVISION=$(LANG= svn info $path | sed -n 's/Last Changed Rev: //p')
+      if test -z "${SVN_REVISION}"; then SVN_REVISION=0; fi
       break;
     fi
   done
@@ -36,6 +38,7 @@ m4_define(x_minor_diff, mrw_esyscmd_s([
   for path in . .. ../..; do
     if svn info $path 2>&1 > /dev/null; then
       SVN_REVISION=$(LANG= svn info $path | sed -n 's/Last Changed Rev: //p')
+      if test -z "${SVN_REVISION}"; then SVN_REVISION=0; fi
       break;
     fi;
   done

bootstrap.sh

@@ -120,7 +120,7 @@ GENERATED FILES
     * 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.in - if you enabled AX_USE_SCRIPTS
+    * scripts/makefile.am - if you enabled AX_USE_SCRIPTS
     * doc/makefile.am - if you enabled AX_USE_DOXYGEN
     * doc/doxyfile.in - if you enabled AX_USE_DOXYGEN
     * test/makefile.am - if you enabled AX_BUILD_TEST or AX_USE_CPPUNIT
@@ -196,7 +196,7 @@ FILES
                   <ou can access the readme by calling
                   ${DEFAULT_PROJECT_NAME}::description().
   * ChangeLog:    Your changelog is automatically maintained from
-                  subversion history, using svn2cl | subversion-tools. You don't need to
+                  subversion history, using svn2cl. You don't need to
                   care about.
   * configure.ac: This file becomes very short and simple. You provide
                   the project name, the major and minor version. The
@@ -332,7 +332,7 @@ to() {
         case "$1" in
             (--condition) shift # test for a tag, abort if not set
                 if ! testtag "$1"; then
-                    return
+                    return 0
                 fi;;
             (--mode) shift # test for a tag, abort if not set
                 mode="$1";;
@@ -373,7 +373,14 @@ copy() {
         # file already exists and must not be rebuilt
         return
     fi
-    run cp "${0%/*}/$1" "$1"
+    local source="${0%/*}/$1"
+    if ! test -r "${source}"; then
+        source="../${source}"
+        if ! test -r "${source}"; then
+            source="${0%/*}/$1"
+        fi
+    fi
+    run cp "${source}" "$1"
     if test $exists -eq 0; then
         run svn add "$1"
         run svn propset svn:keywords "Id" "$1"
@@ -402,6 +409,12 @@ doxyadd() {
     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
+    svn mkdir trunk branches tags
+    cd trunk
+fi
+
 # Initialize the environment:
 copy ${MY_NAME}
 copy ax_init_standard_project.m4
@@ -427,8 +440,7 @@ ${DEFAULT_PROJECT_NAME}
 
 add description for ${DEFAULT_PROJECT_NAME}
 EOF
-to configure.ac <<EOF && \
+to configure.ac <<EOF && notice "please edit configure.ac, then rerun $0" && exit 0
-    ( notice "please edit configure.ac, then rerun $0"; exit 0 )
 ${HEADER}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
@@ -700,7 +712,11 @@ namespace NAMESPACE {
   const std::string IDENT("\$Id: " PACKAGE_STRING);
 }
 EOF
-echo "${HEADER}MAINTAINERCLEANFILES = makefile.in" | to --condition AX_USE_SCRIPTS scripts/makefile.am
+to --condition AX_USE_SCRIPTS scripts/makefile.am <<EOF
+${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|AX_USE_CPPUNIT' test/makefile.am <<EOF
 ${HEADER}$(if testtag AX_USE_CXX; then
@@ -819,12 +835,12 @@ 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 | 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, subversion, svn2cl, 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 | qt4-default | 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
 Maintainer: @AUTHOR@
-Build-Depends: ${BUILD-DEPENDS}
+Build-Depends: ${BUILD_DEPENDS}
 
 Package: @PACKAGE_NAME@
 Section: $(if testtag AX_USE_LIBTOOL; then echo  "libs"; fi)
@@ -838,7 +854,7 @@ $(      if testtag AX_USE_LIBTOOL; then
 Package: @PACKAGE_NAME@-dev
 Section: libdevel
 Architecture: any
-Depends: @PACKAGE_NAME@ (= \${binary:Version}), ${BUILD-DEPENDS}
+Depends: @PACKAGE_NAME@ (= \${binary:Version}), ${BUILD_DEPENDS}
 Description: @DESCRIPTION@ - Development Package
 @README_DEB@
 EOF2
@@ -983,8 +999,28 @@ fi)
 
 EOF
 SUBDIRS=""
+if testtag AX_USE_CXX; then
+    SUBDIRS="${SUBDIRS} src"
+fi
+if testtag AX_BUILD_TEST AX_USE_CPPUNIT; then
+    SUBDIRS="${SUBDIRS} test"
+fi
+if testtag AX_USE_SCRIPTS; then
+    SUBDIRS="${SUBDIRS} scripts"
+fi
+if testtag AX_USE_DOXYGEN; then
+    SUBDIRS="${SUBDIRS} doc"
+fi
+if testtag AX_BUILD_EXAMPLES; then
+    SUBDIRS="${SUBDIRS} examples"
+fi
+if testtag AX_BUILD_HTML; then
+    SUBDIRS="${SUBDIRS} html"
+fi
 for d in src test scripts doc examples html; do
-    test -d $d && SUBDIRS="${SUBDIRS} $d"
+    if test -d "$d" -a "${SUBDIRS//$d/}" = "${SUBDIRS}"; then
+        SUBDIRS="${SUBDIRS} $d"
+    fi
 done
 to makefile.am<<EOF
 ${HEADER}SUBDIRS =${SUBDIRS}
@@ -1014,7 +1050,7 @@ if test -f makefile; then
 fi
 
 #### Bootstrap Before Configure ####
-run --no-check svn2cl | subversion-tools
+run --no-check svn2cl
 run aclocal
 if testtag AX_USE_LIBTOOL; then run libtoolize --force; fi
 run automake -a

resolve-debbuilddeps.sh

@@ -11,25 +11,27 @@
 ## 45678901234567890123456789012345678901234567890123456789012345678901234567890
 
 SCHROOTNAME="$1"
+if test -n "${SCHROOTNAME}"; then
+  DO="schroot -c "${SCHROOTNAME}" --"
+  SUDO="schroot -c "${SCHROOTNAME}" -u root -d / --"
+else
+  DO=""
+  SUDO="sudo"
+fi
 
 function install() {
-    if test -n "${SCHROOTNAME}"; then
+    if ${SUDO} apt-get -y install $*; then
-        if schroot -c "${SCHROOTNAME}" -u root -d / -- apt-get -y install $*; then
         return 0
-        fi
     else
-        if apt-get -y install $*; then
-            return 0
-        fi
-    fi
         return 1
+    fi
 }
 
 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 "$(apt-cache policy -q ${f})" && ! dpkg -l "${f}"; then
+        if test -n "$(${DO} apt-cache policy -q ${f})" && ! ${DO} dpkg -l "${f}"; then
             TO_INSTALL+=" ${f}"
         fi
     done
@@ -38,13 +40,8 @@ if test -e debian/control.in -a ! -e debian/control; then
         sed 's,@[^@]*@, dummytext,g' > debian/control
 fi
 
-if test -n "${SCHROOTNAME}"; then
+install dpkg-dev
-  schroot -c "${SCHROOTNAME}" -u root -d / -- apt-get -y install dpkg-dev
+DEPS=$(${DO} dpkg-checkbuilddeps 2>&1 || true)
-  DEPS=$(schroot -c "${SCHROOTNAME}" -- dpkg-checkbuilddeps 2>&1 || true)
-else
-  apt-get -y install dpkg-dev
-  DEPS=$(dpkg-checkbuilddeps 2>&1 || true)
-fi
 DEPS=$(echo "$DEPS" | sed -n '/Unmet build dependencies/ { s,.*Unmet build dependencies: ,,g; s, ([^)]*),,g; s, *| *,|,g; p}')
 
 for pa in ${DEPS}; do