From 09ca5c85affb44d1e8f0b38338c99c35e2b3945d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marc=20W=C3=A4ckerlin?= Date: Mon, 9 Nov 2015 22:56:31 +0000 Subject: [PATCH] build system updated --- ChangeLog | 34 ++++++++++++++++++++++++++++++ ax_init_standard_project.m4 | 5 ++++- bootstrap.sh | 32 ++++++++++++++++++++++------- debian/control.in | 2 +- resolve-debbuilddeps.sh | 29 ++++++++++++-------------- sql-to-dot.sed | 41 +++++++++++++++++++++++++++++++++++++ 6 files changed, 118 insertions(+), 25 deletions(-) create mode 100755 sql-to-dot.sed diff --git a/ChangeLog b/ChangeLog index 07ea3b2..604ff88 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,37 @@ +2015-11-07 10:47 marc + + * bootstrap.sh, debian/control.in: there is no qt4-default + +2015-11-07 09:23 marc + + * bootstrap.sh: there is no qt4-default + +2015-11-07 00:23 marc + + * html/makefile.am, scripts/makefile.am: added dist + +2015-11-05 12:55 marc + + * bootstrap.sh, debian, debian/changelog.in, debian/compat, + debian/control.in, debian/docs, debian/rules: updated build + system + +2015-11-05 12:39 marc + + * COPYING, ChangeLog, INSTALL, README, ax_check_qt.m4, + ax_cxx_compile_stdcxx_11.m4, ax_init_standard_project.m4, + bootstrap.sh, build-in-docker.sh, build-resource-file.sh, + configure.ac, debian, debian/changelog.in, debian/compat, + debian/control.in, debian/docs, debian/rules, doc, + doc/doxyfile.in, doc/makefile.am, html, html/convert-videos.sh, + html/default.jpg, html/makefile.am, html/movieposter.sh, + html/unknown-movie-folder.jpg, mac-create-app-bundle.sh, + makefile.am, resolve-debbuilddeps.sh, resolve-rpmbuilddeps.sh, + scripts, scripts/convert-videos.sh, scripts/default.jpg, + scripts/makefile.am, scripts/movieposter.sh, + scripts/unknown-movie-folder.jpg, src, videoweb.spec.in: updated + build system + 2015-11-03 22:02 marc * AUTHORS: AUTHOR updated to new homepage diff --git a/ax_init_standard_project.m4 b/ax_init_standard_project.m4 index eef210e..01404ac 100644 --- a/ax_init_standard_project.m4 +++ b/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 @@ -342,7 +345,7 @@ EOF # use this in configure.ac to support debian packages AC_DEFUN([AX_USE_DEBIAN_PACKAGING], [ - README_DEB=$(tail -n +3 README | sed -e 's/^$/./g' -e 's/^/ /g') + README_DEB=$(tail -n +3 README | sed -e 's/^ *$/./g' -e 's/^/ /g') AC_SUBST(README_DEB) _AM_SUBST_NOTMAKE([README_DEB]) AC_CONFIG_FILES([debian/changelog debian/control]) diff --git a/bootstrap.sh b/bootstrap.sh index e548561..fb14847 100755 --- a/bootstrap.sh +++ b/bootstrap.sh @@ -110,7 +110,9 @@ GENERATED FILES * resolve-rpmbuilddeps.sh - script to install RPM package dependencies * 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 + * 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 + * 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) @@ -196,7 +198,7 @@ FILES debian/control fi -if test -n "${SCHROOTNAME}"; then - schroot -c "${SCHROOTNAME}" -u root -d / -- apt-get -y install dpkg-dev - DEPS=$(schroot -c "${SCHROOTNAME}" -- dpkg-checkbuilddeps 2>&1 || true) -else - apt-get -y install dpkg-dev - DEPS=$(dpkg-checkbuilddeps 2>&1 || true) -fi +install dpkg-dev +DEPS=$(${DO} dpkg-checkbuilddeps 2>&1 || true) DEPS=$(echo "$DEPS" | sed -n '/Unmet build dependencies/ { s,.*Unmet build dependencies: ,,g; s, ([^)]*),,g; s, *| *,|,g; p}') for pa in ${DEPS}; do diff --git a/sql-to-dot.sed b/sql-to-dot.sed new file mode 100755 index 0000000..99b8b17 --- /dev/null +++ b/sql-to-dot.sed @@ -0,0 +1,41 @@ +#! /bin/sed -f +1i\ +/** @page database Database Schema\ +\ +@dot\ +digraph schema { + +# remove newlines +:a;N;$!ba;s/\n/ /g +# reduce spaces +s, \+, ,g + +s| *CREATE *TABLE *\(if *not *exists\)\? *`\?\([a-z]\+\)`\? *|\n \2\n [shape=none, margin=0, label=<\n \n \n|ig + +s/varchar *( *\([0-9]\+\) *)/varchar[\1]/ig + +s/ *PRIMARY KEY *( *`\?\([a-z]\+\)`\? *) *[,)]//ig + +:b;s/\([a-z]\+\)\([^;]*\)FOREIGN KEY *( *`\?\([a-z]\+\)`\? *) *REFERENCES *`\?\([a-z]\+\)`\? *( *`\?\([a-z]\+\)`\? *) *\([^,)]*\)[,)]\(.*\)/\1\2\7\n \1:\3 -> \4:\5/ig;tb + +:c;s|\n[(,] *`\?\([a-z]\+\)`\? *\([^ ]\+\)*\([^,)]*\) *COMMENT *[`"']\([^`"']*\)[`"'] *[,)]|\n \n,|ig;tc + +s| \+||g +s|\)|\1
\2|g +:d;s|\(
[^<]\{30,40\}\) \+\([^<]\{20,\}\)|\1
\2|g;td + +s| *COMMENT *= *["']\?\([^"']*\)["']\?|\n |ig + +s| \+||g +s|\)|\1
\2|g +:e;s|\(
[^<]\{60,80\}\) \+\([^<]\{30,\}\)|\1
\2|g;te + +s/\n,[^\n]*/\n/g +s|;|\n
\2
\1\2\3\4
\+||g +s|\(]*>[^<]\{30,40\}\) \+\([^<]\{20,\}
\1
\+||g +s|\(]*>[^<]\{60,80\}\) \+\([^<]\{30,\}
\n >];\n|ig + +$a\ +}\ +@enddot\ +*/