use ./build-in-docker.sh on build server
This commit is contained in:
		
							
								
								
									
										11
									
								
								ChangeLog
									
									
									
									
									
								
							
							
						
						
									
										11
									
								
								ChangeLog
									
									
									
									
									
								
							| @@ -1,3 +1,14 @@ | |||||||
|  | 2015-11-16 12:38  marc | ||||||
|  |  | ||||||
|  | 	* doc/doxyfile.in: SVG must not be interactive for embedding in | ||||||
|  | 	  redmine | ||||||
|  |  | ||||||
|  | 2015-11-09 11:22  marc | ||||||
|  |  | ||||||
|  | 	* ChangeLog, ax_init_standard_project.m4, bootstrap.sh, | ||||||
|  | 	  debian/control.in, resolve-debbuilddeps.sh: fixed build | ||||||
|  | 	  dependencies | ||||||
|  |  | ||||||
| 2015-11-07 10:47  marc | 2015-11-07 10:47  marc | ||||||
|  |  | ||||||
| 	* bootstrap.sh: there is no qt4-default | 	* bootstrap.sh: there is no qt4-default | ||||||
|   | |||||||
| @@ -90,16 +90,19 @@ AC_DEFUN([AX_ADD_MAKEFILE_TARGET_DEP], [ | |||||||
|   fi |   fi | ||||||
| ]) | ]) | ||||||
|  |  | ||||||
| # Same as AC_SUBST, but adds -Dname="value" option to CPPFLAGS | # Same as AC_SUBST, but adds -Dname="value" option to CPPFLAGS and a | ||||||
|  | # notz only a @name@ replacement, but also a @name_ENCODED@ one to be | ||||||
|  | # used in code. | ||||||
| #  - parameters: | #  - parameters: | ||||||
| #     $1 = variable name | #     $1 = variable name | ||||||
| AC_DEFUN([AX_SUBST], [ | AC_DEFUN([AX_SUBST], [ | ||||||
|  |   [$1]_ENCODED=$(echo "${$1}" | awk 1 ORS='\\n' | sed 's,\\n$,,') | ||||||
|  |   [$1]_ENCODED=${[$1]_ENCODED//\"/\\\"} | ||||||
|  |   [$1]_ENCODED=${[$1]_ENCODED//\'/\'\"\'\"\'} | ||||||
|  |   [$1]_ENCODED=${[$1]_ENCODED//#/\\#} | ||||||
|  |   AM_CPPFLAGS+=" '-D$1=\"${[$1]_ENCODED}\"'" | ||||||
|   AC_SUBST([$1]) |   AC_SUBST([$1]) | ||||||
|   tmp_var=$(echo "${$1}" | awk 1 ORS='\\n' | sed 's,\\n$,,') |   AC_SUBST([$1]_ENCODED) | ||||||
|   tmp_var=${tmp_var//\"/\\\"} |  | ||||||
|   tmp_var=${tmp_var//\'/\'\"\'\"\'} |  | ||||||
|   tmp_var=${tmp_var//#/\\#} |  | ||||||
|   AM_CPPFLAGS+=" '-D$1=\"${tmp_var}\"'" |  | ||||||
|   AC_SUBST(AM_CPPFLAGS) |   AC_SUBST(AM_CPPFLAGS) | ||||||
| ]) | ]) | ||||||
|  |  | ||||||
| @@ -167,14 +170,18 @@ AC_DEFUN([AX_INIT_STANDARD_PROJECT], [ | |||||||
|   AX_SUBST(BUILD_NUMBER) |   AX_SUBST(BUILD_NUMBER) | ||||||
|   BUILD_DATE=$(LANG= date +"%a, %d %b %Y %H:%M:%S %z") |   BUILD_DATE=$(LANG= date +"%a, %d %b %Y %H:%M:%S %z") | ||||||
|   AX_SUBST(BUILD_DATE) |   AX_SUBST(BUILD_DATE) | ||||||
|   if test -f "${PROJECT_NAME}-logo.png"; then |   if test -f "${PACKAGE_NAME}.desktop.in"; then | ||||||
|      PROJECT_LOGO="${PROJECT_NAME}-logo.png" |      PACKAGE_DESKTOP="${PACKAGE_NAME}.desktop" | ||||||
|   fi |   fi | ||||||
|   AX_SUBST(PROJECT_LOGO) |   AX_SUBST(PACKAGE_DESKTOP) | ||||||
|   if test -f "${PROJECT_NAME}-icon.png"; then |   if test -f "${PACKAGE_NAME}-logo.png"; then | ||||||
|      PROJECT_ICON="${PROJECT_NAME}-icon.png" |      PACKAGE_LOGO="${PACKAGE_NAME}-logo.png" | ||||||
|   fi |   fi | ||||||
|   AX_SUBST(PROJECT_ICON) |   AX_SUBST(PACKAGE_LOGO) | ||||||
|  |   if test -f "${PACKAGE_NAME}-icon.png"; then | ||||||
|  |      PACKAGE_ICON="${PACKAGE_NAME}-icon.png" | ||||||
|  |   fi | ||||||
|  |   AX_SUBST(PACKAGE_ICON) | ||||||
|  |  | ||||||
|   AC_ARG_ENABLE(pedantic, |   AC_ARG_ENABLE(pedantic, | ||||||
|     [AS_HELP_STRING([--enable-pedantic], |     [AS_HELP_STRING([--enable-pedantic], | ||||||
| @@ -204,6 +211,10 @@ AC_DEFUN([AX_INIT_STANDARD_PROJECT], [ | |||||||
|     AM_CPPFLAGS="${AM_CPPFLAGS} -DQT_NO_DEBUG_OUTPUT -DQT_NO_DEBUG" |     AM_CPPFLAGS="${AM_CPPFLAGS} -DQT_NO_DEBUG_OUTPUT -DQT_NO_DEBUG" | ||||||
|   fi |   fi | ||||||
|    |    | ||||||
|  |   if test -f ${PACKAGE_NAME}.desktop.in; then | ||||||
|  |     AC_CONFIG_FILES([${PACKAGE_NAME}.desktop]) | ||||||
|  |   fi | ||||||
|  |  | ||||||
|   AC_CONFIG_FILES([makefile]) |   AC_CONFIG_FILES([makefile]) | ||||||
|   AX_ADD_MAKEFILE_TARGET_DEP([clean-am], [clean-standard-project-targets], [makefile.in]) |   AX_ADD_MAKEFILE_TARGET_DEP([clean-am], [clean-standard-project-targets], [makefile.in]) | ||||||
|   AX_ADD_MAKEFILE_TARGET_DEP([distclean-am], [distclean-standard-project-targets], [makefile.in]) |   AX_ADD_MAKEFILE_TARGET_DEP([distclean-am], [distclean-standard-project-targets], [makefile.in]) | ||||||
|   | |||||||
							
								
								
									
										48
									
								
								bootstrap.sh
									
									
									
									
									
								
							
							
						
						
									
										48
									
								
								bootstrap.sh
									
									
									
									
									
								
							| @@ -20,7 +20,7 @@ DEFAULT_PROJECT_NAME=${PROJECT_PATH##*/} | |||||||
| configure=0 | configure=0 | ||||||
| build=0 | build=0 | ||||||
| docker=0 | docker=0 | ||||||
| buildtarget="distcheck" | buildtarget="" | ||||||
| overwrite=0 | overwrite=0 | ||||||
| rebuild=0 | rebuild=0 | ||||||
| rebuildfiles=() | rebuildfiles=() | ||||||
| @@ -28,8 +28,9 @@ while test $# -gt 0; do | |||||||
|     case "$1" in |     case "$1" in | ||||||
|         (--configure|-c) configure=1;; |         (--configure|-c) configure=1;; | ||||||
|         (--docker|-d) docker=1;; |         (--docker|-d) docker=1;; | ||||||
|         (--build|-b) configure=1; build=1;; |         (--build|-b) configure=1; build=1; buildtarget+=" distcheck";; | ||||||
|         (--target|-t) shift; configure=1; build=1; buildtarget="$1";; |         (--target|-t) shift; configure=1; build=1; buildtarget+=" $1";; | ||||||
|  |         (--clean) shift; configure=1; build=1; buildtarget+=" maintainer-clean";; | ||||||
|         (--overwrite|-o) overwrite=1;; |         (--overwrite|-o) overwrite=1;; | ||||||
|         (--rebuild|-r) rebuild=1;; |         (--rebuild|-r) rebuild=1;; | ||||||
|         (--rebuild-file|-f) shift; rebuildfiles+=("$1");; |         (--rebuild-file|-f) shift; rebuildfiles+=("$1");; | ||||||
| @@ -110,12 +111,15 @@ GENERATED FILES | |||||||
|     * resolve-rpmbuilddeps.sh - script to install RPM 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 |     * 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 |     * 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 |     * 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 |     * AUTHORS - replace your name in AUTHORS before first run | ||||||
|     * NEWS - empty file add your project's news |     * NEWS - empty file add your project's news | ||||||
|     * README - add project description (first line is header, followed by an empty line) |     * README - add project description (first line is header, followed by an empty line) | ||||||
|     * configure.ac - global configuration file template |     * configure.ac - global configuration file template | ||||||
|     * makefile.am - global makefile template |     * makefile.am - global makefile template | ||||||
|  |     * ${DEFAULT_PROJECT_NAME}.desktop.in - linux desktop file | ||||||
|     * src/makefile.am - if you enabled AX_USE_CXX |     * src/makefile.am - if you enabled AX_USE_CXX | ||||||
|     * src/version.hxx - if you enabled AX_USE_CXX |     * src/version.hxx - if you enabled AX_USE_CXX | ||||||
|     * src/version.cxx - if you enabled AX_USE_CXX |     * src/version.cxx - if you enabled AX_USE_CXX | ||||||
| @@ -196,7 +200,7 @@ FILES | |||||||
|                   <ou can access the readme by calling |                   <ou can access the readme by calling | ||||||
|                   ${DEFAULT_PROJECT_NAME}::description(). |                   ${DEFAULT_PROJECT_NAME}::description(). | ||||||
|   * ChangeLog:    Your changelog is automatically maintained from |   * 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. |                   care about. | ||||||
|   * configure.ac: This file becomes very short and simple. You provide |   * configure.ac: This file becomes very short and simple. You provide | ||||||
|                   the project name, the major and minor version. The |                   the project name, the major and minor version. The | ||||||
| @@ -320,7 +324,7 @@ checkdir() { | |||||||
|  |  | ||||||
| checkfile() { | checkfile() { | ||||||
|     exists=0 |     exists=0 | ||||||
|     if test -f "$1"; then |     if test -f "$1" -o -f "$1".in; then | ||||||
|         exists=1 |         exists=1 | ||||||
|     fi |     fi | ||||||
|     test $exists -eq 1 |     test $exists -eq 1 | ||||||
| @@ -424,6 +428,7 @@ copy resolve-debbuilddeps.sh | |||||||
| copy resolve-rpmbuilddeps.sh | copy resolve-rpmbuilddeps.sh | ||||||
| copy build-in-docker.sh | copy build-in-docker.sh | ||||||
| copy build-resource-file.sh | copy build-resource-file.sh | ||||||
|  | copy sql-to-dot.sed | ||||||
| copy mac-create-app-bundle.sh | copy mac-create-app-bundle.sh | ||||||
| AUTHOR=$(gpg -K  | sed -n 's,uid *,,p' | sort | head -1) | AUTHOR=$(gpg -K  | sed -n 's,uid *,,p' | sort | head -1) | ||||||
| if test -z "${AUTHOR}"; then | if test -z "${AUTHOR}"; then | ||||||
| @@ -703,10 +708,10 @@ namespace NAMESPACE { | |||||||
|     return README; |     return README; | ||||||
|   } |   } | ||||||
|   std::string logo() { |   std::string logo() { | ||||||
|     return PROJECT_LOGO; |     return PACKAGE_LOGO; | ||||||
|   } |   } | ||||||
|   std::string icon() { |   std::string icon() { | ||||||
|     return PROJECT_ICON; |     return PACKAGE_ICON; | ||||||
|   } |   } | ||||||
|   const std::string WHAT("#(@) " PACKAGE_STRING); |   const std::string WHAT("#(@) " PACKAGE_STRING); | ||||||
|   const std::string IDENT("\$Id: " PACKAGE_STRING); |   const std::string IDENT("\$Id: " PACKAGE_STRING); | ||||||
| @@ -718,6 +723,7 @@ ${HEADER}dist_bin_SCRIPTS = | |||||||
| MAINTAINERCLEANFILES = makefile.in | MAINTAINERCLEANFILES = makefile.in | ||||||
| EOF | EOF | ||||||
| echo "${HEADER}MAINTAINERCLEANFILES = makefile.in" | to --condition AX_USE_DOXYGEN doc/makefile.am | echo "${HEADER}MAINTAINERCLEANFILES = makefile.in" | to --condition AX_USE_DOXYGEN doc/makefile.am | ||||||
|  | to --condition AX_BUILD_TEST test/runtests.sh < ${0%/*}/test/runtests.sh | ||||||
| to --condition 'AX_BUILD_TEST|AX_USE_CPPUNIT' test/makefile.am <<EOF | to --condition 'AX_BUILD_TEST|AX_USE_CPPUNIT' test/makefile.am <<EOF | ||||||
| ${HEADER}$(if testtag AX_USE_CXX; then | ${HEADER}$(if testtag AX_USE_CXX; then | ||||||
| cat <<EOF2 | cat <<EOF2 | ||||||
| @@ -761,7 +767,7 @@ if testtag AX_USE_DOXYGEN; then | |||||||
|         doxyreplace PROJECT_NAME "@PACKAGE_NAME@" |         doxyreplace PROJECT_NAME "@PACKAGE_NAME@" | ||||||
|         doxyreplace PROJECT_NUMBER "@PACKAGE_VERSION@" |         doxyreplace PROJECT_NUMBER "@PACKAGE_VERSION@" | ||||||
|         doxyreplace PROJECT_BRIEF "@DESCRIPTION@" |         doxyreplace PROJECT_BRIEF "@DESCRIPTION@" | ||||||
|         doxyreplace PROJECT_LOGO "@PROJECT_LOGO@" |         doxyreplace PROJECT_LOGO "@top_srcdir@/@PACKACE_LOGO@" | ||||||
|         doxyreplace INLINE_INHERITED_MEMB YES |         doxyreplace INLINE_INHERITED_MEMB YES | ||||||
|         doxyreplace MULTILINE_CPP_IS_BRIEF YES |         doxyreplace MULTILINE_CPP_IS_BRIEF YES | ||||||
|         doxyreplace TAB_SIZE 2 |         doxyreplace TAB_SIZE 2 | ||||||
| @@ -771,6 +777,7 @@ if testtag AX_USE_DOXYGEN; then | |||||||
|         doxyadd ALIASES '"classmutex=\\par Reentrant:\\nAccess is locked with class static mutex @c "' |         doxyadd ALIASES '"classmutex=\\par Reentrant:\\nAccess is locked with class static mutex @c "' | ||||||
|         doxyadd ALIASES '"instancemutex=\\par Reentrant:\\nAccess is locked with per instance mutex @c "' |         doxyadd ALIASES '"instancemutex=\\par Reentrant:\\nAccess is locked with per instance mutex @c "' | ||||||
|         doxyadd ALIASES '"mutex=\\par Reentrant:\\nAccess is locked with mutex @c "' |         doxyadd ALIASES '"mutex=\\par Reentrant:\\nAccess is locked with mutex @c "' | ||||||
|  |         doxyadd ALIASES '"api=\\xrefitem api \\"API Call\\" \\"\\""' | ||||||
|         doxyreplace ENABLE_PREPROCESSING YES |         doxyreplace ENABLE_PREPROCESSING YES | ||||||
|         doxyreplace MACRO_EXPANSION YES |         doxyreplace MACRO_EXPANSION YES | ||||||
|         doxyadd PREDEFINED '"NAMESPACE=@PACKAGE_NAME@"' |         doxyadd PREDEFINED '"NAMESPACE=@PACKAGE_NAME@"' | ||||||
| @@ -797,14 +804,14 @@ if testtag AX_USE_DOXYGEN; then | |||||||
|         if testtag AX_BUILD_TEST AX_USE_CPPUNIT; then |         if testtag AX_BUILD_TEST AX_USE_CPPUNIT; then | ||||||
|             doxyadd INPUT "@top_srcdir@/test" |             doxyadd INPUT "@top_srcdir@/test" | ||||||
|         fi |         fi | ||||||
|         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' |         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 RECURSIVE YES | ||||||
|         doxyreplace EXCLUDE_PATTERNS "moc_* uic_* qrc_*" |         doxyreplace EXCLUDE_PATTERNS "moc_* uic_* qrc_*" | ||||||
|         if testtag AX_BUILD_EXAMPLES; then |         if testtag AX_BUILD_EXAMPLES; then | ||||||
|             doxyreplace EXAMPLE_PATH @top_srcdir@/examples |             doxyreplace EXAMPLE_PATH @top_srcdir@/examples | ||||||
|         fi |         fi | ||||||
|         doxyreplace EXAMPLE_RECURSIVE YES |         doxyreplace EXAMPLE_RECURSIVE YES | ||||||
|         doxyreplace FILTER_PATTERNS '*.wt=doxygen-webtester.sed *.sql=@top_srcdir@/sql2dot.sed' |         doxyreplace FILTER_PATTERNS '*.wt=doxygen-webtester.sed *.sql=@top_srcdir@/sql-to-dot.sed' | ||||||
|         doxyreplace SOURCE_BROWSER YES |         doxyreplace SOURCE_BROWSER YES | ||||||
|         doxyreplace INLINE_SOURCES YES |         doxyreplace INLINE_SOURCES YES | ||||||
|         doxyreplace GENERATE_TESTLIST YES |         doxyreplace GENERATE_TESTLIST YES | ||||||
| @@ -822,7 +829,7 @@ if testtag AX_USE_DOXYGEN; then | |||||||
|         doxyreplace CLASS_GRAPH YES |         doxyreplace CLASS_GRAPH YES | ||||||
|         doxyreplace TEMPLATE_RELATIONS YES |         doxyreplace TEMPLATE_RELATIONS YES | ||||||
|         doxyreplace DOT_IMAGE_FORMAT svg |         doxyreplace DOT_IMAGE_FORMAT svg | ||||||
|         doxyreplace INTERACTIVE_SVG YES |         doxyreplace INTERACTIVE_SVG NO | ||||||
|         doxyreplace DOT_TRANSPARENT YES |         doxyreplace DOT_TRANSPARENT YES | ||||||
|     fi |     fi | ||||||
| fi | fi | ||||||
| @@ -882,6 +889,17 @@ ${HEADER}%: | |||||||
| EOF | EOF | ||||||
|     echo 7 | to debian/compat |     echo 7 | to debian/compat | ||||||
| fi | fi | ||||||
|  | to ${PACKAGE_NAME}.desktop.in <<EOF | ||||||
|  | [Desktop Entry] | ||||||
|  | Type=Application | ||||||
|  | Name=${PACKAGE_NAME} | ||||||
|  | GenericName=${PACKAGE_NAME} | ||||||
|  | Comment=@DESCRIPTION@ | ||||||
|  | Icon=@prefix@/share/@PACKAGE_NAME@/@PACKAGE_ICON@ | ||||||
|  | Exec=${PACKAGE_NAME} %u | ||||||
|  | Terminal=false | ||||||
|  | Categories=Qt;Utility; | ||||||
|  | EOF | ||||||
| to --condition AX_USE_RPM_PACKAGING ${PACKAGE_NAME}.spec.in <<EOF | to --condition AX_USE_RPM_PACKAGING ${PACKAGE_NAME}.spec.in <<EOF | ||||||
| Summary: @DESCRIPTION@ | Summary: @DESCRIPTION@ | ||||||
| Name: @PACKAGE_NAME@ | Name: @PACKAGE_NAME@ | ||||||
| @@ -955,6 +973,7 @@ $(if testtag AX_USE_LIBTOOL; then | |||||||
| echo '/usr/%_lib/@PACKAGE_NAME@.so.*' | echo '/usr/%_lib/@PACKAGE_NAME@.so.*' | ||||||
| else | else | ||||||
| echo '/usr/bin/*' | echo '/usr/bin/*' | ||||||
|  | echo '/usr/share/applications/*' | ||||||
| fi) | fi) | ||||||
| %doc | %doc | ||||||
| $(if testtag AX_USE_LIBTOOL; then | $(if testtag AX_USE_LIBTOOL; then | ||||||
| @@ -1025,7 +1044,10 @@ done | |||||||
| to makefile.am<<EOF | to makefile.am<<EOF | ||||||
| ${HEADER}SUBDIRS =${SUBDIRS} | ${HEADER}SUBDIRS =${SUBDIRS} | ||||||
|  |  | ||||||
| doc_DATA = AUTHORS NEWS README COPYING INSTALL ChangeLog | desktopdir = \${datadir}/applications | ||||||
|  | desktop_DATA = @PACKAGE_DESKTOP@ | ||||||
|  | dist_pkgdata_DATA = @PACKAGE_ICON@ | ||||||
|  | dist_doc_DATA = AUTHORS NEWS README COPYING INSTALL ChangeLog | ||||||
|  |  | ||||||
| MAINTAINERCLEANFILES = makefile.in | MAINTAINERCLEANFILES = makefile.in | ||||||
| EOF | EOF | ||||||
| @@ -1050,7 +1072,7 @@ if test -f makefile; then | |||||||
| fi | fi | ||||||
|  |  | ||||||
| #### Bootstrap Before Configure #### | #### Bootstrap Before Configure #### | ||||||
| run --no-check svn2cl | subversion-tools | run --no-check svn2cl | ||||||
| run aclocal | run aclocal | ||||||
| if testtag AX_USE_LIBTOOL; then run libtoolize --force; fi | if testtag AX_USE_LIBTOOL; then run libtoolize --force; fi | ||||||
| run automake -a | run automake -a | ||||||
|   | |||||||
							
								
								
									
										6
									
								
								build-in-docker.conf
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										6
									
								
								build-in-docker.conf
									
									
									
									
									
										Normal file
									
								
							| @@ -0,0 +1,6 @@ | |||||||
|  | repos+=("Debian|Ubuntu-precise::::::universe") | ||||||
|  | repos+=("Ubuntu-precise:::'deb http://archive.ubuntu.com/ubuntu precise universe'") | ||||||
|  | repos+=("https://dev.marc.waeckerlin.org/repository") | ||||||
|  | keys+=("https://dev.marc.waeckerlin.org/repository/PublicKey") | ||||||
|  | envs+=("-e 'HOME=${HOME}'") | ||||||
|  | dirs+=("-v ${HOME}/.gnupg:${HOME}/.gnupg:ro") | ||||||
| @@ -1,15 +1,177 @@ | |||||||
| #! /bin/bash -ex | #! /bin/bash -e | ||||||
|  | set -o errtrace | ||||||
|  |  | ||||||
| # build and test everything in a fresh docker installation | # build and test everything in a fresh docker installation | ||||||
|  | img="ubuntu:latest" | ||||||
|  | repos=() | ||||||
|  | keys=() | ||||||
|  | envs=() | ||||||
|  | dirs=("-v $(pwd):/workdir") | ||||||
|  | packages=() | ||||||
|  | targets="all check distcheck" | ||||||
|  | commands=() | ||||||
|  | if test -e ./build-in-docker.conf; then | ||||||
|  |     # you can preconfigure the variables in file build-in-docker.conf | ||||||
|  |     # if you do so, add the file to EXTRA_DIST in makefile.am | ||||||
|  |     source ./build-in-docker.conf | ||||||
|  | fi | ||||||
|  | while test $# -gt 0; do | ||||||
|  |     case "$1" in | ||||||
|  |         (-h|--help) | ||||||
|  |             echo "$0 [OPTIONS]" | ||||||
|  |             echo | ||||||
|  |             echo "OPTIONS:" | ||||||
|  |             echo | ||||||
|  |             echo "  -h, --help            show this help" | ||||||
|  |             echo "  -i, --image <image>   use given docker image instead of ${img}" | ||||||
|  |             echo "  -t, --targets targets specify build targets, default: ${targets}" | ||||||
|  |             echo "  -r, --repo <url>      add given apt repository" | ||||||
|  |             echo "  -k, --key <url>       add public key from url" | ||||||
|  |             echo "  -e, --env <var>=<val> set environment variable in docker" | ||||||
|  |             echo "  -d, --dir <dir>       access given directory read only" | ||||||
|  |             echo "  -p, --package <pkg>   install extra debian packages" | ||||||
|  |             echo "  -c, --cmd <command>   execute commands as root in docker" | ||||||
|  |             echo | ||||||
|  |             echo "  The options -r -k -e -d -p -c can be repeated several times." | ||||||
|  |             echo | ||||||
|  |             echo "  The options -r -p -c allow an if-then-else contruct" | ||||||
|  |             echo "  depending on the operating system:" | ||||||
|  |             echo "    <os>:::<A>:::<B>" | ||||||
|  |             echo "    <os>:::<A>" | ||||||
|  |             echo "  Read as: On linux type <os> use <A> else use <B>" | ||||||
|  |             echo "  That means: If the distributer ID or codename in lsb_release" | ||||||
|  |             echo "  matches regular expression <os>, then <A> is replaced, else <B> is replaced." | ||||||
|  |             echo "  The three colons are for splitting <os> from <A> and <B> part." | ||||||
|  |             echo "  E.g.: Install package curl on wheezy and npm on olter systems:" | ||||||
|  |             echo "    $0 -p Debian|precise:::curl:::npm" | ||||||
|  |             echo | ||||||
|  |             echo "EXAMPLE:" | ||||||
|  |             echo | ||||||
|  |             echo "$0 -i mwaeckerlin/ubuntu:trusty-i386 \\" | ||||||
|  |             echo "                     -t deb \\" | ||||||
|  |             echo "                     -e ANDROID_HOME=/opt/local/android \\" | ||||||
|  |             echo "                     -d /opt/local/android \\" | ||||||
|  |             echo "                     -r universe \\" | ||||||
|  |             echo "                     -r https://dev.marc.waeckerlin.org/repository \\" | ||||||
|  |             echo "                     -k https://dev.marc.waeckerlin.org/repository/PublicKey \\" | ||||||
|  |             echo "                     -p mrw-c++" | ||||||
|  |             echo | ||||||
|  |             exit 0 | ||||||
|  |             ;; | ||||||
|  |         (-i|--image) shift; | ||||||
|  |             img="$1" | ||||||
|  |             ;; | ||||||
|  |         (-t|--targets) shift; | ||||||
|  |             targets="$1" | ||||||
|  |             ;; | ||||||
|  |         (-r|--repo) shift; | ||||||
|  |             repos+=("$1") | ||||||
|  |             ;; | ||||||
|  |         (-k|--key) shift; | ||||||
|  |             keys+=("$1") | ||||||
|  |             ;; | ||||||
|  |         (-e|--env) shift; | ||||||
|  |             envs+=("-e $1") | ||||||
|  |             ;; | ||||||
|  |         (-d|--dirs) shift; | ||||||
|  |             dirs+=("-v $1:$1:ro") | ||||||
|  |             ;; | ||||||
|  |         (-p|--package) shift; | ||||||
|  |             packages+=("$1") | ||||||
|  |             ;; | ||||||
|  |         (-c|--cmd) shift; | ||||||
|  |             commands+=("$1") | ||||||
|  |             ;; | ||||||
|  |         (*) | ||||||
|  |             echo "**** ERROR: unknown option '$1', try --help" 1>&2 | ||||||
|  |             exit 1 | ||||||
|  |             ;; | ||||||
|  |     esac | ||||||
|  |     if test $# -eq 0; then | ||||||
|  |         echo "**** ERROR: missing value, try --help" 2>61 | ||||||
|  |         exit 1 | ||||||
|  |     fi | ||||||
|  |     shift | ||||||
|  | done | ||||||
|  |  | ||||||
| DOCKER_ID=$(docker run -d -v $(pwd):/workdir -w /workdir ubuntu sleep infinity) | function traperror() { | ||||||
| trap "docker rm -f ${DOCKER_ID}" INT TERM EXIT |     set +x | ||||||
| docker exec ${DOCKER_ID} apt-get install -y software-properties-common apt-transport-https dpkg-dev |     local DOCKER_ID="$1" | ||||||
| docker exec ${DOCKER_ID} apt-add-repository universe |     local err=($2) # error status | ||||||
| docker exec ${DOCKER_ID} apt-add-repository https://dev.marc.waeckerlin.org/repository |     local line="$3" # LINENO | ||||||
| wget -O- https://dev.marc.waeckerlin.org/repository/PublicKey \ |     local linecallfunc="$4"  | ||||||
|    | docker exec -i ${DOCKER_ID} apt-key add - |     local command="$5" | ||||||
|  |     local funcstack="$6" | ||||||
|  |     for e in ${err[@]}; do | ||||||
|  |         if test -n "$e" -a "$e" != "0"; then | ||||||
|  |             echo "<---" | ||||||
|  |             echo "ERROR: line $line - command '$command' exited with status: $e (${err[@]})" | ||||||
|  |             if [ "${funcstack}" != "main" -o "$linecallfunc" != "0" ]; then | ||||||
|  |                 echo -n "   ... Error at ${funcstack} " | ||||||
|  |                 if [ "$linecallfunc" != "" ]; then | ||||||
|  |                     echo -n "called at line $linecallfunc" | ||||||
|  |                 fi | ||||||
|  |                 echo | ||||||
|  |             fi | ||||||
|  |             echo -n "   ... cleanup docker: " | ||||||
|  |             docker rm -f "${DOCKER_ID}" | ||||||
|  |             echo "returning status: $e" | ||||||
|  |             echo "--->" | ||||||
|  |             exit $e | ||||||
|  |         fi | ||||||
|  |     done | ||||||
|  |     echo -n "   SUCCESS ... cleanup docker: " | ||||||
|  |     docker rm -f "${DOCKER_ID}" | ||||||
|  |     exit 0 | ||||||
|  | } | ||||||
|  |  | ||||||
|  | function ifthenelse() { | ||||||
|  |     arg="$1" | ||||||
|  |     shift | ||||||
|  |     cmd="$*" | ||||||
|  |     if test "${arg/:::/}" = "${arg}"; then | ||||||
|  |         docker exec ${DOCKER_ID} bash -c "${cmd//ARG/${arg}}" | ||||||
|  |     else | ||||||
|  |         os="${arg%%:::*}" | ||||||
|  |         thenpart="${arg#*:::}" | ||||||
|  |         if test "${thenpart/:::/}" = "${thenpart}"; then | ||||||
|  |             docker exec ${DOCKER_ID} bash -c 'os="'$os'"; if [[ "$(lsb_release -is)-$(lsb_release -cs)-$(dpkg --print-architecture)" =~ ${os} ]]; then '"${cmd//ARG/${thenpart}}"'; fi' | ||||||
|  |         else | ||||||
|  |             elsepart="${thenpart##*:::}" | ||||||
|  |             thenpart="${thenpart%:::*}" | ||||||
|  |             if test -n "${thenpart}"; then | ||||||
|  |                 docker exec ${DOCKER_ID} bash -c 'os="'$os'"; if [[ "$(lsb_release -is)-$(lsb_release -cs)-$(dpkg --print-architecture)" =~ ${os} ]]; then '"${cmd//ARG/${thenpart}}"'; else '"${cmd//ARG/${elsepart}}"'; fi' | ||||||
|  |             else | ||||||
|  |                 docker exec ${DOCKER_ID} bash -c 'os="'$os'"; if [[ "$(lsb_release -is)-$(lsb_release -cs)-$(dpkg --print-architecture)" =~ ${os} ]]; then true; else '"${cmd//ARG/${elsepart}}"'; fi' | ||||||
|  |             fi     | ||||||
|  |         fi | ||||||
|  |     fi | ||||||
|  | } | ||||||
|  |  | ||||||
|  | set -x | ||||||
|  |  | ||||||
|  | docker pull $img | ||||||
|  | DOCKER_ID=$(docker run -d ${dirs[@]} ${envs[@]} -w /workdir $img sleep infinity) | ||||||
|  | trap 'traperror '"${DOCKER_ID}"' "$? ${PIPESTATUS[@]}" $LINENO $BASH_LINENO "$BASH_COMMAND" "${FUNCNAME[@]}" "${FUNCTION}"' SIGINT INT TERM EXIT | ||||||
| docker exec ${DOCKER_ID} apt-get update | docker exec ${DOCKER_ID} apt-get update | ||||||
|  | docker exec ${DOCKER_ID} apt-get upgrade -y | ||||||
|  | docker exec ${DOCKER_ID} apt-get install -y python-software-properties software-properties-common apt-transport-https dpkg-dev lsb-release || \ | ||||||
|  |     docker exec ${DOCKER_ID} apt-get install -y software-properties-common apt-transport-https dpkg-dev lsb-release || \ | ||||||
|  |     docker exec ${DOCKER_ID} apt-get install -y python-software-properties apt-transport-https dpkg-dev lsb-release; | ||||||
|  | for repo in "${repos[@]}"; do | ||||||
|  |     ifthenelse "${repo}" "apt-add-repository ARG" | ||||||
|  | done | ||||||
|  | for key in "${keys[@]}"; do | ||||||
|  |     wget -O- "$key" \ | ||||||
|  |         | docker exec -i ${DOCKER_ID} apt-key add - | ||||||
|  | done | ||||||
|  | docker exec ${DOCKER_ID} apt-get update | ||||||
|  | for package in "${packages[@]}"; do | ||||||
|  |     ifthenelse "${package}" "apt-get install -y --force-yes ARG" | ||||||
|  | done | ||||||
|  | for command in "${commands[@]}"; do | ||||||
|  |     ifthenelse "${command}" "ARG" | ||||||
|  | done | ||||||
| docker exec ${DOCKER_ID} ./resolve-debbuilddeps.sh | docker exec ${DOCKER_ID} ./resolve-debbuilddeps.sh | ||||||
| docker exec -u $(id -u) ${DOCKER_ID} svn upgrade || true | docker exec -u $(id -u) ${DOCKER_ID} svn upgrade || true | ||||||
| docker exec -u $(id -u) ${DOCKER_ID} ./bootstrap.sh -t "all check distcheck" | docker exec -u $(id -u) ${DOCKER_ID} ./bootstrap.sh -t "${targets}" | ||||||
|   | |||||||
							
								
								
									
										9
									
								
								libpcscxx.desktop.in
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										9
									
								
								libpcscxx.desktop.in
									
									
									
									
									
										Normal file
									
								
							| @@ -0,0 +1,9 @@ | |||||||
|  | [Desktop Entry] | ||||||
|  | Type=Application | ||||||
|  | Name=libpcscxx | ||||||
|  | GenericName=libpcscxx | ||||||
|  | Comment=@DESCRIPTION@ | ||||||
|  | Icon=@prefix@/share/@PACKAGE_NAME@/@PACKAGE_ICON@ | ||||||
|  | Exec=libpcscxx %u | ||||||
|  | Terminal=false | ||||||
|  | Categories=Qt;Utility; | ||||||
| @@ -16,7 +16,11 @@ if test -n "${SCHROOTNAME}"; then | |||||||
|   SUDO="schroot -c "${SCHROOTNAME}" -u root -d / --" |   SUDO="schroot -c "${SCHROOTNAME}" -u root -d / --" | ||||||
| else | else | ||||||
|   DO="" |   DO="" | ||||||
|   SUDO="sudo" |   if grep -q '/docker/' /proc/1/cgroup; then | ||||||
|  |       SUDO="" | ||||||
|  |   else | ||||||
|  |       SUDO="sudo" | ||||||
|  |   fi | ||||||
| fi | fi | ||||||
|  |  | ||||||
| function install() { | function install() { | ||||||
| @@ -31,7 +35,7 @@ TO_INSTALL= | |||||||
|  |  | ||||||
| if test -e debian/control.in -a ! -e debian/control; then | 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 |     for f in $(sed -n 's, *AX_DEB_DEPEND_IFEXISTS(\([^)]*\)).*,\1,p' configure.ac); do | ||||||
|         if test -n "$(${DO} apt-cache policy -q ${f})" && ! ${DO} dpkg -l "${f}"; then |         if test -n "$(${DO} apt-cache policy -q ${f})" && ! "$(${DO} apt-cache policy ${f} 2>&1 | grep -q 'N: Unable to locate package')" && ! ${DO} dpkg -l "${f}"; then | ||||||
|             TO_INSTALL+=" ${f}" |             TO_INSTALL+=" ${f}" | ||||||
|         fi |         fi | ||||||
|     done |     done | ||||||
| @@ -41,7 +45,7 @@ if test -e debian/control.in -a ! -e debian/control; then | |||||||
| fi | fi | ||||||
|  |  | ||||||
| install dpkg-dev | install dpkg-dev | ||||||
| DEPS=$(${DO} dpkg-checkbuilddeps 2>&1 || true) | DEPS=$(LANG= ${DO} dpkg-checkbuilddeps 2>&1 || true) | ||||||
| DEPS=$(echo "$DEPS" | sed -n '/Unmet build dependencies/ { s,.*Unmet build dependencies: ,,g; s, ([^)]*),,g; s, *| *,|,g; p}') | DEPS=$(echo "$DEPS" | sed -n '/Unmet build dependencies/ { s,.*Unmet build dependencies: ,,g; s, ([^)]*),,g; s, *| *,|,g; p}') | ||||||
|  |  | ||||||
| for pa in ${DEPS}; do | for pa in ${DEPS}; do | ||||||
|   | |||||||
							
								
								
									
										81
									
								
								sql-to-dot.sed
									
									
									
									
									
										Executable file
									
								
							
							
						
						
									
										81
									
								
								sql-to-dot.sed
									
									
									
									
									
										Executable file
									
								
							| @@ -0,0 +1,81 @@ | |||||||
|  | #! /bin/sed -nf | ||||||
|  | 1i\ | ||||||
|  | /** @page database Database Schema\ | ||||||
|  | \ | ||||||
|  | @dot\ | ||||||
|  | digraph schema { | ||||||
|  |  | ||||||
|  | # get everithing on one single line | ||||||
|  | H;$!d;$x | ||||||
|  |  | ||||||
|  | # remove all single-line comment lines | ||||||
|  | s/\n--[^\n]*//g | ||||||
|  |  | ||||||
|  | # reduce spaces | ||||||
|  | s,\t\| \+, ,g | ||||||
|  |  | ||||||
|  | # remove multiline comments | ||||||
|  | :f;s,\(.*\)/\*.*\*/[ \n]*;*,\1,g;tf | ||||||
|  |  | ||||||
|  | # remove empty lines | ||||||
|  | s,\n\+,\n,g | ||||||
|  |  | ||||||
|  | # remove unknown commands | ||||||
|  | s,\(;\|\n\) *\(DELIMITER\|USE\|DROP\|CREATE[ \n]\+DATABASE\)[ \n]\+[^;]*;\+,,ig | ||||||
|  |  | ||||||
|  | # convert special characters within quotes | ||||||
|  | :a;s/^\(\([^"]*"[^",]*"\)*[^"]*"[^"]*\),\([^"]*".*\)/\1\##COMMA##\3/g;ta | ||||||
|  | :c;s/^\(\([^']*'[^',]*'\)*[^']*'[^']*\),\([^']*'.*\)/\1\##COMMA##\3/g;tc | ||||||
|  |  | ||||||
|  | # backup everything to the buffer | ||||||
|  | # then analyze only on one create table | ||||||
|  | :i | ||||||
|  | h | ||||||
|  | s,.*\(create[ \n]\+table[^;]*;\).*,\1,ig | ||||||
|  |  | ||||||
|  | # start html table node | ||||||
|  | s|CREATE[ \n]\+TABLE[ \n]\+\(if[ \n]\+not[ \n]\+exists[ \n]\+\)\?`\?\(\w\+\)`\?|    \2\n        [shape=none, margin=0, label=<\n            <table bgcolor="#dddddd">\n                <tr><td bgcolor="#ddddff" colspan="4"><b>\2</b></td></tr>|ig | ||||||
|  |  | ||||||
|  | # remove key definitions | ||||||
|  | s/[),][\n ]*\(PRIMARY[ \n]\+\)\?KEY[ \n]\+[^(]*([^)]*)//gi | ||||||
|  |  | ||||||
|  | # move foreign keys as relation to the end | ||||||
|  | :b;s/\(\w\+\)\([^;]*\)FOREIGN[\n ]\+KEY[ \n]*([ \n]*`\?\([a-z]\+\)`\?[ \n]*)[ \n]*REFERENCES[ \n]*`\?\([a-z]\+\)`\?[ \n]*([ \n]*`\?\([a-z]\+\)`\?[ \n]*)[ \n]*\([^,)]*\)\([,)].*\)/\1\2\7\n \1:\3 -> \4:\5 [label="\6"]##SEMICOLON##/ig;tb | ||||||
|  |  | ||||||
|  | # create table rows | ||||||
|  | s|[(,][ \n]*`\?\(\w\+\)`\?[ \n]\+\(\w\+\(([^)]\+)\)\?\)[ \n]*\([^,)]*\)[ \n]\+COMMENT[ \n]*["']\([^"']*\)["'][ \n]*|\n                <tr><td align="left" port="\1"><b>\1</b></td><td align="left">\2</td><td align="left">\4</td><td align="left">\5</td></tr>|gi | ||||||
|  | s|[(,][ \n]*`\?\(\w\+\)`\?[ \n]\+\(\w\+\(([^)]\+)\)\?\)[ \n]*\([^,)]*\)|\n                <tr><td align="left" port="\1"><b>\1</b></td><td align="left">\2</td><td align="left">\4</td></tr>|g | ||||||
|  |  | ||||||
|  | # add line breaks for long lines | ||||||
|  | s|\(<td[^>]*>[^<]\{30,40\}\)[ \n]\+\([^<]\{20,\}</td>\)|\1<br/>\2|g | ||||||
|  | #:d;s|\(<br/>[^<]\{30,40\}\)[ \n]\+\([^<]\{20,\}</td>\)|\1<br/>\2|g;td | ||||||
|  |  | ||||||
|  | # add table comment below | ||||||
|  | :k;tk | ||||||
|  | s|[ \n]*)[^)]*COMMENT[ \n]*=[ \n]*["']\?\([^"']*\)["']\?[^;]*|\n                <tr><td bgcolor="#ddddff" colspan="4">\1</td></tr>|ig;th | ||||||
|  | s|)[^);]*;|\n;|ig | ||||||
|  | :h | ||||||
|  |  | ||||||
|  | # cleanup comment below, add line breaksfor long lines | ||||||
|  | s|\(<td[^>]*>[^<]\{60,80\}\)[ \n]\+\([^<]\{30,\}</td>\)|\1<br/>\2|g | ||||||
|  | #:e;s|\(<br/>[^<]\{60,80\}\)[ \n]\+\([^<]\{30,\}</td>\)|\1<br/>\2|g;te | ||||||
|  |  | ||||||
|  | # close table | ||||||
|  | s|;|\n            </table>\n        >];|ig | ||||||
|  |  | ||||||
|  | # convert ##COMMA## to , | ||||||
|  | s|##COMMA##|,|g | ||||||
|  | # convert ##SEMICOLON## to ; | ||||||
|  | s,##SEMICOLON##,;,g | ||||||
|  |  | ||||||
|  | # print one table | ||||||
|  | p | ||||||
|  | # get buffer back and remove the table that has just been analyzed | ||||||
|  | x | ||||||
|  | s,\(.*\)create[ \n]\+table[^;]*;\(.*\),\1\2,ig | ||||||
|  | ti | ||||||
|  |  | ||||||
|  | $a\ | ||||||
|  | }\ | ||||||
|  | @enddot\ | ||||||
|  | */ | ||||||
		Reference in New Issue
	
	Block a user