build system updated
This commit is contained in:
		
							
								
								
									
										28
									
								
								ChangeLog
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										28
									
								
								ChangeLog
									
									
									
									
									
										Normal file
									
								
							| @@ -0,0 +1,28 @@ | ||||
| 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 09:12  marc | ||||
|  | ||||
| 	* scripts/makefile.am: fixed old stuff in makefile | ||||
|  | ||||
| 2015-11-06 23:40  marc | ||||
|  | ||||
| 	* AUTHORS: updated author woth new homepage | ||||
|  | ||||
| 2015-11-05 15:58  marc | ||||
|  | ||||
| 	* ., AUTHORS, NEWS, 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-chroots.spec.in, | ||||
| 	  debian/changelog.in, debian/compat, debian/control.in, | ||||
| 	  debian/docs, debian/rules, doc, doc/doxyfile.in, doc/makefile.am, | ||||
| 	  mac-create-app-bundle.sh, makefile.am, resolve-debbuilddeps.sh, | ||||
| 	  resolve-rpmbuilddeps.sh, scripts, scripts/makefile.am, | ||||
| 	  scripts/setup-debootstrap.sh: initial project creation | ||||
|  | ||||
| @@ -345,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]) | ||||
|   | ||||
							
								
								
									
										17
									
								
								bootstrap.sh
									
									
									
									
									
								
							
							
						
						
									
										17
									
								
								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 | ||||
|                   <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 | ||||
| @@ -424,6 +426,7 @@ copy resolve-debbuilddeps.sh | ||||
| copy resolve-rpmbuilddeps.sh | ||||
| copy build-in-docker.sh | ||||
| copy build-resource-file.sh | ||||
| copy sql-to-dot.sed | ||||
| copy mac-create-app-bundle.sh | ||||
| AUTHOR=$(gpg -K  | sed -n 's,uid *,,p' | sort | head -1) | ||||
| if test -z "${AUTHOR}"; then | ||||
| @@ -718,6 +721,7 @@ ${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 test/runtests.sh < test/runtests.sh | ||||
| to --condition 'AX_BUILD_TEST|AX_USE_CPPUNIT' test/makefile.am <<EOF | ||||
| ${HEADER}$(if testtag AX_USE_CXX; then | ||||
| cat <<EOF2 | ||||
| @@ -771,6 +775,7 @@ if testtag AX_USE_DOXYGEN; then | ||||
|         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 '"mutex=\\par Reentrant:\\nAccess is locked with mutex @c "' | ||||
|         doxyadd ALIASES '"api=\\xrefitem api \\"API Call\\" \\"\\""' | ||||
|         doxyreplace ENABLE_PREPROCESSING YES | ||||
|         doxyreplace MACRO_EXPANSION YES | ||||
|         doxyadd PREDEFINED '"NAMESPACE=@PACKAGE_NAME@"' | ||||
| @@ -797,14 +802,14 @@ if testtag AX_USE_DOXYGEN; then | ||||
|         if testtag AX_BUILD_TEST AX_USE_CPPUNIT; then | ||||
|             doxyadd INPUT "@top_srcdir@/test" | ||||
|         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 EXCLUDE_PATTERNS "moc_* uic_* qrc_*" | ||||
|         if testtag AX_BUILD_EXAMPLES; then | ||||
|             doxyreplace EXAMPLE_PATH @top_srcdir@/examples | ||||
|         fi | ||||
|         doxyreplace EXAMPLE_RECURSIVE YES | ||||
|         doxyreplace FILTER_PATTERNS '*.wt=doxygen-webtester.sed' | ||||
|         doxyreplace FILTER_PATTERNS '*.wt=doxygen-webtester.sed *.sql=@top_srcdir@/sql-to-dot.sed' | ||||
|         doxyreplace SOURCE_BROWSER YES | ||||
|         doxyreplace INLINE_SOURCES YES | ||||
|         doxyreplace GENERATE_TESTLIST YES | ||||
| @@ -822,7 +827,7 @@ if testtag AX_USE_DOXYGEN; then | ||||
|         doxyreplace CLASS_GRAPH YES | ||||
|         doxyreplace TEMPLATE_RELATIONS YES | ||||
|         doxyreplace DOT_IMAGE_FORMAT svg | ||||
|         doxyreplace INTERACTIVE_SVG YES | ||||
|         doxyreplace INTERACTIVE_SVG NO | ||||
|         doxyreplace DOT_TRANSPARENT YES | ||||
|     fi | ||||
| fi | ||||
| @@ -835,7 +840,7 @@ 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 | 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)" | ||||
|     to debian/control.in <<EOF | ||||
| Source: @PACKAGE_NAME@ | ||||
| Priority: extra | ||||
| @@ -1050,7 +1055,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 | ||||
|   | ||||
| @@ -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 schroot -c "${SCHROOTNAME}" -u root -d / -- apt-get -y install $*; then | ||||
|             return 0 | ||||
|         fi | ||||
|     if ${SUDO} apt-get -y install $*; then | ||||
|         return 0 | ||||
|     else | ||||
|         if apt-get -y install $*; then | ||||
|             return 0 | ||||
|         fi | ||||
|         return 1 | ||||
|     fi | ||||
|     return 1 | ||||
| } | ||||
|  | ||||
| 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 | ||||
|   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 | ||||
|   | ||||
							
								
								
									
										41
									
								
								sql-to-dot.sed
									
									
									
									
									
										Executable file
									
								
							
							
						
						
									
										41
									
								
								sql-to-dot.sed
									
									
									
									
									
										Executable file
									
								
							| @@ -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            <table bgcolor="#dddddd">\n                <tr><td bgcolor="#ddddff" colspan="4"><b>\2</b></td></tr>\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                <tr><td align="left" port="\1"><b>\1</b></td><td align="left">\2</td><td align="left">\3</td><td align="left">\4</td></tr>\n,|ig;tc | ||||
|  | ||||
| s| \+</td>|</td>|g | ||||
| s|<td> \+|<td>|g | ||||
| s|\(<td[^>]*>[^<]\{30,40\}\) \+\([^<]\{20,\}</td>\)|\1<br/>\2|g | ||||
| :d;s|\(<br/>[^<]\{30,40\}\) \+\([^<]\{20,\}</td>\)|\1<br/>\2|g;td | ||||
|  | ||||
| s| *COMMENT *= *["']\?\([^"']*\)["']\?|\n                <tr><td bgcolor="#ddddff" colspan="4">\1</td></tr>|ig | ||||
|  | ||||
| s| \+</td>|</td>|g | ||||
| s|<td> \+|<td>|g | ||||
| s|\(<td[^>]*>[^<]\{60,80\}\) \+\([^<]\{30,\}</td>\)|\1<br/>\2|g | ||||
| :e;s|\(<br/>[^<]\{60,80\}\) \+\([^<]\{30,\}</td>\)|\1<br/>\2|g;te | ||||
|  | ||||
| s/\n,[^\n]*/\n/g | ||||
| s|;|\n            </table>\n        >];\n|ig | ||||
|  | ||||
| $a\ | ||||
| }\ | ||||
| @enddot\ | ||||
| */ | ||||
		Reference in New Issue
	
	Block a user