new way to generate database fromseparate schema.sql

bootstrap.sh

@@ -111,6 +111,7 @@ GENERATED FILES
     * build-in-docker.sh - script to build the project encapsulated in a docker container
     * build-resource-file.sh - build resource.qrc file from a resource directory
     * mac-create-app-bundle.sh - script to create apple mac os-x app-bundle
+    * test/runtests.sh - template file to run test scripts, i.e. docker based
     * AUTHORS - replace your name in AUTHORS before first run
     * NEWS - empty file add your project's news
     * README - add project description (first line is header, followed by an empty line)
@@ -120,7 +121,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 +197,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 +333,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 +374,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 +410,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
@@ -412,6 +426,7 @@ copy resolve-rpmbuilddeps.sh
 copy build-in-docker.sh
 copy build-resource-file.sh
 copy mac-create-app-bundle.sh
+if testtag AX_BUILD_TEST; then copy test/runtests.sh; fi
 AUTHOR=$(gpg -K  | sed -n 's,uid *,,p' | sort | head -1)
 if test -z "${AUTHOR}"; then
     AUTHOR="FIRSTNAME LASTNAME (URL) <EMAIL>"
@@ -427,8 +442,7 @@ ${DEFAULT_PROJECT_NAME}
 
 add description for ${DEFAULT_PROJECT_NAME}
 EOF
-to configure.ac <<EOF && \
-    ( notice "please edit configure.ac, then rerun $0"; exit 0 )
+to configure.ac <<EOF && 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 +714,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 +837,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, 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)"
     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 +856,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 +1001,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 +1052,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